diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a776a9d86..4211f910c 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -20,22 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "apiwrap.h"
 
-#include "data/data_drafts.h"
-#include "observer_peer.h"
-#include "lang/lang_keys.h"
 #include "application.h"
-#include "mainwindow.h"
-#include "messenger.h"
-#include "mainwidget.h"
-#include "history/history_widget.h"
-#include "storage/localstorage.h"
 #include "auth_session.h"
+#include "base/algorithm.h" // for_each_apply
 #include "boxes/confirm_box.h"
-#include "window/themes/window_theme.h"
-#include "window/notifications_manager.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/stickers.h"
-#include "base/algorithm.h" // for_each_apply
+#include "data/data_drafts.h"
+#include "history/history_widget.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "storage/localstorage.h"
+#include "window/notifications_manager.h"
+#include "window/themes/window_theme.h"
 
 namespace {
 
@@ -50,12 +50,11 @@ constexpr auto kUnreadMentionsNextRequestLimit = 100;
 
 } // namespace
 
-ApiWrap::ApiWrap(not_null<AuthSession*> session)
-: _session(session)
-, _messageDataResolveDelayed([this] { resolveMessageDatas(); })
-, _webPagesTimer([this] { resolveWebPages(); })
-, _draftsSaveTimer([this] { saveDraftsToCloud(); }) {
-}
+ApiWrap::ApiWrap(not_null<AuthSession *> session)
+    : _session(session)
+    , _messageDataResolveDelayed([this] { resolveMessageDatas(); })
+    , _webPagesTimer([this] { resolveWebPages(); })
+    , _draftsSaveTimer([this] { saveDraftsToCloud(); }) {}
 
 void ApiWrap::start() {
 	Window::Theme::Background()->start();
@@ -66,24 +65,29 @@ void ApiWrap::requestAppChangelogs() {
 	auto oldAppVersion = Local::oldMapVersion();
 	if (oldAppVersion > 0 && oldAppVersion < AppVersion) {
 		_changelogSubscription = subscribe(_session->data().moreChatsLoaded(), [this, oldAppVersion] {
-			auto oldVersionString = qsl("%1.%2.%3").arg(oldAppVersion / 1000000).arg((oldAppVersion % 1000000) / 1000).arg(oldAppVersion % 1000);
-			request(MTPhelp_GetAppChangelog(MTP_string(oldVersionString))).done([this, oldAppVersion](const MTPUpdates &result) {
-				applyUpdates(result);
+			auto oldVersionString = qsl("%1.%2.%3")
+			                            .arg(oldAppVersion / 1000000)
+			                            .arg((oldAppVersion % 1000000) / 1000)
+			                            .arg(oldAppVersion % 1000);
+			request(MTPhelp_GetAppChangelog(MTP_string(oldVersionString)))
+			    .done([this, oldAppVersion](const MTPUpdates &result) {
+				    applyUpdates(result);
 
-				auto resultEmpty = true;
-				switch (result.type()) {
-				case mtpc_updateShortMessage:
-				case mtpc_updateShortChatMessage:
-				case mtpc_updateShort: resultEmpty = false; break;
-				case mtpc_updatesCombined: resultEmpty = result.c_updatesCombined().vupdates.v.isEmpty(); break;
-				case mtpc_updates: resultEmpty = result.c_updates().vupdates.v.isEmpty(); break;
-				case mtpc_updatesTooLong:
-				case mtpc_updateShortSentMessage: LOG(("API Error: Bad updates type in app changelog.")); break;
-				}
-				if (resultEmpty) {
-					addLocalChangelogs(oldAppVersion);
-				}
-			}).send();
+				    auto resultEmpty = true;
+				    switch (result.type()) {
+				    case mtpc_updateShortMessage:
+				    case mtpc_updateShortChatMessage:
+				    case mtpc_updateShort: resultEmpty = false; break;
+				    case mtpc_updatesCombined: resultEmpty = result.c_updatesCombined().vupdates.v.isEmpty(); break;
+				    case mtpc_updates: resultEmpty = result.c_updates().vupdates.v.isEmpty(); break;
+				    case mtpc_updatesTooLong:
+				    case mtpc_updateShortSentMessage: LOG(("API Error: Bad updates type in app changelog.")); break;
+				    }
+				    if (resultEmpty) {
+					    addLocalChangelogs(oldAppVersion);
+				    }
+			    })
+			    .send();
 			unsubscribe(base::take(_changelogSubscription));
 		});
 	}
@@ -92,13 +96,14 @@ void ApiWrap::requestAppChangelogs() {
 void ApiWrap::addLocalChangelogs(int oldAppVersion) {
 	auto addedSome = false;
 	auto addLocalChangelog = [this, &addedSome](const QString &text) {
-		auto textWithEntities = TextWithEntities { text };
+		auto textWithEntities = TextWithEntities{text};
 		TextUtilities::ParseEntities(textWithEntities, TextParseLinks);
 		App::wnd()->serviceNotification(textWithEntities, MTP_messageMediaEmpty(), unixtime());
 		addedSome = true;
 	};
 	auto text = lng_new_version_wrap(lt_version, str_const_toString(AppVersionStr), lt_changes,
-		lang(lng_new_version_minor), lt_link, lang(lng_url_changelog)).trimmed();
+	                                 lang(lng_new_version_minor), lt_link, lang(lng_url_changelog))
+	                .trimmed();
 	addLocalChangelog(text);
 }
 
@@ -141,9 +146,12 @@ void ApiWrap::resolveMessageDatas() {
 
 	auto ids = collectMessageIds(_messageDataRequests);
 	if (!ids.isEmpty()) {
-		auto requestId = request(MTPmessages_GetMessages(MTP_vector<MTPint>(ids))).done([this](const MTPmessages_Messages &result, mtpRequestId requestId) {
-			gotMessageDatas(nullptr, result, requestId);
-		}).after(kSmallDelayMs).send();
+		auto requestId = request(MTPmessages_GetMessages(MTP_vector<MTPint>(ids)))
+		                     .done([this](const MTPmessages_Messages &result, mtpRequestId requestId) {
+			                     gotMessageDatas(nullptr, result, requestId);
+		                     })
+		                     .after(kSmallDelayMs)
+		                     .send();
 		for (auto &request : _messageDataRequests) {
 			if (request.requestId > 0) continue;
 			request.requestId = requestId;
@@ -156,9 +164,13 @@ void ApiWrap::resolveMessageDatas() {
 		}
 		auto ids = collectMessageIds(j.value());
 		if (!ids.isEmpty()) {
-			auto requestId = request(MTPchannels_GetMessages(j.key()->inputChannel, MTP_vector<MTPint>(ids))).done([this, channel = j.key()](const MTPmessages_Messages &result, mtpRequestId requestId) {
-				gotMessageDatas(channel, result, requestId);
-			}).after(kSmallDelayMs).send();
+			auto requestId =
+			    request(MTPchannels_GetMessages(j.key()->inputChannel, MTP_vector<MTPint>(ids)))
+			        .done([this, channel = j.key()](const MTPmessages_Messages &result, mtpRequestId requestId) {
+				        gotMessageDatas(channel, result, requestId);
+			        })
+			        .after(kSmallDelayMs)
+			        .send();
 
 			for (auto &request : *j) {
 				if (request.requestId > 0) continue;
@@ -190,7 +202,9 @@ void ApiWrap::gotMessageDatas(ChannelData *channel, const MTPmessages_Messages &
 		if (channel) {
 			channel->ptsReceived(d.vpts.v);
 		} else {
-			LOG(("App Error: received messages.channelMessages when no channel was passed! (ApiWrap::gotDependencyItem)"));
+			LOG(
+			    ("App Error: received messages.channelMessages when no channel was passed! "
+			     "(ApiWrap::gotDependencyItem)"));
 		}
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
@@ -201,9 +215,7 @@ void ApiWrap::gotMessageDatas(ChannelData *channel, const MTPmessages_Messages &
 	if (requests) {
 		for (auto i = requests->begin(); i != requests->cend();) {
 			if (i.value().requestId == requestId) {
-				for_const (auto &callback, i.value().callbacks) {
-					callback(channel, i.key());
-				}
+				for_const (auto &callback, i.value().callbacks) { callback(channel, i.key()); }
 				i = requests->erase(i);
 			} else {
 				++i;
@@ -219,21 +231,28 @@ void ApiWrap::requestFullPeer(PeerData *peer) {
 	if (!peer || _fullPeerRequests.contains(peer)) return;
 
 	auto sendRequest = [this, peer] {
-		auto failHandler = [this, peer](const RPCError &error) {
-			_fullPeerRequests.remove(peer);
-		};
+		auto failHandler = [this, peer](const RPCError &error) { _fullPeerRequests.remove(peer); };
 		if (auto user = peer->asUser()) {
-			return request(MTPusers_GetFullUser(user->inputUser)).done([this, user](const MTPUserFull &result, mtpRequestId requestId) {
-				gotUserFull(user, result, requestId);
-			}).fail(failHandler).send();
+			return request(MTPusers_GetFullUser(user->inputUser))
+			    .done([this, user](const MTPUserFull &result, mtpRequestId requestId) {
+				    gotUserFull(user, result, requestId);
+			    })
+			    .fail(failHandler)
+			    .send();
 		} else if (auto chat = peer->asChat()) {
-			return request(MTPmessages_GetFullChat(chat->inputChat)).done([this, peer](const MTPmessages_ChatFull &result, mtpRequestId requestId) {
-				gotChatFull(peer, result, requestId);
-			}).fail(failHandler).send();
+			return request(MTPmessages_GetFullChat(chat->inputChat))
+			    .done([this, peer](const MTPmessages_ChatFull &result, mtpRequestId requestId) {
+				    gotChatFull(peer, result, requestId);
+			    })
+			    .fail(failHandler)
+			    .send();
 		} else if (auto channel = peer->asChannel()) {
-			return request(MTPchannels_GetFullChannel(channel->inputChannel)).done([this, peer](const MTPmessages_ChatFull &result, mtpRequestId requestId) {
-				gotChatFull(peer, result, requestId);
-			}).fail(failHandler).send();
+			return request(MTPchannels_GetFullChannel(channel->inputChannel))
+			    .done([this, peer](const MTPmessages_ChatFull &result, mtpRequestId requestId) {
+				    gotChatFull(peer, result, requestId);
+			    })
+			    .fail(failHandler)
+			    .send();
 		}
 		return 0;
 	};
@@ -255,9 +274,11 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 	auto &vc = d.vchats.v;
 	auto badVersion = false;
 	if (peer->isChat()) {
-		badVersion = (!vc.isEmpty() && vc[0].type() == mtpc_chat && vc[0].c_chat().vversion.v < peer->asChat()->version);
+		badVersion =
+		    (!vc.isEmpty() && vc[0].type() == mtpc_chat && vc[0].c_chat().vversion.v < peer->asChat()->version);
 	} else if (peer->isChannel()) {
-		badVersion = (!vc.isEmpty() && vc[0].type() == mtpc_channel && vc[0].c_channel().vversion.v < peer->asChannel()->version);
+		badVersion = (!vc.isEmpty() && vc[0].type() == mtpc_channel &&
+		              vc[0].c_channel().vversion.v < peer->asChannel()->version);
 	}
 
 	App::feedUsers(d.vusers);
@@ -288,7 +309,9 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 		} else {
 			chat->photoId = 0;
 		}
-		chat->setInviteLink((f.vexported_invite.type() == mtpc_chatInviteExported) ? qs(f.vexported_invite.c_chatInviteExported().vlink) : QString());
+		chat->setInviteLink((f.vexported_invite.type() == mtpc_chatInviteExported) ?
+		                        qs(f.vexported_invite.c_chatInviteExported().vlink) :
+		                        QString());
 		chat->fullUpdated();
 
 		notifySettingReceived(MTP_inputNotifyPeer(peer->input), f.vnotify_settings);
@@ -355,7 +378,9 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 		channel->setAdminsCount(f.has_admins_count() ? f.vadmins_count.v : 0);
 		channel->setRestrictedCount(f.has_banned_count() ? f.vbanned_count.v : 0);
 		channel->setKickedCount(f.has_kicked_count() ? f.vkicked_count.v : 0);
-		channel->setInviteLink((f.vexported_invite.type() == mtpc_chatInviteExported) ? qs(f.vexported_invite.c_chatInviteExported().vlink) : QString());
+		channel->setInviteLink((f.vexported_invite.type() == mtpc_chatInviteExported) ?
+		                           qs(f.vexported_invite.c_chatInviteExported().vlink) :
+		                           QString());
 		if (auto h = App::historyLoaded(channel->id)) {
 			if (h->inboxReadBefore < f.vread_inbox_max_id.v + 1) {
 				h->setUnreadCount(f.vunread_count.v);
@@ -373,9 +398,13 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 			auto stickersChanged = (canEditStickers != channel->canEditStickers());
 			auto stickerSet = (f.has_stickerset() ? &f.vstickerset.c_stickerSet() : nullptr);
 			auto newSetId = (stickerSet ? stickerSet->vid.v : 0);
-			auto oldSetId = (channel->mgInfo->stickerSet.type() == mtpc_inputStickerSetID) ? channel->mgInfo->stickerSet.c_inputStickerSetID().vid.v : 0;
+			auto oldSetId = (channel->mgInfo->stickerSet.type() == mtpc_inputStickerSetID) ?
+			                    channel->mgInfo->stickerSet.c_inputStickerSetID().vid.v :
+			                    0;
 			if (oldSetId != newSetId) {
-				channel->mgInfo->stickerSet = stickerSet ? MTP_inputStickerSetID(stickerSet->vid, stickerSet->vaccess_hash) : MTP_inputStickerSetEmpty();
+				channel->mgInfo->stickerSet = stickerSet ?
+				                                  MTP_inputStickerSetID(stickerSet->vid, stickerSet->vaccess_hash) :
+				                                  MTP_inputStickerSetEmpty();
 				stickersChanged = true;
 			}
 			if (stickersChanged) {
@@ -384,8 +413,7 @@ void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result, mt
 		}
 		channel->fullUpdated();
 
-		if (canViewAdmins != channel->canViewAdmins()
-			|| canViewMembers != channel->canViewMembers()) {
+		if (canViewAdmins != channel->canViewAdmins() || canViewMembers != channel->canViewMembers()) {
 			Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelRightsChanged);
 		}
 
@@ -415,7 +443,8 @@ void ApiWrap::gotUserFull(UserData *user, const MTPUserFull &result, mtpRequestI
 	if (d.has_profile_photo()) {
 		App::feedPhoto(d.vprofile_photo);
 	}
-	App::feedUserLink(MTP_int(peerToUser(user->id)), d.vlink.c_contacts_link().vmy_link, d.vlink.c_contacts_link().vforeign_link);
+	App::feedUserLink(MTP_int(peerToUser(user->id)), d.vlink.c_contacts_link().vmy_link,
+	                  d.vlink.c_contacts_link().vforeign_link);
 	if (App::main()) {
 		notifySettingReceived(MTP_inputNotifyPeer(user->input), d.vnotify_settings);
 	}
@@ -426,7 +455,9 @@ void ApiWrap::gotUserFull(UserData *user, const MTPUserFull &result, mtpRequestI
 		user->setBotInfoVersion(-1);
 	}
 	user->setBlockStatus(d.is_blocked() ? UserData::BlockStatus::Blocked : UserData::BlockStatus::NotBlocked);
-	user->setCallsStatus(d.is_phone_calls_private() ? UserData::CallsStatus::Private : d.is_phone_calls_available() ? UserData::CallsStatus::Enabled : UserData::CallsStatus::Disabled);
+	user->setCallsStatus(d.is_phone_calls_private() ? UserData::CallsStatus::Private :
+	                                                  d.is_phone_calls_available() ? UserData::CallsStatus::Enabled :
+	                                                                                 UserData::CallsStatus::Disabled);
 	user->setAbout(d.has_about() ? qs(d.vabout) : QString());
 	user->setCommonChatsCount(d.vcommon_chats_count.v);
 	user->fullUpdated();
@@ -444,9 +475,7 @@ void ApiWrap::requestPeer(PeerData *peer) {
 	if (!peer || _fullPeerRequests.contains(peer) || _peerRequests.contains(peer)) return;
 
 	auto sendRequest = [this, peer] {
-		auto failHandler = [this, peer](const RPCError &error) {
-			_peerRequests.remove(peer);
-		};
+		auto failHandler = [this, peer](const RPCError &error) { _peerRequests.remove(peer); };
 		auto chatHandler = [this, peer](const MTPmessages_Chats &result) {
 			_peerRequests.remove(peer);
 
@@ -456,7 +485,8 @@ void ApiWrap::requestPeer(PeerData *peer) {
 				if (auto chat = peer->asChat()) {
 					badVersion = (!v.isEmpty() && v[0].type() == mtpc_chat && v[0].c_chat().vversion.v < chat->version);
 				} else if (auto channel = peer->asChannel()) {
-					badVersion = (!v.isEmpty() && v[0].type() == mtpc_channel && v[0].c_channel().vversion.v < channel->version);
+					badVersion =
+					    (!v.isEmpty() && v[0].type() == mtpc_channel && v[0].c_channel().vversion.v < channel->version);
 				}
 				auto chat = App::feedChats(*chats);
 				if (chat == peer) {
@@ -472,14 +502,23 @@ void ApiWrap::requestPeer(PeerData *peer) {
 			}
 		};
 		if (auto user = peer->asUser()) {
-			return request(MTPusers_GetUsers(MTP_vector<MTPInputUser>(1, user->inputUser))).done([this, user](const MTPVector<MTPUser> &result) {
-				_peerRequests.remove(user);
-				App::feedUsers(result);
-			}).fail(failHandler).send();
+			return request(MTPusers_GetUsers(MTP_vector<MTPInputUser>(1, user->inputUser)))
+			    .done([this, user](const MTPVector<MTPUser> &result) {
+				    _peerRequests.remove(user);
+				    App::feedUsers(result);
+			    })
+			    .fail(failHandler)
+			    .send();
 		} else if (auto chat = peer->asChat()) {
-			return request(MTPmessages_GetChats(MTP_vector<MTPint>(1, chat->inputChat))).done(chatHandler).fail(failHandler).send();
+			return request(MTPmessages_GetChats(MTP_vector<MTPint>(1, chat->inputChat)))
+			    .done(chatHandler)
+			    .fail(failHandler)
+			    .send();
 		} else if (auto channel = peer->asChannel()) {
-			return request(MTPchannels_GetChannels(MTP_vector<MTPInputChannel>(1, channel->inputChannel))).done(chatHandler).fail(failHandler).send();
+			return request(MTPchannels_GetChannels(MTP_vector<MTPInputChannel>(1, channel->inputChannel)))
+			    .done(chatHandler)
+			    .fail(failHandler)
+			    .send();
 		}
 		return 0;
 	};
@@ -488,14 +527,14 @@ void ApiWrap::requestPeer(PeerData *peer) {
 	}
 }
 
-void ApiWrap::requestPeers(const QList<PeerData*> &peers) {
+void ApiWrap::requestPeers(const QList<PeerData *> &peers) {
 	QVector<MTPint> chats;
 	QVector<MTPInputChannel> channels;
 	QVector<MTPInputUser> users;
 	chats.reserve(peers.size());
 	channels.reserve(peers.size());
 	users.reserve(peers.size());
-	for (QList<PeerData*>::const_iterator i = peers.cbegin(), e = peers.cend(); i != e; ++i) {
+	for (QList<PeerData *>::const_iterator i = peers.cbegin(), e = peers.cend(); i != e; ++i) {
 		if (!*i || _fullPeerRequests.contains(*i) || _peerRequests.contains(*i)) continue;
 		if ((*i)->isUser()) {
 			users.push_back((*i)->asUser()->inputUser);
@@ -517,9 +556,9 @@ void ApiWrap::requestPeers(const QList<PeerData*> &peers) {
 		request(MTPchannels_GetChannels(MTP_vector<MTPInputChannel>(channels))).done(handleChats).send();
 	}
 	if (!users.isEmpty()) {
-		request(MTPusers_GetUsers(MTP_vector<MTPInputUser>(users))).done([this](const MTPVector<MTPUser> &result) {
-			App::feedUsers(result);
-		}).send();
+		request(MTPusers_GetUsers(MTP_vector<MTPInputUser>(users)))
+		    .done([this](const MTPVector<MTPUser> &result) { App::feedUsers(result); })
+		    .send();
 	}
 }
 
@@ -529,7 +568,8 @@ void ApiWrap::requestLastParticipants(ChannelData *channel, bool fromStart) {
 	}
 
 	auto needAdmins = channel->canViewAdmins();
-	auto adminsOutdated = (channel->mgInfo->lastParticipantsStatus & MegagroupInfo::LastParticipantsAdminsOutdated) != 0;
+	auto adminsOutdated =
+	    (channel->mgInfo->lastParticipantsStatus & MegagroupInfo::LastParticipantsAdminsOutdated) != 0;
 	if ((needAdmins && adminsOutdated) || channel->lastParticipantsCountOutdated()) {
 		fromStart = true;
 	}
@@ -542,13 +582,20 @@ void ApiWrap::requestLastParticipants(ChannelData *channel, bool fromStart) {
 		}
 	}
 
-	auto requestId = request(MTPchannels_GetParticipants(channel->inputChannel, MTP_channelParticipantsRecent(), MTP_int(fromStart ? 0 : channel->mgInfo->lastParticipants.size()), MTP_int(Global::ChatSizeMax()))).done([this, channel](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
-		lastParticipantsDone(channel, result, requestId);
-	}).fail([this, channel](const RPCError &error, mtpRequestId requestId) {
-		if (_participantsRequests.value(channel) == requestId || _participantsRequests.value(channel) == -requestId) {
-			_participantsRequests.remove(channel);
-		}
-	}).send();
+	auto requestId =
+	    request(MTPchannels_GetParticipants(channel->inputChannel, MTP_channelParticipantsRecent(),
+	                                        MTP_int(fromStart ? 0 : channel->mgInfo->lastParticipants.size()),
+	                                        MTP_int(Global::ChatSizeMax())))
+	        .done([this, channel](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
+		        lastParticipantsDone(channel, result, requestId);
+	        })
+	        .fail([this, channel](const RPCError &error, mtpRequestId requestId) {
+		        if (_participantsRequests.value(channel) == requestId ||
+		            _participantsRequests.value(channel) == -requestId) {
+			        _participantsRequests.remove(channel);
+		        }
+	        })
+	        .send();
 
 	_participantsRequests.insert(channel, fromStart ? requestId : -requestId);
 }
@@ -558,18 +605,23 @@ void ApiWrap::requestBots(ChannelData *channel) {
 		return;
 	}
 
-	auto requestId = request(MTPchannels_GetParticipants(channel->inputChannel, MTP_channelParticipantsBots(), MTP_int(0), MTP_int(Global::ChatSizeMax()))).done([this, channel](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
-		lastParticipantsDone(channel, result, requestId);
-	}).fail([this, channel](const RPCError &error, mtpRequestId requestId) {
-		if (_botsRequests.value(channel) == requestId) {
-			_botsRequests.remove(channel);
-		}
-	}).send();
+	auto requestId = request(MTPchannels_GetParticipants(channel->inputChannel, MTP_channelParticipantsBots(),
+	                                                     MTP_int(0), MTP_int(Global::ChatSizeMax())))
+	                     .done([this, channel](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
+		                     lastParticipantsDone(channel, result, requestId);
+	                     })
+	                     .fail([this, channel](const RPCError &error, mtpRequestId requestId) {
+		                     if (_botsRequests.value(channel) == requestId) {
+			                     _botsRequests.remove(channel);
+		                     }
+	                     })
+	                     .send();
 
 	_botsRequests.insert(channel, requestId);
 }
 
-void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
+void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelParticipants &result,
+                                   mtpRequestId requestId) {
 	bool bots = (_botsRequests.value(peer) == requestId), fromStart = false;
 	if (bots) {
 		_botsRequests.remove(peer);
@@ -618,11 +670,11 @@ void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelP
 			userId = participant.c_channelParticipantAdmin().vuser_id.v;
 			adminCanEdit = participant.c_channelParticipantAdmin().is_can_edit();
 			adminRights = participant.c_channelParticipantAdmin().vadmin_rights;
-		break;
+			break;
 		case mtpc_channelParticipantBanned:
 			userId = participant.c_channelParticipantBanned().vuser_id.v;
 			restrictedRights = participant.c_channelParticipantBanned().vbanned_rights;
-		break;
+			break;
 		case mtpc_channelParticipantCreator: userId = participant.c_channelParticipantCreator().vuser_id.v; break;
 		}
 		if (!userId) {
@@ -636,7 +688,7 @@ void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelP
 		if (bots) {
 			if (u->botInfo) {
 				peer->mgInfo->bots.insert(u);
-				botStatus = 2;// (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
+				botStatus = 2; // (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
 				if (!u->botInfo->inited) {
 					needBotsInfos = true;
 				}
@@ -648,9 +700,9 @@ void ApiWrap::lastParticipantsDone(ChannelData *peer, const MTPchannels_ChannelP
 			if (peer->mgInfo->lastParticipants.indexOf(u) < 0) {
 				peer->mgInfo->lastParticipants.push_back(u);
 				if (adminRights.c_channelAdminRights().vflags.v) {
-					peer->mgInfo->lastAdmins.insert(u, MegagroupInfo::Admin { adminRights, adminCanEdit });
+					peer->mgInfo->lastAdmins.insert(u, MegagroupInfo::Admin{adminRights, adminCanEdit});
 				} else if (restrictedRights.c_channelBannedRights().vflags.v != 0) {
-					peer->mgInfo->lastRestricted.insert(u, MegagroupInfo::Restricted { restrictedRights });
+					peer->mgInfo->lastRestricted.insert(u, MegagroupInfo::Restricted{restrictedRights});
 				}
 				if (u->botInfo) {
 					peer->mgInfo->bots.insert(u);
@@ -690,46 +742,50 @@ void ApiWrap::requestSelfParticipant(ChannelData *channel) {
 		return;
 	}
 
-	auto requestId = request(MTPchannels_GetParticipant(channel->inputChannel, MTP_inputUserSelf())).done([this, channel](const MTPchannels_ChannelParticipant &result) {
-		_selfParticipantRequests.remove(channel);
-		if (result.type() != mtpc_channels_channelParticipant) {
-			LOG(("API Error: unknown type in gotSelfParticipant (%1)").arg(result.type()));
-			channel->inviter = -1;
-			if (App::main()) App::main()->onSelfParticipantUpdated(channel);
-			return;
-		}
+	auto requestId = request(MTPchannels_GetParticipant(channel->inputChannel, MTP_inputUserSelf()))
+	                     .done([this, channel](const MTPchannels_ChannelParticipant &result) {
+		                     _selfParticipantRequests.remove(channel);
+		                     if (result.type() != mtpc_channels_channelParticipant) {
+			                     LOG(("API Error: unknown type in gotSelfParticipant (%1)").arg(result.type()));
+			                     channel->inviter = -1;
+			                     if (App::main()) App::main()->onSelfParticipantUpdated(channel);
+			                     return;
+		                     }
 
-		auto &p = result.c_channels_channelParticipant();
-		App::feedUsers(p.vusers);
+		                     auto &p = result.c_channels_channelParticipant();
+		                     App::feedUsers(p.vusers);
 
-		switch (p.vparticipant.type()) {
-		case mtpc_channelParticipantSelf: {
-			auto &d = p.vparticipant.c_channelParticipantSelf();
-			channel->inviter = d.vinviter_id.v;
-			channel->inviteDate = date(d.vdate);
-		} break;
-		case mtpc_channelParticipantCreator: {
-			auto &d = p.vparticipant.c_channelParticipantCreator();
-			channel->inviter = _session->userId();
-			channel->inviteDate = date(MTP_int(channel->date));
-			if (channel->mgInfo) {
-				channel->mgInfo->creator = App::self();
-			}
-		} break;
-		case mtpc_channelParticipantAdmin: {
-			auto &d = p.vparticipant.c_channelParticipantAdmin();
-			channel->inviter = d.vinviter_id.v;
-			channel->inviteDate = date(d.vdate);
-		} break;
-		}
+		                     switch (p.vparticipant.type()) {
+		                     case mtpc_channelParticipantSelf: {
+			                     auto &d = p.vparticipant.c_channelParticipantSelf();
+			                     channel->inviter = d.vinviter_id.v;
+			                     channel->inviteDate = date(d.vdate);
+		                     } break;
+		                     case mtpc_channelParticipantCreator: {
+			                     auto &d = p.vparticipant.c_channelParticipantCreator();
+			                     channel->inviter = _session->userId();
+			                     channel->inviteDate = date(MTP_int(channel->date));
+			                     if (channel->mgInfo) {
+				                     channel->mgInfo->creator = App::self();
+			                     }
+		                     } break;
+		                     case mtpc_channelParticipantAdmin: {
+			                     auto &d = p.vparticipant.c_channelParticipantAdmin();
+			                     channel->inviter = d.vinviter_id.v;
+			                     channel->inviteDate = date(d.vdate);
+		                     } break;
+		                     }
 
-		if (App::main()) App::main()->onSelfParticipantUpdated(channel);
-	}).fail([this, channel](const RPCError &error) {
-		_selfParticipantRequests.remove(channel);
-		if (error.type() == qstr("USER_NOT_PARTICIPANT")) {
-			channel->inviter = -1;
-		}
-	}).after(kSmallDelayMs).send();
+		                     if (App::main()) App::main()->onSelfParticipantUpdated(channel);
+	                     })
+	                     .fail([this, channel](const RPCError &error) {
+		                     _selfParticipantRequests.remove(channel);
+		                     if (error.type() == qstr("USER_NOT_PARTICIPANT")) {
+			                     channel->inviter = -1;
+		                     }
+	                     })
+	                     .after(kSmallDelayMs)
+	                     .send();
 
 	_selfParticipantRequests.insert(channel, requestId);
 }
@@ -740,14 +796,15 @@ void ApiWrap::kickParticipant(PeerData *peer, UserData *user, const MTPChannelBa
 
 	if (auto channel = peer->asChannel()) {
 		auto rights = ChannelData::KickedRestrictedRights();
-		auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser, rights)).done([this, channel, user, currentRights, rights](const MTPUpdates &result) {
-			applyUpdates(result);
+		auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser, rights))
+		                     .done([this, channel, user, currentRights, rights](const MTPUpdates &result) {
+			                     applyUpdates(result);
 
-			_kickRequests.remove(KickRequest(channel, user));
-			channel->applyEditBanned(user, currentRights, rights);
-		}).fail([this, kick](const RPCError &error) {
-			_kickRequests.remove(kick);
-		}).send();
+			                     _kickRequests.remove(KickRequest(channel, user));
+			                     channel->applyEditBanned(user, currentRights, rights);
+		                     })
+		                     .fail([this, kick](const RPCError &error) { _kickRequests.remove(kick); })
+		                     .send();
 
 		_kickRequests.insert(kick, requestId);
 	}
@@ -758,20 +815,22 @@ void ApiWrap::unblockParticipant(PeerData *peer, UserData *user) {
 	if (_kickRequests.contains(kick)) return;
 
 	if (auto channel = peer->asChannel()) {
-		auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)))).done([this, peer, user](const MTPUpdates &result) {
-			applyUpdates(result);
+		auto requestId = request(MTPchannels_EditBanned(channel->inputChannel, user->inputUser,
+		                                                MTP_channelBannedRights(MTP_flags(0), MTP_int(0))))
+		                     .done([this, peer, user](const MTPUpdates &result) {
+			                     applyUpdates(result);
 
-			_kickRequests.remove(KickRequest(peer, user));
-			if (auto channel = peer->asMegagroup()) {
-				if (channel->kickedCount() > 0) {
-					channel->setKickedCount(channel->kickedCount() - 1);
-				} else {
-					channel->updateFullForced();
-				}
-			}
-		}).fail([this, kick](const RPCError &error) {
-			_kickRequests.remove(kick);
-		}).send();
+			                     _kickRequests.remove(KickRequest(peer, user));
+			                     if (auto channel = peer->asMegagroup()) {
+				                     if (channel->kickedCount() > 0) {
+					                     channel->setKickedCount(channel->kickedCount() - 1);
+				                     } else {
+					                     channel->updateFullForced();
+				                     }
+			                     }
+		                     })
+		                     .fail([this, kick](const RPCError &error) { _kickRequests.remove(kick); })
+		                     .send();
 
 		_kickRequests.insert(kick, requestId);
 	}
@@ -789,11 +848,12 @@ void ApiWrap::requestStickerSets() {
 		if (i.value().second) continue;
 
 		auto waitMs = (j == e) ? 0 : kSmallDelayMs;
-		i.value().second = request(MTPmessages_GetStickerSet(MTP_inputStickerSetID(MTP_long(i.key()), MTP_long(i.value().first)))).done([this, setId = i.key()](const MTPmessages_StickerSet &result) {
-			gotStickerSet(setId, result);
-		}).fail([this, setId = i.key()](const RPCError &error) {
-			_stickerSetRequests.remove(setId);
-		}).after(waitMs).send();
+		i.value().second =
+		    request(MTPmessages_GetStickerSet(MTP_inputStickerSetID(MTP_long(i.key()), MTP_long(i.value().first))))
+		        .done([this, setId = i.key()](const MTPmessages_StickerSet &result) { gotStickerSet(setId, result); })
+		        .fail([this, setId = i.key()](const RPCError &error) { _stickerSetRequests.remove(setId); })
+		        .after(waitMs)
+		        .send();
 	}
 }
 
@@ -804,7 +864,8 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers:
 	request(base::take(_stickersReorderRequestId)).cancel();
 	request(base::take(_stickersClearRecentRequestId)).cancel();
 
-	auto writeInstalled = true, writeRecent = false, writeCloudRecent = false, writeFaved = false, writeArchived = false;
+	auto writeInstalled = true, writeRecent = false, writeCloudRecent = false, writeFaved = false,
+	     writeArchived = false;
 	auto &recent = cGetRecentStickers();
 	auto &sets = Global::RefStickerSets();
 
@@ -822,11 +883,11 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers:
 				writeRecent = true;
 			}
 
-			_stickersClearRecentRequestId = request(MTPmessages_ClearRecentStickers(MTP_flags(0))).done([this](const MTPBool &result) {
-				_stickersClearRecentRequestId = 0;
-			}).fail([this](const RPCError &error) {
-				_stickersClearRecentRequestId = 0;
-			}).send();
+			_stickersClearRecentRequestId =
+			    request(MTPmessages_ClearRecentStickers(MTP_flags(0)))
+			        .done([this](const MTPBool &result) { _stickersClearRecentRequestId = 0; })
+			        .fail([this](const RPCError &error) { _stickersClearRecentRequestId = 0; })
+			        .send();
 			continue;
 		}
 
@@ -841,19 +902,26 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers:
 				}
 			}
 			if (!(it->flags & MTPDstickerSet::Flag::f_archived)) {
-				MTPInputStickerSet setId = (it->id && it->access) ? MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access)) : MTP_inputStickerSetShortName(MTP_string(it->shortName));
+				MTPInputStickerSet setId = (it->id && it->access) ?
+				                               MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access)) :
+				                               MTP_inputStickerSetShortName(MTP_string(it->shortName));
 
-				auto requestId = request(MTPmessages_UninstallStickerSet(setId)).done([this](const MTPBool &result, mtpRequestId requestId) {
-					stickerSetDisenabled(requestId);
-				}).fail([this](const RPCError &error, mtpRequestId requestId) {
-					stickerSetDisenabled(requestId);
-				}).after(kSmallDelayMs).send();
+				auto requestId = request(MTPmessages_UninstallStickerSet(setId))
+				                     .done([this](const MTPBool &result, mtpRequestId requestId) {
+					                     stickerSetDisenabled(requestId);
+				                     })
+				                     .fail([this](const RPCError &error, mtpRequestId requestId) {
+					                     stickerSetDisenabled(requestId);
+				                     })
+				                     .after(kSmallDelayMs)
+				                     .send();
 
 				_stickerSetDisenableRequests.insert(requestId);
 
 				int removeIndex = Global::StickerSetsOrder().indexOf(it->id);
 				if (removeIndex >= 0) Global::RefStickerSetsOrder().removeAt(removeIndex);
-				if (!(it->flags & MTPDstickerSet_ClientFlag::f_featured) && !(it->flags & MTPDstickerSet_ClientFlag::f_special)) {
+				if (!(it->flags & MTPDstickerSet_ClientFlag::f_featured) &&
+				    !(it->flags & MTPDstickerSet_ClientFlag::f_special)) {
 					sets.erase(it);
 				} else {
 					if (it->flags & MTPDstickerSet::Flag::f_archived) {
@@ -878,13 +946,18 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers:
 		auto it = sets.find(setId);
 		if (it != sets.cend()) {
 			if ((it->flags & MTPDstickerSet::Flag::f_archived) && !localRemoved.contains(it->id)) {
-				MTPInputStickerSet mtpSetId = (it->id && it->access) ? MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access)) : MTP_inputStickerSetShortName(MTP_string(it->shortName));
+				MTPInputStickerSet mtpSetId = (it->id && it->access) ?
+				                                  MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access)) :
+				                                  MTP_inputStickerSetShortName(MTP_string(it->shortName));
 
-				auto requestId = request(MTPmessages_InstallStickerSet(mtpSetId, MTP_boolFalse())).done([this](const MTPmessages_StickerSetInstallResult &result, mtpRequestId requestId) {
-					stickerSetDisenabled(requestId);
-				}).fail([this](const RPCError &error, mtpRequestId requestId) {
-					stickerSetDisenabled(requestId);
-				}).after(kSmallDelayMs).send();
+				auto requestId = request(MTPmessages_InstallStickerSet(mtpSetId, MTP_boolFalse()))
+				                     .done([this](const MTPmessages_StickerSetInstallResult &result,
+				                                  mtpRequestId requestId) { stickerSetDisenabled(requestId); })
+				                     .fail([this](const RPCError &error, mtpRequestId requestId) {
+					                     stickerSetDisenabled(requestId);
+				                     })
+				                     .after(kSmallDelayMs)
+				                     .send();
 
 				_stickerSetDisenableRequests.insert(requestId);
 
@@ -896,10 +969,8 @@ void ApiWrap::saveStickerSets(const Stickers::Order &localOrder, const Stickers:
 		}
 	}
 	for (auto it = sets.begin(); it != sets.cend();) {
-		if ((it->flags & MTPDstickerSet_ClientFlag::f_featured)
-			|| (it->flags & MTPDstickerSet::Flag::f_installed)
-			|| (it->flags & MTPDstickerSet::Flag::f_archived)
-			|| (it->flags & MTPDstickerSet_ClientFlag::f_special)) {
+		if ((it->flags & MTPDstickerSet_ClientFlag::f_featured) || (it->flags & MTPDstickerSet::Flag::f_installed) ||
+		    (it->flags & MTPDstickerSet::Flag::f_archived) || (it->flags & MTPDstickerSet_ClientFlag::f_special)) {
 			++it;
 		} else {
 			it = sets.erase(it);
@@ -931,15 +1002,18 @@ void ApiWrap::joinChannel(ChannelData *channel) {
 	if (channel->amIn()) {
 		Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelAmIn);
 	} else if (!_channelAmInRequests.contains(channel)) {
-		auto requestId = request(MTPchannels_JoinChannel(channel->inputChannel)).done([this, channel](const MTPUpdates &result) {
-			_channelAmInRequests.remove(channel);
-			applyUpdates(result);
-		}).fail([this, channel](const RPCError &error) {
-			if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
-				Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
-			}
-			_channelAmInRequests.remove(channel);
-		}).send();
+		auto requestId = request(MTPchannels_JoinChannel(channel->inputChannel))
+		                     .done([this, channel](const MTPUpdates &result) {
+			                     _channelAmInRequests.remove(channel);
+			                     applyUpdates(result);
+		                     })
+		                     .fail([this, channel](const RPCError &error) {
+			                     if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
+				                     Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
+			                     }
+			                     _channelAmInRequests.remove(channel);
+		                     })
+		                     .send();
 
 		_channelAmInRequests.insert(channel, requestId);
 	}
@@ -949,12 +1023,13 @@ void ApiWrap::leaveChannel(ChannelData *channel) {
 	if (!channel->amIn()) {
 		Notify::peerUpdatedDelayed(channel, Notify::PeerUpdate::Flag::ChannelAmIn);
 	} else if (!_channelAmInRequests.contains(channel)) {
-		auto requestId = request(MTPchannels_LeaveChannel(channel->inputChannel)).done([this, channel](const MTPUpdates &result) {
-			_channelAmInRequests.remove(channel);
-			applyUpdates(result);
-		}).fail([this, channel](const RPCError &error) {
-			_channelAmInRequests.remove(channel);
-		}).send();
+		auto requestId = request(MTPchannels_LeaveChannel(channel->inputChannel))
+		                     .done([this, channel](const MTPUpdates &result) {
+			                     _channelAmInRequests.remove(channel);
+			                     applyUpdates(result);
+		                     })
+		                     .fail([this, channel](const RPCError &error) { _channelAmInRequests.remove(channel); })
+		                     .send();
 
 		_channelAmInRequests.insert(channel, requestId);
 	}
@@ -964,12 +1039,13 @@ void ApiWrap::blockUser(UserData *user) {
 	if (user->isBlocked()) {
 		Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserIsBlocked);
 	} else if (!_blockRequests.contains(user)) {
-		auto requestId = request(MTPcontacts_Block(user->inputUser)).done([this, user](const MTPBool &result) {
-			_blockRequests.remove(user);
-			user->setBlockStatus(UserData::BlockStatus::Blocked);
-		}).fail([this, user](const RPCError &error) {
-			_blockRequests.remove(user);
-		}).send();
+		auto requestId = request(MTPcontacts_Block(user->inputUser))
+		                     .done([this, user](const MTPBool &result) {
+			                     _blockRequests.remove(user);
+			                     user->setBlockStatus(UserData::BlockStatus::Blocked);
+		                     })
+		                     .fail([this, user](const RPCError &error) { _blockRequests.remove(user); })
+		                     .send();
 
 		_blockRequests.insert(user, requestId);
 	}
@@ -979,12 +1055,13 @@ void ApiWrap::unblockUser(UserData *user) {
 	if (!user->isBlocked()) {
 		Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserIsBlocked);
 	} else if (!_blockRequests.contains(user)) {
-		auto requestId = request(MTPcontacts_Unblock(user->inputUser)).done([this, user](const MTPBool &result) {
-			_blockRequests.remove(user);
-			user->setBlockStatus(UserData::BlockStatus::NotBlocked);
-		}).fail([this, user](const RPCError &error) {
-			_blockRequests.remove(user);
-		}).send();
+		auto requestId = request(MTPcontacts_Unblock(user->inputUser))
+		                     .done([this, user](const MTPBool &result) {
+			                     _blockRequests.remove(user);
+			                     user->setBlockStatus(UserData::BlockStatus::NotBlocked);
+		                     })
+		                     .fail([this, user](const RPCError &error) { _blockRequests.remove(user); })
+		                     .send();
 
 		_blockRequests.insert(user, requestId);
 	}
@@ -996,19 +1073,27 @@ void ApiWrap::exportInviteLink(PeerData *peer) {
 	}
 
 	auto sendRequest = [this, peer] {
-		auto exportFail = [this, peer](const RPCError &error) {
-			_exportInviteRequests.remove(peer);
-		};
+		auto exportFail = [this, peer](const RPCError &error) { _exportInviteRequests.remove(peer); };
 		if (auto chat = peer->asChat()) {
-			return request(MTPmessages_ExportChatInvite(chat->inputChat)).done([this, chat](const MTPExportedChatInvite &result) {
-				_exportInviteRequests.remove(chat);
-				chat->setInviteLink((result.type() == mtpc_chatInviteExported) ? qs(result.c_chatInviteExported().vlink) : QString());
-			}).fail(exportFail).send();
+			return request(MTPmessages_ExportChatInvite(chat->inputChat))
+			    .done([this, chat](const MTPExportedChatInvite &result) {
+				    _exportInviteRequests.remove(chat);
+				    chat->setInviteLink((result.type() == mtpc_chatInviteExported) ?
+				                            qs(result.c_chatInviteExported().vlink) :
+				                            QString());
+			    })
+			    .fail(exportFail)
+			    .send();
 		} else if (auto channel = peer->asChannel()) {
-			return request(MTPchannels_ExportInvite(channel->inputChannel)).done([this, channel](const MTPExportedChatInvite &result) {
-				_exportInviteRequests.remove(channel);
-				channel->setInviteLink((result.type() == mtpc_chatInviteExported) ? qs(result.c_chatInviteExported().vlink) : QString());
-			}).fail(exportFail).send();
+			return request(MTPchannels_ExportInvite(channel->inputChannel))
+			    .done([this, channel](const MTPExportedChatInvite &result) {
+				    _exportInviteRequests.remove(channel);
+				    channel->setInviteLink((result.type() == mtpc_chatInviteExported) ?
+				                               qs(result.c_chatInviteExported().vlink) :
+				                               QString());
+			    })
+			    .fail(exportFail)
+			    .send();
 		}
 		return 0;
 	};
@@ -1021,13 +1106,16 @@ void ApiWrap::requestNotifySetting(PeerData *peer) {
 	if (_notifySettingRequests.contains(peer)) return;
 
 	auto notifyPeer = MTP_inputNotifyPeer(peer->input);
-	auto requestId = request(MTPaccount_GetNotifySettings(notifyPeer)).done([this, notifyPeer, peer](const MTPPeerNotifySettings &result) {
-		notifySettingReceived(notifyPeer, result);
-		_notifySettingRequests.remove(peer);
-	}).fail([this, notifyPeer, peer](const RPCError &error) {
-		notifySettingReceived(notifyPeer, MTP_peerNotifySettingsEmpty());
-		_notifySettingRequests.remove(peer);
-	}).send();
+	auto requestId = request(MTPaccount_GetNotifySettings(notifyPeer))
+	                     .done([this, notifyPeer, peer](const MTPPeerNotifySettings &result) {
+		                     notifySettingReceived(notifyPeer, result);
+		                     _notifySettingRequests.remove(peer);
+	                     })
+	                     .fail([this, notifyPeer, peer](const RPCError &error) {
+		                     notifySettingReceived(notifyPeer, MTP_peerNotifySettingsEmpty());
+		                     _notifySettingRequests.remove(peer);
+	                     })
+	                     .send();
 
 	_notifySettingRequests.insert(peer, requestId);
 }
@@ -1047,15 +1135,16 @@ void ApiWrap::savePrivacy(const MTPInputPrivacyKey &key, QVector<MTPInputPrivacy
 		_privacySaveRequests.erase(it);
 	}
 
-	auto requestId = request(MTPaccount_SetPrivacy(key, MTP_vector<MTPInputPrivacyRule>(std::move(rules)))).done([this, keyTypeId](const MTPaccount_PrivacyRules &result) {
-		Expects(result.type() == mtpc_account_privacyRules);
-		auto &rules = result.c_account_privacyRules();
-		App::feedUsers(rules.vusers);
-		_privacySaveRequests.remove(keyTypeId);
-		handlePrivacyChange(keyTypeId, rules.vrules);
-	}).fail([this, keyTypeId](const RPCError &error) {
-		_privacySaveRequests.remove(keyTypeId);
-	}).send();
+	auto requestId = request(MTPaccount_SetPrivacy(key, MTP_vector<MTPInputPrivacyRule>(std::move(rules))))
+	                     .done([this, keyTypeId](const MTPaccount_PrivacyRules &result) {
+		                     Expects(result.type() == mtpc_account_privacyRules);
+		                     auto &rules = result.c_account_privacyRules();
+		                     App::feedUsers(rules.vusers);
+		                     _privacySaveRequests.remove(keyTypeId);
+		                     handlePrivacyChange(keyTypeId, rules.vrules);
+	                     })
+	                     .fail([this, keyTypeId](const RPCError &error) { _privacySaveRequests.remove(keyTypeId); })
+	                     .send();
 
 	_privacySaveRequests.insert(keyTypeId, requestId);
 }
@@ -1072,7 +1161,8 @@ void ApiWrap::handlePrivacyChange(mtpTypeId keyTypeId, const MTPVector<MTPPrivac
 		auto everyoneRule = Rule::Unknown;
 		for (auto &rule : rules.v) {
 			auto type = rule.type();
-			if (type != mtpc_privacyValueAllowAll && type != mtpc_privacyValueDisallowAll && contactsRule != Rule::Unknown) {
+			if (type != mtpc_privacyValueAllowAll && type != mtpc_privacyValueDisallowAll &&
+			    contactsRule != Rule::Unknown) {
 				// This is simplified: we ignore per-user rules that come after a contacts rule.
 				// But none of the official apps provide such complicated rule sets, so its fine.
 				continue;
@@ -1127,30 +1217,33 @@ void ApiWrap::handlePrivacyChange(mtpTypeId keyTypeId, const MTPVector<MTPPrivac
 		if (_contactsStatusesRequestId) {
 			request(_contactsStatusesRequestId).cancel();
 		}
-		_contactsStatusesRequestId = request(MTPcontacts_GetStatuses()).done([this](const MTPVector<MTPContactStatus> &result) {
-			_contactsStatusesRequestId = 0;
-			for_const (auto &item, result.v) {
-				Assert(item.type() == mtpc_contactStatus);
-				auto &data = item.c_contactStatus();
-				if (auto user = App::userLoaded(data.vuser_id.v)) {
-					auto oldOnlineTill = user->onlineTill;
-					auto newOnlineTill = onlineTillFromStatus(data.vstatus, oldOnlineTill);
-					if (oldOnlineTill != newOnlineTill) {
-						user->onlineTill = newOnlineTill;
-						Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserOnlineChanged);
-					}
-				}
-			}
-		}).fail([this](const RPCError &error) {
-			_contactsStatusesRequestId = 0;
-		}).send();
+		_contactsStatusesRequestId =
+		    request(MTPcontacts_GetStatuses())
+		        .done([this](const MTPVector<MTPContactStatus> &result) {
+			        _contactsStatusesRequestId = 0;
+			        for_const (auto &item, result.v) {
+				        Assert(item.type() == mtpc_contactStatus);
+				        auto &data = item.c_contactStatus();
+				        if (auto user = App::userLoaded(data.vuser_id.v)) {
+					        auto oldOnlineTill = user->onlineTill;
+					        auto newOnlineTill = onlineTillFromStatus(data.vstatus, oldOnlineTill);
+					        if (oldOnlineTill != newOnlineTill) {
+						        user->onlineTill = newOnlineTill;
+						        Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserOnlineChanged);
+					        }
+				        }
+			        }
+		        })
+		        .fail([this](const RPCError &error) { _contactsStatusesRequestId = 0; })
+		        .send();
 	}
 }
 
 int ApiWrap::onlineTillFromStatus(const MTPUserStatus &status, int currentOnlineTill) {
 	switch (status.type()) {
 	case mtpc_userStatusEmpty: return 0;
-	case mtpc_userStatusRecently: return (currentOnlineTill > -10) ? -2 : currentOnlineTill; // don't modify pseudo-online
+	case mtpc_userStatusRecently:
+		return (currentOnlineTill > -10) ? -2 : currentOnlineTill; // don't modify pseudo-online
 	case mtpc_userStatusLastWeek: return -3;
 	case mtpc_userStatusLastMonth: return -4;
 	case mtpc_userStatusOffline: return status.c_userStatusOffline().vwas_online.v;
@@ -1182,32 +1275,38 @@ void ApiWrap::saveDraftsToCloud() {
 		if (!textWithTags.tags.isEmpty()) {
 			flags |= MTPmessages_SaveDraft::Flag::f_entities;
 		}
-		auto entities = TextUtilities::EntitiesToMTP(ConvertTextTagsToEntities(textWithTags.tags), TextUtilities::ConvertOption::SkipLocal);
+		auto entities = TextUtilities::EntitiesToMTP(ConvertTextTagsToEntities(textWithTags.tags),
+		                                             TextUtilities::ConvertOption::SkipLocal);
 
-		cloudDraft->saveRequestId = request(MTPmessages_SaveDraft(MTP_flags(flags), MTP_int(cloudDraft->msgId), history->peer->input, MTP_string(textWithTags.text), entities)).done([this, history](const MTPBool &result, mtpRequestId requestId) {
-			if (auto cloudDraft = history->cloudDraft()) {
-				if (cloudDraft->saveRequestId == requestId) {
-					cloudDraft->saveRequestId = 0;
-					history->draftSavedToCloud();
-				}
-			}
-			auto i = _draftsSaveRequestIds.find(history);
-			if (i != _draftsSaveRequestIds.cend() && i.value() == requestId) {
-				_draftsSaveRequestIds.remove(history);
-				checkQuitPreventFinished();
-			}
-		}).fail([this, history](const RPCError &error, mtpRequestId requestId) {
-			if (auto cloudDraft = history->cloudDraft()) {
-				if (cloudDraft->saveRequestId == requestId) {
-					history->clearCloudDraft();
-				}
-			}
-			auto i = _draftsSaveRequestIds.find(history);
-			if (i != _draftsSaveRequestIds.cend() && i.value() == requestId) {
-				_draftsSaveRequestIds.remove(history);
-				checkQuitPreventFinished();
-			}
-		}).send();
+		cloudDraft->saveRequestId =
+		    request(MTPmessages_SaveDraft(MTP_flags(flags), MTP_int(cloudDraft->msgId), history->peer->input,
+		                                  MTP_string(textWithTags.text), entities))
+		        .done([this, history](const MTPBool &result, mtpRequestId requestId) {
+			        if (auto cloudDraft = history->cloudDraft()) {
+				        if (cloudDraft->saveRequestId == requestId) {
+					        cloudDraft->saveRequestId = 0;
+					        history->draftSavedToCloud();
+				        }
+			        }
+			        auto i = _draftsSaveRequestIds.find(history);
+			        if (i != _draftsSaveRequestIds.cend() && i.value() == requestId) {
+				        _draftsSaveRequestIds.remove(history);
+				        checkQuitPreventFinished();
+			        }
+		        })
+		        .fail([this, history](const RPCError &error, mtpRequestId requestId) {
+			        if (auto cloudDraft = history->cloudDraft()) {
+				        if (cloudDraft->saveRequestId == requestId) {
+					        history->clearCloudDraft();
+				        }
+			        }
+			        auto i = _draftsSaveRequestIds.find(history);
+			        if (i != _draftsSaveRequestIds.cend() && i.value() == requestId) {
+				        _draftsSaveRequestIds.remove(history);
+				        checkQuitPreventFinished();
+			        }
+		        })
+		        .send();
 
 		i.value() = cloudDraft->saveRequestId;
 	}
@@ -1240,11 +1339,15 @@ PeerData *ApiWrap::notifySettingReceived(MTPInputNotifyPeer notifyPeer, const MT
 	case mtpc_inputNotifyPeer: {
 		auto &peer = notifyPeer.c_inputNotifyPeer().vpeer;
 		switch (peer.type()) {
-		case mtpc_inputPeerEmpty: App::main()->applyNotifySetting(MTP_notifyPeer(MTP_peerUser(MTP_int(0))), settings); break;
+		case mtpc_inputPeerEmpty:
+			App::main()->applyNotifySetting(MTP_notifyPeer(MTP_peerUser(MTP_int(0))), settings);
+			break;
 		case mtpc_inputPeerSelf: requestedPeer = App::self(); break;
 		case mtpc_inputPeerUser: requestedPeer = App::user(peerFromUser(peer.c_inputPeerUser().vuser_id)); break;
 		case mtpc_inputPeerChat: requestedPeer = App::chat(peerFromChat(peer.c_inputPeerChat().vchat_id)); break;
-		case mtpc_inputPeerChannel: requestedPeer = App::channel(peerFromChannel(peer.c_inputPeerChannel().vchannel_id)); break;
+		case mtpc_inputPeerChannel:
+			requestedPeer = App::channel(peerFromChannel(peer.c_inputPeerChannel().vchannel_id));
+			break;
 		}
 		if (requestedPeer) {
 			App::main()->applyNotifySetting(MTP_notifyPeer(peerToMTP(requestedPeer->id)), settings);
@@ -1284,7 +1387,7 @@ void ApiWrap::clearWebPageRequests() {
 void ApiWrap::resolveWebPages() {
 	auto ids = QVector<MTPint>(); // temp_req_id = -1
 	using IndexAndMessageIds = QPair<qint32, QVector<MTPint>>;
-	using MessageIdsByChannel = QMap<ChannelData*, IndexAndMessageIds>;
+	using MessageIdsByChannel = QMap<ChannelData *, IndexAndMessageIds>;
 	MessageIdsByChannel idsByChannel; // temp_req_id = -index - 2
 
 	auto &items = App::webPageItems();
@@ -1304,7 +1407,9 @@ void ApiWrap::resolveWebPages() {
 							auto channel = item->history()->peer->asChannel();
 							auto channelMap = idsByChannel.find(channel);
 							if (channelMap == idsByChannel.cend()) {
-								channelMap = idsByChannel.insert(channel, IndexAndMessageIds(idsByChannel.size(), QVector<MTPint>(1, MTP_int(item->id))));
+								channelMap = idsByChannel.insert(
+								    channel,
+								    IndexAndMessageIds(idsByChannel.size(), QVector<MTPint>(1, MTP_int(item->id))));
 							} else {
 								channelMap.value().second.push_back(MTP_int(item->id));
 							}
@@ -1321,15 +1426,22 @@ void ApiWrap::resolveWebPages() {
 
 	auto requestId = mtpRequestId(0);
 	if (!ids.isEmpty()) {
-		requestId = request(MTPmessages_GetMessages(MTP_vector<MTPint>(ids))).done([this](const MTPmessages_Messages &result, mtpRequestId requestId) {
-			gotWebPages(nullptr, result, requestId);
-		}).after(kSmallDelayMs).send();
+		requestId = request(MTPmessages_GetMessages(MTP_vector<MTPint>(ids)))
+		                .done([this](const MTPmessages_Messages &result, mtpRequestId requestId) {
+			                gotWebPages(nullptr, result, requestId);
+		                })
+		                .after(kSmallDelayMs)
+		                .send();
 	}
 	QVector<mtpRequestId> reqsByIndex(idsByChannel.size(), 0);
 	for (auto i = idsByChannel.cbegin(), e = idsByChannel.cend(); i != e; ++i) {
-		reqsByIndex[i.value().first] = request(MTPchannels_GetMessages(i.key()->inputChannel, MTP_vector<MTPint>(i.value().second))).done([this, channel = i.key()](const MTPmessages_Messages &result, mtpRequestId requestId) {
-			gotWebPages(channel, result, requestId);
-		}).after(kSmallDelayMs).send();
+		reqsByIndex[i.value().first] =
+		    request(MTPchannels_GetMessages(i.key()->inputChannel, MTP_vector<MTPint>(i.value().second)))
+		        .done([this, channel = i.key()](const MTPmessages_Messages &result, mtpRequestId requestId) {
+			        gotWebPages(channel, result, requestId);
+		        })
+		        .after(kSmallDelayMs)
+		        .send();
 	}
 	if (requestId || !reqsByIndex.isEmpty()) {
 		for (auto &pendingRequestId : _webPagesPending) {
@@ -1350,9 +1462,7 @@ void ApiWrap::resolveWebPages() {
 }
 
 void ApiWrap::requestParticipantsCountDelayed(ChannelData *channel) {
-	_participantsCountRequestTimer.call(kReloadChannelMembersTimeout, [this, channel] {
-		channel->updateFullForced();
-	});
+	_participantsCountRequestTimer.call(kReloadChannelMembersTimeout, [this, channel] { channel->updateFullForced(); });
 }
 
 void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs, mtpRequestId req) {
@@ -1391,8 +1501,12 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
 		const auto &msg(v->at(i));
 		switch (msg.type()) {
 		case mtpc_message: msgsIds.insert((quint64(quint32(msg.c_message().vid.v)) << 32) | quint64(i), i); break;
-		case mtpc_messageEmpty: msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i); break;
-		case mtpc_messageService: msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i); break;
+		case mtpc_messageEmpty:
+			msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i);
+			break;
+		case mtpc_messageService:
+			msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i);
+			break;
 		}
 	}
 
@@ -1409,9 +1523,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
 				i.key()->pendingTill = -1;
 				auto j = items.constFind(i.key());
 				if (j != items.cend()) {
-					for_const (auto item, j.value()) {
-						item->setPendingInitDimensions();
-					}
+					for_const (auto item, j.value()) { item->setPendingInitDimensions(); }
 				}
 			}
 			i = _webPagesPending.erase(i);
@@ -1425,17 +1537,16 @@ void ApiWrap::stickersSaveOrder() {
 	if (_stickersOrder.size() > 1) {
 		QVector<MTPlong> mtpOrder;
 		mtpOrder.reserve(_stickersOrder.size());
-		for_const (auto setId, _stickersOrder) {
-			mtpOrder.push_back(MTP_long(setId));
-		}
+		for_const (auto setId, _stickersOrder) { mtpOrder.push_back(MTP_long(setId)); }
 
-		_stickersReorderRequestId = request(MTPmessages_ReorderStickerSets(MTP_flags(0), MTP_vector<MTPlong>(mtpOrder))).done([this](const MTPBool &result) {
-			_stickersReorderRequestId = 0;
-		}).fail([this](const RPCError &error) {
-			_stickersReorderRequestId = 0;
-			Global::SetLastStickersUpdate(0);
-			updateStickers();
-		}).send();
+		_stickersReorderRequestId = request(MTPmessages_ReorderStickerSets(MTP_flags(0), MTP_vector<MTPlong>(mtpOrder)))
+		                                .done([this](const MTPBool &result) { _stickersReorderRequestId = 0; })
+		                                .fail([this](const RPCError &error) {
+			                                _stickersReorderRequestId = 0;
+			                                Global::SetLastStickersUpdate(0);
+			                                updateStickers();
+		                                })
+		                                .send();
 	}
 }
 
@@ -1448,7 +1559,7 @@ void ApiWrap::updateStickers() {
 	requestSavedGifs(now);
 }
 
-void ApiWrap::setGroupStickerSet(not_null<ChannelData*> megagroup, const MTPInputStickerSet &set) {
+void ApiWrap::setGroupStickerSet(not_null<ChannelData *> megagroup, const MTPInputStickerSet &set) {
 	Expects(megagroup->mgInfo != nullptr);
 	megagroup->mgInfo->stickerSet = set;
 	request(MTPchannels_SetStickers(megagroup->inputChannel, set)).send();
@@ -1471,14 +1582,18 @@ void ApiWrap::requestStickers(TimeId now) {
 		case mtpc_messages_allStickers: {
 			auto &d = result.c_messages_allStickers();
 			Stickers::SetsReceived(d.vsets.v, d.vhash.v);
-		} return;
+		}
+			return;
 		default: Unexpected("Type in ApiWrap::stickersDone()");
 		}
 	};
-	_stickersUpdateRequest = request(MTPmessages_GetAllStickers(MTP_int(Local::countStickersHash(true)))).done(onDone).fail([this, onDone](const RPCError &error) {
-		LOG(("App Fail: Failed to get stickers!"));
-		onDone(MTP_messages_allStickersNotModified());
-	}).send();
+	_stickersUpdateRequest = request(MTPmessages_GetAllStickers(MTP_int(Local::countStickersHash(true))))
+	                             .done(onDone)
+	                             .fail([this, onDone](const RPCError &error) {
+		                             LOG(("App Fail: Failed to get stickers!"));
+		                             onDone(MTP_messages_allStickersNotModified());
+	                             })
+	                             .send();
 }
 
 void ApiWrap::requestRecentStickers(TimeId now) {
@@ -1496,15 +1611,21 @@ void ApiWrap::requestRecentStickers(TimeId now) {
 		case mtpc_messages_recentStickersNotModified: return;
 		case mtpc_messages_recentStickers: {
 			auto &d = result.c_messages_recentStickers();
-			Stickers::SpecialSetReceived(Stickers::CloudRecentSetId, lang(lng_recent_stickers), d.vstickers.v, d.vhash.v);
-		} return;
+			Stickers::SpecialSetReceived(Stickers::CloudRecentSetId, lang(lng_recent_stickers), d.vstickers.v,
+			                             d.vhash.v);
+		}
+			return;
 		default: Unexpected("Type in ApiWrap::recentStickersDone()");
 		}
 	};
-	_recentStickersUpdateRequest = request(MTPmessages_GetRecentStickers(MTP_flags(0), MTP_int(Local::countRecentStickersHash()))).done(onDone).fail([this, onDone](const RPCError &error) {
-		LOG(("App Fail: Failed to get recent stickers!"));
-		onDone(MTP_messages_recentStickersNotModified());
-	}).send();
+	_recentStickersUpdateRequest =
+	    request(MTPmessages_GetRecentStickers(MTP_flags(0), MTP_int(Local::countRecentStickersHash())))
+	        .done(onDone)
+	        .fail([this, onDone](const RPCError &error) {
+		        LOG(("App Fail: Failed to get recent stickers!"));
+		        onDone(MTP_messages_recentStickersNotModified());
+	        })
+	        .send();
 }
 
 void ApiWrap::requestFavedStickers(TimeId now) {
@@ -1522,19 +1643,25 @@ void ApiWrap::requestFavedStickers(TimeId now) {
 		case mtpc_messages_favedStickersNotModified: return;
 		case mtpc_messages_favedStickers: {
 			auto &d = result.c_messages_favedStickers();
-			Stickers::SpecialSetReceived(Stickers::FavedSetId, lang(lng_faved_stickers), d.vstickers.v, d.vhash.v, d.vpacks.v);
-		} return;
+			Stickers::SpecialSetReceived(Stickers::FavedSetId, lang(lng_faved_stickers), d.vstickers.v, d.vhash.v,
+			                             d.vpacks.v);
+		}
+			return;
 		default: Unexpected("Type in ApiWrap::favedStickersDone()");
 		}
 	};
-	_favedStickersUpdateRequest = request(MTPmessages_GetFavedStickers(MTP_int(Local::countFavedStickersHash()))).done(onDone).fail([this, onDone](const RPCError &error) {
-		LOG(("App Fail: Failed to get faved stickers!"));
-		onDone(MTP_messages_favedStickersNotModified());
-	}).send();
+	_favedStickersUpdateRequest = request(MTPmessages_GetFavedStickers(MTP_int(Local::countFavedStickersHash())))
+	                                  .done(onDone)
+	                                  .fail([this, onDone](const RPCError &error) {
+		                                  LOG(("App Fail: Failed to get faved stickers!"));
+		                                  onDone(MTP_messages_favedStickersNotModified());
+	                                  })
+	                                  .send();
 }
 
 void ApiWrap::requestFeaturedStickers(TimeId now) {
-	if (Global::LastFeaturedStickersUpdate() != 0 && now < Global::LastFeaturedStickersUpdate() + kStickersUpdateTimeout) {
+	if (Global::LastFeaturedStickersUpdate() != 0 &&
+	    now < Global::LastFeaturedStickersUpdate() + kStickersUpdateTimeout) {
 		return;
 	}
 	if (_featuredStickersUpdateRequest) {
@@ -1549,14 +1676,19 @@ void ApiWrap::requestFeaturedStickers(TimeId now) {
 		case mtpc_messages_featuredStickers: {
 			auto &d = result.c_messages_featuredStickers();
 			Stickers::FeaturedSetsReceived(d.vsets.v, d.vunread.v, d.vhash.v);
-		} return;
+		}
+			return;
 		default: Unexpected("Type in ApiWrap::featuredStickersDone()");
 		}
 	};
-	_featuredStickersUpdateRequest = request(MTPmessages_GetFeaturedStickers(MTP_int(Local::countFeaturedStickersHash()))).done(onDone).fail([this, onDone](const RPCError &error) {
-		LOG(("App Fail: Failed to get featured stickers!"));
-		onDone(MTP_messages_featuredStickersNotModified());
-	}).send();
+	_featuredStickersUpdateRequest =
+	    request(MTPmessages_GetFeaturedStickers(MTP_int(Local::countFeaturedStickersHash())))
+	        .done(onDone)
+	        .fail([this, onDone](const RPCError &error) {
+		        LOG(("App Fail: Failed to get featured stickers!"));
+		        onDone(MTP_messages_featuredStickersNotModified());
+	        })
+	        .send();
 }
 
 void ApiWrap::requestSavedGifs(TimeId now) {
@@ -1575,14 +1707,18 @@ void ApiWrap::requestSavedGifs(TimeId now) {
 		case mtpc_messages_savedGifs: {
 			auto &d = result.c_messages_savedGifs();
 			Stickers::GifsReceived(d.vgifs.v, d.vhash.v);
-		} return;
+		}
+			return;
 		default: Unexpected("Type in ApiWrap::savedGifsDone()");
 		}
 	};
-	_savedGifsUpdateRequest = request(MTPmessages_GetSavedGifs(MTP_int(Local::countSavedGifsHash()))).done(onDone).fail([this, onDone](const RPCError &error) {
-		LOG(("App Fail: Failed to get saved gifs!"));
-		onDone(MTP_messages_savedGifsNotModified());
-	}).send();
+	_savedGifsUpdateRequest = request(MTPmessages_GetSavedGifs(MTP_int(Local::countSavedGifsHash())))
+	                              .done(onDone)
+	                              .fail([this, onDone](const RPCError &error) {
+		                              LOG(("App Fail: Failed to get saved gifs!"));
+		                              onDone(MTP_messages_savedGifsNotModified());
+	                              })
+	                              .send();
 }
 
 void ApiWrap::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
@@ -1590,13 +1726,22 @@ void ApiWrap::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 	case mtpc_updateShortMessage: {
 		auto &d = updates.c_updateShortMessage();
 		auto flags = mtpCastFlags(d.vflags.v) | MTPDmessage::Flag::f_from_id;
-		App::histories().addNewMessage(MTP_message(MTP_flags(flags), d.vid, d.is_out() ? MTP_int(Auth().userId()) : d.vuser_id, MTP_peerUser(d.is_out() ? d.vuser_id : MTP_int(Auth().userId())), d.vfwd_from, d.vvia_bot_id, d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup, d.has_entities() ? d.ventities : MTPnullEntities, MTPint(), MTPint(), MTPstring()), NewMessageUnread);
+		App::histories().addNewMessage(
+		    MTP_message(MTP_flags(flags), d.vid, d.is_out() ? MTP_int(Auth().userId()) : d.vuser_id,
+		                MTP_peerUser(d.is_out() ? d.vuser_id : MTP_int(Auth().userId())), d.vfwd_from, d.vvia_bot_id,
+		                d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup,
+		                d.has_entities() ? d.ventities : MTPnullEntities, MTPint(), MTPint(), MTPstring()),
+		    NewMessageUnread);
 	} break;
 
 	case mtpc_updateShortChatMessage: {
 		auto &d = updates.c_updateShortChatMessage();
 		auto flags = mtpCastFlags(d.vflags.v) | MTPDmessage::Flag::f_from_id;
-		App::histories().addNewMessage(MTP_message(MTP_flags(flags), d.vid, d.vfrom_id, MTP_peerChat(d.vchat_id), d.vfwd_from, d.vvia_bot_id, d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup, d.has_entities() ? d.ventities : MTPnullEntities, MTPint(), MTPint(), MTPstring()), NewMessageUnread);
+		App::histories().addNewMessage(
+		    MTP_message(MTP_flags(flags), d.vid, d.vfrom_id, MTP_peerChat(d.vchat_id), d.vfwd_from, d.vvia_bot_id,
+		                d.vreply_to_msg_id, d.vdate, d.vmessage, MTP_messageMediaEmpty(), MTPnullMarkup,
+		                d.has_entities() ? d.ventities : MTPnullEntities, MTPint(), MTPint(), MTPstring()),
+		    NewMessageUnread);
 	} break;
 
 	case mtpc_updateShortSentMessage: {
@@ -1706,49 +1851,54 @@ void ApiWrap::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 	}
 }
 
-void ApiWrap::jumpToDate(not_null<PeerData*> peer, const QDate &date) {
+void ApiWrap::jumpToDate(not_null<PeerData *> peer, const QDate &date) {
 	// API returns a message with date <= offset_date.
 	// So we request a message with offset_date = desired_date - 1 and add_offset = -1.
 	// This should give us the first message with date >= desired_date.
 	auto offset_date = static_cast<int>(QDateTime(date).toTime_t()) - 1;
 	auto add_offset = -1;
 	auto limit = 1;
-	request(MTPmessages_GetHistory(peer->input, MTP_int(0), MTP_int(offset_date), MTP_int(add_offset), MTP_int(limit), MTP_int(0), MTP_int(0))).done([peer](const MTPmessages_Messages &result) {
-		auto getMessagesList = [&result, peer]() -> const QVector<MTPMessage>* {
-			auto handleMessages = [](auto &messages) {
-				App::feedUsers(messages.vusers);
-				App::feedChats(messages.vchats);
-				return &messages.vmessages.v;
-			};
-			switch (result.type()) {
-			case mtpc_messages_messages: return handleMessages(result.c_messages_messages());
-			case mtpc_messages_messagesSlice: return handleMessages(result.c_messages_messagesSlice());
-			case mtpc_messages_channelMessages: {
-				auto &messages = result.c_messages_channelMessages();
-				if (peer && peer->isChannel()) {
-					peer->asChannel()->ptsReceived(messages.vpts.v);
-				} else {
-					LOG(("API Error: received messages.channelMessages when no channel was passed! (MainWidget::showJumpToDate)"));
-				}
-				return handleMessages(messages);
-			} break;
-			}
-			return nullptr;
-		};
+	request(MTPmessages_GetHistory(peer->input, MTP_int(0), MTP_int(offset_date), MTP_int(add_offset), MTP_int(limit),
+	                               MTP_int(0), MTP_int(0)))
+	    .done([peer](const MTPmessages_Messages &result) {
+		    auto getMessagesList = [&result, peer]() -> const QVector<MTPMessage> * {
+			    auto handleMessages = [](auto &messages) {
+				    App::feedUsers(messages.vusers);
+				    App::feedChats(messages.vchats);
+				    return &messages.vmessages.v;
+			    };
+			    switch (result.type()) {
+			    case mtpc_messages_messages: return handleMessages(result.c_messages_messages());
+			    case mtpc_messages_messagesSlice: return handleMessages(result.c_messages_messagesSlice());
+			    case mtpc_messages_channelMessages: {
+				    auto &messages = result.c_messages_channelMessages();
+				    if (peer && peer->isChannel()) {
+					    peer->asChannel()->ptsReceived(messages.vpts.v);
+				    } else {
+					    LOG(
+					        ("API Error: received messages.channelMessages when no channel was passed! "
+					         "(MainWidget::showJumpToDate)"));
+				    }
+				    return handleMessages(messages);
+			    } break;
+			    }
+			    return nullptr;
+		    };
 
-		if (auto list = getMessagesList()) {
-			App::feedMsgs(*list, NewMessageExisting);
-			for (auto &message : *list) {
-				auto id = idFromMessage(message);
-				Ui::showPeerHistory(peer, id);
-				return;
-			}
-		}
-		Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
-	}).send();
+		    if (auto list = getMessagesList()) {
+			    App::feedMsgs(*list, NewMessageExisting);
+			    for (auto &message : *list) {
+				    auto id = idFromMessage(message);
+				    Ui::showPeerHistory(peer, id);
+				    return;
+			    }
+		    }
+		    Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
+	    })
+	    .send();
 }
 
-void ApiWrap::preloadEnoughUnreadMentions(not_null<History*> history) {
+void ApiWrap::preloadEnoughUnreadMentions(not_null<History *> history) {
 	auto fullCount = history->getUnreadMentionsCount();
 	auto loadedCount = history->getUnreadMentionsLoadedCount();
 	auto allLoaded = (fullCount >= 0) ? (loadedCount >= fullCount) : false;
@@ -1763,12 +1913,14 @@ void ApiWrap::preloadEnoughUnreadMentions(not_null<History*> history) {
 	auto addOffset = loadedCount ? -(limit + 1) : -limit;
 	auto maxId = 0;
 	auto minId = 0;
-	auto requestId = request(MTPmessages_GetUnreadMentions(history->peer->input, MTP_int(offsetId), MTP_int(addOffset), MTP_int(limit), MTP_int(maxId), MTP_int(minId))).done([this, history](const MTPmessages_Messages &result) {
-		_unreadMentionsRequests.remove(history);
-		history->addUnreadMentionsSlice(result);
-	}).fail([this, history](const RPCError &error) {
-		_unreadMentionsRequests.remove(history);
-	}).send();
+	auto requestId = request(MTPmessages_GetUnreadMentions(history->peer->input, MTP_int(offsetId), MTP_int(addOffset),
+	                                                       MTP_int(limit), MTP_int(maxId), MTP_int(minId)))
+	                     .done([this, history](const MTPmessages_Messages &result) {
+		                     _unreadMentionsRequests.remove(history);
+		                     history->addUnreadMentionsSlice(result);
+	                     })
+	                     .fail([this, history](const RPCError &error) { _unreadMentionsRequests.remove(history); })
+	                     .send();
 	_unreadMentionsRequests.emplace(history, requestId);
 }
 
@@ -1784,90 +1936,88 @@ void ApiWrap::checkForUnreadMentions(const base::flat_set<MsgId> &possiblyReadMe
 	}
 }
 
-void ApiWrap::cancelEditChatAdmins(not_null<ChatData*> chat) {
-	_chatAdminsEnabledRequests.take(chat)
-		| requestCanceller();
+void ApiWrap::cancelEditChatAdmins(not_null<ChatData *> chat) {
+	_chatAdminsEnabledRequests.take(chat) | requestCanceller();
 
-	_chatAdminsSaveRequests.take(chat)
-		| base::for_each_apply(requestCanceller());
+	_chatAdminsSaveRequests.take(chat) | base::for_each_apply(requestCanceller());
 
 	_chatAdminsToSave.remove(chat);
 }
 
-void ApiWrap::editChatAdmins(
-		not_null<ChatData*> chat,
-		bool adminsEnabled,
-		base::flat_set<not_null<UserData*>> &&admins) {
+void ApiWrap::editChatAdmins(not_null<ChatData *> chat, bool adminsEnabled,
+                             base::flat_set<not_null<UserData *>> &&admins) {
 	cancelEditChatAdmins(chat);
 	if (adminsEnabled) {
 		_chatAdminsToSave.emplace(chat, std::move(admins));
 	}
 
-	auto requestId = request(MTPmessages_ToggleChatAdmins(chat->inputChat, MTP_bool(adminsEnabled))).done([this, chat](const MTPUpdates &updates) {
-		_chatAdminsEnabledRequests.remove(chat);
-		applyUpdates(updates);
-		saveChatAdmins(chat);
-	}).fail([this, chat](const RPCError &error) {
-		_chatAdminsEnabledRequests.remove(chat);
-		if (error.type() == qstr("CHAT_NOT_MODIFIED")) {
-			saveChatAdmins(chat);
-		}
-	}).send();
+	auto requestId = request(MTPmessages_ToggleChatAdmins(chat->inputChat, MTP_bool(adminsEnabled)))
+	                     .done([this, chat](const MTPUpdates &updates) {
+		                     _chatAdminsEnabledRequests.remove(chat);
+		                     applyUpdates(updates);
+		                     saveChatAdmins(chat);
+	                     })
+	                     .fail([this, chat](const RPCError &error) {
+		                     _chatAdminsEnabledRequests.remove(chat);
+		                     if (error.type() == qstr("CHAT_NOT_MODIFIED")) {
+			                     saveChatAdmins(chat);
+		                     }
+	                     })
+	                     .send();
 	_chatAdminsEnabledRequests.emplace(chat, requestId);
 }
 
-void ApiWrap::saveChatAdmins(not_null<ChatData*> chat) {
+void ApiWrap::saveChatAdmins(not_null<ChatData *> chat) {
 	if (!_chatAdminsToSave.contains(chat)) {
 		return;
 	}
-	auto requestId = request(MTPmessages_GetFullChat(chat->inputChat)).done([this, chat](const MTPmessages_ChatFull &result) {
-		_chatAdminsEnabledRequests.remove(chat);
-		processFullPeer(chat, result);
-		sendSaveChatAdminsRequests(chat);
-	}).fail([this, chat](const RPCError &error) {
-		_chatAdminsEnabledRequests.remove(chat);
-		_chatAdminsToSave.remove(chat);
-	}).send();
+	auto requestId = request(MTPmessages_GetFullChat(chat->inputChat))
+	                     .done([this, chat](const MTPmessages_ChatFull &result) {
+		                     _chatAdminsEnabledRequests.remove(chat);
+		                     processFullPeer(chat, result);
+		                     sendSaveChatAdminsRequests(chat);
+	                     })
+	                     .fail([this, chat](const RPCError &error) {
+		                     _chatAdminsEnabledRequests.remove(chat);
+		                     _chatAdminsToSave.remove(chat);
+	                     })
+	                     .send();
 	_chatAdminsEnabledRequests.emplace(chat, requestId);
 }
 
-void ApiWrap::sendSaveChatAdminsRequests(not_null<ChatData*> chat) {
-	auto editOne = [this, chat](not_null<UserData*> user, bool admin) {
-		auto requestId = request(MTPmessages_EditChatAdmin(
-				chat->inputChat,
-				user->inputUser,
-				MTP_bool(admin)))
-			.done([this, chat, user, admin](
-					const MTPBool &result,
-					mtpRequestId requestId) {
-			_chatAdminsSaveRequests[chat].remove(requestId);
-			if (_chatAdminsSaveRequests[chat].empty()) {
-				_chatAdminsSaveRequests.remove(chat);
-				Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
-			}
-			if (mtpIsTrue(result)) {
-				if (admin) {
-					if (chat->noParticipantInfo()) {
-						requestFullPeer(chat);
-					} else {
-						chat->admins.insert(user);
-					}
-				} else {
-					chat->admins.remove(user);
-				}
-			}
-		}).fail([this, chat](
-				const RPCError &error,
-				mtpRequestId requestId) {
-			_chatAdminsSaveRequests[chat].remove(requestId);
-			if (_chatAdminsSaveRequests[chat].empty()) {
-				_chatAdminsSaveRequests.remove(chat);
-			}
-			chat->invalidateParticipants();
-			if (error.type() == qstr("USER_RESTRICTED")) {
-				Ui::show(Box<InformBox>(lang(lng_cant_do_this)));
-			}
-		}).canWait(5).send();
+void ApiWrap::sendSaveChatAdminsRequests(not_null<ChatData *> chat) {
+	auto editOne = [this, chat](not_null<UserData *> user, bool admin) {
+		auto requestId = request(MTPmessages_EditChatAdmin(chat->inputChat, user->inputUser, MTP_bool(admin)))
+		                     .done([this, chat, user, admin](const MTPBool &result, mtpRequestId requestId) {
+			                     _chatAdminsSaveRequests[chat].remove(requestId);
+			                     if (_chatAdminsSaveRequests[chat].empty()) {
+				                     _chatAdminsSaveRequests.remove(chat);
+				                     Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
+			                     }
+			                     if (mtpIsTrue(result)) {
+				                     if (admin) {
+					                     if (chat->noParticipantInfo()) {
+						                     requestFullPeer(chat);
+					                     } else {
+						                     chat->admins.insert(user);
+					                     }
+				                     } else {
+					                     chat->admins.remove(user);
+				                     }
+			                     }
+		                     })
+		                     .fail([this, chat](const RPCError &error, mtpRequestId requestId) {
+			                     _chatAdminsSaveRequests[chat].remove(requestId);
+			                     if (_chatAdminsSaveRequests[chat].empty()) {
+				                     _chatAdminsSaveRequests.remove(chat);
+			                     }
+			                     chat->invalidateParticipants();
+			                     if (error.type() == qstr("USER_RESTRICTED")) {
+				                     Ui::show(Box<InformBox>(lang(lng_cant_do_this)));
+			                     }
+		                     })
+		                     .canWait(5)
+		                     .send();
 
 		_chatAdminsSaveRequests[chat].insert(requestId);
 	};
@@ -1878,7 +2028,7 @@ void ApiWrap::sendSaveChatAdminsRequests(not_null<ChatData*> chat) {
 	Assert(!!admins);
 
 	auto toRemove = chat->admins;
-	auto toAppoint = std::vector<not_null<UserData*>>();
+	auto toAppoint = std::vector<not_null<UserData *>>();
 	if (!admins->empty()) {
 		toAppoint.reserve(admins->size());
 		for (auto user : *admins) {
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index f0d23a5ee..8050d69d4 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -20,16 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/timer.h"
-#include <QtCore/QObject>
-#include "mtproto/rpc_sender.h"
-#include "mtproto/core_types.h"
-#include "core/single_timer.h"
-#include "mtproto/sender.h"
 #include "base/flat_map.h"
 #include "base/flat_set.h"
-#include "structs.h"
+#include "base/timer.h"
+#include "core/single_timer.h"
 #include "facades.h"
+#include "mtproto/core_types.h"
+#include "mtproto/rpc_sender.h"
+#include "mtproto/sender.h"
+#include "structs.h"
+#include <QtCore/QObject>
 
 class AuthSession;
 
@@ -49,17 +49,17 @@ class History;
 
 class ApiWrap : private MTP::Sender, private base::Subscriber {
 public:
-	ApiWrap(not_null<AuthSession*> session);
+	ApiWrap(not_null<AuthSession *> session);
 
 	void start();
 	void applyUpdates(const MTPUpdates &updates, quint64 sentMessageRandomId = 0);
 
-	using RequestMessageDataCallback = base::lambda<void(ChannelData*, MsgId)>;
+	using RequestMessageDataCallback = base::lambda<void(ChannelData *, MsgId)>;
 	void requestMessageData(ChannelData *channel, MsgId msgId, RequestMessageDataCallback callback);
 
 	void requestFullPeer(PeerData *peer);
 	void requestPeer(PeerData *peer);
-	void requestPeers(const QList<PeerData*> &peers);
+	void requestPeers(const QList<PeerData *> &peers);
 	void requestLastParticipants(ChannelData *channel, bool fromStart = true);
 	void requestBots(ChannelData *channel);
 	void requestParticipantsCountDelayed(ChannelData *channel);
@@ -79,7 +79,7 @@ public:
 	void requestStickerSets();
 	void saveStickerSets(const Stickers::Order &localOrder, const Stickers::Order &localRemoved);
 	void updateStickers();
-	void setGroupStickerSet(not_null<ChannelData*> megagroup, const MTPInputStickerSet &set);
+	void setGroupStickerSet(not_null<ChannelData *> megagroup, const MTPInputStickerSet &set);
 
 	void joinChannel(ChannelData *channel);
 	void leaveChannel(ChannelData *channel);
@@ -96,7 +96,7 @@ public:
 	void handlePrivacyChange(mtpTypeId keyTypeId, const MTPVector<MTPPrivacyRule> &rules);
 	int onlineTillFromStatus(const MTPUserStatus &status, int currentOnlineTill);
 
-	base::Observable<PeerData*> &fullPeerUpdated() {
+	base::Observable<PeerData *> &fullPeerUpdated() {
 		return _fullPeerUpdated;
 	}
 
@@ -105,15 +105,12 @@ public:
 	void applyUpdatesNoPtsCheck(const MTPUpdates &updates);
 	void applyUpdateNoPtsCheck(const MTPUpdate &update);
 
-	void jumpToDate(not_null<PeerData*> peer, const QDate &date);
+	void jumpToDate(not_null<PeerData *> peer, const QDate &date);
 
-	void preloadEnoughUnreadMentions(not_null<History*> history);
+	void preloadEnoughUnreadMentions(not_null<History *> history);
 	void checkForUnreadMentions(const base::flat_set<MsgId> &possiblyReadMentions, ChannelData *channel = nullptr);
 
-	void editChatAdmins(
-		not_null<ChatData*> chat,
-		bool adminsEnabled,
-		base::flat_set<not_null<UserData*>> &&admins);
+	void editChatAdmins(not_null<ChatData *> chat, bool adminsEnabled, base::flat_set<not_null<UserData *>> &&admins);
 
 	~ApiWrap();
 
@@ -156,18 +153,18 @@ private:
 	void requestFeaturedStickers(TimeId now);
 	void requestSavedGifs(TimeId now);
 
-	void cancelEditChatAdmins(not_null<ChatData*> chat);
-	void saveChatAdmins(not_null<ChatData*> chat);
-	void sendSaveChatAdminsRequests(not_null<ChatData*> chat);
+	void cancelEditChatAdmins(not_null<ChatData *> chat);
+	void saveChatAdmins(not_null<ChatData *> chat);
+	void sendSaveChatAdminsRequests(not_null<ChatData *> chat);
 
-	not_null<AuthSession*> _session;
+	not_null<AuthSession *> _session;
 	mtpRequestId _changelogSubscription = 0;
 
 	MessageDataRequests _messageDataRequests;
-	QMap<ChannelData*, MessageDataRequests> _channelMessageDataRequests;
+	QMap<ChannelData *, MessageDataRequests> _channelMessageDataRequests;
 	SingleQueuedInvokation _messageDataResolveDelayed;
 
-	using PeerRequests = QMap<PeerData*, mtpRequestId>;
+	using PeerRequests = QMap<PeerData *, mtpRequestId>;
 	PeerRequests _fullPeerRequests;
 	PeerRequests _peerRequests;
 
@@ -175,24 +172,24 @@ private:
 	PeerRequests _botsRequests;
 	base::DelayedCallTimer _participantsCountRequestTimer;
 
-	typedef QPair<PeerData*, UserData*> KickRequest;
+	typedef QPair<PeerData *, UserData *> KickRequest;
 	typedef QMap<KickRequest, mtpRequestId> KickRequests;
 	KickRequests _kickRequests;
 
-	QMap<ChannelData*, mtpRequestId> _selfParticipantRequests;
+	QMap<ChannelData *, mtpRequestId> _selfParticipantRequests;
 
-	QMap<WebPageData*, mtpRequestId> _webPagesPending;
+	QMap<WebPageData *, mtpRequestId> _webPagesPending;
 	base::Timer _webPagesTimer;
 
-	QMap<quint64, QPair<quint64, mtpRequestId> > _stickerSetRequests;
+	QMap<quint64, QPair<quint64, mtpRequestId>> _stickerSetRequests;
 
-	QMap<ChannelData*, mtpRequestId> _channelAmInRequests;
-	QMap<UserData*, mtpRequestId> _blockRequests;
-	QMap<PeerData*, mtpRequestId> _exportInviteRequests;
+	QMap<ChannelData *, mtpRequestId> _channelAmInRequests;
+	QMap<UserData *, mtpRequestId> _blockRequests;
+	QMap<PeerData *, mtpRequestId> _exportInviteRequests;
 
-	QMap<PeerData*, mtpRequestId> _notifySettingRequests;
+	QMap<PeerData *, mtpRequestId> _notifySettingRequests;
 
-	QMap<History*, mtpRequestId> _draftsSaveRequestIds;
+	QMap<History *, mtpRequestId> _draftsSaveRequestIds;
 	base::Timer _draftsSaveTimer;
 
 	OrderedSet<mtpRequestId> _stickerSetDisenableRequests;
@@ -210,12 +207,11 @@ private:
 
 	mtpRequestId _contactsStatusesRequestId = 0;
 
-	base::flat_map<not_null<History*>, mtpRequestId> _unreadMentionsRequests;
+	base::flat_map<not_null<History *>, mtpRequestId> _unreadMentionsRequests;
 
-	base::flat_map<not_null<ChatData*>, mtpRequestId> _chatAdminsEnabledRequests;
-	base::flat_map<not_null<ChatData*>, base::flat_set<not_null<UserData*>>> _chatAdminsToSave;
-	base::flat_map<not_null<ChatData*>, base::flat_set<mtpRequestId>> _chatAdminsSaveRequests;
-
-	base::Observable<PeerData*> _fullPeerUpdated;
+	base::flat_map<not_null<ChatData *>, mtpRequestId> _chatAdminsEnabledRequests;
+	base::flat_map<not_null<ChatData *>, base::flat_set<not_null<UserData *>>> _chatAdminsToSave;
+	base::flat_map<not_null<ChatData *>, base::flat_set<mtpRequestId>> _chatAdminsSaveRequests;
 
+	base::Observable<PeerData *> _fullPeerUpdated;
 };
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 4d49df8be..c4801e018 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -24,2759 +24,2865 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <libexif/exif-data.h>
 #endif // OS_MAC_OLD
 
-#include "styles/style_overview.h"
-#include "styles/style_mediaview.h"
-#include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
-#include "styles/style_boxes.h"
-#include "lang/lang_keys.h"
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
 #include "data/data_abstract_structure.h"
-#include "history/history_service_layout.h"
 #include "history/history_location_manager.h"
 #include "history/history_media_types.h"
-#include "media/media_audio.h"
+#include "history/history_service_layout.h"
 #include "inline_bots/inline_bot_layout_item.h"
-#include "messenger.h"
-#include "application.h"
-#include "storage/file_upload.h"
-#include "mainwindow.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
-#include "storage/localstorage.h"
-#include "apiwrap.h"
+#include "mainwindow.h"
+#include "media/media_audio.h"
+#include "messenger.h"
 #include "numbers.h"
 #include "observer_peer.h"
-#include "auth_session.h"
-#include "window/themes/window_theme.h"
-#include "window/notifications_manager.h"
 #include "platform/platform_notifications_manager.h"
+#include "storage/file_upload.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_history.h"
+#include "styles/style_mediaview.h"
+#include "styles/style_overview.h"
+#include "window/notifications_manager.h"
+#include "window/themes/window_theme.h"
 
-#include <QLinkedList>   // used in list of PhotosData
-#include <QFontDatabase>
 #include <QBuffer>
+#include <QFontDatabase>
 #include <QImageReader>
+#include <QLinkedList> // used in list of PhotosData
 
 namespace {
-	App::LaunchState _launchState = App::Launched;
+App::LaunchState _launchState = App::Launched;
 
-	UserData *self = nullptr;
+UserData *self = nullptr;
 
-	using PeersData = QHash<PeerId, PeerData*>;
-	PeersData peersData;
+using PeersData = QHash<PeerId, PeerData *>;
+PeersData peersData;
 
-	using MutedPeers = QMap<PeerData*, bool>;
-	MutedPeers mutedPeers;
+using MutedPeers = QMap<PeerData *, bool>;
+MutedPeers mutedPeers;
 
-	PhotosData photosData;
-	DocumentsData documentsData;
+PhotosData photosData;
+DocumentsData documentsData;
 
-	using LocationsData = QHash<LocationCoords, LocationData*>;
-	LocationsData locationsData;
+using LocationsData = QHash<LocationCoords, LocationData *>;
+LocationsData locationsData;
 
-	using WebPagesData = QHash<WebPageId, WebPageData*>;
-	WebPagesData webPagesData;
+using WebPagesData = QHash<WebPageId, WebPageData *>;
+WebPagesData webPagesData;
 
-	using GamesData = QHash<GameId, GameData*>;
-	GamesData gamesData;
+using GamesData = QHash<GameId, GameData *>;
+GamesData gamesData;
 
-	PhotoItems photoItems;
-	DocumentItems documentItems;
-	WebPageItems webPageItems;
-	GameItems gameItems;
-	SharedContactItems sharedContactItems;
-	GifItems gifItems;
+PhotoItems photoItems;
+DocumentItems documentItems;
+WebPageItems webPageItems;
+GameItems gameItems;
+SharedContactItems sharedContactItems;
+GifItems gifItems;
 
-	using DependentItemsSet = OrderedSet<HistoryItem*>;
-	using DependentItems = QMap<HistoryItem*, DependentItemsSet>;
-	DependentItems dependentItems;
+using DependentItemsSet = OrderedSet<HistoryItem *>;
+using DependentItems = QMap<HistoryItem *, DependentItemsSet>;
+DependentItems dependentItems;
 
-	Histories histories;
+Histories histories;
 
-	using MsgsData = QHash<MsgId, HistoryItem*>;
-	MsgsData msgsData;
-	using ChannelMsgsData = QMap<ChannelId, MsgsData>;
-	ChannelMsgsData channelMsgsData;
+using MsgsData = QHash<MsgId, HistoryItem *>;
+MsgsData msgsData;
+using ChannelMsgsData = QMap<ChannelId, MsgsData>;
+ChannelMsgsData channelMsgsData;
 
-	using RandomData = QMap<quint64, FullMsgId>;
-	RandomData randomData;
+using RandomData = QMap<quint64, FullMsgId>;
+RandomData randomData;
 
-	using SentData = QMap<quint64, QPair<PeerId, QString>>;
-	SentData sentData;
+using SentData = QMap<quint64, QPair<PeerId, QString>>;
+SentData sentData;
 
-	HistoryItem *hoveredItem = nullptr,
-		*pressedItem = nullptr,
-		*hoveredLinkItem = nullptr,
-		*pressedLinkItem = nullptr,
-		*contextItem = nullptr,
-		*mousedItem = nullptr;
+HistoryItem *hoveredItem = nullptr, *pressedItem = nullptr, *hoveredLinkItem = nullptr, *pressedLinkItem = nullptr,
+            *contextItem = nullptr, *mousedItem = nullptr;
 
-	QPixmap *emoji = nullptr, *emojiLarge = nullptr;
-	style::font monofont;
+QPixmap *emoji = nullptr, *emojiLarge = nullptr;
+style::font monofont;
 
-	struct CornersPixmaps {
-		QPixmap p[4];
-	};
-	QVector<CornersPixmaps> corners;
-	using CornersMap = QMap<quint32, CornersPixmaps>;
-	CornersMap cornersMap;
-	QImage cornersMaskLarge[4], cornersMaskSmall[4];
+struct CornersPixmaps {
+	QPixmap p[4];
+};
+QVector<CornersPixmaps> corners;
+using CornersMap = QMap<quint32, CornersPixmaps>;
+CornersMap cornersMap;
+QImage cornersMaskLarge[4], cornersMaskSmall[4];
 
-	using EmojiImagesMap = QMap<int, QPixmap>;
-	EmojiImagesMap MainEmojiMap;
-	QMap<int, EmojiImagesMap> OtherEmojiMap;
+using EmojiImagesMap = QMap<int, QPixmap>;
+EmojiImagesMap MainEmojiMap;
+QMap<int, EmojiImagesMap> OtherEmojiMap;
 
-	qint32 serviceImageCacheSize = 0;
+qint32 serviceImageCacheSize = 0;
 
-	using LastPhotosList = QLinkedList<PhotoData*>;
-	LastPhotosList lastPhotos;
-	using LastPhotosMap = QHash<PhotoData*, LastPhotosList::iterator>;
-	LastPhotosMap lastPhotosMap;
-}
+using LastPhotosList = QLinkedList<PhotoData *>;
+LastPhotosList lastPhotos;
+using LastPhotosMap = QHash<PhotoData *, LastPhotosList::iterator>;
+LastPhotosMap lastPhotosMap;
+} // namespace
 
 namespace App {
 
-	QString formatPhone(QString phone) {
-		if (phone.isEmpty()) return QString();
-		if (phone.at(0) == '0') return phone;
+QString formatPhone(QString phone) {
+	if (phone.isEmpty()) return QString();
+	if (phone.at(0) == '0') return phone;
 
-		QString number = phone;
-		for (const QChar *ch = phone.constData(), *e = ch + phone.size(); ch != e; ++ch) {
-			if (ch->unicode() < '0' || ch->unicode() > '9') {
-				number = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
-			}
+	QString number = phone;
+	for (const QChar *ch = phone.constData(), *e = ch + phone.size(); ch != e; ++ch) {
+		if (ch->unicode() < '0' || ch->unicode() > '9') {
+			number = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
 		}
-		QVector<int> groups = phoneNumberParse(number);
-		if (groups.isEmpty()) return '+' + number;
-
-		QString result;
-		result.reserve(number.size() + groups.size() + 1);
-		result.append('+');
-		qint32 sum = 0;
-		for (qint32 i = 0, l = groups.size(); i < l; ++i) {
-			result.append(number.midRef(sum, groups.at(i)));
-			sum += groups.at(i);
-			if (sum < number.size()) result.append(' ');
-		}
-		if (sum < number.size()) result.append(number.midRef(sum));
-		return result;
 	}
+	QVector<int> groups = phoneNumberParse(number);
+	if (groups.isEmpty()) return '+' + number;
 
-	MainWindow *wnd() {
-		if (auto instance = Messenger::InstancePointer()) {
-			return instance->getActiveWindow();
-		}
-		return nullptr;
+	QString result;
+	result.reserve(number.size() + groups.size() + 1);
+	result.append('+');
+	qint32 sum = 0;
+	for (qint32 i = 0, l = groups.size(); i < l; ++i) {
+		result.append(number.midRef(sum, groups.at(i)));
+		sum += groups.at(i);
+		if (sum < number.size()) result.append(' ');
 	}
+	if (sum < number.size()) result.append(number.midRef(sum));
+	return result;
+}
 
-	MainWidget *main() {
-		if (auto window = wnd()) {
-			return window->mainWidget();
-		}
-		return nullptr;
+MainWindow *wnd() {
+	if (auto instance = Messenger::InstancePointer()) {
+		return instance->getActiveWindow();
 	}
+	return nullptr;
+}
 
-	bool passcoded() {
-		if (auto window = wnd()) {
-			return window->passcodeWidget();
-		}
-		return false;
+MainWidget *main() {
+	if (auto window = wnd()) {
+		return window->mainWidget();
 	}
+	return nullptr;
+}
+
+bool passcoded() {
+	if (auto window = wnd()) {
+		return window->passcodeWidget();
+	}
+	return false;
+}
 
 namespace {
-	bool loggedOut() {
-		if (Global::LocalPasscode()) {
-			Global::SetLocalPasscode(false);
-			Global::RefLocalPasscodeChanged().notify();
-		}
-		Media::Player::mixer()->stopAndClear();
-		if (auto w = wnd()) {
-			w->tempDirDelete(Local::ClearManagerAll);
-			w->setupIntro();
-		}
-		histories().clear();
-		Messenger::Instance().authSessionDestroy();
-		Local::reset();
-		Window::Theme::Background()->reset();
-
-		cSetOtherOnline(0);
-		globalNotifyAllPtr = UnknownNotifySettings;
-		globalNotifyUsersPtr = UnknownNotifySettings;
-		globalNotifyChatsPtr = UnknownNotifySettings;
-		clearStorageImages();
-		if (auto w = wnd()) {
-			w->updateConnectingStatus();
-		}
-		return true;
+bool loggedOut() {
+	if (Global::LocalPasscode()) {
+		Global::SetLocalPasscode(false);
+		Global::RefLocalPasscodeChanged().notify();
 	}
+	Media::Player::mixer()->stopAndClear();
+	if (auto w = wnd()) {
+		w->tempDirDelete(Local::ClearManagerAll);
+		w->setupIntro();
+	}
+	histories().clear();
+	Messenger::Instance().authSessionDestroy();
+	Local::reset();
+	Window::Theme::Background()->reset();
+
+	cSetOtherOnline(0);
+	globalNotifyAllPtr = UnknownNotifySettings;
+	globalNotifyUsersPtr = UnknownNotifySettings;
+	globalNotifyChatsPtr = UnknownNotifySettings;
+	clearStorageImages();
+	if (auto w = wnd()) {
+		w->updateConnectingStatus();
+	}
+	return true;
+}
 } // namespace
 
-	void logOut() {
-		if (auto mtproto = Messenger::Instance().mtp()) {
-			mtproto->logout(rpcDone(&loggedOut), rpcFail(&loggedOut));
-		} else {
-			// We log out because we've forgotten passcode.
-			// So we just start mtproto from scratch.
-			Messenger::Instance().startMtp();
-			loggedOut();
-		}
+void logOut() {
+	if (auto mtproto = Messenger::Instance().mtp()) {
+		mtproto->logout(rpcDone(&loggedOut), rpcFail(&loggedOut));
+	} else {
+		// We log out because we've forgotten passcode.
+		// So we just start mtproto from scratch.
+		Messenger::Instance().startMtp();
+		loggedOut();
 	}
+}
 
-	TimeId onlineForSort(UserData *user, TimeId now) {
-		if (isServiceUser(user->id) || user->botInfo) {
-			return -1;
-		}
-		TimeId online = user->onlineTill;
-		if (online <= 0) {
-			switch (online) {
-			case 0:
-			case -1: return online;
-
-			case -2: {
-				QDate yesterday(date(now).date());
-				return qint32(QDateTime(yesterday.addDays(-3)).toTime_t()) + (unixtime() - myunixtime());
-			} break;
-
-			case -3: {
-				QDate weekago(date(now).date());
-				return qint32(QDateTime(weekago.addDays(-7)).toTime_t()) + (unixtime() - myunixtime());
-			} break;
-
-			case -4: {
-				QDate monthago(date(now).date());
-				return qint32(QDateTime(monthago.addDays(-30)).toTime_t()) + (unixtime() - myunixtime());
-			} break;
-			}
-			return -online;
-		}
-		return online;
+TimeId onlineForSort(UserData *user, TimeId now) {
+	if (isServiceUser(user->id) || user->botInfo) {
+		return -1;
 	}
+	TimeId online = user->onlineTill;
+	if (online <= 0) {
+		switch (online) {
+		case 0:
+		case -1: return online;
 
-	qint32 onlineWillChangeIn(UserData *user, TimeId now) {
-		if (isServiceUser(user->id) || user->botInfo) {
-			return 86400;
+		case -2: {
+			QDate yesterday(date(now).date());
+			return qint32(QDateTime(yesterday.addDays(-3)).toTime_t()) + (unixtime() - myunixtime());
+		} break;
+
+		case -3: {
+			QDate weekago(date(now).date());
+			return qint32(QDateTime(weekago.addDays(-7)).toTime_t()) + (unixtime() - myunixtime());
+		} break;
+
+		case -4: {
+			QDate monthago(date(now).date());
+			return qint32(QDateTime(monthago.addDays(-30)).toTime_t()) + (unixtime() - myunixtime());
+		} break;
 		}
-		return onlineWillChangeIn(user->onlineTill, now);
+		return -online;
 	}
+	return online;
+}
 
-	qint32 onlineWillChangeIn(TimeId online, TimeId now) {
-		if (online <= 0) {
-            if (-online > now) return -online - now;
-            return 86400;
-        }
-		if (online > now) {
-			return online - now;
-		}
-		qint32 minutes = (now - online) / 60;
-		if (minutes < 60) {
-			return (minutes + 1) * 60 - (now - online);
-		}
-		qint32 hours = (now - online) / 3600;
-		if (hours < 12) {
-			return (hours + 1) * 3600 - (now - online);
-		}
-		QDateTime dNow(date(now)), dTomorrow(dNow.date().addDays(1));
-		return dNow.secsTo(dTomorrow);
+qint32 onlineWillChangeIn(UserData *user, TimeId now) {
+	if (isServiceUser(user->id) || user->botInfo) {
+		return 86400;
 	}
+	return onlineWillChangeIn(user->onlineTill, now);
+}
 
-	QString onlineText(UserData *user, TimeId now, bool precise) {
-		if (isNotificationsUser(user->id)) {
-			return lang(lng_status_service_notifications);
-		} else if (user->botInfo) {
-			return lang(lng_status_bot);
-		} else if (isServiceUser(user->id)) {
-			return lang(lng_status_support);
-		}
-		return onlineText(user->onlineTill, now, precise);
+qint32 onlineWillChangeIn(TimeId online, TimeId now) {
+	if (online <= 0) {
+		if (-online > now) return -online - now;
+		return 86400;
 	}
+	if (online > now) {
+		return online - now;
+	}
+	qint32 minutes = (now - online) / 60;
+	if (minutes < 60) {
+		return (minutes + 1) * 60 - (now - online);
+	}
+	qint32 hours = (now - online) / 3600;
+	if (hours < 12) {
+		return (hours + 1) * 3600 - (now - online);
+	}
+	QDateTime dNow(date(now)), dTomorrow(dNow.date().addDays(1));
+	return dNow.secsTo(dTomorrow);
+}
 
-	QString onlineText(TimeId online, TimeId now, bool precise) {
-		if (online <= 0) {
-			switch (online) {
-			case 0:
-            case -1: return lang(lng_status_offline);
-			case -2: return lang(lng_status_recently);
-			case -3: return lang(lng_status_last_week);
-			case -4: return lang(lng_status_last_month);
-			}
-            return (-online > now) ? lang(lng_status_online) : lang(lng_status_recently);
-		}
-		if (online > now) {
-			return lang(lng_status_online);
-		}
-		QString when;
-		if (precise) {
-			QDateTime dOnline(date(online)), dNow(date(now));
-			if (dOnline.date() == dNow.date()) {
-				return lng_status_lastseen_today(lt_time, dOnline.time().toString(cTimeFormat()));
-			} else if (dOnline.date().addDays(1) == dNow.date()) {
-				return lng_status_lastseen_yesterday(lt_time, dOnline.time().toString(cTimeFormat()));
-			}
-			return lng_status_lastseen_date_time(lt_date, dOnline.date().toString(qsl("dd.MM.yy")), lt_time, dOnline.time().toString(cTimeFormat()));
-		}
-		qint32 minutes = (now - online) / 60;
-		if (!minutes) {
-			return lang(lng_status_lastseen_now);
-		} else if (minutes < 60) {
-			return lng_status_lastseen_minutes(lt_count, minutes);
-		}
-		qint32 hours = (now - online) / 3600;
-		if (hours < 12) {
-			return lng_status_lastseen_hours(lt_count, hours);
+QString onlineText(UserData *user, TimeId now, bool precise) {
+	if (isNotificationsUser(user->id)) {
+		return lang(lng_status_service_notifications);
+	} else if (user->botInfo) {
+		return lang(lng_status_bot);
+	} else if (isServiceUser(user->id)) {
+		return lang(lng_status_support);
+	}
+	return onlineText(user->onlineTill, now, precise);
+}
+
+QString onlineText(TimeId online, TimeId now, bool precise) {
+	if (online <= 0) {
+		switch (online) {
+		case 0:
+		case -1: return lang(lng_status_offline);
+		case -2: return lang(lng_status_recently);
+		case -3: return lang(lng_status_last_week);
+		case -4: return lang(lng_status_last_month);
 		}
+		return (-online > now) ? lang(lng_status_online) : lang(lng_status_recently);
+	}
+	if (online > now) {
+		return lang(lng_status_online);
+	}
+	QString when;
+	if (precise) {
 		QDateTime dOnline(date(online)), dNow(date(now));
 		if (dOnline.date() == dNow.date()) {
 			return lng_status_lastseen_today(lt_time, dOnline.time().toString(cTimeFormat()));
 		} else if (dOnline.date().addDays(1) == dNow.date()) {
 			return lng_status_lastseen_yesterday(lt_time, dOnline.time().toString(cTimeFormat()));
 		}
-		return lng_status_lastseen_date(lt_date, dOnline.date().toString(qsl("dd.MM.yy")));
+		return lng_status_lastseen_date_time(lt_date, dOnline.date().toString(qsl("dd.MM.yy")), lt_time,
+		                                     dOnline.time().toString(cTimeFormat()));
+	}
+	qint32 minutes = (now - online) / 60;
+	if (!minutes) {
+		return lang(lng_status_lastseen_now);
+	} else if (minutes < 60) {
+		return lng_status_lastseen_minutes(lt_count, minutes);
+	}
+	qint32 hours = (now - online) / 3600;
+	if (hours < 12) {
+		return lng_status_lastseen_hours(lt_count, hours);
+	}
+	QDateTime dOnline(date(online)), dNow(date(now));
+	if (dOnline.date() == dNow.date()) {
+		return lng_status_lastseen_today(lt_time, dOnline.time().toString(cTimeFormat()));
+	} else if (dOnline.date().addDays(1) == dNow.date()) {
+		return lng_status_lastseen_yesterday(lt_time, dOnline.time().toString(cTimeFormat()));
+	}
+	return lng_status_lastseen_date(lt_date, dOnline.date().toString(qsl("dd.MM.yy")));
+}
+
+namespace {
+// we should get a full restriction in "{fulltype}: {reason}" format and we
+// need to find a "-all" tag in {fulltype}, otherwise ignore this restriction
+QString extractRestrictionReason(const QString &fullRestriction) {
+	int fullTypeEnd = fullRestriction.indexOf(':');
+	if (fullTypeEnd <= 0) {
+		return QString();
 	}
 
-	namespace {
-		// we should get a full restriction in "{fulltype}: {reason}" format and we
-		// need to find a "-all" tag in {fulltype}, otherwise ignore this restriction
-		QString extractRestrictionReason(const QString &fullRestriction) {
-			int fullTypeEnd = fullRestriction.indexOf(':');
-			if (fullTypeEnd <= 0) {
-				return QString();
-			}
-
-			// {fulltype} is in "{type}-{tag}-{tag}-{tag}" format
-			// if we find "all" tag we return the restriction string
-			auto typeTags = fullRestriction.mid(0, fullTypeEnd).split('-').mid(1);
+	// {fulltype} is in "{type}-{tag}-{tag}-{tag}" format
+	// if we find "all" tag we return the restriction string
+	auto typeTags = fullRestriction.mid(0, fullTypeEnd).split('-').mid(1);
 #ifndef OS_MAC_STORE
-			auto restrictionApplies = typeTags.contains(qsl("all"));
+	auto restrictionApplies = typeTags.contains(qsl("all"));
 #else // OS_MAC_STORE
-			auto restrictionApplies = typeTags.contains(qsl("all")) || typeTags.contains(qsl("ios"));
+	auto restrictionApplies = typeTags.contains(qsl("all")) || typeTags.contains(qsl("ios"));
 #endif // OS_MAC_STORE
-			if (restrictionApplies) {
-				return fullRestriction.midRef(fullTypeEnd + 1).trimmed().toString();
+	if (restrictionApplies) {
+		return fullRestriction.midRef(fullTypeEnd + 1).trimmed().toString();
+	}
+	return QString();
+}
+} // namespace
+
+bool onlineColorUse(UserData *user, TimeId now) {
+	if (isServiceUser(user->id) || user->botInfo) {
+		return false;
+	}
+	return onlineColorUse(user->onlineTill, now);
+}
+
+bool onlineColorUse(TimeId online, TimeId now) {
+	if (online <= 0) {
+		switch (online) {
+		case 0:
+		case -1:
+		case -2:
+		case -3:
+		case -4: return false;
+		}
+		return (-online > now);
+	}
+	return (online > now);
+}
+
+UserData *feedUser(const MTPUser &user) {
+	UserData *data = nullptr;
+	bool wasContact = false, minimal = false;
+	const MTPUserStatus *status = 0, emptyStatus = MTP_userStatusEmpty();
+
+	Notify::PeerUpdate update;
+	using UpdateFlag = Notify::PeerUpdate::Flag;
+
+	switch (user.type()) {
+	case mtpc_userEmpty: {
+		auto &d = user.c_userEmpty();
+
+		auto peer = peerFromUser(d.vid.v);
+		data = App::user(peer);
+		auto canShareThisContact = data->canShareThisContactFast();
+		wasContact = data->isContact();
+
+		data->input = MTP_inputPeerUser(d.vid, MTP_long(0));
+		data->inputUser = MTP_inputUser(d.vid, MTP_long(0));
+		data->setName(lang(lng_deleted), QString(), QString(), QString());
+		data->setPhoto(MTP_userProfilePhotoEmpty());
+		data->setIsInaccessible();
+		data->flags = 0;
+		data->setBotInfoVersion(-1);
+		status = &emptyStatus;
+		data->contact = -1;
+
+		if (canShareThisContact != data->canShareThisContactFast()) update.flags |= UpdateFlag::UserCanShareContact;
+		if (wasContact != data->isContact()) update.flags |= UpdateFlag::UserIsContact;
+	} break;
+	case mtpc_user: {
+		auto &d = user.c_user();
+		minimal = d.is_min();
+
+		auto peer = peerFromUser(d.vid.v);
+		data = App::user(peer);
+		auto canShareThisContact = data->canShareThisContactFast();
+		wasContact = data->isContact();
+		if (!minimal) {
+			data->flags = d.vflags.v;
+			if (d.is_self()) {
+				data->input = MTP_inputPeerSelf();
+				data->inputUser = MTP_inputUserSelf();
+			} else if (!d.has_access_hash()) {
+				data->input = MTP_inputPeerUser(d.vid, MTP_long(data->isInaccessible() ? 0 : data->access));
+				data->inputUser = MTP_inputUser(d.vid, MTP_long(data->isInaccessible() ? 0 : data->access));
+			} else {
+				data->input = MTP_inputPeerUser(d.vid, d.vaccess_hash);
+				data->inputUser = MTP_inputUser(d.vid, d.vaccess_hash);
 			}
-			return QString();
-		}
-	}
-
-	bool onlineColorUse(UserData *user, TimeId now) {
-		if (isServiceUser(user->id) || user->botInfo) {
-			return false;
-		}
-		return onlineColorUse(user->onlineTill, now);
-	}
-
-	bool onlineColorUse(TimeId online, TimeId now) {
-		if (online <= 0) {
-			switch (online) {
-			case 0:
-			case -1:
-			case -2:
-			case -3:
-			case -4: return false;
+			if (d.is_restricted()) {
+				data->setRestrictionReason(extractRestrictionReason(qs(d.vrestriction_reason)));
+			} else {
+				data->setRestrictionReason(QString());
 			}
-			return (-online > now);
 		}
-		return (online > now);
-	}
-
-	UserData *feedUser(const MTPUser &user) {
-		UserData *data = nullptr;
-		bool wasContact = false, minimal = false;
-		const MTPUserStatus *status = 0, emptyStatus = MTP_userStatusEmpty();
-
-		Notify::PeerUpdate update;
-		using UpdateFlag = Notify::PeerUpdate::Flag;
-
-		switch (user.type()) {
-		case mtpc_userEmpty: {
-			auto &d = user.c_userEmpty();
-
-			auto peer = peerFromUser(d.vid.v);
-			data = App::user(peer);
-			auto canShareThisContact = data->canShareThisContactFast();
-			wasContact = data->isContact();
-
-			data->input = MTP_inputPeerUser(d.vid, MTP_long(0));
-			data->inputUser = MTP_inputUser(d.vid, MTP_long(0));
+		if (d.is_deleted()) {
+			if (!data->phone().isEmpty()) {
+				data->setPhone(QString());
+				update.flags |= UpdateFlag::UserPhoneChanged;
+			}
 			data->setName(lang(lng_deleted), QString(), QString(), QString());
 			data->setPhoto(MTP_userProfilePhotoEmpty());
 			data->setIsInaccessible();
-			data->flags = 0;
-			data->setBotInfoVersion(-1);
 			status = &emptyStatus;
-			data->contact = -1;
+		} else {
+			// apply first_name and last_name from minimal user only if we don't have
+			// local values for first name and last name already, otherwise skip
+			bool noLocalName = data->firstName.isEmpty() && data->lastName.isEmpty();
+			QString fname = (!minimal || noLocalName) ?
+			                    (d.has_first_name() ? TextUtilities::SingleLine(qs(d.vfirst_name)) : QString()) :
+			                    data->firstName;
+			QString lname = (!minimal || noLocalName) ?
+			                    (d.has_last_name() ? TextUtilities::SingleLine(qs(d.vlast_name)) : QString()) :
+			                    data->lastName;
 
-			if (canShareThisContact != data->canShareThisContactFast()) update.flags |= UpdateFlag::UserCanShareContact;
-			if (wasContact != data->isContact()) update.flags |= UpdateFlag::UserIsContact;
-		} break;
-		case mtpc_user: {
-			auto &d = user.c_user();
-			minimal = d.is_min();
+			QString phone = minimal ? data->phone() : (d.has_phone() ? qs(d.vphone) : QString());
+			QString uname =
+			    minimal ? data->username : (d.has_username() ? TextUtilities::SingleLine(qs(d.vusername)) : QString());
 
-			auto peer = peerFromUser(d.vid.v);
-			data = App::user(peer);
-			auto canShareThisContact = data->canShareThisContactFast();
-			wasContact = data->isContact();
-			if (!minimal) {
-				data->flags = d.vflags.v;
-				if (d.is_self()) {
-					data->input = MTP_inputPeerSelf();
-					data->inputUser = MTP_inputUserSelf();
-				} else if (!d.has_access_hash()) {
-					data->input = MTP_inputPeerUser(d.vid, MTP_long(data->isInaccessible() ? 0 : data->access));
-					data->inputUser = MTP_inputUser(d.vid, MTP_long(data->isInaccessible() ? 0 : data->access));
-				} else {
-					data->input = MTP_inputPeerUser(d.vid, d.vaccess_hash);
-					data->inputUser = MTP_inputUser(d.vid, d.vaccess_hash);
-				}
-				if (d.is_restricted()) {
-					data->setRestrictionReason(extractRestrictionReason(qs(d.vrestriction_reason)));
-				} else {
-					data->setRestrictionReason(QString());
-				}
+			bool phoneChanged = (data->phone() != phone);
+			if (phoneChanged) {
+				data->setPhone(phone);
+				update.flags |= UpdateFlag::UserPhoneChanged;
 			}
-			if (d.is_deleted()) {
-				if (!data->phone().isEmpty()) {
-					data->setPhone(QString());
-					update.flags |= UpdateFlag::UserPhoneChanged;
-				}
-				data->setName(lang(lng_deleted), QString(), QString(), QString());
+			bool nameChanged = (data->firstName != fname) || (data->lastName != lname);
+
+			bool showPhone = !isServiceUser(data->id) && !d.is_self() && !d.is_contact() && !d.is_mutual_contact();
+			bool showPhoneChanged = !isServiceUser(data->id) && !d.is_self() &&
+			                        ((showPhone && data->contact) || (!showPhone && !data->contact));
+			if (minimal) {
+				showPhoneChanged = false;
+				showPhone = !isServiceUser(data->id) && (data->id != Auth().userPeerId()) && !data->contact;
+			}
+
+			// see also Local::readPeer
+
+			QString pname = (showPhoneChanged || phoneChanged || nameChanged) ?
+			                    ((showPhone && !phone.isEmpty()) ? formatPhone(phone) : QString()) :
+			                    data->nameOrPhone;
+
+			if (!minimal && d.is_self() && uname != data->username) {
+				SignalHandlers::setCrashAnnotation("Username", uname);
+			}
+			data->setName(fname, lname, pname, uname);
+			if (d.has_photo()) {
+				data->setPhoto(d.vphoto);
+			} else {
 				data->setPhoto(MTP_userProfilePhotoEmpty());
-				data->setIsInaccessible();
-				status = &emptyStatus;
+			}
+			if (d.has_access_hash()) data->access = d.vaccess_hash.v;
+			status = d.has_status() ? &d.vstatus : &emptyStatus;
+		}
+		if (!minimal) {
+			if (d.has_bot_info_version()) {
+				data->setBotInfoVersion(d.vbot_info_version.v);
+				data->botInfo->readsAllHistory = d.is_bot_chat_history();
+				if (data->botInfo->cantJoinGroups != d.is_bot_nochats()) {
+					data->botInfo->cantJoinGroups = d.is_bot_nochats();
+					update.flags |= UpdateFlag::BotCanAddToGroups;
+				}
+				data->botInfo->inlinePlaceholder =
+				    d.has_bot_inline_placeholder() ? '_' + qs(d.vbot_inline_placeholder) : QString();
 			} else {
-				// apply first_name and last_name from minimal user only if we don't have
-				// local values for first name and last name already, otherwise skip
-				bool noLocalName = data->firstName.isEmpty() && data->lastName.isEmpty();
-				QString fname = (!minimal || noLocalName) ? (d.has_first_name() ? TextUtilities::SingleLine(qs(d.vfirst_name)) : QString()) : data->firstName;
-				QString lname = (!minimal || noLocalName) ? (d.has_last_name() ? TextUtilities::SingleLine(qs(d.vlast_name)) : QString()) : data->lastName;
-
-				QString phone = minimal ? data->phone() : (d.has_phone() ? qs(d.vphone) : QString());
-				QString uname = minimal ? data->username : (d.has_username() ? TextUtilities::SingleLine(qs(d.vusername)) : QString());
-
-				bool phoneChanged = (data->phone() != phone);
-				if (phoneChanged) {
-					data->setPhone(phone);
-					update.flags |= UpdateFlag::UserPhoneChanged;
-				}
-				bool nameChanged = (data->firstName != fname) || (data->lastName != lname);
-
-				bool showPhone = !isServiceUser(data->id) && !d.is_self() && !d.is_contact() && !d.is_mutual_contact();
-				bool showPhoneChanged = !isServiceUser(data->id) && !d.is_self() && ((showPhone && data->contact) || (!showPhone && !data->contact));
-				if (minimal) {
-					showPhoneChanged = false;
-					showPhone = !isServiceUser(data->id) && (data->id != Auth().userPeerId()) && !data->contact;
-				}
-
-				// see also Local::readPeer
-
-				QString pname = (showPhoneChanged || phoneChanged || nameChanged) ? ((showPhone && !phone.isEmpty()) ? formatPhone(phone) : QString()) : data->nameOrPhone;
-
-				if (!minimal && d.is_self() && uname != data->username) {
-					SignalHandlers::setCrashAnnotation("Username", uname);
-				}
-				data->setName(fname, lname, pname, uname);
-				if (d.has_photo()) {
-					data->setPhoto(d.vphoto);
-				} else {
-					data->setPhoto(MTP_userProfilePhotoEmpty());
-				}
-				if (d.has_access_hash()) data->access = d.vaccess_hash.v;
-				status = d.has_status() ? &d.vstatus : &emptyStatus;
+				data->setBotInfoVersion(-1);
 			}
-			if (!minimal) {
-				if (d.has_bot_info_version()) {
-					data->setBotInfoVersion(d.vbot_info_version.v);
-					data->botInfo->readsAllHistory = d.is_bot_chat_history();
-					if (data->botInfo->cantJoinGroups != d.is_bot_nochats()) {
-						data->botInfo->cantJoinGroups = d.is_bot_nochats();
-						update.flags |= UpdateFlag::BotCanAddToGroups;
-					}
-					data->botInfo->inlinePlaceholder = d.has_bot_inline_placeholder() ? '_' + qs(d.vbot_inline_placeholder) : QString();
-				} else {
-					data->setBotInfoVersion(-1);
-				}
-				data->contact = (d.is_contact() || d.is_mutual_contact()) ? 1 : (data->phone().isEmpty() ? -1 : 0);
-				if (data->contact == 1 && cReportSpamStatuses().value(data->id, dbiprsHidden) != dbiprsHidden) {
-					cRefReportSpamStatuses().insert(data->id, dbiprsHidden);
-					Local::writeReportSpamStatuses();
-				}
-				if (d.is_self() && ::self != data) {
-					::self = data;
-					Global::RefSelfChanged().notify();
-				}
+			data->contact = (d.is_contact() || d.is_mutual_contact()) ? 1 : (data->phone().isEmpty() ? -1 : 0);
+			if (data->contact == 1 && cReportSpamStatuses().value(data->id, dbiprsHidden) != dbiprsHidden) {
+				cRefReportSpamStatuses().insert(data->id, dbiprsHidden);
+				Local::writeReportSpamStatuses();
 			}
-
-			if (canShareThisContact != data->canShareThisContactFast()) update.flags |= UpdateFlag::UserCanShareContact;
-			if (wasContact != data->isContact()) update.flags |= UpdateFlag::UserIsContact;
-		} break;
-		}
-
-		if (!data) {
-			return nullptr;
-		}
-
-		if (minimal) {
-			if (data->loadedStatus == PeerData::NotLoaded) {
-				data->loadedStatus = PeerData::MinimalLoaded;
-			}
-		} else if (data->loadedStatus != PeerData::FullLoaded) {
-			data->loadedStatus = PeerData::FullLoaded;
-		}
-
-		if (status && !minimal) {
-			auto oldOnlineTill = data->onlineTill;
-			auto newOnlineTill = Auth().api().onlineTillFromStatus(*status, oldOnlineTill);
-			if (oldOnlineTill != newOnlineTill) {
-				data->onlineTill = newOnlineTill;
-				update.flags |= UpdateFlag::UserOnlineChanged;
+			if (d.is_self() && ::self != data) {
+				::self = data;
+				Global::RefSelfChanged().notify();
 			}
 		}
 
-		if (data->contact < 0 && !data->phone().isEmpty() && data->id != Auth().userPeerId()) {
-			data->contact = 0;
-		}
-		if (App::main()) {
-			if ((data->contact > 0 && !wasContact) || (wasContact && data->contact < 1)) {
-				Notify::userIsContactChanged(data);
-			}
-			if (update.flags) {
-				update.peer = data;
-				Notify::peerUpdatedDelayed(update);
-			}
-		}
-		return data;
+		if (canShareThisContact != data->canShareThisContactFast()) update.flags |= UpdateFlag::UserCanShareContact;
+		if (wasContact != data->isContact()) update.flags |= UpdateFlag::UserIsContact;
+	} break;
 	}
 
-	UserData *feedUsers(const MTPVector<MTPUser> &users) {
-        UserData *result = nullptr;
-		for_const (auto &user, users.v) {
-			if (auto feededUser = feedUser(user)) {
-				result = feededUser;
-			}
-		}
-
-		return result;
+	if (!data) {
+		return nullptr;
 	}
 
-	PeerData *feedChat(const MTPChat &chat) {
-		PeerData *data = nullptr;
-		bool minimal = false;
-
-		Notify::PeerUpdate update;
-		using UpdateFlag = Notify::PeerUpdate::Flag;
-
-		switch (chat.type()) {
-		case mtpc_chat: {
-			auto &d(chat.c_chat());
-
-			data = App::chat(peerFromChat(d.vid.v));
-			auto cdata = data->asChat();
-			auto canEdit = cdata->canEdit();
-
-			if (cdata->version < d.vversion.v) {
-				cdata->version = d.vversion.v;
-				cdata->invalidateParticipants();
-			}
-
-			data->input = MTP_inputPeerChat(d.vid);
-			cdata->setName(qs(d.vtitle));
-			cdata->setPhoto(d.vphoto);
-			cdata->date = d.vdate.v;
-
-			if (d.has_migrated_to() && d.vmigrated_to.type() == mtpc_inputChannel) {
-				const auto &c(d.vmigrated_to.c_inputChannel());
-				ChannelData *channel = App::channel(peerFromChannel(c.vchannel_id));
-				if (!channel->mgInfo) {
-					channel->flags |= MTPDchannel::Flag::f_megagroup;
-					channel->flagsUpdated();
-				}
-				if (!channel->access) {
-					channel->input = MTP_inputPeerChannel(c.vchannel_id, c.vaccess_hash);
-					channel->inputChannel = d.vmigrated_to;
-					channel->access = d.vmigrated_to.c_inputChannel().vaccess_hash.v;
-				}
-				bool updatedTo = (cdata->migrateToPtr != channel), updatedFrom = (channel->mgInfo->migrateFromPtr != cdata);
-				if (updatedTo) {
-					cdata->migrateToPtr = channel;
-				}
-				if (updatedFrom) {
-					channel->mgInfo->migrateFromPtr = cdata;
-					if (History *h = App::historyLoaded(cdata->id)) {
-						if (History *hto = App::historyLoaded(channel->id)) {
-							if (!h->isEmpty()) {
-								h->clear(true);
-							}
-							if (hto->inChatList(Dialogs::Mode::All) && h->inChatList(Dialogs::Mode::All)) {
-								App::removeDialog(h);
-							}
-						}
-					}
-					Notify::migrateUpdated(channel);
-					update.flags |= UpdateFlag::MigrationChanged;
-				}
-				if (updatedTo) {
-					Notify::migrateUpdated(cdata);
-					update.flags |= UpdateFlag::MigrationChanged;
-				}
-			}
-
-			if (!(cdata->flags & MTPDchat::Flag::f_admins_enabled) && (d.vflags.v & MTPDchat::Flag::f_admins_enabled)) {
-				cdata->invalidateParticipants();
-			}
-			cdata->flags = d.vflags.v;
-
-			cdata->count = d.vparticipants_count.v;
-			cdata->setIsForbidden(false);
-			if (canEdit != cdata->canEdit()) {
-				update.flags |= UpdateFlag::ChatCanEdit;
-			}
-		} break;
-		case mtpc_chatForbidden: {
-			auto &d(chat.c_chatForbidden());
-
-			data = App::chat(peerFromChat(d.vid.v));
-			auto cdata = data->asChat();
-			auto canEdit = cdata->canEdit();
-
-			data->input = MTP_inputPeerChat(d.vid);
-			cdata->setName(qs(d.vtitle));
-			cdata->setPhoto(MTP_chatPhotoEmpty());
-			cdata->date = 0;
-			cdata->count = -1;
-			cdata->invalidateParticipants();
-			cdata->flags = 0;
-			cdata->setIsForbidden(true);
-			if (canEdit != cdata->canEdit()) {
-				update.flags |= UpdateFlag::ChatCanEdit;
-			}
-		} break;
-		case mtpc_channel: {
-			auto &d = chat.c_channel();
-
-			auto peerId = peerFromChannel(d.vid.v);
-			minimal = d.is_min();
-			if (minimal) {
-				data = App::channelLoaded(peerId);
-				if (!data) {
-					return nullptr; // minimal is not loaded, need to make getDifference
-				}
-			} else {
-				data = App::channel(peerId);
-				data->input = MTP_inputPeerChannel(d.vid, d.has_access_hash() ? d.vaccess_hash : MTP_long(0));
-			}
-
-			auto cdata = data->asChannel();
-			auto wasInChannel = cdata->amIn();
-			auto canViewAdmins = cdata->canViewAdmins();
-			auto canViewMembers = cdata->canViewMembers();
-			auto canAddMembers = cdata->canAddMembers();
-
-			if (minimal) {
-				auto mask = MTPDchannel::Flag::f_broadcast | MTPDchannel::Flag::f_verified | MTPDchannel::Flag::f_megagroup | MTPDchannel::Flag::f_democracy;
-				cdata->flags = (cdata->flags & ~mask) | (d.vflags.v & mask);
-			} else {
-				if (d.has_admin_rights()) {
-					cdata->setAdminRights(d.vadmin_rights);
-				} else if (cdata->hasAdminRights()) {
-					cdata->setAdminRights(MTP_channelAdminRights(MTP_flags(0)));
-				}
-				if (d.has_banned_rights()) {
-					cdata->setRestrictedRights(d.vbanned_rights);
-				} else if (cdata->hasRestrictedRights()) {
-					cdata->setRestrictedRights(MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
-				}
-				cdata->inputChannel = MTP_inputChannel(d.vid, d.vaccess_hash);
-				cdata->access = d.vaccess_hash.v;
-				cdata->date = d.vdate.v;
-				if (cdata->version < d.vversion.v) {
-					cdata->version = d.vversion.v;
-				}
-				if (d.is_restricted()) {
-					cdata->setRestrictionReason(extractRestrictionReason(qs(d.vrestriction_reason)));
-				} else {
-					cdata->setRestrictionReason(QString());
-				}
-				cdata->flags = d.vflags.v;
-			}
-			cdata->flagsUpdated();
-
-			QString uname = d.has_username() ? TextUtilities::SingleLine(qs(d.vusername)) : QString();
-			cdata->setName(qs(d.vtitle), uname);
-
-			cdata->setIsForbidden(false);
-			cdata->setPhoto(d.vphoto);
-
-			if (wasInChannel != cdata->amIn()) update.flags |= UpdateFlag::ChannelAmIn;
-			if (canViewAdmins != cdata->canViewAdmins()
-				|| canViewMembers != cdata->canViewMembers()
-				|| canAddMembers != cdata->canAddMembers()) update.flags |= UpdateFlag::ChannelRightsChanged;
-		} break;
-		case mtpc_channelForbidden: {
-			auto &d(chat.c_channelForbidden());
-
-			auto peerId = peerFromChannel(d.vid.v);
-			data = App::channel(peerId);
-			data->input = MTP_inputPeerChannel(d.vid, d.vaccess_hash);
-
-			auto cdata = data->asChannel();
-			auto wasInChannel = cdata->amIn();
-			auto canViewAdmins = cdata->canViewAdmins();
-			auto canViewMembers = cdata->canViewMembers();
-			auto canAddMembers = cdata->canAddMembers();
-
-			cdata->inputChannel = MTP_inputChannel(d.vid, d.vaccess_hash);
-
-			auto mask = mtpCastFlags(MTPDchannelForbidden::Flag::f_broadcast | MTPDchannelForbidden::Flag::f_megagroup);
-			cdata->flags = (cdata->flags & ~mask) | (mtpCastFlags(d.vflags) & mask);
-			cdata->flagsUpdated();
-
-			if (cdata->hasAdminRights()) {
-				cdata->setAdminRights(MTP_channelAdminRights(MTP_flags(0)));
-			}
-			if (cdata->hasRestrictedRights()) {
-				cdata->setRestrictedRights(MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
-			}
-
-			cdata->setName(qs(d.vtitle), QString());
-
-			cdata->access = d.vaccess_hash.v;
-			cdata->setPhoto(MTP_chatPhotoEmpty());
-			cdata->date = 0;
-			cdata->setMembersCount(0);
-			cdata->setIsForbidden(true);
-
-			if (wasInChannel != cdata->amIn()) update.flags |= UpdateFlag::ChannelAmIn;
-			if (canViewAdmins != cdata->canViewAdmins()
-				|| canViewMembers != cdata->canViewMembers()
-				|| canAddMembers != cdata->canAddMembers()) update.flags |= UpdateFlag::ChannelRightsChanged;
-		} break;
-		}
-		if (!data) {
-			return nullptr;
+	if (minimal) {
+		if (data->loadedStatus == PeerData::NotLoaded) {
+			data->loadedStatus = PeerData::MinimalLoaded;
 		}
+	} else if (data->loadedStatus != PeerData::FullLoaded) {
+		data->loadedStatus = PeerData::FullLoaded;
+	}
 
-		if (minimal) {
-			if (data->loadedStatus == PeerData::NotLoaded) {
-				data->loadedStatus = PeerData::MinimalLoaded;
-			}
-		} else if (data->loadedStatus != PeerData::FullLoaded) {
-			data->loadedStatus = PeerData::FullLoaded;
+	if (status && !minimal) {
+		auto oldOnlineTill = data->onlineTill;
+		auto newOnlineTill = Auth().api().onlineTillFromStatus(*status, oldOnlineTill);
+		if (oldOnlineTill != newOnlineTill) {
+			data->onlineTill = newOnlineTill;
+			update.flags |= UpdateFlag::UserOnlineChanged;
+		}
+	}
+
+	if (data->contact < 0 && !data->phone().isEmpty() && data->id != Auth().userPeerId()) {
+		data->contact = 0;
+	}
+	if (App::main()) {
+		if ((data->contact > 0 && !wasContact) || (wasContact && data->contact < 1)) {
+			Notify::userIsContactChanged(data);
 		}
 		if (update.flags) {
 			update.peer = data;
 			Notify::peerUpdatedDelayed(update);
 		}
-		return data;
 	}
+	return data;
+}
 
-	PeerData *feedChats(const MTPVector<MTPChat> &chats) {
-		PeerData *result = nullptr;
-		for_const (auto &chat, chats.v) {
-			if (auto feededChat = feedChat(chat)) {
-				result = feededChat;
-			}
+UserData *feedUsers(const MTPVector<MTPUser> &users) {
+	UserData *result = nullptr;
+	for_const (auto &user, users.v) {
+		if (auto feededUser = feedUser(user)) {
+			result = feededUser;
 		}
-		return result;
 	}
 
-	void feedParticipants(const MTPChatParticipants &p, bool requestBotInfos) {
-		ChatData *chat = 0;
-		switch (p.type()) {
-		case mtpc_chatParticipantsForbidden: {
-			const auto &d(p.c_chatParticipantsForbidden());
-			chat = App::chat(d.vchat_id.v);
-			chat->count = -1;
-			chat->invalidateParticipants();
-		} break;
+	return result;
+}
 
-		case mtpc_chatParticipants: {
-			const auto &d(p.c_chatParticipants());
-			chat = App::chat(d.vchat_id.v);
-			auto canEdit = chat->canEdit();
-			if (!requestBotInfos || chat->version <= d.vversion.v) { // !requestBotInfos is true on getFullChat result
-				chat->version = d.vversion.v;
-				auto &v = d.vparticipants.v;
-				chat->count = v.size();
-				qint32 pversion = chat->participants.isEmpty() ? 1 : (chat->participants.begin().value() + 1);
-				chat->invitedByMe.clear();
-				chat->admins.clear();
-				chat->flags &= ~MTPDchat::Flag::f_admin;
-				for (auto i = v.cbegin(), e = v.cend(); i != e; ++i) {
-					qint32 uid = 0, inviter = 0;
-					switch (i->type()) {
-					case mtpc_chatParticipantCreator: {
-						const auto &p(i->c_chatParticipantCreator());
-						uid = p.vuser_id.v;
-						chat->creator = uid;
-					} break;
-					case mtpc_chatParticipantAdmin: {
-						const auto &p(i->c_chatParticipantAdmin());
-						uid = p.vuser_id.v;
-						inviter = p.vinviter_id.v;
-					} break;
-					case mtpc_chatParticipant: {
-						const auto &p(i->c_chatParticipant());
-						uid = p.vuser_id.v;
-						inviter = p.vinviter_id.v;
-					} break;
-					}
-					if (!uid) continue;
+PeerData *feedChat(const MTPChat &chat) {
+	PeerData *data = nullptr;
+	bool minimal = false;
 
-					UserData *user = App::userLoaded(uid);
-					if (user) {
-						chat->participants[user] = pversion;
-						if (inviter == Auth().userId()) {
-							chat->invitedByMe.insert(user);
+	Notify::PeerUpdate update;
+	using UpdateFlag = Notify::PeerUpdate::Flag;
+
+	switch (chat.type()) {
+	case mtpc_chat: {
+		auto &d(chat.c_chat());
+
+		data = App::chat(peerFromChat(d.vid.v));
+		auto cdata = data->asChat();
+		auto canEdit = cdata->canEdit();
+
+		if (cdata->version < d.vversion.v) {
+			cdata->version = d.vversion.v;
+			cdata->invalidateParticipants();
+		}
+
+		data->input = MTP_inputPeerChat(d.vid);
+		cdata->setName(qs(d.vtitle));
+		cdata->setPhoto(d.vphoto);
+		cdata->date = d.vdate.v;
+
+		if (d.has_migrated_to() && d.vmigrated_to.type() == mtpc_inputChannel) {
+			const auto &c(d.vmigrated_to.c_inputChannel());
+			ChannelData *channel = App::channel(peerFromChannel(c.vchannel_id));
+			if (!channel->mgInfo) {
+				channel->flags |= MTPDchannel::Flag::f_megagroup;
+				channel->flagsUpdated();
+			}
+			if (!channel->access) {
+				channel->input = MTP_inputPeerChannel(c.vchannel_id, c.vaccess_hash);
+				channel->inputChannel = d.vmigrated_to;
+				channel->access = d.vmigrated_to.c_inputChannel().vaccess_hash.v;
+			}
+			bool updatedTo = (cdata->migrateToPtr != channel), updatedFrom = (channel->mgInfo->migrateFromPtr != cdata);
+			if (updatedTo) {
+				cdata->migrateToPtr = channel;
+			}
+			if (updatedFrom) {
+				channel->mgInfo->migrateFromPtr = cdata;
+				if (History *h = App::historyLoaded(cdata->id)) {
+					if (History *hto = App::historyLoaded(channel->id)) {
+						if (!h->isEmpty()) {
+							h->clear(true);
 						}
-						if (i->type() == mtpc_chatParticipantAdmin) {
-							chat->admins.insert(user);
-							if (user->isSelf()) {
-								chat->flags |= MTPDchat::Flag::f_admin;
-							}
+						if (hto->inChatList(Dialogs::Mode::All) && h->inChatList(Dialogs::Mode::All)) {
+							App::removeDialog(h);
 						}
-					} else {
-						chat->invalidateParticipants();
-						break;
-					}
-				}
-				if (!chat->participants.isEmpty()) {
-					History *h = App::historyLoaded(chat->id);
-					bool found = !h || !h->lastKeyboardFrom;
-					qint32 botStatus = -1;
-					for (auto i = chat->participants.begin(), e = chat->participants.end(); i != e;) {
-						if (i.value() < pversion) {
-							i = chat->participants.erase(i);
-						} else {
-							if (i.key()->botInfo) {
-								botStatus = 2;// (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
-								if (requestBotInfos && !i.key()->botInfo->inited) {
-									Auth().api().requestFullPeer(i.key());
-								}
-							}
-							if (!found && i.key()->id == h->lastKeyboardFrom) {
-								found = true;
-							}
-							++i;
-						}
-					}
-					chat->botStatus = botStatus;
-					if (!found) {
-						h->clearLastKeyboard();
 					}
 				}
+				Notify::migrateUpdated(channel);
+				update.flags |= UpdateFlag::MigrationChanged;
 			}
-			if (canEdit != chat->canEdit()) {
-				Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
+			if (updatedTo) {
+				Notify::migrateUpdated(cdata);
+				update.flags |= UpdateFlag::MigrationChanged;
 			}
-		} break;
 		}
-		Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::MembersChanged | Notify::PeerUpdate::Flag::AdminsChanged);
+
+		if (!(cdata->flags & MTPDchat::Flag::f_admins_enabled) && (d.vflags.v & MTPDchat::Flag::f_admins_enabled)) {
+			cdata->invalidateParticipants();
+		}
+		cdata->flags = d.vflags.v;
+
+		cdata->count = d.vparticipants_count.v;
+		cdata->setIsForbidden(false);
+		if (canEdit != cdata->canEdit()) {
+			update.flags |= UpdateFlag::ChatCanEdit;
+		}
+	} break;
+	case mtpc_chatForbidden: {
+		auto &d(chat.c_chatForbidden());
+
+		data = App::chat(peerFromChat(d.vid.v));
+		auto cdata = data->asChat();
+		auto canEdit = cdata->canEdit();
+
+		data->input = MTP_inputPeerChat(d.vid);
+		cdata->setName(qs(d.vtitle));
+		cdata->setPhoto(MTP_chatPhotoEmpty());
+		cdata->date = 0;
+		cdata->count = -1;
+		cdata->invalidateParticipants();
+		cdata->flags = 0;
+		cdata->setIsForbidden(true);
+		if (canEdit != cdata->canEdit()) {
+			update.flags |= UpdateFlag::ChatCanEdit;
+		}
+	} break;
+	case mtpc_channel: {
+		auto &d = chat.c_channel();
+
+		auto peerId = peerFromChannel(d.vid.v);
+		minimal = d.is_min();
+		if (minimal) {
+			data = App::channelLoaded(peerId);
+			if (!data) {
+				return nullptr; // minimal is not loaded, need to make getDifference
+			}
+		} else {
+			data = App::channel(peerId);
+			data->input = MTP_inputPeerChannel(d.vid, d.has_access_hash() ? d.vaccess_hash : MTP_long(0));
+		}
+
+		auto cdata = data->asChannel();
+		auto wasInChannel = cdata->amIn();
+		auto canViewAdmins = cdata->canViewAdmins();
+		auto canViewMembers = cdata->canViewMembers();
+		auto canAddMembers = cdata->canAddMembers();
+
+		if (minimal) {
+			auto mask = MTPDchannel::Flag::f_broadcast | MTPDchannel::Flag::f_verified |
+			            MTPDchannel::Flag::f_megagroup | MTPDchannel::Flag::f_democracy;
+			cdata->flags = (cdata->flags & ~mask) | (d.vflags.v & mask);
+		} else {
+			if (d.has_admin_rights()) {
+				cdata->setAdminRights(d.vadmin_rights);
+			} else if (cdata->hasAdminRights()) {
+				cdata->setAdminRights(MTP_channelAdminRights(MTP_flags(0)));
+			}
+			if (d.has_banned_rights()) {
+				cdata->setRestrictedRights(d.vbanned_rights);
+			} else if (cdata->hasRestrictedRights()) {
+				cdata->setRestrictedRights(MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
+			}
+			cdata->inputChannel = MTP_inputChannel(d.vid, d.vaccess_hash);
+			cdata->access = d.vaccess_hash.v;
+			cdata->date = d.vdate.v;
+			if (cdata->version < d.vversion.v) {
+				cdata->version = d.vversion.v;
+			}
+			if (d.is_restricted()) {
+				cdata->setRestrictionReason(extractRestrictionReason(qs(d.vrestriction_reason)));
+			} else {
+				cdata->setRestrictionReason(QString());
+			}
+			cdata->flags = d.vflags.v;
+		}
+		cdata->flagsUpdated();
+
+		QString uname = d.has_username() ? TextUtilities::SingleLine(qs(d.vusername)) : QString();
+		cdata->setName(qs(d.vtitle), uname);
+
+		cdata->setIsForbidden(false);
+		cdata->setPhoto(d.vphoto);
+
+		if (wasInChannel != cdata->amIn()) update.flags |= UpdateFlag::ChannelAmIn;
+		if (canViewAdmins != cdata->canViewAdmins() || canViewMembers != cdata->canViewMembers() ||
+		    canAddMembers != cdata->canAddMembers())
+			update.flags |= UpdateFlag::ChannelRightsChanged;
+	} break;
+	case mtpc_channelForbidden: {
+		auto &d(chat.c_channelForbidden());
+
+		auto peerId = peerFromChannel(d.vid.v);
+		data = App::channel(peerId);
+		data->input = MTP_inputPeerChannel(d.vid, d.vaccess_hash);
+
+		auto cdata = data->asChannel();
+		auto wasInChannel = cdata->amIn();
+		auto canViewAdmins = cdata->canViewAdmins();
+		auto canViewMembers = cdata->canViewMembers();
+		auto canAddMembers = cdata->canAddMembers();
+
+		cdata->inputChannel = MTP_inputChannel(d.vid, d.vaccess_hash);
+
+		auto mask = mtpCastFlags(MTPDchannelForbidden::Flag::f_broadcast | MTPDchannelForbidden::Flag::f_megagroup);
+		cdata->flags = (cdata->flags & ~mask) | (mtpCastFlags(d.vflags) & mask);
+		cdata->flagsUpdated();
+
+		if (cdata->hasAdminRights()) {
+			cdata->setAdminRights(MTP_channelAdminRights(MTP_flags(0)));
+		}
+		if (cdata->hasRestrictedRights()) {
+			cdata->setRestrictedRights(MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
+		}
+
+		cdata->setName(qs(d.vtitle), QString());
+
+		cdata->access = d.vaccess_hash.v;
+		cdata->setPhoto(MTP_chatPhotoEmpty());
+		cdata->date = 0;
+		cdata->setMembersCount(0);
+		cdata->setIsForbidden(true);
+
+		if (wasInChannel != cdata->amIn()) update.flags |= UpdateFlag::ChannelAmIn;
+		if (canViewAdmins != cdata->canViewAdmins() || canViewMembers != cdata->canViewMembers() ||
+		    canAddMembers != cdata->canAddMembers())
+			update.flags |= UpdateFlag::ChannelRightsChanged;
+	} break;
+	}
+	if (!data) {
+		return nullptr;
 	}
 
-	void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d) {
-		ChatData *chat = App::chat(d.vchat_id.v);
-		if (chat->version + 1 < d.vversion.v) {
+	if (minimal) {
+		if (data->loadedStatus == PeerData::NotLoaded) {
+			data->loadedStatus = PeerData::MinimalLoaded;
+		}
+	} else if (data->loadedStatus != PeerData::FullLoaded) {
+		data->loadedStatus = PeerData::FullLoaded;
+	}
+	if (update.flags) {
+		update.peer = data;
+		Notify::peerUpdatedDelayed(update);
+	}
+	return data;
+}
+
+PeerData *feedChats(const MTPVector<MTPChat> &chats) {
+	PeerData *result = nullptr;
+	for_const (auto &chat, chats.v) {
+		if (auto feededChat = feedChat(chat)) {
+			result = feededChat;
+		}
+	}
+	return result;
+}
+
+void feedParticipants(const MTPChatParticipants &p, bool requestBotInfos) {
+	ChatData *chat = 0;
+	switch (p.type()) {
+	case mtpc_chatParticipantsForbidden: {
+		const auto &d(p.c_chatParticipantsForbidden());
+		chat = App::chat(d.vchat_id.v);
+		chat->count = -1;
+		chat->invalidateParticipants();
+	} break;
+
+	case mtpc_chatParticipants: {
+		const auto &d(p.c_chatParticipants());
+		chat = App::chat(d.vchat_id.v);
+		auto canEdit = chat->canEdit();
+		if (!requestBotInfos || chat->version <= d.vversion.v) { // !requestBotInfos is true on getFullChat result
 			chat->version = d.vversion.v;
-			chat->invalidateParticipants();
-			Auth().api().requestPeer(chat);
-		} else if (chat->version <= d.vversion.v && chat->count >= 0) {
-			chat->version = d.vversion.v;
-			UserData *user = App::userLoaded(d.vuser_id.v);
-			if (user) {
-				if (chat->participants.isEmpty() && chat->count) {
-					chat->count++;
-					chat->botStatus = 0;
-				} else if (chat->participants.find(user) == chat->participants.end()) {
-					chat->participants[user] = (chat->participants.isEmpty() ? 1 : chat->participants.begin().value());
-					if (d.vinviter_id.v == Auth().userId()) {
+			auto &v = d.vparticipants.v;
+			chat->count = v.size();
+			qint32 pversion = chat->participants.isEmpty() ? 1 : (chat->participants.begin().value() + 1);
+			chat->invitedByMe.clear();
+			chat->admins.clear();
+			chat->flags &= ~MTPDchat::Flag::f_admin;
+			for (auto i = v.cbegin(), e = v.cend(); i != e; ++i) {
+				qint32 uid = 0, inviter = 0;
+				switch (i->type()) {
+				case mtpc_chatParticipantCreator: {
+					const auto &p(i->c_chatParticipantCreator());
+					uid = p.vuser_id.v;
+					chat->creator = uid;
+				} break;
+				case mtpc_chatParticipantAdmin: {
+					const auto &p(i->c_chatParticipantAdmin());
+					uid = p.vuser_id.v;
+					inviter = p.vinviter_id.v;
+				} break;
+				case mtpc_chatParticipant: {
+					const auto &p(i->c_chatParticipant());
+					uid = p.vuser_id.v;
+					inviter = p.vinviter_id.v;
+				} break;
+				}
+				if (!uid) continue;
+
+				UserData *user = App::userLoaded(uid);
+				if (user) {
+					chat->participants[user] = pversion;
+					if (inviter == Auth().userId()) {
 						chat->invitedByMe.insert(user);
-					} else {
-						chat->invitedByMe.remove(user);
 					}
-					chat->count++;
-					if (user->botInfo) {
-						chat->botStatus = 2;// (chat->botStatus > 0/* || !user->botInfo->readsAllHistory*/) ? 2 : 1;
-						if (!user->botInfo->inited) {
-							Auth().api().requestFullPeer(user);
+					if (i->type() == mtpc_chatParticipantAdmin) {
+						chat->admins.insert(user);
+						if (user->isSelf()) {
+							chat->flags |= MTPDchat::Flag::f_admin;
 						}
 					}
-				}
-			} else {
-				chat->invalidateParticipants();
-				chat->count++;
-			}
-			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::MembersChanged);
-		}
-	}
-
-	void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d) {
-		ChatData *chat = App::chat(d.vchat_id.v);
-		if (chat->version + 1 < d.vversion.v) {
-			chat->version = d.vversion.v;
-			chat->invalidateParticipants();
-			Auth().api().requestPeer(chat);
-		} else if (chat->version <= d.vversion.v && chat->count > 0) {
-			chat->version = d.vversion.v;
-			auto canEdit = chat->canEdit();
-			UserData *user = App::userLoaded(d.vuser_id.v);
-			if (user) {
-				if (chat->participants.isEmpty()) {
-					if (chat->count > 0) {
-						chat->count--;
-					}
 				} else {
-					auto i = chat->participants.find(user);
-					if (i != chat->participants.end()) {
-						chat->participants.erase(i);
-						chat->count--;
-						chat->invitedByMe.remove(user);
-						chat->admins.remove(user);
-						if (user->isSelf()) {
-							chat->flags &= ~MTPDchat::Flag::f_admin;
-						}
-
-						History *h = App::historyLoaded(chat->id);
-						if (h && h->lastKeyboardFrom == user->id) {
-							h->clearLastKeyboard();
-						}
-					}
-					if (chat->botStatus > 0 && user->botInfo) {
-						qint32 botStatus = -1;
-						for (auto j = chat->participants.cbegin(), e = chat->participants.cend(); j != e; ++j) {
-							if (j.key()->botInfo) {
-								if (true || botStatus > 0/* || !j.key()->botInfo->readsAllHistory*/) {
-									botStatus = 2;
-									break;
-								}
-								botStatus = 1;
+					chat->invalidateParticipants();
+					break;
+				}
+			}
+			if (!chat->participants.isEmpty()) {
+				History *h = App::historyLoaded(chat->id);
+				bool found = !h || !h->lastKeyboardFrom;
+				qint32 botStatus = -1;
+				for (auto i = chat->participants.begin(), e = chat->participants.end(); i != e;) {
+					if (i.value() < pversion) {
+						i = chat->participants.erase(i);
+					} else {
+						if (i.key()->botInfo) {
+							botStatus = 2; // (botStatus > 0/* || !i.key()->botInfo->readsAllHistory*/) ? 2 : 1;
+							if (requestBotInfos && !i.key()->botInfo->inited) {
+								Auth().api().requestFullPeer(i.key());
 							}
 						}
-						chat->botStatus = botStatus;
+						if (!found && i.key()->id == h->lastKeyboardFrom) {
+							found = true;
+						}
+						++i;
 					}
 				}
-			} else {
-				chat->invalidateParticipants();
-				chat->count--;
-			}
-			if (canEdit != chat->canEdit()) {
-				Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
-			}
-			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::MembersChanged);
-		}
-	}
-
-	void feedChatAdmins(const MTPDupdateChatAdmins &d) {
-		ChatData *chat = App::chat(d.vchat_id.v);
-		if (chat->version <= d.vversion.v) {
-			bool badVersion = (chat->version + 1 < d.vversion.v);
-			if (badVersion) {
-				chat->invalidateParticipants();
-				Auth().api().requestPeer(chat);
-			}
-			chat->version = d.vversion.v;
-			if (mtpIsTrue(d.venabled)) {
-				if (!badVersion) {
-					chat->invalidateParticipants();
+				chat->botStatus = botStatus;
+				if (!found) {
+					h->clearLastKeyboard();
 				}
-				chat->flags |= MTPDchat::Flag::f_admins_enabled;
-			} else {
-				chat->flags &= ~MTPDchat::Flag::f_admins_enabled;
 			}
-			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
 		}
+		if (canEdit != chat->canEdit()) {
+			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
+		}
+	} break;
 	}
+	Notify::peerUpdatedDelayed(chat,
+	                           Notify::PeerUpdate::Flag::MembersChanged | Notify::PeerUpdate::Flag::AdminsChanged);
+}
 
-	void feedParticipantAdmin(const MTPDupdateChatParticipantAdmin &d) {
-		ChatData *chat = App::chat(d.vchat_id.v);
-		if (chat->version + 1 < d.vversion.v) {
-			chat->version = d.vversion.v;
-			chat->invalidateParticipants();
-			Auth().api().requestPeer(chat);
-		} else if (chat->version <= d.vversion.v && chat->count > 0) {
-			chat->version = d.vversion.v;
-			auto canEdit = chat->canEdit();
-			UserData *user = App::userLoaded(d.vuser_id.v);
-			if (user) {
-				if (mtpIsTrue(d.vis_admin)) {
-					if (user->isSelf()) {
-						chat->flags |= MTPDchat::Flag::f_admin;
-					}
-					if (chat->noParticipantInfo()) {
-						Auth().api().requestFullPeer(chat);
-					} else {
-						chat->admins.insert(user);
-					}
+void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d) {
+	ChatData *chat = App::chat(d.vchat_id.v);
+	if (chat->version + 1 < d.vversion.v) {
+		chat->version = d.vversion.v;
+		chat->invalidateParticipants();
+		Auth().api().requestPeer(chat);
+	} else if (chat->version <= d.vversion.v && chat->count >= 0) {
+		chat->version = d.vversion.v;
+		UserData *user = App::userLoaded(d.vuser_id.v);
+		if (user) {
+			if (chat->participants.isEmpty() && chat->count) {
+				chat->count++;
+				chat->botStatus = 0;
+			} else if (chat->participants.find(user) == chat->participants.end()) {
+				chat->participants[user] = (chat->participants.isEmpty() ? 1 : chat->participants.begin().value());
+				if (d.vinviter_id.v == Auth().userId()) {
+					chat->invitedByMe.insert(user);
 				} else {
+					chat->invitedByMe.remove(user);
+				}
+				chat->count++;
+				if (user->botInfo) {
+					chat->botStatus = 2; // (chat->botStatus > 0/* || !user->botInfo->readsAllHistory*/) ? 2 : 1;
+					if (!user->botInfo->inited) {
+						Auth().api().requestFullPeer(user);
+					}
+				}
+			}
+		} else {
+			chat->invalidateParticipants();
+			chat->count++;
+		}
+		Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::MembersChanged);
+	}
+}
+
+void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d) {
+	ChatData *chat = App::chat(d.vchat_id.v);
+	if (chat->version + 1 < d.vversion.v) {
+		chat->version = d.vversion.v;
+		chat->invalidateParticipants();
+		Auth().api().requestPeer(chat);
+	} else if (chat->version <= d.vversion.v && chat->count > 0) {
+		chat->version = d.vversion.v;
+		auto canEdit = chat->canEdit();
+		UserData *user = App::userLoaded(d.vuser_id.v);
+		if (user) {
+			if (chat->participants.isEmpty()) {
+				if (chat->count > 0) {
+					chat->count--;
+				}
+			} else {
+				auto i = chat->participants.find(user);
+				if (i != chat->participants.end()) {
+					chat->participants.erase(i);
+					chat->count--;
+					chat->invitedByMe.remove(user);
+					chat->admins.remove(user);
 					if (user->isSelf()) {
 						chat->flags &= ~MTPDchat::Flag::f_admin;
 					}
-					chat->admins.remove(user);
+
+					History *h = App::historyLoaded(chat->id);
+					if (h && h->lastKeyboardFrom == user->id) {
+						h->clearLastKeyboard();
+					}
 				}
-			} else {
+				if (chat->botStatus > 0 && user->botInfo) {
+					qint32 botStatus = -1;
+					for (auto j = chat->participants.cbegin(), e = chat->participants.cend(); j != e; ++j) {
+						if (j.key()->botInfo) {
+							if (true || botStatus > 0 /* || !j.key()->botInfo->readsAllHistory*/) {
+								botStatus = 2;
+								break;
+							}
+							botStatus = 1;
+						}
+					}
+					chat->botStatus = botStatus;
+				}
+			}
+		} else {
+			chat->invalidateParticipants();
+			chat->count--;
+		}
+		if (canEdit != chat->canEdit()) {
+			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
+		}
+		Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::MembersChanged);
+	}
+}
+
+void feedChatAdmins(const MTPDupdateChatAdmins &d) {
+	ChatData *chat = App::chat(d.vchat_id.v);
+	if (chat->version <= d.vversion.v) {
+		bool badVersion = (chat->version + 1 < d.vversion.v);
+		if (badVersion) {
+			chat->invalidateParticipants();
+			Auth().api().requestPeer(chat);
+		}
+		chat->version = d.vversion.v;
+		if (mtpIsTrue(d.venabled)) {
+			if (!badVersion) {
 				chat->invalidateParticipants();
 			}
-			if (canEdit != chat->canEdit()) {
-				Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
-			}
-			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
+			chat->flags |= MTPDchat::Flag::f_admins_enabled;
+		} else {
+			chat->flags &= ~MTPDchat::Flag::f_admins_enabled;
 		}
+		Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
 	}
+}
 
-	bool checkEntitiesAndViewsUpdate(const MTPDmessage &m) {
-		auto peerId = peerFromMTP(m.vto_id);
-		if (m.has_from_id() && peerId == Auth().userPeerId()) {
-			peerId = peerFromUser(m.vfrom_id);
-		}
-		if (auto existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
-			auto text = qs(m.vmessage);
-			auto entities = m.has_entities() ? TextUtilities::EntitiesFromMTP(m.ventities.v) : EntitiesInText();
-			existing->setText({ text, entities });
-			existing->updateMedia(m.has_media() ? (&m.vmedia) : nullptr);
-			existing->updateReplyMarkup(m.has_reply_markup() ? (&m.vreply_markup) : nullptr);
-			existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
-			existing->addToOverview(AddToOverviewNew);
-
-			if (!existing->detached()) {
-				App::checkSavedGif(existing);
-				return true;
+void feedParticipantAdmin(const MTPDupdateChatParticipantAdmin &d) {
+	ChatData *chat = App::chat(d.vchat_id.v);
+	if (chat->version + 1 < d.vversion.v) {
+		chat->version = d.vversion.v;
+		chat->invalidateParticipants();
+		Auth().api().requestPeer(chat);
+	} else if (chat->version <= d.vversion.v && chat->count > 0) {
+		chat->version = d.vversion.v;
+		auto canEdit = chat->canEdit();
+		UserData *user = App::userLoaded(d.vuser_id.v);
+		if (user) {
+			if (mtpIsTrue(d.vis_admin)) {
+				if (user->isSelf()) {
+					chat->flags |= MTPDchat::Flag::f_admin;
+				}
+				if (chat->noParticipantInfo()) {
+					Auth().api().requestFullPeer(chat);
+				} else {
+					chat->admins.insert(user);
+				}
+			} else {
+				if (user->isSelf()) {
+					chat->flags &= ~MTPDchat::Flag::f_admin;
+				}
+				chat->admins.remove(user);
 			}
-
-			return false;
+		} else {
+			chat->invalidateParticipants();
 		}
+		if (canEdit != chat->canEdit()) {
+			Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::ChatCanEdit);
+		}
+		Notify::peerUpdatedDelayed(chat, Notify::PeerUpdate::Flag::AdminsChanged);
+	}
+}
+
+bool checkEntitiesAndViewsUpdate(const MTPDmessage &m) {
+	auto peerId = peerFromMTP(m.vto_id);
+	if (m.has_from_id() && peerId == Auth().userPeerId()) {
+		peerId = peerFromUser(m.vfrom_id);
+	}
+	if (auto existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
+		auto text = qs(m.vmessage);
+		auto entities = m.has_entities() ? TextUtilities::EntitiesFromMTP(m.ventities.v) : EntitiesInText();
+		existing->setText({text, entities});
+		existing->updateMedia(m.has_media() ? (&m.vmedia) : nullptr);
+		existing->updateReplyMarkup(m.has_reply_markup() ? (&m.vreply_markup) : nullptr);
+		existing->setViewsCount(m.has_views() ? m.vviews.v : -1);
+		existing->addToOverview(AddToOverviewNew);
+
+		if (!existing->detached()) {
+			App::checkSavedGif(existing);
+			return true;
+		}
+
 		return false;
 	}
+	return false;
+}
 
-	template <typename TMTPDclass>
-	void updateEditedMessage(const TMTPDclass &m) {
-		auto peerId = peerFromMTP(m.vto_id);
-		if (m.has_from_id() && peerId == Auth().userPeerId()) {
-			peerId = peerFromUser(m.vfrom_id);
-		}
-		if (auto existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
-			existing->applyEdition(m);
-		}
+template <typename TMTPDclass> void updateEditedMessage(const TMTPDclass &m) {
+	auto peerId = peerFromMTP(m.vto_id);
+	if (m.has_from_id() && peerId == Auth().userPeerId()) {
+		peerId = peerFromUser(m.vfrom_id);
 	}
-
-	void updateEditedMessage(const MTPMessage &m) {
-		if (m.type() == mtpc_message) { // apply message edit
-			App::updateEditedMessage(m.c_message());
-		} else if (m.type() == mtpc_messageService) {
-			App::updateEditedMessage(m.c_messageService());
-		}
+	if (auto existing = App::histItemById(peerToChannel(peerId), m.vid.v)) {
+		existing->applyEdition(m);
 	}
+}
 
-	void addSavedGif(DocumentData *doc) {
-		SavedGifs &saved(cRefSavedGifs());
-		qint32 index = saved.indexOf(doc);
-		if (index) {
-			if (index > 0) saved.remove(index);
-			saved.push_front(doc);
-			if (saved.size() > Global::SavedGifsLimit()) saved.pop_back();
-			Local::writeSavedGifs();
-
-			Auth().data().savedGifsUpdated().notify();
-			cSetLastSavedGifsUpdate(0);
-			Auth().api().updateStickers();
-		}
+void updateEditedMessage(const MTPMessage &m) {
+	if (m.type() == mtpc_message) { // apply message edit
+		App::updateEditedMessage(m.c_message());
+	} else if (m.type() == mtpc_messageService) {
+		App::updateEditedMessage(m.c_messageService());
 	}
+}
 
-	void checkSavedGif(HistoryItem *item) {
-		if (!item->Has<HistoryMessageForwarded>() && (item->out() || item->history()->peer == App::self())) {
-			if (auto media = item->getMedia()) {
-				if (auto doc = media->getDocument()) {
-					if (doc->isGifv()) {
-						addSavedGif(doc);
-					}
+void addSavedGif(DocumentData *doc) {
+	SavedGifs &saved(cRefSavedGifs());
+	qint32 index = saved.indexOf(doc);
+	if (index) {
+		if (index > 0) saved.remove(index);
+		saved.push_front(doc);
+		if (saved.size() > Global::SavedGifsLimit()) saved.pop_back();
+		Local::writeSavedGifs();
+
+		Auth().data().savedGifsUpdated().notify();
+		cSetLastSavedGifsUpdate(0);
+		Auth().api().updateStickers();
+	}
+}
+
+void checkSavedGif(HistoryItem *item) {
+	if (!item->Has<HistoryMessageForwarded>() && (item->out() || item->history()->peer == App::self())) {
+		if (auto media = item->getMedia()) {
+			if (auto doc = media->getDocument()) {
+				if (doc->isGifv()) {
+					addSavedGif(doc);
 				}
 			}
 		}
 	}
+}
 
-	void feedMsgs(const QVector<MTPMessage> &msgs, NewMessageType type) {
-		QMap<quint64, qint32> msgsIds;
-		for (qint32 i = 0, l = msgs.size(); i < l; ++i) {
-			const auto &msg(msgs.at(i));
-			switch (msg.type()) {
-			case mtpc_message: {
-				const auto &d(msg.c_message());
-				bool needToAdd = true;
-				if (type == NewMessageUnread) { // new message, index my forwarded messages to links overview
-					if (checkEntitiesAndViewsUpdate(d)) { // already in blocks
-						LOG(("Skipping message, because it is already in blocks!"));
-						needToAdd = false;
-					}
+void feedMsgs(const QVector<MTPMessage> &msgs, NewMessageType type) {
+	QMap<quint64, qint32> msgsIds;
+	for (qint32 i = 0, l = msgs.size(); i < l; ++i) {
+		const auto &msg(msgs.at(i));
+		switch (msg.type()) {
+		case mtpc_message: {
+			const auto &d(msg.c_message());
+			bool needToAdd = true;
+			if (type == NewMessageUnread) { // new message, index my forwarded messages to links overview
+				if (checkEntitiesAndViewsUpdate(d)) { // already in blocks
+					LOG(("Skipping message, because it is already in blocks!"));
+					needToAdd = false;
 				}
-				if (needToAdd) {
-					msgsIds.insert((quint64(quint32(d.vid.v)) << 32) | quint64(i), i);
-				}
-			} break;
-			case mtpc_messageEmpty: msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i); break;
-			case mtpc_messageService: msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i); break;
 			}
-		}
-		for (QMap<quint64, qint32>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
-			histories().addNewMessage(msgs.at(i.value()), type);
-		}
-	}
-
-	void feedMsgs(const MTPVector<MTPMessage> &msgs, NewMessageType type) {
-		return feedMsgs(msgs.v, type);
-	}
-
-	ImagePtr image(const MTPPhotoSize &size) {
-		switch (size.type()) {
-		case mtpc_photoSize: {
-			auto &d = size.c_photoSize();
-			if (d.vlocation.type() == mtpc_fileLocation) {
-				auto &l = d.vlocation.c_fileLocation();
-				return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v), d.vsize.v);
+			if (needToAdd) {
+				msgsIds.insert((quint64(quint32(d.vid.v)) << 32) | quint64(i), i);
 			}
 		} break;
-		case mtpc_photoCachedSize: {
-			auto &d = size.c_photoCachedSize();
-			if (d.vlocation.type() == mtpc_fileLocation) {
-				auto &l = d.vlocation.c_fileLocation();
-				auto bytes = qba(d.vbytes);
-				return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v), bytes);
-			} else if (d.vlocation.type() == mtpc_fileLocationUnavailable) {
-				auto bytes = qba(d.vbytes);
-				return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, 0, 0, 0, 0), bytes);
-			}
-		} break;
-		}
-		return ImagePtr();
-	}
-
-	StorageImageLocation imageLocation(qint32 w, qint32 h, const MTPFileLocation &loc) {
-		if (loc.type() == mtpc_fileLocation) {
-			const auto &l(loc.c_fileLocation());
-			return StorageImageLocation(w, h, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v);
-		}
-		return StorageImageLocation(w, h, 0, 0, 0, 0);
-	}
-
-	StorageImageLocation imageLocation(const MTPPhotoSize &size) {
-		switch (size.type()) {
-		case mtpc_photoSize: {
-			const auto &d(size.c_photoSize());
-			return imageLocation(d.vw.v, d.vh.v, d.vlocation);
-		} break;
-		case mtpc_photoCachedSize: {
-			const auto &d(size.c_photoCachedSize());
-			return imageLocation(d.vw.v, d.vh.v, d.vlocation);
-		} break;
-		}
-		return StorageImageLocation();
-	}
-
-	void feedInboxRead(const PeerId &peer, MsgId upTo) {
-		if (auto history = App::historyLoaded(peer)) {
-			history->inboxRead(upTo);
-		}
-	}
-
-	void feedOutboxRead(const PeerId &peer, MsgId upTo, TimeId when) {
-		if (auto history = App::historyLoaded(peer)) {
-			history->outboxRead(upTo);
-			if (history->lastMsg && history->lastMsg->out() && history->lastMsg->id <= upTo) {
-				if (App::main()) App::main()->dlgUpdated(history->peer, history->lastMsg->id);
-			}
-			history->updateChatListEntry();
-
-			if (history->peer->isUser()) {
-				history->peer->asUser()->madeAction(when);
-			}
-		}
-	}
-
-	inline MsgsData *fetchMsgsData(ChannelId channelId, bool insert = true) {
-		if (channelId == NoChannel) return &msgsData;
-		ChannelMsgsData::iterator i = channelMsgsData.find(channelId);
-		if (i == channelMsgsData.cend()) {
-			if (insert) {
-				i = channelMsgsData.insert(channelId, MsgsData());
-			} else {
-				return 0;
-			}
-		}
-		return &(*i);
-	}
-
-	void feedWereDeleted(ChannelId channelId, const QVector<MTPint> &msgsIds) {
-		MsgsData *data = fetchMsgsData(channelId, false);
-		if (!data) return;
-
-		ChannelHistory *channelHistory = (channelId == NoChannel) ? 0 : App::historyLoaded(peerFromChannel(channelId))->asChannelHistory();
-
-		QMap<History*, bool> historiesToCheck;
-		for (QVector<MTPint>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
-			MsgsData::const_iterator j = data->constFind(i->v);
-			if (j != data->cend()) {
-				History *h = (*j)->history();
-				(*j)->destroy();
-				if (!h->lastMsg) historiesToCheck.insert(h, true);
-			} else {
-				if (channelHistory) {
-					if (channelHistory->unreadCount() > 0 && i->v >= channelHistory->inboxReadBefore) {
-						channelHistory->setUnreadCount(channelHistory->unreadCount() - 1);
-					}
-				}
-			}
-		}
-		if (main()) {
-			for (QMap<History*, bool>::const_iterator i = historiesToCheck.cbegin(), e = historiesToCheck.cend(); i != e; ++i) {
-				main()->checkPeerHistory(i.key()->peer);
-			}
-		}
-	}
-
-	void feedUserLink(MTPint userId, const MTPContactLink &myLink, const MTPContactLink &foreignLink) {
-		UserData *user = userLoaded(userId.v);
-		if (user) {
-			auto wasContact = user->isContact();
-			bool wasShowPhone = !user->contact;
-			switch (myLink.type()) {
-			case mtpc_contactLinkContact:
-				user->contact = 1;
-				if (user->contact == 1 && cReportSpamStatuses().value(user->id, dbiprsHidden) != dbiprsHidden) {
-					cRefReportSpamStatuses().insert(user->id, dbiprsHidden);
-					Local::writeReportSpamStatuses();
-				}
+		case mtpc_messageEmpty:
+			msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i);
 			break;
-			case mtpc_contactLinkHasPhone:
+		case mtpc_messageService:
+			msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i);
+			break;
+		}
+	}
+	for (QMap<quint64, qint32>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
+		histories().addNewMessage(msgs.at(i.value()), type);
+	}
+}
+
+void feedMsgs(const MTPVector<MTPMessage> &msgs, NewMessageType type) {
+	return feedMsgs(msgs.v, type);
+}
+
+ImagePtr image(const MTPPhotoSize &size) {
+	switch (size.type()) {
+	case mtpc_photoSize: {
+		auto &d = size.c_photoSize();
+		if (d.vlocation.type() == mtpc_fileLocation) {
+			auto &l = d.vlocation.c_fileLocation();
+			return ImagePtr(
+			    StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v),
+			    d.vsize.v);
+		}
+	} break;
+	case mtpc_photoCachedSize: {
+		auto &d = size.c_photoCachedSize();
+		if (d.vlocation.type() == mtpc_fileLocation) {
+			auto &l = d.vlocation.c_fileLocation();
+			auto bytes = qba(d.vbytes);
+			return ImagePtr(
+			    StorageImageLocation(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v), bytes);
+		} else if (d.vlocation.type() == mtpc_fileLocationUnavailable) {
+			auto bytes = qba(d.vbytes);
+			return ImagePtr(StorageImageLocation(d.vw.v, d.vh.v, 0, 0, 0, 0), bytes);
+		}
+	} break;
+	}
+	return ImagePtr();
+}
+
+StorageImageLocation imageLocation(qint32 w, qint32 h, const MTPFileLocation &loc) {
+	if (loc.type() == mtpc_fileLocation) {
+		const auto &l(loc.c_fileLocation());
+		return StorageImageLocation(w, h, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v);
+	}
+	return StorageImageLocation(w, h, 0, 0, 0, 0);
+}
+
+StorageImageLocation imageLocation(const MTPPhotoSize &size) {
+	switch (size.type()) {
+	case mtpc_photoSize: {
+		const auto &d(size.c_photoSize());
+		return imageLocation(d.vw.v, d.vh.v, d.vlocation);
+	} break;
+	case mtpc_photoCachedSize: {
+		const auto &d(size.c_photoCachedSize());
+		return imageLocation(d.vw.v, d.vh.v, d.vlocation);
+	} break;
+	}
+	return StorageImageLocation();
+}
+
+void feedInboxRead(const PeerId &peer, MsgId upTo) {
+	if (auto history = App::historyLoaded(peer)) {
+		history->inboxRead(upTo);
+	}
+}
+
+void feedOutboxRead(const PeerId &peer, MsgId upTo, TimeId when) {
+	if (auto history = App::historyLoaded(peer)) {
+		history->outboxRead(upTo);
+		if (history->lastMsg && history->lastMsg->out() && history->lastMsg->id <= upTo) {
+			if (App::main()) App::main()->dlgUpdated(history->peer, history->lastMsg->id);
+		}
+		history->updateChatListEntry();
+
+		if (history->peer->isUser()) {
+			history->peer->asUser()->madeAction(when);
+		}
+	}
+}
+
+inline MsgsData *fetchMsgsData(ChannelId channelId, bool insert = true) {
+	if (channelId == NoChannel) return &msgsData;
+	ChannelMsgsData::iterator i = channelMsgsData.find(channelId);
+	if (i == channelMsgsData.cend()) {
+		if (insert) {
+			i = channelMsgsData.insert(channelId, MsgsData());
+		} else {
+			return 0;
+		}
+	}
+	return &(*i);
+}
+
+void feedWereDeleted(ChannelId channelId, const QVector<MTPint> &msgsIds) {
+	MsgsData *data = fetchMsgsData(channelId, false);
+	if (!data) return;
+
+	ChannelHistory *channelHistory =
+	    (channelId == NoChannel) ? 0 : App::historyLoaded(peerFromChannel(channelId))->asChannelHistory();
+
+	QMap<History *, bool> historiesToCheck;
+	for (QVector<MTPint>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
+		MsgsData::const_iterator j = data->constFind(i->v);
+		if (j != data->cend()) {
+			History *h = (*j)->history();
+			(*j)->destroy();
+			if (!h->lastMsg) historiesToCheck.insert(h, true);
+		} else {
+			if (channelHistory) {
+				if (channelHistory->unreadCount() > 0 && i->v >= channelHistory->inboxReadBefore) {
+					channelHistory->setUnreadCount(channelHistory->unreadCount() - 1);
+				}
+			}
+		}
+	}
+	if (main()) {
+		for (QMap<History *, bool>::const_iterator i = historiesToCheck.cbegin(), e = historiesToCheck.cend(); i != e;
+		     ++i) {
+			main()->checkPeerHistory(i.key()->peer);
+		}
+	}
+}
+
+void feedUserLink(MTPint userId, const MTPContactLink &myLink, const MTPContactLink &foreignLink) {
+	UserData *user = userLoaded(userId.v);
+	if (user) {
+		auto wasContact = user->isContact();
+		bool wasShowPhone = !user->contact;
+		switch (myLink.type()) {
+		case mtpc_contactLinkContact:
+			user->contact = 1;
+			if (user->contact == 1 && cReportSpamStatuses().value(user->id, dbiprsHidden) != dbiprsHidden) {
+				cRefReportSpamStatuses().insert(user->id, dbiprsHidden);
+				Local::writeReportSpamStatuses();
+			}
+			break;
+		case mtpc_contactLinkHasPhone: user->contact = 0; break;
+		case mtpc_contactLinkNone:
+		case mtpc_contactLinkUnknown: user->contact = -1; break;
+		}
+		if (user->contact < 1) {
+			if (user->contact < 0 && !user->phone().isEmpty() && user->id != Auth().userPeerId()) {
 				user->contact = 0;
-			break;
-			case mtpc_contactLinkNone:
-			case mtpc_contactLinkUnknown:
-				user->contact = -1;
-			break;
-			}
-			if (user->contact < 1) {
-				if (user->contact < 0 && !user->phone().isEmpty() && user->id != Auth().userPeerId()) {
-					user->contact = 0;
-				}
 			}
+		}
 
-			if (wasContact != user->isContact()) {
-				Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserIsContact);
-			}
-			if ((user->contact > 0 && !wasContact) || (wasContact && user->contact < 1)) {
-				Notify::userIsContactChanged(user);
-			}
+		if (wasContact != user->isContact()) {
+			Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserIsContact);
+		}
+		if ((user->contact > 0 && !wasContact) || (wasContact && user->contact < 1)) {
+			Notify::userIsContactChanged(user);
+		}
 
-			bool showPhone = !isServiceUser(user->id) && !user->isSelf() && !user->contact;
-			bool showPhoneChanged = !isServiceUser(user->id) && !user->isSelf() && ((showPhone && !wasShowPhone) || (!showPhone && wasShowPhone));
-			if (showPhoneChanged) {
-				user->setName(TextUtilities::SingleLine(user->firstName), TextUtilities::SingleLine(user->lastName), showPhone ? App::formatPhone(user->phone()) : QString(), TextUtilities::SingleLine(user->username));
-			}
+		bool showPhone = !isServiceUser(user->id) && !user->isSelf() && !user->contact;
+		bool showPhoneChanged = !isServiceUser(user->id) && !user->isSelf() &&
+		                        ((showPhone && !wasShowPhone) || (!showPhone && wasShowPhone));
+		if (showPhoneChanged) {
+			user->setName(TextUtilities::SingleLine(user->firstName), TextUtilities::SingleLine(user->lastName),
+			              showPhone ? App::formatPhone(user->phone()) : QString(),
+			              TextUtilities::SingleLine(user->username));
 		}
 	}
+}
 
-	PhotoData *feedPhoto(const MTPPhoto &photo, PhotoData *convert) {
-		switch (photo.type()) {
-		case mtpc_photo: {
-			return feedPhoto(photo.c_photo(), convert);
-		} break;
-		case mtpc_photoEmpty: {
-			return App::photoSet(photo.c_photoEmpty().vid.v, convert, 0, 0, ImagePtr(), ImagePtr(), ImagePtr());
-		} break;
+PhotoData *feedPhoto(const MTPPhoto &photo, PhotoData *convert) {
+	switch (photo.type()) {
+	case mtpc_photo: {
+		return feedPhoto(photo.c_photo(), convert);
+	} break;
+	case mtpc_photoEmpty: {
+		return App::photoSet(photo.c_photoEmpty().vid.v, convert, 0, 0, ImagePtr(), ImagePtr(), ImagePtr());
+	} break;
+	}
+	return App::photo(0);
+}
+
+PhotoData *feedPhoto(const MTPPhoto &photo, const PreparedPhotoThumbs &thumbs) {
+	const QPixmap *thumb = 0, *medium = 0, *full = 0;
+	qint32 thumbLevel = -1, mediumLevel = -1, fullLevel = -1;
+	for (PreparedPhotoThumbs::const_iterator i = thumbs.cbegin(), e = thumbs.cend(); i != e; ++i) {
+		qint32 newThumbLevel = -1, newMediumLevel = -1, newFullLevel = -1;
+		switch (i.key()) {
+		case 's':
+			newThumbLevel = 0;
+			newMediumLevel = 5;
+			newFullLevel = 4;
+			break; // box 100x100
+		case 'm':
+			newThumbLevel = 2;
+			newMediumLevel = 0;
+			newFullLevel = 3;
+			break; // box 320x320
+		case 'x':
+			newThumbLevel = 5;
+			newMediumLevel = 3;
+			newFullLevel = 1;
+			break; // box 800x800
+		case 'y':
+			newThumbLevel = 6;
+			newMediumLevel = 6;
+			newFullLevel = 0;
+			break; // box 1280x1280
+		case 'w':
+			newThumbLevel = 8;
+			newMediumLevel = 8;
+			newFullLevel = 2;
+			break; // box 2560x2560 // if loading this fix HistoryPhoto::updateFrom
+		case 'a':
+			newThumbLevel = 1;
+			newMediumLevel = 4;
+			newFullLevel = 8;
+			break; // crop 160x160
+		case 'b':
+			newThumbLevel = 3;
+			newMediumLevel = 1;
+			newFullLevel = 7;
+			break; // crop 320x320
+		case 'c':
+			newThumbLevel = 4;
+			newMediumLevel = 2;
+			newFullLevel = 6;
+			break; // crop 640x640
+		case 'd':
+			newThumbLevel = 7;
+			newMediumLevel = 7;
+			newFullLevel = 5;
+			break; // crop 1280x1280
 		}
+		if (newThumbLevel < 0 || newMediumLevel < 0 || newFullLevel < 0) {
+			continue;
+		}
+		if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
+			thumbLevel = newThumbLevel;
+			thumb = &i.value();
+		}
+		if (mediumLevel < 0 || newMediumLevel < mediumLevel) {
+			mediumLevel = newMediumLevel;
+			medium = &i.value();
+		}
+		if (fullLevel < 0 || newFullLevel < fullLevel) {
+			fullLevel = newFullLevel;
+			full = &i.value();
+		}
+	}
+	if (!thumb || !medium || !full) {
 		return App::photo(0);
 	}
-
-	PhotoData *feedPhoto(const MTPPhoto &photo, const PreparedPhotoThumbs &thumbs) {
-		const QPixmap *thumb = 0, *medium = 0, *full = 0;
-		qint32 thumbLevel = -1, mediumLevel = -1, fullLevel = -1;
-		for (PreparedPhotoThumbs::const_iterator i = thumbs.cbegin(), e = thumbs.cend(); i != e; ++i) {
-			qint32 newThumbLevel = -1, newMediumLevel = -1, newFullLevel = -1;
-			switch (i.key()) {
-			case 's': newThumbLevel = 0; newMediumLevel = 5; newFullLevel = 4; break; // box 100x100
-			case 'm': newThumbLevel = 2; newMediumLevel = 0; newFullLevel = 3; break; // box 320x320
-			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 1; break; // box 800x800
-			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 0; break; // box 1280x1280
-			case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560 // if loading this fix HistoryPhoto::updateFrom
-			case 'a': newThumbLevel = 1; newMediumLevel = 4; newFullLevel = 8; break; // crop 160x160
-			case 'b': newThumbLevel = 3; newMediumLevel = 1; newFullLevel = 7; break; // crop 320x320
-			case 'c': newThumbLevel = 4; newMediumLevel = 2; newFullLevel = 6; break; // crop 640x640
-			case 'd': newThumbLevel = 7; newMediumLevel = 7; newFullLevel = 5; break; // crop 1280x1280
-			}
-			if (newThumbLevel < 0 || newMediumLevel < 0 || newFullLevel < 0) {
-				continue;
-			}
-			if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
-				thumbLevel = newThumbLevel;
-				thumb = &i.value();
-			}
-			if (mediumLevel < 0 || newMediumLevel < mediumLevel) {
-				mediumLevel = newMediumLevel;
-				medium = &i.value();
-			}
-			if (fullLevel < 0 || newFullLevel < fullLevel) {
-				fullLevel = newFullLevel;
-				full = &i.value();
-			}
-		}
-		if (!thumb || !medium || !full) {
-			return App::photo(0);
-		}
-		switch (photo.type()) {
-		case mtpc_photo: {
-			const auto &ph(photo.c_photo());
-			return App::photoSet(ph.vid.v, 0, ph.vaccess_hash.v, ph.vdate.v, ImagePtr(*thumb, "JPG"), ImagePtr(*medium, "JPG"), ImagePtr(*full, "JPG"));
-		} break;
-		case mtpc_photoEmpty: return App::photo(photo.c_photoEmpty().vid.v);
-		}
-		return App::photo(0);
+	switch (photo.type()) {
+	case mtpc_photo: {
+		const auto &ph(photo.c_photo());
+		return App::photoSet(ph.vid.v, 0, ph.vaccess_hash.v, ph.vdate.v, ImagePtr(*thumb, "JPG"),
+		                     ImagePtr(*medium, "JPG"), ImagePtr(*full, "JPG"));
+	} break;
+	case mtpc_photoEmpty: return App::photo(photo.c_photoEmpty().vid.v);
 	}
+	return App::photo(0);
+}
 
-	PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert) {
-		auto &sizes = photo.vsizes.v;
-		const MTPPhotoSize *thumb = 0, *medium = 0, *full = 0;
-		qint32 thumbLevel = -1, mediumLevel = -1, fullLevel = -1;
-		for (QVector<MTPPhotoSize>::const_iterator i = sizes.cbegin(), e = sizes.cend(); i != e; ++i) {
-			char size = 0;
-			switch (i->type()) {
-			case mtpc_photoSize: {
-				auto &s = i->c_photoSize().vtype.v;
-				if (s.size()) size = s[0];
-			} break;
-
-			case mtpc_photoCachedSize: {
-				auto &s = i->c_photoCachedSize().vtype.v;
-				if (s.size()) size = s[0];
-			} break;
-			}
-			if (!size) continue;
-
-			qint32 newThumbLevel = -1, newMediumLevel = -1, newFullLevel = -1;
-			switch (size) {
-			case 's': newThumbLevel = 0; newMediumLevel = 5; newFullLevel = 4; break; // box 100x100
-			case 'm': newThumbLevel = 2; newMediumLevel = 0; newFullLevel = 3; break; // box 320x320
-			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 1; break; // box 800x800
-			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 0; break; // box 1280x1280
-			case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560
-			case 'a': newThumbLevel = 1; newMediumLevel = 4; newFullLevel = 8; break; // crop 160x160
-			case 'b': newThumbLevel = 3; newMediumLevel = 1; newFullLevel = 7; break; // crop 320x320
-			case 'c': newThumbLevel = 4; newMediumLevel = 2; newFullLevel = 6; break; // crop 640x640
-			case 'd': newThumbLevel = 7; newMediumLevel = 7; newFullLevel = 5; break; // crop 1280x1280
-			}
-			if (newThumbLevel < 0 || newMediumLevel < 0 || newFullLevel < 0) {
-				continue;
-			}
-			if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
-				thumbLevel = newThumbLevel;
-				thumb = &(*i);
-			}
-			if (mediumLevel < 0 || newMediumLevel < mediumLevel) {
-				mediumLevel = newMediumLevel;
-				medium = &(*i);
-			}
-			if (fullLevel < 0 || newFullLevel < fullLevel) {
-				fullLevel = newFullLevel;
-				full = &(*i);
-			}
-		}
-		if (thumb && medium && full) {
-			return App::photoSet(photo.vid.v, convert, photo.vaccess_hash.v, photo.vdate.v, App::image(*thumb), App::image(*medium), App::image(*full));
-		}
-		return App::photoSet(photo.vid.v, convert, 0, 0, ImagePtr(), ImagePtr(), ImagePtr());
-	}
-
-	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb) {
-		switch (document.type()) {
-		case mtpc_document: {
-			auto &d = document.c_document();
-			return App::documentSet(d.vid.v, 0, d.vaccess_hash.v, d.vversion.v, d.vdate.v, d.vattributes.v, qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v, StorageImageLocation());
+PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert) {
+	auto &sizes = photo.vsizes.v;
+	const MTPPhotoSize *thumb = 0, *medium = 0, *full = 0;
+	qint32 thumbLevel = -1, mediumLevel = -1, fullLevel = -1;
+	for (QVector<MTPPhotoSize>::const_iterator i = sizes.cbegin(), e = sizes.cend(); i != e; ++i) {
+		char size = 0;
+		switch (i->type()) {
+		case mtpc_photoSize: {
+			auto &s = i->c_photoSize().vtype.v;
+			if (s.size()) size = s[0];
 		} break;
-		case mtpc_documentEmpty: return App::document(document.c_documentEmpty().vid.v);
-		}
-		return App::document(0);
-	}
 
-	DocumentData *feedDocument(const MTPdocument &document, DocumentData *convert) {
-		switch (document.type()) {
-		case mtpc_document: {
-			return feedDocument(document.c_document(), convert);
-		} break;
-		case mtpc_documentEmpty: {
-			return App::documentSet(document.c_documentEmpty().vid.v, convert, 0, 0, 0, QVector<MTPDocumentAttribute>(), QString(), ImagePtr(), 0, 0, StorageImageLocation());
+		case mtpc_photoCachedSize: {
+			auto &s = i->c_photoCachedSize().vtype.v;
+			if (s.size()) size = s[0];
 		} break;
 		}
-		return App::document(0);
-	}
+		if (!size) continue;
 
-	DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert) {
-		return App::documentSet(document.vid.v, convert, document.vaccess_hash.v, document.vversion.v, document.vdate.v, document.vattributes.v, qs(document.vmime_type), App::image(document.vthumb), document.vdc_id.v, document.vsize.v, App::imageLocation(document.vthumb));
-	}
-
-	WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert) {
-		auto description = TextWithEntities { webpage.has_description() ? TextUtilities::Clean(qs(webpage.vdescription)) : QString() };
-		auto siteName = webpage.has_site_name() ? qs(webpage.vsite_name) : QString();
-		auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
-		if (siteName == qstr("Twitter") || siteName == qstr("Instagram")) {
-			parseFlags |= TextParseHashtags | TextParseMentions;
+		qint32 newThumbLevel = -1, newMediumLevel = -1, newFullLevel = -1;
+		switch (size) {
+		case 's':
+			newThumbLevel = 0;
+			newMediumLevel = 5;
+			newFullLevel = 4;
+			break; // box 100x100
+		case 'm':
+			newThumbLevel = 2;
+			newMediumLevel = 0;
+			newFullLevel = 3;
+			break; // box 320x320
+		case 'x':
+			newThumbLevel = 5;
+			newMediumLevel = 3;
+			newFullLevel = 1;
+			break; // box 800x800
+		case 'y':
+			newThumbLevel = 6;
+			newMediumLevel = 6;
+			newFullLevel = 0;
+			break; // box 1280x1280
+		case 'w':
+			newThumbLevel = 8;
+			newMediumLevel = 8;
+			newFullLevel = 2;
+			break; // box 2560x2560
+		case 'a':
+			newThumbLevel = 1;
+			newMediumLevel = 4;
+			newFullLevel = 8;
+			break; // crop 160x160
+		case 'b':
+			newThumbLevel = 3;
+			newMediumLevel = 1;
+			newFullLevel = 7;
+			break; // crop 320x320
+		case 'c':
+			newThumbLevel = 4;
+			newMediumLevel = 2;
+			newFullLevel = 6;
+			break; // crop 640x640
+		case 'd':
+			newThumbLevel = 7;
+			newMediumLevel = 7;
+			newFullLevel = 5;
+			break; // crop 1280x1280
 		}
-		TextUtilities::ParseEntities(description, parseFlags);
-		return App::webPageSet(webpage.vid.v, convert, webpage.has_type() ? qs(webpage.vtype) : qsl("article"), qs(webpage.vurl), qs(webpage.vdisplay_url), siteName, webpage.has_title() ? qs(webpage.vtitle) : QString(), description, webpage.has_photo() ? App::feedPhoto(webpage.vphoto) : nullptr, webpage.has_document() ? App::feedDocument(webpage.vdocument) : nullptr, webpage.has_duration() ? webpage.vduration.v : 0, webpage.has_author() ? qs(webpage.vauthor) : QString(), 0);
-	}
-
-	WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert) {
-		return App::webPageSet(webpage.vid.v, convert, QString(), QString(), QString(), QString(), QString(), TextWithEntities(), nullptr, nullptr, 0, QString(), webpage.vdate.v);
-	}
-
-	WebPageData *feedWebPage(const MTPWebPage &webpage) {
-		switch (webpage.type()) {
-		case mtpc_webPage: return App::feedWebPage(webpage.c_webPage());
-		case mtpc_webPageEmpty: {
-			WebPageData *page = App::webPage(webpage.c_webPageEmpty().vid.v);
-			if (page->pendingTill > 0) page->pendingTill = -1; // failed
-			return page;
-		} break;
-		case mtpc_webPagePending: return App::feedWebPage(webpage.c_webPagePending());
-		case mtpc_webPageNotModified: LOG(("API Error: webPageNotModified is unexpected in feedWebPage().")); break;
+		if (newThumbLevel < 0 || newMediumLevel < 0 || newFullLevel < 0) {
+			continue;
+		}
+		if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
+			thumbLevel = newThumbLevel;
+			thumb = &(*i);
+		}
+		if (mediumLevel < 0 || newMediumLevel < mediumLevel) {
+			mediumLevel = newMediumLevel;
+			medium = &(*i);
+		}
+		if (fullLevel < 0 || newFullLevel < fullLevel) {
+			fullLevel = newFullLevel;
+			full = &(*i);
 		}
-		return nullptr;
 	}
-
-	WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content) {
-		return App::webPageSet(webPageId, nullptr, qsl("article"), QString(), QString(), siteName, QString(), content, nullptr, nullptr, 0, QString(), 0);
+	if (thumb && medium && full) {
+		return App::photoSet(photo.vid.v, convert, photo.vaccess_hash.v, photo.vdate.v, App::image(*thumb),
+		                     App::image(*medium), App::image(*full));
 	}
+	return App::photoSet(photo.vid.v, convert, 0, 0, ImagePtr(), ImagePtr(), ImagePtr());
+}
 
-	GameData *feedGame(const MTPDgame &game, GameData *convert) {
-		return App::gameSet(game.vid.v, convert, game.vaccess_hash.v, qs(game.vshort_name), qs(game.vtitle), qs(game.vdescription), App::feedPhoto(game.vphoto), game.has_document() ? App::feedDocument(game.vdocument) : nullptr);
+DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb) {
+	switch (document.type()) {
+	case mtpc_document: {
+		auto &d = document.c_document();
+		return App::documentSet(d.vid.v, 0, d.vaccess_hash.v, d.vversion.v, d.vdate.v, d.vattributes.v,
+		                        qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v,
+		                        StorageImageLocation());
+	} break;
+	case mtpc_documentEmpty: return App::document(document.c_documentEmpty().vid.v);
 	}
+	return App::document(0);
+}
 
-	PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction) {
-		if (!id) return nullptr;
+DocumentData *feedDocument(const MTPdocument &document, DocumentData *convert) {
+	switch (document.type()) {
+	case mtpc_document: {
+		return feedDocument(document.c_document(), convert);
+	} break;
+	case mtpc_documentEmpty: {
+		return App::documentSet(document.c_documentEmpty().vid.v, convert, 0, 0, 0, QVector<MTPDocumentAttribute>(),
+		                        QString(), ImagePtr(), 0, 0, StorageImageLocation());
+	} break;
+	}
+	return App::document(0);
+}
 
-		auto i = peersData.constFind(id);
-		if (i == peersData.cend()) {
-			PeerData *newData = nullptr;
-			if (peerIsUser(id)) {
-				newData = new UserData(id);
-			} else if (peerIsChat(id)) {
-				newData = new ChatData(id);
-			} else if (peerIsChannel(id)) {
-				newData = new ChannelData(id);
+DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert) {
+	return App::documentSet(document.vid.v, convert, document.vaccess_hash.v, document.vversion.v, document.vdate.v,
+	                        document.vattributes.v, qs(document.vmime_type), App::image(document.vthumb),
+	                        document.vdc_id.v, document.vsize.v, App::imageLocation(document.vthumb));
+}
+
+WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert) {
+	auto description =
+	    TextWithEntities{webpage.has_description() ? TextUtilities::Clean(qs(webpage.vdescription)) : QString()};
+	auto siteName = webpage.has_site_name() ? qs(webpage.vsite_name) : QString();
+	auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
+	if (siteName == qstr("Twitter") || siteName == qstr("Instagram")) {
+		parseFlags |= TextParseHashtags | TextParseMentions;
+	}
+	TextUtilities::ParseEntities(description, parseFlags);
+	return App::webPageSet(
+	    webpage.vid.v, convert, webpage.has_type() ? qs(webpage.vtype) : qsl("article"), qs(webpage.vurl),
+	    qs(webpage.vdisplay_url), siteName, webpage.has_title() ? qs(webpage.vtitle) : QString(), description,
+	    webpage.has_photo() ? App::feedPhoto(webpage.vphoto) : nullptr,
+	    webpage.has_document() ? App::feedDocument(webpage.vdocument) : nullptr,
+	    webpage.has_duration() ? webpage.vduration.v : 0, webpage.has_author() ? qs(webpage.vauthor) : QString(), 0);
+}
+
+WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert) {
+	return App::webPageSet(webpage.vid.v, convert, QString(), QString(), QString(), QString(), QString(),
+	                       TextWithEntities(), nullptr, nullptr, 0, QString(), webpage.vdate.v);
+}
+
+WebPageData *feedWebPage(const MTPWebPage &webpage) {
+	switch (webpage.type()) {
+	case mtpc_webPage: return App::feedWebPage(webpage.c_webPage());
+	case mtpc_webPageEmpty: {
+		WebPageData *page = App::webPage(webpage.c_webPageEmpty().vid.v);
+		if (page->pendingTill > 0) page->pendingTill = -1; // failed
+		return page;
+	} break;
+	case mtpc_webPagePending: return App::feedWebPage(webpage.c_webPagePending());
+	case mtpc_webPageNotModified: LOG(("API Error: webPageNotModified is unexpected in feedWebPage().")); break;
+	}
+	return nullptr;
+}
+
+WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content) {
+	return App::webPageSet(webPageId, nullptr, qsl("article"), QString(), QString(), siteName, QString(), content,
+	                       nullptr, nullptr, 0, QString(), 0);
+}
+
+GameData *feedGame(const MTPDgame &game, GameData *convert) {
+	return App::gameSet(game.vid.v, convert, game.vaccess_hash.v, qs(game.vshort_name), qs(game.vtitle),
+	                    qs(game.vdescription), App::feedPhoto(game.vphoto),
+	                    game.has_document() ? App::feedDocument(game.vdocument) : nullptr);
+}
+
+PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction) {
+	if (!id) return nullptr;
+
+	auto i = peersData.constFind(id);
+	if (i == peersData.cend()) {
+		PeerData *newData = nullptr;
+		if (peerIsUser(id)) {
+			newData = new UserData(id);
+		} else if (peerIsChat(id)) {
+			newData = new ChatData(id);
+		} else if (peerIsChannel(id)) {
+			newData = new ChannelData(id);
+		}
+		Assert(newData != nullptr);
+
+		newData->input = MTPinputPeer(MTP_inputPeerEmpty());
+		i = peersData.insert(id, newData);
+	}
+	switch (restriction) {
+	case PeerData::MinimalLoaded: {
+		if (i.value()->loadedStatus == PeerData::NotLoaded) {
+			return nullptr;
+		}
+	} break;
+	case PeerData::FullLoaded: {
+		if (i.value()->loadedStatus != PeerData::FullLoaded) {
+			return nullptr;
+		}
+	} break;
+	case PeerData::NotLoaded: break;
+	}
+	return i.value();
+}
+
+void enumerateUsers(base::lambda<void(UserData *)> action) {
+	for_const (auto peer, peersData) {
+		if (auto user = peer->asUser()) {
+			action(user);
+		}
+	}
+}
+
+UserData *self() {
+	return ::self;
+}
+
+PeerData *peerByName(const QString &username) {
+	QString uname(username.trimmed());
+	for_const (PeerData *peer, peersData) {
+		if (!peer->userName().compare(uname, Qt::CaseInsensitive)) {
+			return peer;
+		}
+	}
+	return nullptr;
+}
+
+void updateImage(ImagePtr &old, ImagePtr now) {
+	if (now->isNull()) return;
+	if (old->isNull()) {
+		old = now;
+	} else if (DelayedStorageImage *img = old->toDelayedStorageImage()) {
+		StorageImageLocation loc = now->location();
+		if (!loc.isNull()) {
+			img->setStorageLocation(loc);
+		}
+	}
+}
+
+PhotoData *photo(const PhotoId &photo) {
+	PhotosData::const_iterator i = ::photosData.constFind(photo);
+	if (i == ::photosData.cend()) {
+		i = ::photosData.insert(photo, new PhotoData(photo));
+	}
+	return i.value();
+}
+
+PhotoData *photoSet(const PhotoId &photo, PhotoData *convert, const quint64 &access, qint32 date, const ImagePtr &thumb,
+                    const ImagePtr &medium, const ImagePtr &full) {
+	if (convert) {
+		if (convert->id != photo) {
+			PhotosData::iterator i = ::photosData.find(convert->id);
+			if (i != ::photosData.cend() && i.value() == convert) {
+				::photosData.erase(i);
 			}
-			Assert(newData != nullptr);
-
-			newData->input = MTPinputPeer(MTP_inputPeerEmpty());
-			i = peersData.insert(id, newData);
+			convert->id = photo;
+			convert->uploadingData.reset();
 		}
-		switch (restriction) {
-		case PeerData::MinimalLoaded: {
-			if (i.value()->loadedStatus == PeerData::NotLoaded) {
-				return nullptr;
-			}
-		} break;
-		case PeerData::FullLoaded: {
-			if (i.value()->loadedStatus != PeerData::FullLoaded) {
-				return nullptr;
-			}
-		} break;
-		case PeerData::NotLoaded: break;
-		}
-		return i.value();
-	}
-
-	void enumerateUsers(base::lambda<void(UserData*)> action) {
-		for_const (auto peer, peersData) {
-			if (auto user = peer->asUser()) {
-				action(user);
-			}
+		if (date) {
+			convert->access = access;
+			convert->date = date;
+			updateImage(convert->thumb, thumb);
+			updateImage(convert->medium, medium);
+			updateImage(convert->full, full);
 		}
 	}
-
-	UserData *self() {
-		return ::self;
-	}
-
-	PeerData *peerByName(const QString &username) {
-		QString uname(username.trimmed());
-		for_const (PeerData *peer, peersData) {
-			if (!peer->userName().compare(uname, Qt::CaseInsensitive)) {
-				return peer;
-			}
-		}
-		return nullptr;
-	}
-
-	void updateImage(ImagePtr &old, ImagePtr now) {
-		if (now->isNull()) return;
-		if (old->isNull()) {
-			old = now;
-		} else if (DelayedStorageImage *img = old->toDelayedStorageImage()) {
-			StorageImageLocation loc = now->location();
-			if (!loc.isNull()) {
-				img->setStorageLocation(loc);
-			}
-		}
-	}
-
-	PhotoData *photo(const PhotoId &photo) {
-		PhotosData::const_iterator i = ::photosData.constFind(photo);
-		if (i == ::photosData.cend()) {
-			i = ::photosData.insert(photo, new PhotoData(photo));
-		}
-		return i.value();
-	}
-
-	PhotoData *photoSet(const PhotoId &photo, PhotoData *convert, const quint64 &access, qint32 date, const ImagePtr &thumb, const ImagePtr &medium, const ImagePtr &full) {
+	PhotosData::const_iterator i = ::photosData.constFind(photo);
+	PhotoData *result;
+	LastPhotosMap::iterator inLastIter = lastPhotosMap.end();
+	if (i == ::photosData.cend()) {
 		if (convert) {
-			if (convert->id != photo) {
-				PhotosData::iterator i = ::photosData.find(convert->id);
-				if (i != ::photosData.cend() && i.value() == convert) {
-					::photosData.erase(i);
-				}
-				convert->id = photo;
-				convert->uploadingData.reset();
+			result = convert;
+		} else {
+			result = new PhotoData(photo, access, date, thumb, medium, full);
+		}
+		::photosData.insert(photo, result);
+	} else {
+		result = i.value();
+		if (result != convert && date) {
+			result->access = access;
+			result->date = date;
+			updateImage(result->thumb, thumb);
+			updateImage(result->medium, medium);
+			updateImage(result->full, full);
+		}
+		inLastIter = lastPhotosMap.find(result);
+	}
+	if (inLastIter == lastPhotosMap.end()) { // insert new one
+		if (lastPhotos.size() == MaxPhotosInMemory) {
+			lastPhotos.front()->forget();
+			lastPhotosMap.remove(lastPhotos.front());
+			lastPhotos.pop_front();
+		}
+		lastPhotosMap.insert(result, lastPhotos.insert(lastPhotos.end(), result));
+	} else {
+		lastPhotos.erase(inLastIter.value()); // move to back
+		(*inLastIter) = lastPhotos.insert(lastPhotos.end(), result);
+	}
+	return result;
+}
+
+DocumentData *document(const DocumentId &document) {
+	DocumentsData::const_iterator i = ::documentsData.constFind(document);
+	if (i == ::documentsData.cend()) {
+		i = ::documentsData.insert(document, DocumentData::create(document));
+	}
+	return i.value();
+}
+
+DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const quint64 &access, qint32 version,
+                          qint32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime,
+                          const ImagePtr &thumb, qint32 dc, qint32 size, const StorageImageLocation &thumbLocation) {
+	bool versionChanged = false;
+	bool sentSticker = false;
+	if (convert) {
+		MediaKey oldKey = convert->mediaKey();
+		bool idChanged = (convert->id != document);
+		if (idChanged) {
+			DocumentsData::iterator i = ::documentsData.find(convert->id);
+			if (i != ::documentsData.cend() && i.value() == convert) {
+				::documentsData.erase(i);
 			}
-			if (date) {
-				convert->access = access;
-				convert->date = date;
+
+			convert->id = document;
+			convert->status = FileReady;
+			sentSticker = (convert->sticker() != 0);
+		}
+		if (date) {
+			convert->setattributes(attributes);
+			versionChanged = convert->setRemoteVersion(version);
+			convert->setRemoteLocation(dc, access);
+			convert->date = date;
+			convert->mime = mime;
+			if (!thumb->isNull() && (convert->thumb->isNull() || convert->thumb->width() < thumb->width() ||
+			                         convert->thumb->height() < thumb->height() || versionChanged)) {
 				updateImage(convert->thumb, thumb);
-				updateImage(convert->medium, medium);
-				updateImage(convert->full, full);
 			}
-		}
-		PhotosData::const_iterator i = ::photosData.constFind(photo);
-		PhotoData *result;
-		LastPhotosMap::iterator inLastIter = lastPhotosMap.end();
-		if (i == ::photosData.cend()) {
-			if (convert) {
-				result = convert;
-			} else {
-				result = new PhotoData(photo, access, date, thumb, medium, full);
+			convert->size = size;
+			convert->recountIsImage();
+			if (convert->sticker() && convert->sticker()->loc.isNull() && !thumbLocation.isNull()) {
+				convert->sticker()->loc = thumbLocation;
 			}
-			::photosData.insert(photo, result);
-		} else {
-			result = i.value();
-			if (result != convert && date) {
-				result->access = access;
-				result->date = date;
-				updateImage(result->thumb, thumb);
-				updateImage(result->medium, medium);
-				updateImage(result->full, full);
-			}
-			inLastIter = lastPhotosMap.find(result);
-		}
-		if (inLastIter == lastPhotosMap.end()) { // insert new one
-			if (lastPhotos.size() == MaxPhotosInMemory) {
-				lastPhotos.front()->forget();
-				lastPhotosMap.remove(lastPhotos.front());
-				lastPhotos.pop_front();
-			}
-			lastPhotosMap.insert(result, lastPhotos.insert(lastPhotos.end(), result));
-		} else {
-			lastPhotos.erase(inLastIter.value()); // move to back
-			(*inLastIter) = lastPhotos.insert(lastPhotos.end(), result);
-		}
-		return result;
-	}
 
-	DocumentData *document(const DocumentId &document) {
-		DocumentsData::const_iterator i = ::documentsData.constFind(document);
-		if (i == ::documentsData.cend()) {
-			i = ::documentsData.insert(document, DocumentData::create(document));
-		}
-		return i.value();
-	}
-
-	DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const quint64 &access, qint32 version, qint32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, qint32 dc, qint32 size, const StorageImageLocation &thumbLocation) {
-		bool versionChanged = false;
-		bool sentSticker = false;
-		if (convert) {
-			MediaKey oldKey = convert->mediaKey();
-			bool idChanged = (convert->id != document);
+			MediaKey newKey = convert->mediaKey();
 			if (idChanged) {
-				DocumentsData::iterator i = ::documentsData.find(convert->id);
-				if (i != ::documentsData.cend() && i.value() == convert) {
-					::documentsData.erase(i);
+				if (convert->voice()) {
+					Local::copyAudio(oldKey, newKey);
+				} else if (convert->sticker() || convert->isAnimation()) {
+					Local::copyStickerImage(oldKey, newKey);
 				}
-
-				convert->id = document;
-				convert->status = FileReady;
-				sentSticker = (convert->sticker() != 0);
-			}
-			if (date) {
-				convert->setattributes(attributes);
-				versionChanged = convert->setRemoteVersion(version);
-				convert->setRemoteLocation(dc, access);
-				convert->date = date;
-				convert->mime = mime;
-				if (!thumb->isNull() && (convert->thumb->isNull() || convert->thumb->width() < thumb->width() || convert->thumb->height() < thumb->height() || versionChanged)) {
-					updateImage(convert->thumb, thumb);
-				}
-				convert->size = size;
-				convert->recountIsImage();
-				if (convert->sticker() && convert->sticker()->loc.isNull() && !thumbLocation.isNull()) {
-					convert->sticker()->loc = thumbLocation;
-				}
-
-				MediaKey newKey = convert->mediaKey();
-				if (idChanged) {
-					if (convert->voice()) {
-						Local::copyAudio(oldKey, newKey);
-					} else if (convert->sticker() || convert->isAnimation()) {
-						Local::copyStickerImage(oldKey, newKey);
-					}
-				}
-			}
-
-			if (cSavedGifs().indexOf(convert) >= 0) { // id changed
-				Local::writeSavedGifs();
 			}
 		}
-		DocumentsData::const_iterator i = ::documentsData.constFind(document);
-		DocumentData *result;
-		if (i == ::documentsData.cend()) {
-			if (convert) {
-				result = convert;
-			} else {
-				result = DocumentData::create(document, dc, access, version, attributes);
-				result->date = date;
-				result->mime = mime;
+
+		if (cSavedGifs().indexOf(convert) >= 0) { // id changed
+			Local::writeSavedGifs();
+		}
+	}
+	DocumentsData::const_iterator i = ::documentsData.constFind(document);
+	DocumentData *result;
+	if (i == ::documentsData.cend()) {
+		if (convert) {
+			result = convert;
+		} else {
+			result = DocumentData::create(document, dc, access, version, attributes);
+			result->date = date;
+			result->mime = mime;
+			result->thumb = thumb;
+			result->size = size;
+			result->recountIsImage();
+			if (result->sticker()) {
+				result->sticker()->loc = thumbLocation;
+			}
+		}
+		::documentsData.insert(document, result);
+	} else {
+		result = i.value();
+		if (result != convert && date) {
+			result->setattributes(attributes);
+			versionChanged = result->setRemoteVersion(version);
+			if (!result->isValid()) {
+				result->setRemoteLocation(dc, access);
+			}
+			result->date = date;
+			result->mime = mime;
+			if (!thumb->isNull() && (result->thumb->isNull() || result->thumb->width() < thumb->width() ||
+			                         result->thumb->height() < thumb->height() || versionChanged)) {
 				result->thumb = thumb;
-				result->size = size;
-				result->recountIsImage();
-				if (result->sticker()) {
-					result->sticker()->loc = thumbLocation;
-				}
 			}
-			::documentsData.insert(document, result);
-		} else {
-			result = i.value();
-			if (result != convert && date) {
-				result->setattributes(attributes);
-				versionChanged = result->setRemoteVersion(version);
-				if (!result->isValid()) {
-					result->setRemoteLocation(dc, access);
-				}
-				result->date = date;
-				result->mime = mime;
-				if (!thumb->isNull() && (result->thumb->isNull() || result->thumb->width() < thumb->width() || result->thumb->height() < thumb->height() || versionChanged)) {
-					result->thumb = thumb;
-				}
-				result->size = size;
-				result->recountIsImage();
-				if (result->sticker() && result->sticker()->loc.isNull() && !thumbLocation.isNull()) {
-					result->sticker()->loc = thumbLocation;
-				}
+			result->size = size;
+			result->recountIsImage();
+			if (result->sticker() && result->sticker()->loc.isNull() && !thumbLocation.isNull()) {
+				result->sticker()->loc = thumbLocation;
 			}
 		}
-		if (sentSticker && App::main()) {
-			App::main()->incrementSticker(result);
-		}
-		if (versionChanged) {
-			if (result->sticker() && result->sticker()->set.type() == mtpc_inputStickerSetID) {
-				auto it = Global::StickerSets().constFind(result->sticker()->set.c_inputStickerSetID().vid.v);
-				if (it != Global::StickerSets().cend()) {
-					if (it->id == Stickers::CloudRecentSetId) {
-						Local::writeRecentStickers();
-					} else if (it->id == Stickers::FavedSetId) {
-						Local::writeFavedStickers();
-					} else if (it->flags & MTPDstickerSet::Flag::f_archived) {
-						Local::writeArchivedStickers();
-					} else if (it->flags & MTPDstickerSet::Flag::f_installed) {
-						Local::writeInstalledStickers();
-					}
-					if (it->flags & MTPDstickerSet_ClientFlag::f_featured) {
-						Local::writeFeaturedStickers();
-					}
-				}
-			}
-			auto &items = App::documentItems();
-			auto i = items.constFind(result);
-			if (i != items.cend()) {
-				for_const (auto item, i.value()) {
-					item->setPendingInitDimensions();
-				}
-			}
-		}
-		return result;
 	}
-
-	WebPageData *webPage(const WebPageId &webPage) {
-		auto i = webPagesData.constFind(webPage);
-		if (i == webPagesData.cend()) {
-			i = webPagesData.insert(webPage, new WebPageData(webPage));
-		}
-		return i.value();
+	if (sentSticker && App::main()) {
+		App::main()->incrementSticker(result);
 	}
+	if (versionChanged) {
+		if (result->sticker() && result->sticker()->set.type() == mtpc_inputStickerSetID) {
+			auto it = Global::StickerSets().constFind(result->sticker()->set.c_inputStickerSetID().vid.v);
+			if (it != Global::StickerSets().cend()) {
+				if (it->id == Stickers::CloudRecentSetId) {
+					Local::writeRecentStickers();
+				} else if (it->id == Stickers::FavedSetId) {
+					Local::writeFavedStickers();
+				} else if (it->flags & MTPDstickerSet::Flag::f_archived) {
+					Local::writeArchivedStickers();
+				} else if (it->flags & MTPDstickerSet::Flag::f_installed) {
+					Local::writeInstalledStickers();
+				}
+				if (it->flags & MTPDstickerSet_ClientFlag::f_featured) {
+					Local::writeFeaturedStickers();
+				}
+			}
+		}
+		auto &items = App::documentItems();
+		auto i = items.constFind(result);
+		if (i != items.cend()) {
+			for_const (auto item, i.value()) { item->setPendingInitDimensions(); }
+		}
+	}
+	return result;
+}
 
-	WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, PhotoData *photo, DocumentData *document, qint32 duration, const QString &author, qint32 pendingTill) {
+WebPageData *webPage(const WebPageId &webPage) {
+	auto i = webPagesData.constFind(webPage);
+	if (i == webPagesData.cend()) {
+		i = webPagesData.insert(webPage, new WebPageData(webPage));
+	}
+	return i.value();
+}
+
+WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url,
+                        const QString &displayUrl, const QString &siteName, const QString &title,
+                        const TextWithEntities &description, PhotoData *photo, DocumentData *document, qint32 duration,
+                        const QString &author, qint32 pendingTill) {
+	if (convert) {
+		if (convert->id != webPage) {
+			auto i = webPagesData.find(convert->id);
+			if (i != webPagesData.cend() && i.value() == convert) {
+				webPagesData.erase(i);
+			}
+			convert->id = webPage;
+		}
+		if ((convert->url.isEmpty() && !url.isEmpty()) ||
+		    (convert->pendingTill && convert->pendingTill != pendingTill && pendingTill >= -1)) {
+			convert->type = toWebPageType(type);
+			convert->url = TextUtilities::Clean(url);
+			convert->displayUrl = TextUtilities::Clean(displayUrl);
+			convert->siteName = TextUtilities::Clean(siteName);
+			convert->title = TextUtilities::SingleLine(title);
+			convert->description = description;
+			convert->photo = photo;
+			convert->document = document;
+			convert->duration = duration;
+			convert->author = TextUtilities::Clean(author);
+			if (convert->pendingTill > 0 && pendingTill <= 0) {
+				Auth().api().clearWebPageRequest(convert);
+			}
+			convert->pendingTill = pendingTill;
+			if (App::main()) App::main()->webPageUpdated(convert);
+		}
+	}
+	auto i = webPagesData.constFind(webPage);
+	WebPageData *result;
+	if (i == webPagesData.cend()) {
 		if (convert) {
-			if (convert->id != webPage) {
-				auto i = webPagesData.find(convert->id);
-				if (i != webPagesData.cend() && i.value() == convert) {
-					webPagesData.erase(i);
-				}
-				convert->id = webPage;
-			}
-			if ((convert->url.isEmpty() && !url.isEmpty()) || (convert->pendingTill && convert->pendingTill != pendingTill && pendingTill >= -1)) {
-				convert->type = toWebPageType(type);
-				convert->url = TextUtilities::Clean(url);
-				convert->displayUrl = TextUtilities::Clean(displayUrl);
-				convert->siteName = TextUtilities::Clean(siteName);
-				convert->title = TextUtilities::SingleLine(title);
-				convert->description = description;
-				convert->photo = photo;
-				convert->document = document;
-				convert->duration = duration;
-				convert->author = TextUtilities::Clean(author);
-				if (convert->pendingTill > 0 && pendingTill <= 0) {
-					Auth().api().clearWebPageRequest(convert);
-				}
-				convert->pendingTill = pendingTill;
-				if (App::main()) App::main()->webPageUpdated(convert);
-			}
-		}
-		auto i = webPagesData.constFind(webPage);
-		WebPageData *result;
-		if (i == webPagesData.cend()) {
-			if (convert) {
-				result = convert;
-			} else {
-				result = new WebPageData(webPage, toWebPageType(type), url, displayUrl, siteName, title, description, document, photo, duration, author, (pendingTill >= -1) ? pendingTill : -1);
-				if (pendingTill > 0) {
-					Auth().api().requestWebPageDelayed(result);
-				}
-			}
-			webPagesData.insert(webPage, result);
+			result = convert;
 		} else {
-			result = i.value();
-			if (result != convert) {
-				if ((result->url.isEmpty() && !url.isEmpty()) || (result->pendingTill && result->pendingTill != pendingTill && pendingTill >= -1)) {
-					result->type = toWebPageType(type);
-					result->url = TextUtilities::Clean(url);
-					result->displayUrl = TextUtilities::Clean(displayUrl);
-					result->siteName = TextUtilities::Clean(siteName);
-					result->title = TextUtilities::SingleLine(title);
-					result->description = description;
-					result->photo = photo;
-					result->document = document;
-					result->duration = duration;
-					result->author = TextUtilities::Clean(author);
-					if (result->pendingTill > 0 && pendingTill <= 0) {
-						Auth().api().clearWebPageRequest(result);
-					}
-					result->pendingTill = pendingTill;
-					if (App::main()) App::main()->webPageUpdated(result);
-				}
+			result = new WebPageData(webPage, toWebPageType(type), url, displayUrl, siteName, title, description,
+			                         document, photo, duration, author, (pendingTill >= -1) ? pendingTill : -1);
+			if (pendingTill > 0) {
+				Auth().api().requestWebPageDelayed(result);
 			}
 		}
-		return result;
-	}
-
-	GameData *game(const GameId &game) {
-		auto i = gamesData.constFind(game);
-		if (i == gamesData.cend()) {
-			i = gamesData.insert(game, new GameData(game));
+		webPagesData.insert(webPage, result);
+	} else {
+		result = i.value();
+		if (result != convert) {
+			if ((result->url.isEmpty() && !url.isEmpty()) ||
+			    (result->pendingTill && result->pendingTill != pendingTill && pendingTill >= -1)) {
+				result->type = toWebPageType(type);
+				result->url = TextUtilities::Clean(url);
+				result->displayUrl = TextUtilities::Clean(displayUrl);
+				result->siteName = TextUtilities::Clean(siteName);
+				result->title = TextUtilities::SingleLine(title);
+				result->description = description;
+				result->photo = photo;
+				result->document = document;
+				result->duration = duration;
+				result->author = TextUtilities::Clean(author);
+				if (result->pendingTill > 0 && pendingTill <= 0) {
+					Auth().api().clearWebPageRequest(result);
+				}
+				result->pendingTill = pendingTill;
+				if (App::main()) App::main()->webPageUpdated(result);
+			}
 		}
-		return i.value();
 	}
+	return result;
+}
 
-	GameData *gameSet(const GameId &game, GameData *convert, const quint64 &accessHash, const QString &shortName, const QString &title, const QString &description, PhotoData *photo, DocumentData *document) {
+GameData *game(const GameId &game) {
+	auto i = gamesData.constFind(game);
+	if (i == gamesData.cend()) {
+		i = gamesData.insert(game, new GameData(game));
+	}
+	return i.value();
+}
+
+GameData *gameSet(const GameId &game, GameData *convert, const quint64 &accessHash, const QString &shortName,
+                  const QString &title, const QString &description, PhotoData *photo, DocumentData *document) {
+	if (convert) {
+		if (convert->id != game) {
+			auto i = gamesData.find(convert->id);
+			if (i != gamesData.cend() && i.value() == convert) {
+				gamesData.erase(i);
+			}
+			convert->id = game;
+			convert->accessHash = 0;
+		}
+		if (!convert->accessHash && accessHash) {
+			convert->accessHash = accessHash;
+			convert->shortName = TextUtilities::Clean(shortName);
+			convert->title = TextUtilities::SingleLine(title);
+			convert->description = TextUtilities::Clean(description);
+			convert->photo = photo;
+			convert->document = document;
+			if (App::main()) App::main()->gameUpdated(convert);
+		}
+	}
+	auto i = gamesData.constFind(game);
+	GameData *result;
+	if (i == gamesData.cend()) {
 		if (convert) {
-			if (convert->id != game) {
-				auto i = gamesData.find(convert->id);
-				if (i != gamesData.cend() && i.value() == convert) {
-					gamesData.erase(i);
-				}
-				convert->id = game;
-				convert->accessHash = 0;
-			}
-			if (!convert->accessHash && accessHash) {
-				convert->accessHash = accessHash;
-				convert->shortName = TextUtilities::Clean(shortName);
-				convert->title = TextUtilities::SingleLine(title);
-				convert->description = TextUtilities::Clean(description);
-				convert->photo = photo;
-				convert->document = document;
-				if (App::main()) App::main()->gameUpdated(convert);
-			}
-		}
-		auto i = gamesData.constFind(game);
-		GameData *result;
-		if (i == gamesData.cend()) {
-			if (convert) {
-				result = convert;
-			} else {
-				result = new GameData(game, accessHash, shortName, title, description, photo, document);
-			}
-			gamesData.insert(game, result);
+			result = convert;
 		} else {
-			result = i.value();
-			if (result != convert) {
-				if (!result->accessHash && accessHash) {
-					result->accessHash = accessHash;
-					result->shortName = TextUtilities::Clean(shortName);
-					result->title = TextUtilities::SingleLine(title);
-					result->description = TextUtilities::Clean(description);
-					result->photo = photo;
-					result->document = document;
-					if (App::main()) App::main()->gameUpdated(result);
-				}
+			result = new GameData(game, accessHash, shortName, title, description, photo, document);
+		}
+		gamesData.insert(game, result);
+	} else {
+		result = i.value();
+		if (result != convert) {
+			if (!result->accessHash && accessHash) {
+				result->accessHash = accessHash;
+				result->shortName = TextUtilities::Clean(shortName);
+				result->title = TextUtilities::SingleLine(title);
+				result->description = TextUtilities::Clean(description);
+				result->photo = photo;
+				result->document = document;
+				if (App::main()) App::main()->gameUpdated(result);
 			}
 		}
-		return result;
 	}
+	return result;
+}
 
-	LocationData *location(const LocationCoords &coords) {
-		auto i = locationsData.constFind(coords);
-		if (i == locationsData.cend()) {
-			i = locationsData.insert(coords, new LocationData(coords));
-		}
+LocationData *location(const LocationCoords &coords) {
+	auto i = locationsData.constFind(coords);
+	if (i == locationsData.cend()) {
+		i = locationsData.insert(coords, new LocationData(coords));
+	}
+	return i.value();
+}
+
+void forgetMedia() {
+	lastPhotos.clear();
+	lastPhotosMap.clear();
+	for_const (auto photo, ::photosData) { photo->forget(); }
+	for_const (auto document, ::documentsData) { document->forget(); }
+	for_const (auto location, ::locationsData) { location->thumb->forget(); }
+}
+
+MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo) {
+	if (photo.type() == mtpc_userProfilePhoto) {
+		const auto &uphoto(photo.c_userProfilePhoto());
+
+		QVector<MTPPhotoSize> photoSizes;
+		photoSizes.push_back(
+		    MTP_photoSize(MTP_string("a"), uphoto.vphoto_small, MTP_int(160), MTP_int(160), MTP_int(0)));
+		photoSizes.push_back(MTP_photoSize(MTP_string("c"), uphoto.vphoto_big, MTP_int(640), MTP_int(640), MTP_int(0)));
+
+		return MTP_photo(MTP_flags(0), uphoto.vphoto_id, MTP_long(0), date, MTP_vector<MTPPhotoSize>(photoSizes));
+	}
+	return MTP_photoEmpty(MTP_long(0));
+}
+
+QString peerName(const PeerData *peer, bool forDialogs) {
+	return peer ?
+	           ((forDialogs && peer->isUser() && !peer->asUser()->nameOrPhone.isEmpty()) ? peer->asUser()->nameOrPhone :
+	                                                                                       peer->name) :
+	           lang(lng_deleted);
+}
+
+Histories &histories() {
+	return ::histories;
+}
+
+not_null<History *> history(const PeerId &peer) {
+	return ::histories.findOrInsert(peer);
+}
+
+History *historyFromDialog(const PeerId &peer, qint32 unreadCnt, qint32 maxInboxRead, qint32 maxOutboxRead) {
+	return ::histories.findOrInsert(peer, unreadCnt, maxInboxRead, maxOutboxRead);
+}
+
+History *historyLoaded(const PeerId &peer) {
+	return ::histories.find(peer);
+}
+
+HistoryItem *histItemById(ChannelId channelId, MsgId itemId) {
+	if (!itemId) return nullptr;
+
+	auto data = fetchMsgsData(channelId, false);
+	if (!data) return nullptr;
+
+	auto i = data->constFind(itemId);
+	if (i != data->cend()) {
 		return i.value();
 	}
+	return nullptr;
+}
 
-	void forgetMedia() {
-		lastPhotos.clear();
-		lastPhotosMap.clear();
-		for_const (auto photo, ::photosData) {
-			photo->forget();
-		}
-		for_const (auto document, ::documentsData) {
-			document->forget();
-		}
-		for_const (auto location, ::locationsData) {
-			location->thumb->forget();
+void historyRegItem(HistoryItem *item) {
+	MsgsData *data = fetchMsgsData(item->channelId());
+	MsgsData::const_iterator i = data->constFind(item->id);
+	if (i == data->cend()) {
+		data->insert(item->id, item);
+	} else if (i.value() != item) {
+		LOG(("App Error: trying to historyRegItem() an already registered item"));
+		i.value()->destroy();
+		data->insert(item->id, item);
+	}
+}
+
+void historyItemDetached(HistoryItem *item) {
+	if (::hoveredItem == item) {
+		hoveredItem(nullptr);
+	}
+	if (::pressedItem == item) {
+		pressedItem(nullptr);
+	}
+	if (::hoveredLinkItem == item) {
+		hoveredLinkItem(nullptr);
+	}
+	if (::pressedLinkItem == item) {
+		pressedLinkItem(nullptr);
+	}
+	if (::contextItem == item) {
+		contextItem(nullptr);
+	}
+	if (::mousedItem == item) {
+		mousedItem(nullptr);
+	}
+}
+
+void historyUnregItem(HistoryItem *item) {
+	auto data = fetchMsgsData(item->channelId(), false);
+	if (!data) return;
+
+	auto i = data->find(item->id);
+	if (i != data->cend()) {
+		if (i.value() == item) {
+			data->erase(i);
 		}
 	}
+	historyItemDetached(item);
+	auto j = ::dependentItems.find(item);
+	if (j != ::dependentItems.cend()) {
+		DependentItemsSet items;
+		std::swap(items, j.value());
+		::dependentItems.erase(j);
 
-	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo) {
-		if (photo.type() == mtpc_userProfilePhoto) {
-			const auto &uphoto(photo.c_userProfilePhoto());
-
-			QVector<MTPPhotoSize> photoSizes;
-			photoSizes.push_back(MTP_photoSize(MTP_string("a"), uphoto.vphoto_small, MTP_int(160), MTP_int(160), MTP_int(0)));
-			photoSizes.push_back(MTP_photoSize(MTP_string("c"), uphoto.vphoto_big, MTP_int(640), MTP_int(640), MTP_int(0)));
-
-			return MTP_photo(MTP_flags(0), uphoto.vphoto_id, MTP_long(0), date, MTP_vector<MTPPhotoSize>(photoSizes));
-		}
-		return MTP_photoEmpty(MTP_long(0));
+		for_const (auto dependent, items) { dependent->dependencyItemRemoved(item); }
 	}
-
-	QString peerName(const PeerData *peer, bool forDialogs) {
-		return peer ? ((forDialogs && peer->isUser() && !peer->asUser()->nameOrPhone.isEmpty()) ? peer->asUser()->nameOrPhone : peer->name) : lang(lng_deleted);
+	Auth().notifications().clearFromItem(item);
+	if (Global::started() && !App::quitting()) {
+		Global::RefItemRemoved().notify(item, true);
 	}
+}
 
-	Histories &histories() {
-		return ::histories;
+void historyUpdateDependent(HistoryItem *item) {
+	DependentItems::iterator j = ::dependentItems.find(item);
+	if (j != ::dependentItems.cend()) {
+		for_const (HistoryItem *dependent, j.value()) { dependent->updateDependencyItem(); }
 	}
-
-	not_null<History*> history(const PeerId &peer) {
-		return ::histories.findOrInsert(peer);
+	if (App::main()) {
+		App::main()->itemEdited(item);
 	}
+}
 
-	History *historyFromDialog(const PeerId &peer, qint32 unreadCnt, qint32 maxInboxRead, qint32 maxOutboxRead) {
-		return ::histories.findOrInsert(peer, unreadCnt, maxInboxRead, maxOutboxRead);
-	}
+void historyClearMsgs() {
+	::dependentItems.clear();
 
-	History *historyLoaded(const PeerId &peer) {
-		return ::histories.find(peer);
-	}
-
-	HistoryItem *histItemById(ChannelId channelId, MsgId itemId) {
-		if (!itemId) return nullptr;
-
-		auto data = fetchMsgsData(channelId, false);
-		if (!data) return nullptr;
-
-		auto i = data->constFind(itemId);
-		if (i != data->cend()) {
-			return i.value();
-		}
-		return nullptr;
-	}
-
-	void historyRegItem(HistoryItem *item) {
-		MsgsData *data = fetchMsgsData(item->channelId());
-		MsgsData::const_iterator i = data->constFind(item->id);
-		if (i == data->cend()) {
-			data->insert(item->id, item);
-		} else if (i.value() != item) {
-			LOG(("App Error: trying to historyRegItem() an already registered item"));
-			i.value()->destroy();
-			data->insert(item->id, item);
+	QVector<HistoryItem *> toDelete;
+	for_const (auto item, msgsData) {
+		if (item->detached()) {
+			toDelete.push_back(item);
 		}
 	}
-
-	void historyItemDetached(HistoryItem *item) {
-		if (::hoveredItem == item) {
-			hoveredItem(nullptr);
-		}
-		if (::pressedItem == item) {
-			pressedItem(nullptr);
-		}
-		if (::hoveredLinkItem == item) {
-			hoveredLinkItem(nullptr);
-		}
-		if (::pressedLinkItem == item) {
-			pressedLinkItem(nullptr);
-		}
-		if (::contextItem == item) {
-			contextItem(nullptr);
-		}
-		if (::mousedItem == item) {
-			mousedItem(nullptr);
-		}
-	}
-
-	void historyUnregItem(HistoryItem *item) {
-		auto data = fetchMsgsData(item->channelId(), false);
-		if (!data) return;
-
-		auto i = data->find(item->id);
-		if (i != data->cend()) {
-			if (i.value() == item) {
-				data->erase(i);
-			}
-		}
-		historyItemDetached(item);
-		auto j = ::dependentItems.find(item);
-		if (j != ::dependentItems.cend()) {
-			DependentItemsSet items;
-			std::swap(items, j.value());
-			::dependentItems.erase(j);
-
-			for_const (auto dependent, items) {
-				dependent->dependencyItemRemoved(item);
-			}
-		}
-		Auth().notifications().clearFromItem(item);
-		if (Global::started() && !App::quitting()) {
-			Global::RefItemRemoved().notify(item, true);
-		}
-	}
-
-	void historyUpdateDependent(HistoryItem *item) {
-		DependentItems::iterator j = ::dependentItems.find(item);
-		if (j != ::dependentItems.cend()) {
-			for_const (HistoryItem *dependent, j.value()) {
-				dependent->updateDependencyItem();
-			}
-		}
-		if (App::main()) {
-			App::main()->itemEdited(item);
-		}
-	}
-
-	void historyClearMsgs() {
-		::dependentItems.clear();
-
-		QVector<HistoryItem*> toDelete;
-		for_const (auto item, msgsData) {
+	for_const (auto &chMsgsData, channelMsgsData) {
+		for_const (auto item, chMsgsData) {
 			if (item->detached()) {
 				toDelete.push_back(item);
 			}
 		}
-		for_const (auto &chMsgsData, channelMsgsData) {
-			for_const (auto item, chMsgsData) {
-				if (item->detached()) {
-					toDelete.push_back(item);
-				}
-			}
-		}
-		msgsData.clear();
-		channelMsgsData.clear();
-		for_const (auto item, toDelete) {
-			delete item;
-		}
-
-		clearMousedItems();
 	}
+	msgsData.clear();
+	channelMsgsData.clear();
+	for_const (auto item, toDelete) { delete item; }
 
-	void historyClearItems() {
-		randomData.clear();
-		sentData.clear();
-		mutedPeers.clear();
-		cSetSavedPeers(SavedPeers());
-		cSetSavedPeersByTime(SavedPeersByTime());
-		cSetRecentInlineBots(RecentInlineBots());
+	clearMousedItems();
+}
 
-		for_const (auto peer, ::peersData) {
-			delete peer;
-		}
-		::peersData.clear();
-		for_const (auto game, ::gamesData) {
-			delete game;
-		}
-		::gamesData.clear();
-		for_const (auto webpage, ::webPagesData) {
-			delete webpage;
-		}
-		::webPagesData.clear();
-		for_const (auto photo, ::photosData) {
-			delete photo;
-		}
-		::photosData.clear();
-		for_const (auto document, ::documentsData) {
-			delete document;
-		}
-		::documentsData.clear();
+void historyClearItems() {
+	randomData.clear();
+	sentData.clear();
+	mutedPeers.clear();
+	cSetSavedPeers(SavedPeers());
+	cSetSavedPeersByTime(SavedPeersByTime());
+	cSetRecentInlineBots(RecentInlineBots());
 
-		if (AuthSession::Exists()) {
-			Auth().api().clearWebPageRequests();
-		}
-		cSetRecentStickers(RecentStickerPack());
-		Global::SetStickerSets(Stickers::Sets());
-		Global::SetStickerSetsOrder(Stickers::Order());
-		Global::SetLastStickersUpdate(0);
-		Global::SetLastRecentStickersUpdate(0);
-		Global::SetFeaturedStickerSetsOrder(Stickers::Order());
-		if (Global::FeaturedStickerSetsUnreadCount() != 0) {
-			Global::SetFeaturedStickerSetsUnreadCount(0);
-			Global::RefFeaturedStickerSetsUnreadCountChanged().notify();
-		}
-		Global::SetLastFeaturedStickersUpdate(0);
-		Global::SetArchivedStickerSetsOrder(Stickers::Order());
-		cSetSavedGifs(SavedGifs());
-		cSetLastSavedGifsUpdate(0);
-		cSetReportSpamStatuses(ReportSpamStatuses());
-		cSetAutoDownloadPhoto(0);
-		cSetAutoDownloadAudio(0);
-		cSetAutoDownloadGif(0);
-		::photoItems.clear();
-		::documentItems.clear();
-		::webPageItems.clear();
-		::gameItems.clear();
-		::sharedContactItems.clear();
-		::gifItems.clear();
-		lastPhotos.clear();
-		lastPhotosMap.clear();
-		::self = nullptr;
-		Global::RefSelfChanged().notify(true);
+	for_const (auto peer, ::peersData) { delete peer; }
+	::peersData.clear();
+	for_const (auto game, ::gamesData) { delete game; }
+	::gamesData.clear();
+	for_const (auto webpage, ::webPagesData) { delete webpage; }
+	::webPagesData.clear();
+	for_const (auto photo, ::photosData) { delete photo; }
+	::photosData.clear();
+	for_const (auto document, ::documentsData) { delete document; }
+	::documentsData.clear();
+
+	if (AuthSession::Exists()) {
+		Auth().api().clearWebPageRequests();
 	}
-
-	void historyRegDependency(HistoryItem *dependent, HistoryItem *dependency) {
-		::dependentItems[dependency].insert(dependent);
+	cSetRecentStickers(RecentStickerPack());
+	Global::SetStickerSets(Stickers::Sets());
+	Global::SetStickerSetsOrder(Stickers::Order());
+	Global::SetLastStickersUpdate(0);
+	Global::SetLastRecentStickersUpdate(0);
+	Global::SetFeaturedStickerSetsOrder(Stickers::Order());
+	if (Global::FeaturedStickerSetsUnreadCount() != 0) {
+		Global::SetFeaturedStickerSetsUnreadCount(0);
+		Global::RefFeaturedStickerSetsUnreadCountChanged().notify();
 	}
+	Global::SetLastFeaturedStickersUpdate(0);
+	Global::SetArchivedStickerSetsOrder(Stickers::Order());
+	cSetSavedGifs(SavedGifs());
+	cSetLastSavedGifsUpdate(0);
+	cSetReportSpamStatuses(ReportSpamStatuses());
+	cSetAutoDownloadPhoto(0);
+	cSetAutoDownloadAudio(0);
+	cSetAutoDownloadGif(0);
+	::photoItems.clear();
+	::documentItems.clear();
+	::webPageItems.clear();
+	::gameItems.clear();
+	::sharedContactItems.clear();
+	::gifItems.clear();
+	lastPhotos.clear();
+	lastPhotosMap.clear();
+	::self = nullptr;
+	Global::RefSelfChanged().notify(true);
+}
 
-	void historyUnregDependency(HistoryItem *dependent, HistoryItem *dependency) {
-		auto i = ::dependentItems.find(dependency);
-		if (i != ::dependentItems.cend()) {
-			i.value().remove(dependent);
-			if (i.value().isEmpty()) {
-				::dependentItems.erase(i);
-			}
+void historyRegDependency(HistoryItem *dependent, HistoryItem *dependency) {
+	::dependentItems[dependency].insert(dependent);
+}
+
+void historyUnregDependency(HistoryItem *dependent, HistoryItem *dependency) {
+	auto i = ::dependentItems.find(dependency);
+	if (i != ::dependentItems.cend()) {
+		i.value().remove(dependent);
+		if (i.value().isEmpty()) {
+			::dependentItems.erase(i);
 		}
 	}
+}
 
-	void historyRegRandom(quint64 randomId, const FullMsgId &itemId) {
-		randomData.insert(randomId, itemId);
-	}
+void historyRegRandom(quint64 randomId, const FullMsgId &itemId) {
+	randomData.insert(randomId, itemId);
+}
 
-	void historyUnregRandom(quint64 randomId) {
-		randomData.remove(randomId);
-	}
+void historyUnregRandom(quint64 randomId) {
+	randomData.remove(randomId);
+}
 
-	FullMsgId histItemByRandom(quint64 randomId) {
-		RandomData::const_iterator i = randomData.constFind(randomId);
-		if (i != randomData.cend()) {
-			return i.value();
-		}
-		return FullMsgId();
-	}
-
-	void historyRegSentData(quint64 randomId, const PeerId &peerId, const QString &text) {
-		sentData.insert(randomId, qMakePair(peerId, text));
-	}
-
-	void historyUnregSentData(quint64 randomId) {
-		sentData.remove(randomId);
-	}
-
-	void histSentDataByItem(quint64 randomId, PeerId &peerId, QString &text) {
-		QPair<PeerId, QString> d = sentData.value(randomId);
-		peerId = d.first;
-		text = d.second;
-	}
-
-	void prepareCorners(RoundCorners index, qint32 radius, const QBrush &brush, const style::color *shadow = nullptr, QImage *cors = nullptr) {
-		Expects(::corners.size() > index);
-		qint32 r = radius * cIntRetinaFactor(), s = st::msgShadow * cIntRetinaFactor();
-		QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied), localCors[4];
-		{
-			Painter p(&rect);
-			PainterHighQualityEnabler hq(p);
-
-			p.setCompositionMode(QPainter::CompositionMode_Source);
-			p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
-			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-			p.setPen(Qt::NoPen);
-			if (shadow) {
-				p.setBrush((*shadow)->b);
-				p.drawRoundedRect(0, s, r * 3, r * 3, r, r);
-			}
-			p.setBrush(brush);
-			p.drawRoundedRect(0, 0, r * 3, r * 3, r, r);
-		}
-		if (!cors) cors = localCors;
-		cors[0] = rect.copy(0, 0, r, r);
-		cors[1] = rect.copy(r * 2, 0, r, r);
-		cors[2] = rect.copy(0, r * 2, r, r + (shadow ? s : 0));
-		cors[3] = rect.copy(r * 2, r * 2, r, r + (shadow ? s : 0));
-		if (index != SmallMaskCorners && index != LargeMaskCorners) {
-			for (int i = 0; i < 4; ++i) {
-				::corners[index].p[i] = pixmapFromImageInPlace(std::move(cors[i]));
-				::corners[index].p[i].setDevicePixelRatio(cRetinaFactor());
-			}
-		}
-	}
-
-	void tryFontFamily(QString &family, const QString &tryFamily) {
-		if (family.isEmpty()) {
-			if (!QFontInfo(QFont(tryFamily)).family().trimmed().compare(tryFamily, Qt::CaseInsensitive)) {
-				family = tryFamily;
-			}
-		}
-	}
-
-	int msgRadius() {
-		static int MsgRadius = ([]() {
-			return st::historyMessageRadius;
-			auto minMsgHeight = (st::msgPadding.top() + st::msgFont->height + st::msgPadding.bottom());
-			return minMsgHeight / 2;
-		})();
-		return MsgRadius;
-	}
-
-	void createMaskCorners() {
-		QImage mask[4];
-		prepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskSmall[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskSmall[i].setDevicePixelRatio(cRetinaFactor());
-		}
-		prepareCorners(LargeMaskCorners, msgRadius(), QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskLarge[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskLarge[i].setDevicePixelRatio(cRetinaFactor());
-		}
-	}
-
-	void createPaletteCorners() {
-		prepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
-		prepareCorners(BoxCorners, st::boxRadius, st::boxBg);
-		prepareCorners(BotKbOverCorners, st::dateRadius, st::msgBotKbOverBgAdd);
-		prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-		prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-		prepareCorners(SelectedOverlaySmallCorners, st::buttonRadius, st::msgSelectOverlay);
-		prepareCorners(SelectedOverlayLargeCorners, msgRadius(), st::msgSelectOverlay);
-		prepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
-		prepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
-		prepareCorners(InShadowCorners, msgRadius(), st::msgInShadow);
-		prepareCorners(InSelectedShadowCorners, msgRadius(), st::msgInShadowSelected);
-		prepareCorners(ForwardCorners, msgRadius(), st::historyForwardChooseBg);
-		prepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::mediaviewSaveMsgBg);
-		prepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);
-		prepareCorners(PhotoSelectOverlayCorners, st::buttonRadius, st::overviewPhotoSelectOverlay);
-
-		prepareCorners(Doc1Corners, st::buttonRadius, st::msgFile1Bg);
-		prepareCorners(Doc2Corners, st::buttonRadius, st::msgFile2Bg);
-		prepareCorners(Doc3Corners, st::buttonRadius, st::msgFile3Bg);
-		prepareCorners(Doc4Corners, st::buttonRadius, st::msgFile4Bg);
-
-		prepareCorners(MessageInCorners, msgRadius(), st::msgInBg, &st::msgInShadow);
-		prepareCorners(MessageInSelectedCorners, msgRadius(), st::msgInBgSelected, &st::msgInShadowSelected);
-		prepareCorners(MessageOutCorners, msgRadius(), st::msgOutBg, &st::msgOutShadow);
-		prepareCorners(MessageOutSelectedCorners, msgRadius(), st::msgOutBgSelected, &st::msgOutShadowSelected);
-	}
-
-	void createCorners() {
-		::corners.resize(RoundCornersCount);
-		createMaskCorners();
-		createPaletteCorners();
-	}
-
-	void clearCorners() {
-		::corners.clear();
-		::cornersMap.clear();
-	}
-
-	void initMedia() {
-		if (!::monofont) {
-			QString family;
-			tryFontFamily(family, qsl("Consolas"));
-			tryFontFamily(family, qsl("Liberation Mono"));
-			tryFontFamily(family, qsl("Menlo"));
-			tryFontFamily(family, qsl("Courier"));
-			if (family.isEmpty()) family = QFontDatabase::systemFont(QFontDatabase::FixedFont).family();
-			::monofont = style::font(st::normalFont->f.pixelSize(), 0, family);
-		}
-		Ui::Emoji::Init();
-		if (!::emoji) {
-			::emoji = new QPixmap(Ui::Emoji::Filename(Ui::Emoji::Index()));
-            if (cRetina()) ::emoji->setDevicePixelRatio(cRetinaFactor());
-		}
-		if (!::emojiLarge) {
-			::emojiLarge = new QPixmap(Ui::Emoji::Filename(Ui::Emoji::Index() + 1));
-			if (cRetina()) ::emojiLarge->setDevicePixelRatio(cRetinaFactor());
-		}
-
-		createCorners();
-
-		using Update = Window::Theme::BackgroundUpdate;
-		static auto subscription = Window::Theme::Background()->add_subscription([](const Update &update) {
-			if (update.paletteChanged()) {
-				createPaletteCorners();
-
-				if (App::main()) {
-					App::main()->updateScrollColors();
-				}
-				HistoryLayout::serviceColorsUpdated();
-			} else if (update.type == Update::Type::New) {
-				prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-				prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-
-				if (App::main()) {
-					App::main()->updateScrollColors();
-				}
-				HistoryLayout::serviceColorsUpdated();
-			}
-		});
-	}
-
-	void clearHistories() {
-		ClickHandler::clearActive();
-		ClickHandler::unpressed();
-
-		if (AuthSession::Exists()) {
-			// Clear notifications to prevent any showNotification() calls while destroying items.
-			Auth().notifications().clearAllFast();
-		}
-
-		histories().clear();
-
-		clearStorageImages();
-		cSetServerBackgrounds(WallPapers());
-
-		serviceImageCacheSize = imageCacheSize();
-	}
-
-	void deinitMedia() {
-		delete ::emoji;
-		::emoji = nullptr;
-		delete ::emojiLarge;
-		::emojiLarge = nullptr;
-
-		clearCorners();
-
-		MainEmojiMap.clear();
-		OtherEmojiMap.clear();
-
-		Data::clearGlobalStructures();
-
-		clearAllImages();
-	}
-
-	void hoveredItem(HistoryItem *item) {
-		::hoveredItem = item;
-	}
-
-	HistoryItem *hoveredItem() {
-		return ::hoveredItem;
-	}
-
-	void pressedItem(HistoryItem *item) {
-		::pressedItem = item;
-	}
-
-	HistoryItem *pressedItem() {
-		return ::pressedItem;
-	}
-
-	void hoveredLinkItem(HistoryItem *item) {
-		::hoveredLinkItem = item;
-	}
-
-	HistoryItem *hoveredLinkItem() {
-		return ::hoveredLinkItem;
-	}
-
-	void pressedLinkItem(HistoryItem *item) {
-		::pressedLinkItem = item;
-	}
-
-	HistoryItem *pressedLinkItem() {
-		return ::pressedLinkItem;
-	}
-
-	void contextItem(HistoryItem *item) {
-		::contextItem = item;
-	}
-
-	HistoryItem *contextItem() {
-		return ::contextItem;
-	}
-
-	void mousedItem(HistoryItem *item) {
-		::mousedItem = item;
-	}
-
-	HistoryItem *mousedItem() {
-		return ::mousedItem;
-	}
-
-	void clearMousedItems() {
-		hoveredItem(nullptr);
-		pressedItem(nullptr);
-		hoveredLinkItem(nullptr);
-		pressedLinkItem(nullptr);
-		contextItem(nullptr);
-		mousedItem(nullptr);
-	}
-
-	const style::font &monofont() {
-		return ::monofont;
-	}
-
-	const QPixmap &emoji() {
-		return *::emoji;
-	}
-
-	const QPixmap &emojiLarge() {
-		return *::emojiLarge;
-	}
-
-	const QPixmap &emojiSingle(EmojiPtr emoji, qint32 fontHeight) {
-		auto &map = (fontHeight == st::msgFont->height) ? MainEmojiMap : OtherEmojiMap[fontHeight];
-		auto i = map.constFind(emoji->index());
-		if (i == map.cend()) {
-			auto image = QImage(Ui::Emoji::Size() + st::emojiPadding * cIntRetinaFactor() * 2, fontHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-            if (cRetina()) image.setDevicePixelRatio(cRetinaFactor());
-			image.fill(Qt::transparent);
-			{
-				QPainter p(&image);
-				emojiDraw(p, emoji, st::emojiPadding * cIntRetinaFactor(), (fontHeight * cIntRetinaFactor() - Ui::Emoji::Size()) / 2);
-			}
-			i = map.insert(emoji->index(), App::pixmapFromImageInPlace(std::move(image)));
-		}
+FullMsgId histItemByRandom(quint64 randomId) {
+	RandomData::const_iterator i = randomData.constFind(randomId);
+	if (i != randomData.cend()) {
 		return i.value();
 	}
+	return FullMsgId();
+}
 
-	void checkImageCacheSize() {
-		qint64 nowImageCacheSize = imageCacheSize();
-		if (nowImageCacheSize > serviceImageCacheSize + MemoryForImageCache) {
-			App::forgetMedia();
-			serviceImageCacheSize = imageCacheSize();
+void historyRegSentData(quint64 randomId, const PeerId &peerId, const QString &text) {
+	sentData.insert(randomId, qMakePair(peerId, text));
+}
+
+void historyUnregSentData(quint64 randomId) {
+	sentData.remove(randomId);
+}
+
+void histSentDataByItem(quint64 randomId, PeerId &peerId, QString &text) {
+	QPair<PeerId, QString> d = sentData.value(randomId);
+	peerId = d.first;
+	text = d.second;
+}
+
+void prepareCorners(RoundCorners index, qint32 radius, const QBrush &brush, const style::color *shadow = nullptr,
+                    QImage *cors = nullptr) {
+	Expects(::corners.size() > index);
+	qint32 r = radius * cIntRetinaFactor(), s = st::msgShadow * cIntRetinaFactor();
+	QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied), localCors[4];
+	{
+		Painter p(&rect);
+		PainterHighQualityEnabler hq(p);
+
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		p.setPen(Qt::NoPen);
+		if (shadow) {
+			p.setBrush((*shadow)->b);
+			p.drawRoundedRect(0, s, r * 3, r * 3, r, r);
+		}
+		p.setBrush(brush);
+		p.drawRoundedRect(0, 0, r * 3, r * 3, r, r);
+	}
+	if (!cors) cors = localCors;
+	cors[0] = rect.copy(0, 0, r, r);
+	cors[1] = rect.copy(r * 2, 0, r, r);
+	cors[2] = rect.copy(0, r * 2, r, r + (shadow ? s : 0));
+	cors[3] = rect.copy(r * 2, r * 2, r, r + (shadow ? s : 0));
+	if (index != SmallMaskCorners && index != LargeMaskCorners) {
+		for (int i = 0; i < 4; ++i) {
+			::corners[index].p[i] = pixmapFromImageInPlace(std::move(cors[i]));
+			::corners[index].p[i].setDevicePixelRatio(cRetinaFactor());
 		}
 	}
+}
 
-	bool isValidPhone(QString phone) {
-		phone = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
-		return phone.length() >= 8 || phone == qsl("777") || phone == qsl("333") || phone == qsl("111") || (phone.startsWith(qsl("42")) && (phone.length() == 2 || phone.length() == 5 || phone == qsl("4242")));
+void tryFontFamily(QString &family, const QString &tryFamily) {
+	if (family.isEmpty()) {
+		if (!QFontInfo(QFont(tryFamily)).family().trimmed().compare(tryFamily, Qt::CaseInsensitive)) {
+			family = tryFamily;
+		}
+	}
+}
+
+int msgRadius() {
+	static int MsgRadius = ([]() {
+		return st::historyMessageRadius;
+		auto minMsgHeight = (st::msgPadding.top() + st::msgFont->height + st::msgPadding.bottom());
+		return minMsgHeight / 2;
+	})();
+	return MsgRadius;
+}
+
+void createMaskCorners() {
+	QImage mask[4];
+	prepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
+	for (int i = 0; i < 4; ++i) {
+		::cornersMaskSmall[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
+		::cornersMaskSmall[i].setDevicePixelRatio(cRetinaFactor());
+	}
+	prepareCorners(LargeMaskCorners, msgRadius(), QColor(255, 255, 255), nullptr, mask);
+	for (int i = 0; i < 4; ++i) {
+		::cornersMaskLarge[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
+		::cornersMaskLarge[i].setDevicePixelRatio(cRetinaFactor());
+	}
+}
+
+void createPaletteCorners() {
+	prepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
+	prepareCorners(BoxCorners, st::boxRadius, st::boxBg);
+	prepareCorners(BotKbOverCorners, st::dateRadius, st::msgBotKbOverBgAdd);
+	prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
+	prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
+	prepareCorners(SelectedOverlaySmallCorners, st::buttonRadius, st::msgSelectOverlay);
+	prepareCorners(SelectedOverlayLargeCorners, msgRadius(), st::msgSelectOverlay);
+	prepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
+	prepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
+	prepareCorners(InShadowCorners, msgRadius(), st::msgInShadow);
+	prepareCorners(InSelectedShadowCorners, msgRadius(), st::msgInShadowSelected);
+	prepareCorners(ForwardCorners, msgRadius(), st::historyForwardChooseBg);
+	prepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::mediaviewSaveMsgBg);
+	prepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
+	prepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
+	prepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);
+	prepareCorners(PhotoSelectOverlayCorners, st::buttonRadius, st::overviewPhotoSelectOverlay);
+
+	prepareCorners(Doc1Corners, st::buttonRadius, st::msgFile1Bg);
+	prepareCorners(Doc2Corners, st::buttonRadius, st::msgFile2Bg);
+	prepareCorners(Doc3Corners, st::buttonRadius, st::msgFile3Bg);
+	prepareCorners(Doc4Corners, st::buttonRadius, st::msgFile4Bg);
+
+	prepareCorners(MessageInCorners, msgRadius(), st::msgInBg, &st::msgInShadow);
+	prepareCorners(MessageInSelectedCorners, msgRadius(), st::msgInBgSelected, &st::msgInShadowSelected);
+	prepareCorners(MessageOutCorners, msgRadius(), st::msgOutBg, &st::msgOutShadow);
+	prepareCorners(MessageOutSelectedCorners, msgRadius(), st::msgOutBgSelected, &st::msgOutShadowSelected);
+}
+
+void createCorners() {
+	::corners.resize(RoundCornersCount);
+	createMaskCorners();
+	createPaletteCorners();
+}
+
+void clearCorners() {
+	::corners.clear();
+	::cornersMap.clear();
+}
+
+void initMedia() {
+	if (!::monofont) {
+		QString family;
+		tryFontFamily(family, qsl("Consolas"));
+		tryFontFamily(family, qsl("Liberation Mono"));
+		tryFontFamily(family, qsl("Menlo"));
+		tryFontFamily(family, qsl("Courier"));
+		if (family.isEmpty()) family = QFontDatabase::systemFont(QFontDatabase::FixedFont).family();
+		::monofont = style::font(st::normalFont->f.pixelSize(), 0, family);
+	}
+	Ui::Emoji::Init();
+	if (!::emoji) {
+		::emoji = new QPixmap(Ui::Emoji::Filename(Ui::Emoji::Index()));
+		if (cRetina()) ::emoji->setDevicePixelRatio(cRetinaFactor());
+	}
+	if (!::emojiLarge) {
+		::emojiLarge = new QPixmap(Ui::Emoji::Filename(Ui::Emoji::Index() + 1));
+		if (cRetina()) ::emojiLarge->setDevicePixelRatio(cRetinaFactor());
 	}
 
-	void quit() {
-		if (quitting()) return;
-		setLaunchState(QuitRequested);
+	createCorners();
 
-		if (auto window = wnd()) {
-			if (!Sandbox::isSavingSession()) {
-				window->hide();
+	using Update = Window::Theme::BackgroundUpdate;
+	static auto subscription = Window::Theme::Background()->add_subscription([](const Update &update) {
+		if (update.paletteChanged()) {
+			createPaletteCorners();
+
+			if (App::main()) {
+				App::main()->updateScrollColors();
 			}
+			HistoryLayout::serviceColorsUpdated();
+		} else if (update.type == Update::Type::New) {
+			prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
+			prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
+
+			if (App::main()) {
+				App::main()->updateScrollColors();
+			}
+			HistoryLayout::serviceColorsUpdated();
 		}
-		if (auto mainwidget = main()) {
-			mainwidget->saveDraftToCloud();
-		}
-		Messenger::QuitAttempt();
+	});
+}
+
+void clearHistories() {
+	ClickHandler::clearActive();
+	ClickHandler::unpressed();
+
+	if (AuthSession::Exists()) {
+		// Clear notifications to prevent any showNotification() calls while destroying items.
+		Auth().notifications().clearAllFast();
 	}
 
-	bool quitting() {
-		return _launchState != Launched;
-	}
+	histories().clear();
 
-	LaunchState launchState() {
-		return _launchState;
-	}
+	clearStorageImages();
+	cSetServerBackgrounds(WallPapers());
 
-	void setLaunchState(LaunchState state) {
-		_launchState = state;
-	}
+	serviceImageCacheSize = imageCacheSize();
+}
 
-	void restart() {
-		cSetRestarting(true);
-		cSetRestartingToSettings(true);
-		App::quit();
-	}
+void deinitMedia() {
+	delete ::emoji;
+	::emoji = nullptr;
+	delete ::emojiLarge;
+	::emojiLarge = nullptr;
 
-	QImage readImage(QByteArray data, QByteArray *format, bool opaque, bool *animated) {
-        QByteArray tmpFormat;
-		QImage result;
-		QBuffer buffer(&data);
-        if (!format) {
-            format = &tmpFormat;
-        }
+	clearCorners();
+
+	MainEmojiMap.clear();
+	OtherEmojiMap.clear();
+
+	Data::clearGlobalStructures();
+
+	clearAllImages();
+}
+
+void hoveredItem(HistoryItem *item) {
+	::hoveredItem = item;
+}
+
+HistoryItem *hoveredItem() {
+	return ::hoveredItem;
+}
+
+void pressedItem(HistoryItem *item) {
+	::pressedItem = item;
+}
+
+HistoryItem *pressedItem() {
+	return ::pressedItem;
+}
+
+void hoveredLinkItem(HistoryItem *item) {
+	::hoveredLinkItem = item;
+}
+
+HistoryItem *hoveredLinkItem() {
+	return ::hoveredLinkItem;
+}
+
+void pressedLinkItem(HistoryItem *item) {
+	::pressedLinkItem = item;
+}
+
+HistoryItem *pressedLinkItem() {
+	return ::pressedLinkItem;
+}
+
+void contextItem(HistoryItem *item) {
+	::contextItem = item;
+}
+
+HistoryItem *contextItem() {
+	return ::contextItem;
+}
+
+void mousedItem(HistoryItem *item) {
+	::mousedItem = item;
+}
+
+HistoryItem *mousedItem() {
+	return ::mousedItem;
+}
+
+void clearMousedItems() {
+	hoveredItem(nullptr);
+	pressedItem(nullptr);
+	hoveredLinkItem(nullptr);
+	pressedLinkItem(nullptr);
+	contextItem(nullptr);
+	mousedItem(nullptr);
+}
+
+const style::font &monofont() {
+	return ::monofont;
+}
+
+const QPixmap &emoji() {
+	return *::emoji;
+}
+
+const QPixmap &emojiLarge() {
+	return *::emojiLarge;
+}
+
+const QPixmap &emojiSingle(EmojiPtr emoji, qint32 fontHeight) {
+	auto &map = (fontHeight == st::msgFont->height) ? MainEmojiMap : OtherEmojiMap[fontHeight];
+	auto i = map.constFind(emoji->index());
+	if (i == map.cend()) {
+		auto image = QImage(Ui::Emoji::Size() + st::emojiPadding * cIntRetinaFactor() * 2,
+		                    fontHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+		if (cRetina()) image.setDevicePixelRatio(cRetinaFactor());
+		image.fill(Qt::transparent);
 		{
-			QImageReader reader(&buffer, *format);
-#ifndef OS_MAC_OLD
-			reader.setAutoTransform(true);
-#endif // OS_MAC_OLD
-			if (animated) *animated = reader.supportsAnimation() && reader.imageCount() > 1;
-			QByteArray fmt = reader.format();
-			if (!fmt.isEmpty()) *format = fmt;
-			if (!reader.read(&result)) {
-				return QImage();
-			}
-			fmt = reader.format();
-			if (!fmt.isEmpty()) *format = fmt;
+			QPainter p(&image);
+			emojiDraw(p, emoji, st::emojiPadding * cIntRetinaFactor(),
+			          (fontHeight * cIntRetinaFactor() - Ui::Emoji::Size()) / 2);
 		}
-		buffer.seek(0);
-		auto fmt = QString::fromUtf8(*format).toLower();
-		if (fmt == "jpg" || fmt == "jpeg") {
-#ifdef OS_MAC_OLD
-			if (auto exifData = exif_data_new_from_data((const uchar*)(data.constData()), data.size())) {
-				auto byteOrder = exif_data_get_byte_order(exifData);
-				if (auto exifEntry = exif_data_get_entry(exifData, EXIF_TAG_ORIENTATION)) {
-					auto orientationFix = [exifEntry, byteOrder] {
-						auto orientation = exif_get_short(exifEntry->data, byteOrder);
-						switch (orientation) {
-						case 2: return QTransform(-1, 0, 0, 1, 0, 0);
-						case 3: return QTransform(-1, 0, 0, -1, 0, 0);
-						case 4: return QTransform(1, 0, 0, -1, 0, 0);
-						case 5: return QTransform(0, -1, -1, 0, 0, 0);
-						case 6: return QTransform(0, 1, -1, 0, 0, 0);
-						case 7: return QTransform(0, 1, 1, 0, 0, 0);
-						case 8: return QTransform(0, -1, 1, 0, 0, 0);
-						}
-						return QTransform();
-					};
-					result = result.transformed(orientationFix());
-				}
-				exif_data_free(exifData);
-			}
-#endif // OS_MAC_OLD
-		} else if (opaque) {
-			result = Images::prepareOpaque(std::move(result));
-		}
-		return result;
+		i = map.insert(emoji->index(), App::pixmapFromImageInPlace(std::move(image)));
 	}
+	return i.value();
+}
 
-	QImage readImage(const QString &file, QByteArray *format, bool opaque, bool *animated, QByteArray *content) {
-		QFile f(file);
-		if (f.size() > kImageSizeLimit || !f.open(QIODevice::ReadOnly)) {
-			if (animated) *animated = false;
+void checkImageCacheSize() {
+	qint64 nowImageCacheSize = imageCacheSize();
+	if (nowImageCacheSize > serviceImageCacheSize + MemoryForImageCache) {
+		App::forgetMedia();
+		serviceImageCacheSize = imageCacheSize();
+	}
+}
+
+bool isValidPhone(QString phone) {
+	phone = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
+	return phone.length() >= 8 || phone == qsl("777") || phone == qsl("333") || phone == qsl("111") ||
+	       (phone.startsWith(qsl("42")) && (phone.length() == 2 || phone.length() == 5 || phone == qsl("4242")));
+}
+
+void quit() {
+	if (quitting()) return;
+	setLaunchState(QuitRequested);
+
+	if (auto window = wnd()) {
+		if (!Sandbox::isSavingSession()) {
+			window->hide();
+		}
+	}
+	if (auto mainwidget = main()) {
+		mainwidget->saveDraftToCloud();
+	}
+	Messenger::QuitAttempt();
+}
+
+bool quitting() {
+	return _launchState != Launched;
+}
+
+LaunchState launchState() {
+	return _launchState;
+}
+
+void setLaunchState(LaunchState state) {
+	_launchState = state;
+}
+
+void restart() {
+	cSetRestarting(true);
+	cSetRestartingToSettings(true);
+	App::quit();
+}
+
+QImage readImage(QByteArray data, QByteArray *format, bool opaque, bool *animated) {
+	QByteArray tmpFormat;
+	QImage result;
+	QBuffer buffer(&data);
+	if (!format) {
+		format = &tmpFormat;
+	}
+	{
+		QImageReader reader(&buffer, *format);
+#ifndef OS_MAC_OLD
+		reader.setAutoTransform(true);
+#endif // OS_MAC_OLD
+		if (animated) *animated = reader.supportsAnimation() && reader.imageCount() > 1;
+		QByteArray fmt = reader.format();
+		if (!fmt.isEmpty()) *format = fmt;
+		if (!reader.read(&result)) {
 			return QImage();
 		}
-		auto imageBytes = f.readAll();
-		auto result = readImage(imageBytes, format, opaque, animated);
-		if (content && !result.isNull()) {
-			*content = imageBytes;
-		}
-		return result;
+		fmt = reader.format();
+		if (!fmt.isEmpty()) *format = fmt;
 	}
-
-	QPixmap pixmapFromImageInPlace(QImage &&image) {
-		return QPixmap::fromImage(std::move(image), Qt::ColorOnly);
-	}
-
-	void regPhotoItem(PhotoData *data, HistoryItem *item) {
-		::photoItems[data].insert(item);
-	}
-
-	void unregPhotoItem(PhotoData *data, HistoryItem *item) {
-		::photoItems[data].remove(item);
-	}
-
-	const PhotoItems &photoItems() {
-		return ::photoItems;
-	}
-
-	const PhotosData &photosData() {
-		return ::photosData;
-	}
-
-	void regDocumentItem(DocumentData *data, HistoryItem *item) {
-		::documentItems[data].insert(item);
-	}
-
-	void unregDocumentItem(DocumentData *data, HistoryItem *item) {
-		::documentItems[data].remove(item);
-	}
-
-	const DocumentItems &documentItems() {
-		return ::documentItems;
-	}
-
-	const DocumentsData &documentsData() {
-		return ::documentsData;
-	}
-
-	void regWebPageItem(WebPageData *data, HistoryItem *item) {
-		::webPageItems[data].insert(item);
-	}
-
-	void unregWebPageItem(WebPageData *data, HistoryItem *item) {
-		::webPageItems[data].remove(item);
-	}
-
-	const WebPageItems &webPageItems() {
-		return ::webPageItems;
-	}
-
-	void regGameItem(GameData *data, HistoryItem *item) {
-		::gameItems[data].insert(item);
-	}
-
-	void unregGameItem(GameData *data, HistoryItem *item) {
-		::gameItems[data].remove(item);
-	}
-
-	const GameItems &gameItems() {
-		return ::gameItems;
-	}
-
-	void regSharedContactItem(qint32 userId, HistoryItem *item) {
-		auto user = App::userLoaded(userId);
-		auto canShareThisContact = user ? user->canShareThisContact() : false;
-		::sharedContactItems[userId].insert(item);
-		if (canShareThisContact != (user ? user->canShareThisContact() : false)) {
-			Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserCanShareContact);
-		}
-	}
-
-	void unregSharedContactItem(qint32 userId, HistoryItem *item) {
-		auto user = App::userLoaded(userId);
-		auto canShareThisContact = user ? user->canShareThisContact() : false;
-		::sharedContactItems[userId].remove(item);
-		if (canShareThisContact != (user ? user->canShareThisContact() : false)) {
-			Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserCanShareContact);
-		}
-	}
-
-	const SharedContactItems &sharedContactItems() {
-		return ::sharedContactItems;
-	}
-
-	void regGifItem(Media::Clip::Reader *reader, HistoryItem *item) {
-		::gifItems.insert(reader, item);
-	}
-
-	void unregGifItem(Media::Clip::Reader *reader) {
-		::gifItems.remove(reader);
-	}
-
-	void stopGifItems() {
-		if (!::gifItems.isEmpty()) {
-			auto gifs = ::gifItems;
-			for_const (auto item, gifs) {
-				if (auto media = item->getMedia()) {
-					if (!media->isRoundVideoPlaying()) {
-						media->stopInline();
+	buffer.seek(0);
+	auto fmt = QString::fromUtf8(*format).toLower();
+	if (fmt == "jpg" || fmt == "jpeg") {
+#ifdef OS_MAC_OLD
+		if (auto exifData = exif_data_new_from_data((const uchar *)(data.constData()), data.size())) {
+			auto byteOrder = exif_data_get_byte_order(exifData);
+			if (auto exifEntry = exif_data_get_entry(exifData, EXIF_TAG_ORIENTATION)) {
+				auto orientationFix = [exifEntry, byteOrder] {
+					auto orientation = exif_get_short(exifEntry->data, byteOrder);
+					switch (orientation) {
+					case 2: return QTransform(-1, 0, 0, 1, 0, 0);
+					case 3: return QTransform(-1, 0, 0, -1, 0, 0);
+					case 4: return QTransform(1, 0, 0, -1, 0, 0);
+					case 5: return QTransform(0, -1, -1, 0, 0, 0);
+					case 6: return QTransform(0, 1, -1, 0, 0, 0);
+					case 7: return QTransform(0, 1, 1, 0, 0, 0);
+					case 8: return QTransform(0, -1, 1, 0, 0, 0);
 					}
+					return QTransform();
+				};
+				result = result.transformed(orientationFix());
+			}
+			exif_data_free(exifData);
+		}
+#endif // OS_MAC_OLD
+	} else if (opaque) {
+		result = Images::prepareOpaque(std::move(result));
+	}
+	return result;
+}
+
+QImage readImage(const QString &file, QByteArray *format, bool opaque, bool *animated, QByteArray *content) {
+	QFile f(file);
+	if (f.size() > kImageSizeLimit || !f.open(QIODevice::ReadOnly)) {
+		if (animated) *animated = false;
+		return QImage();
+	}
+	auto imageBytes = f.readAll();
+	auto result = readImage(imageBytes, format, opaque, animated);
+	if (content && !result.isNull()) {
+		*content = imageBytes;
+	}
+	return result;
+}
+
+QPixmap pixmapFromImageInPlace(QImage &&image) {
+	return QPixmap::fromImage(std::move(image), Qt::ColorOnly);
+}
+
+void regPhotoItem(PhotoData *data, HistoryItem *item) {
+	::photoItems[data].insert(item);
+}
+
+void unregPhotoItem(PhotoData *data, HistoryItem *item) {
+	::photoItems[data].remove(item);
+}
+
+const PhotoItems &photoItems() {
+	return ::photoItems;
+}
+
+const PhotosData &photosData() {
+	return ::photosData;
+}
+
+void regDocumentItem(DocumentData *data, HistoryItem *item) {
+	::documentItems[data].insert(item);
+}
+
+void unregDocumentItem(DocumentData *data, HistoryItem *item) {
+	::documentItems[data].remove(item);
+}
+
+const DocumentItems &documentItems() {
+	return ::documentItems;
+}
+
+const DocumentsData &documentsData() {
+	return ::documentsData;
+}
+
+void regWebPageItem(WebPageData *data, HistoryItem *item) {
+	::webPageItems[data].insert(item);
+}
+
+void unregWebPageItem(WebPageData *data, HistoryItem *item) {
+	::webPageItems[data].remove(item);
+}
+
+const WebPageItems &webPageItems() {
+	return ::webPageItems;
+}
+
+void regGameItem(GameData *data, HistoryItem *item) {
+	::gameItems[data].insert(item);
+}
+
+void unregGameItem(GameData *data, HistoryItem *item) {
+	::gameItems[data].remove(item);
+}
+
+const GameItems &gameItems() {
+	return ::gameItems;
+}
+
+void regSharedContactItem(qint32 userId, HistoryItem *item) {
+	auto user = App::userLoaded(userId);
+	auto canShareThisContact = user ? user->canShareThisContact() : false;
+	::sharedContactItems[userId].insert(item);
+	if (canShareThisContact != (user ? user->canShareThisContact() : false)) {
+		Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserCanShareContact);
+	}
+}
+
+void unregSharedContactItem(qint32 userId, HistoryItem *item) {
+	auto user = App::userLoaded(userId);
+	auto canShareThisContact = user ? user->canShareThisContact() : false;
+	::sharedContactItems[userId].remove(item);
+	if (canShareThisContact != (user ? user->canShareThisContact() : false)) {
+		Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserCanShareContact);
+	}
+}
+
+const SharedContactItems &sharedContactItems() {
+	return ::sharedContactItems;
+}
+
+void regGifItem(Media::Clip::Reader *reader, HistoryItem *item) {
+	::gifItems.insert(reader, item);
+}
+
+void unregGifItem(Media::Clip::Reader *reader) {
+	::gifItems.remove(reader);
+}
+
+void stopGifItems() {
+	if (!::gifItems.isEmpty()) {
+		auto gifs = ::gifItems;
+		for_const (auto item, gifs) {
+			if (auto media = item->getMedia()) {
+				if (!media->isRoundVideoPlaying()) {
+					media->stopInline();
 				}
 			}
 		}
 	}
+}
 
-	QString phoneFromSharedContact(qint32 userId) {
-		auto i = ::sharedContactItems.constFind(userId);
-		if (i != ::sharedContactItems.cend() && !i->isEmpty()) {
-			if (auto media = (*i->cbegin())->getMedia()) {
-				if (media->type() == MediaTypeContact) {
-					return static_cast<HistoryContact*>(media)->phone();
-				}
+QString phoneFromSharedContact(qint32 userId) {
+	auto i = ::sharedContactItems.constFind(userId);
+	if (i != ::sharedContactItems.cend() && !i->isEmpty()) {
+		if (auto media = (*i->cbegin())->getMedia()) {
+			if (media->type() == MediaTypeContact) {
+				return static_cast<HistoryContact *>(media)->phone();
 			}
 		}
-		return QString();
 	}
+	return QString();
+}
 
-	void regMuted(PeerData *peer, qint32 changeIn) {
-		::mutedPeers.insert(peer, true);
-		if (App::main()) App::main()->updateMutedIn(changeIn);
-	}
+void regMuted(PeerData *peer, qint32 changeIn) {
+	::mutedPeers.insert(peer, true);
+	if (App::main()) App::main()->updateMutedIn(changeIn);
+}
 
-	void unregMuted(PeerData *peer) {
-		::mutedPeers.remove(peer);
-	}
+void unregMuted(PeerData *peer) {
+	::mutedPeers.remove(peer);
+}
 
-	void updateMuted() {
-		qint32 changeInMin = 0;
-		for (MutedPeers::iterator i = ::mutedPeers.begin(); i != ::mutedPeers.end();) {
-			qint32 changeIn = 0;
-			History *h = App::history(i.key()->id);
-			if (isNotifyMuted(i.key()->notify, &changeIn)) {
-				h->setMute(true);
-				if (changeIn && (!changeInMin || changeIn < changeInMin)) {
-					changeInMin = changeIn;
-				}
-				++i;
-			} else {
-				h->setMute(false);
-				i = ::mutedPeers.erase(i);
+void updateMuted() {
+	qint32 changeInMin = 0;
+	for (MutedPeers::iterator i = ::mutedPeers.begin(); i != ::mutedPeers.end();) {
+		qint32 changeIn = 0;
+		History *h = App::history(i.key()->id);
+		if (isNotifyMuted(i.key()->notify, &changeIn)) {
+			h->setMute(true);
+			if (changeIn && (!changeInMin || changeIn < changeInMin)) {
+				changeInMin = changeIn;
 			}
+			++i;
+		} else {
+			h->setMute(false);
+			i = ::mutedPeers.erase(i);
 		}
-		if (changeInMin) App::main()->updateMutedIn(changeInMin);
 	}
+	if (changeInMin) App::main()->updateMutedIn(changeInMin);
+}
 
-	void setProxySettings(QNetworkAccessManager &manager) {
+void setProxySettings(QNetworkAccessManager &manager) {
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-		manager.setProxy(getHttpProxySettings());
+	manager.setProxy(getHttpProxySettings());
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
-	}
+}
 
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-	QNetworkProxy getHttpProxySettings() {
-		const ProxyData *proxy = nullptr;
-		if (Global::started()) {
-			proxy = (Global::ConnectionType() == dbictHttpProxy) ? (&Global::ConnectionProxy()) : nullptr;
-		} else {
-			proxy = Sandbox::PreLaunchProxy().host.isEmpty() ? nullptr : (&Sandbox::PreLaunchProxy());
-		}
-		if (proxy) {
-			return QNetworkProxy(QNetworkProxy::HttpProxy, proxy->host, proxy->port, proxy->user, proxy->password);
-		}
-		return QNetworkProxy(QNetworkProxy::DefaultProxy);
+QNetworkProxy getHttpProxySettings() {
+	const ProxyData *proxy = nullptr;
+	if (Global::started()) {
+		proxy = (Global::ConnectionType() == dbictHttpProxy) ? (&Global::ConnectionProxy()) : nullptr;
+	} else {
+		proxy = Sandbox::PreLaunchProxy().host.isEmpty() ? nullptr : (&Sandbox::PreLaunchProxy());
 	}
+	if (proxy) {
+		return QNetworkProxy(QNetworkProxy::HttpProxy, proxy->host, proxy->port, proxy->user, proxy->password);
+	}
+	return QNetworkProxy(QNetworkProxy::DefaultProxy);
+}
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
 
-	void setProxySettings(QTcpSocket &socket) {
+void setProxySettings(QTcpSocket &socket) {
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-		if (Global::ConnectionType() == dbictTcpProxy) {
-			auto &p = Global::ConnectionProxy();
-			socket.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, p.host, p.port, p.user, p.password));
-		} else {
-			socket.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
-		}
-#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
+	if (Global::ConnectionType() == dbictTcpProxy) {
+		auto &p = Global::ConnectionProxy();
+		socket.setProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, p.host, p.port, p.user, p.password));
+	} else {
+		socket.setProxy(QNetworkProxy(QNetworkProxy::NoProxy));
 	}
+#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
+}
 
-	void complexAdjustRect(ImageRoundCorners corners, QRect &rect, RectParts &parts) {
-		if (corners & ImageRoundCorner::TopLeft) {
-			if (!(corners & ImageRoundCorner::BottomLeft)) {
-				parts = RectPart::NoTopBottom | RectPart::FullTop;
-				rect.setHeight(rect.height() + msgRadius());
-			}
-		} else if (corners & ImageRoundCorner::BottomLeft) {
-			parts = RectPart::NoTopBottom | RectPart::FullBottom;
-			rect.setTop(rect.y() - msgRadius());
-		} else {
-			parts = RectPart::NoTopBottom;
-			rect.setTop(rect.y() - msgRadius());
+void complexAdjustRect(ImageRoundCorners corners, QRect &rect, RectParts &parts) {
+	if (corners & ImageRoundCorner::TopLeft) {
+		if (!(corners & ImageRoundCorner::BottomLeft)) {
+			parts = RectPart::NoTopBottom | RectPart::FullTop;
 			rect.setHeight(rect.height() + msgRadius());
 		}
+	} else if (corners & ImageRoundCorner::BottomLeft) {
+		parts = RectPart::NoTopBottom | RectPart::FullBottom;
+		rect.setTop(rect.y() - msgRadius());
+	} else {
+		parts = RectPart::NoTopBottom;
+		rect.setTop(rect.y() - msgRadius());
+		rect.setHeight(rect.height() + msgRadius());
 	}
-
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
-		if (radius == ImageRoundRadius::Ellipse) {
-			PainterHighQualityEnabler hq(p);
-			p.setPen(Qt::NoPen);
-			p.setBrush(p.textPalette().selectOverlay);
-			p.drawEllipse(rect);
-		} else {
-			auto overlayCorners = (radius == ImageRoundRadius::Small) ? SelectedOverlaySmallCorners : SelectedOverlayLargeCorners;
-			auto overlayParts = RectPart::Full | RectPart::None;
-			if (radius == ImageRoundRadius::Large) {
-				complexAdjustRect(corners, rect, overlayParts);
-			}
-			roundRect(p, rect, p.textPalette().selectOverlay, overlayCorners, nullptr, overlayParts);
-		}
-	}
-
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
-		auto parts = RectPart::Full | RectPart::None;
-		complexAdjustRect(corners, rect, parts);
-		roundRect(p, rect, st::msgInBg, MessageInCorners, nullptr, parts);
-	}
-
-	QImage *cornersMask(ImageRoundRadius radius) {
-		switch (radius) {
-		case ImageRoundRadius::Large: return ::cornersMaskLarge;
-		case ImageRoundRadius::Small:
-		default: break;
-		}
-		return ::cornersMaskSmall;
-	}
-
-	void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, const CornersPixmaps &corner, const style::color *shadow, RectParts parts) {
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (w < 2 * cornerWidth || h < 2 * cornerHeight) return;
-		if (w > 2 * cornerWidth) {
-			if (parts & RectPart::Top) {
-				p.fillRect(x + cornerWidth, y, w - 2 * cornerWidth, cornerHeight, bg);
-			}
-			if (parts & RectPart::Bottom) {
-				p.fillRect(x + cornerWidth, y + h - cornerHeight, w - 2 * cornerWidth, cornerHeight, bg);
-				if (shadow) {
-					p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, *shadow);
-				}
-			}
-		}
-		if (h > 2 * cornerHeight) {
-			if ((parts & RectPart::NoTopBottom) == RectPart::NoTopBottom) {
-				p.fillRect(x, y + cornerHeight, w, h - 2 * cornerHeight, bg);
-			} else {
-				if (parts & RectPart::Left) {
-					p.fillRect(x, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if ((parts & RectPart::Center) && w > 2 * cornerWidth) {
-					p.fillRect(x + cornerWidth, y + cornerHeight, w - 2 * cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if (parts & RectPart::Right) {
-					p.fillRect(x + w - cornerWidth, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-			}
-		}
-		if (parts & RectPart::TopLeft) {
-			p.drawPixmap(x, y, corner.p[0]);
-		}
-		if (parts & RectPart::TopRight) {
-			p.drawPixmap(x + w - cornerWidth, y, corner.p[1]);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.drawPixmap(x, y + h - cornerHeight, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, RoundCorners index, const style::color *shadow, RectParts parts) {
-		roundRect(p, x, y, w, h, bg, ::corners[index], shadow, parts);
-	}
-
-	void roundShadow(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color shadow, RoundCorners index, RectParts parts) {
-		auto &corner = ::corners[index];
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (parts & RectPart::Bottom) {
-			p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, shadow);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.fillRect(x, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x, y + h - cornerHeight + st::msgShadow, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.fillRect(x + w - cornerWidth, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight + st::msgShadow, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, ImageRoundRadius radius, RectParts parts) {
-		auto colorKey = ((quint32(bg->c.alpha()) & 0xFF) << 24) | ((quint32(bg->c.red()) & 0xFF) << 16) | ((quint32(bg->c.green()) & 0xFF) << 8) | ((quint32(bg->c.blue()) & 0xFF) << 24);
-		auto i = cornersMap.find(colorKey);
-		if (i == cornersMap.cend()) {
-			QImage images[4];
-			switch (radius) {
-			case ImageRoundRadius::Small: prepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
-			case ImageRoundRadius::Large: prepareCorners(LargeMaskCorners, msgRadius(), bg, nullptr, images); break;
-			default: p.fillRect(x, y, w, h, bg); return;
-			}
-
-			CornersPixmaps pixmaps;
-			for (int j = 0; j < 4; ++j) {
-				pixmaps.p[j] = pixmapFromImageInPlace(std::move(images[j]));
-				pixmaps.p[j].setDevicePixelRatio(cRetinaFactor());
-			}
-			i = cornersMap.insert(colorKey, pixmaps);
-		}
-		roundRect(p, x, y, w, h, bg, i.value(), nullptr, parts);
-	}
-
-	WallPapers gServerBackgrounds;
-
 }
+
+void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
+	if (radius == ImageRoundRadius::Ellipse) {
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(p.textPalette().selectOverlay);
+		p.drawEllipse(rect);
+	} else {
+		auto overlayCorners =
+		    (radius == ImageRoundRadius::Small) ? SelectedOverlaySmallCorners : SelectedOverlayLargeCorners;
+		auto overlayParts = RectPart::Full | RectPart::None;
+		if (radius == ImageRoundRadius::Large) {
+			complexAdjustRect(corners, rect, overlayParts);
+		}
+		roundRect(p, rect, p.textPalette().selectOverlay, overlayCorners, nullptr, overlayParts);
+	}
+}
+
+void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
+	auto parts = RectPart::Full | RectPart::None;
+	complexAdjustRect(corners, rect, parts);
+	roundRect(p, rect, st::msgInBg, MessageInCorners, nullptr, parts);
+}
+
+QImage *cornersMask(ImageRoundRadius radius) {
+	switch (radius) {
+	case ImageRoundRadius::Large: return ::cornersMaskLarge;
+	case ImageRoundRadius::Small:
+	default: break;
+	}
+	return ::cornersMaskSmall;
+}
+
+void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, const CornersPixmaps &corner,
+               const style::color *shadow, RectParts parts) {
+	auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
+	auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
+	if (w < 2 * cornerWidth || h < 2 * cornerHeight) return;
+	if (w > 2 * cornerWidth) {
+		if (parts & RectPart::Top) {
+			p.fillRect(x + cornerWidth, y, w - 2 * cornerWidth, cornerHeight, bg);
+		}
+		if (parts & RectPart::Bottom) {
+			p.fillRect(x + cornerWidth, y + h - cornerHeight, w - 2 * cornerWidth, cornerHeight, bg);
+			if (shadow) {
+				p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, *shadow);
+			}
+		}
+	}
+	if (h > 2 * cornerHeight) {
+		if ((parts & RectPart::NoTopBottom) == RectPart::NoTopBottom) {
+			p.fillRect(x, y + cornerHeight, w, h - 2 * cornerHeight, bg);
+		} else {
+			if (parts & RectPart::Left) {
+				p.fillRect(x, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
+			}
+			if ((parts & RectPart::Center) && w > 2 * cornerWidth) {
+				p.fillRect(x + cornerWidth, y + cornerHeight, w - 2 * cornerWidth, h - 2 * cornerHeight, bg);
+			}
+			if (parts & RectPart::Right) {
+				p.fillRect(x + w - cornerWidth, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
+			}
+		}
+	}
+	if (parts & RectPart::TopLeft) {
+		p.drawPixmap(x, y, corner.p[0]);
+	}
+	if (parts & RectPart::TopRight) {
+		p.drawPixmap(x + w - cornerWidth, y, corner.p[1]);
+	}
+	if (parts & RectPart::BottomLeft) {
+		p.drawPixmap(x, y + h - cornerHeight, corner.p[2]);
+	}
+	if (parts & RectPart::BottomRight) {
+		p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight, corner.p[3]);
+	}
+}
+
+void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, RoundCorners index,
+               const style::color *shadow, RectParts parts) {
+	roundRect(p, x, y, w, h, bg, ::corners[index], shadow, parts);
+}
+
+void roundShadow(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color shadow, RoundCorners index,
+                 RectParts parts) {
+	auto &corner = ::corners[index];
+	auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
+	auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
+	if (parts & RectPart::Bottom) {
+		p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, shadow);
+	}
+	if (parts & RectPart::BottomLeft) {
+		p.fillRect(x, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
+		p.drawPixmap(x, y + h - cornerHeight + st::msgShadow, corner.p[2]);
+	}
+	if (parts & RectPart::BottomRight) {
+		p.fillRect(x + w - cornerWidth, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
+		p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight + st::msgShadow, corner.p[3]);
+	}
+}
+
+void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, ImageRoundRadius radius,
+               RectParts parts) {
+	auto colorKey = ((quint32(bg->c.alpha()) & 0xFF) << 24) | ((quint32(bg->c.red()) & 0xFF) << 16) |
+	                ((quint32(bg->c.green()) & 0xFF) << 8) | ((quint32(bg->c.blue()) & 0xFF) << 24);
+	auto i = cornersMap.find(colorKey);
+	if (i == cornersMap.cend()) {
+		QImage images[4];
+		switch (radius) {
+		case ImageRoundRadius::Small: prepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
+		case ImageRoundRadius::Large: prepareCorners(LargeMaskCorners, msgRadius(), bg, nullptr, images); break;
+		default: p.fillRect(x, y, w, h, bg); return;
+		}
+
+		CornersPixmaps pixmaps;
+		for (int j = 0; j < 4; ++j) {
+			pixmaps.p[j] = pixmapFromImageInPlace(std::move(images[j]));
+			pixmaps.p[j].setDevicePixelRatio(cRetinaFactor());
+		}
+		i = cornersMap.insert(colorKey, pixmaps);
+	}
+	roundRect(p, x, y, w, h, bg, i.value(), nullptr, parts);
+}
+
+WallPapers gServerBackgrounds;
+
+} // namespace App
diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h
index 4a1516610..86b042575 100644
--- a/Telegram/SourceFiles/app.h
+++ b/Telegram/SourceFiles/app.h
@@ -20,288 +20,304 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
 #include <QNetworkAccessManager>
+#include <QString>
 
-#include "ui/animation.h"
 #include "core/basic_types.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "layout.h"
 #include "media/media_clip_reader.h"
+#include "ui/animation.h"
 
 class Messenger;
 class MainWindow;
 class MainWidget;
 
-using HistoryItemsMap = OrderedSet<HistoryItem*>;
-using PhotoItems = QHash<PhotoData*, HistoryItemsMap>;
-using DocumentItems = QHash<DocumentData*, HistoryItemsMap>;
-using WebPageItems = QHash<WebPageData*, HistoryItemsMap>;
-using GameItems = QHash<GameData*, HistoryItemsMap>;
+using HistoryItemsMap = OrderedSet<HistoryItem *>;
+using PhotoItems = QHash<PhotoData *, HistoryItemsMap>;
+using DocumentItems = QHash<DocumentData *, HistoryItemsMap>;
+using WebPageItems = QHash<WebPageData *, HistoryItemsMap>;
+using GameItems = QHash<GameData *, HistoryItemsMap>;
 using SharedContactItems = QHash<qint32, HistoryItemsMap>;
-using GifItems = QHash<Media::Clip::Reader*, HistoryItem*>;
+using GifItems = QHash<Media::Clip::Reader *, HistoryItem *>;
 
-using PhotosData = QHash<PhotoId, PhotoData*>;
-using DocumentsData = QHash<DocumentId, DocumentData*>;
+using PhotosData = QHash<PhotoId, PhotoData *>;
+using DocumentsData = QHash<DocumentId, DocumentData *>;
 
 class LocationCoords;
 struct LocationData;
 
 namespace App {
-	MainWindow *wnd();
-	MainWidget *main();
-	bool passcoded();
+MainWindow *wnd();
+MainWidget *main();
+bool passcoded();
 
-	void logOut();
+void logOut();
 
-	QString formatPhone(QString phone);
+QString formatPhone(QString phone);
 
-	TimeId onlineForSort(UserData *user, TimeId now);
-	qint32 onlineWillChangeIn(UserData *user, TimeId now);
-	qint32 onlineWillChangeIn(TimeId online, TimeId now);
-	QString onlineText(UserData *user, TimeId now, bool precise = false);
-	QString onlineText(TimeId online, TimeId now, bool precise = false);
-	bool onlineColorUse(UserData *user, TimeId now);
-	bool onlineColorUse(TimeId online, TimeId now);
+TimeId onlineForSort(UserData *user, TimeId now);
+qint32 onlineWillChangeIn(UserData *user, TimeId now);
+qint32 onlineWillChangeIn(TimeId online, TimeId now);
+QString onlineText(UserData *user, TimeId now, bool precise = false);
+QString onlineText(TimeId online, TimeId now, bool precise = false);
+bool onlineColorUse(UserData *user, TimeId now);
+bool onlineColorUse(TimeId online, TimeId now);
 
-	UserData *feedUser(const MTPUser &user);
-	UserData *feedUsers(const MTPVector<MTPUser> &users); // returns last user
-	PeerData *feedChat(const MTPChat &chat);
-	PeerData *feedChats(const MTPVector<MTPChat> &chats); // returns last chat
+UserData *feedUser(const MTPUser &user);
+UserData *feedUsers(const MTPVector<MTPUser> &users); // returns last user
+PeerData *feedChat(const MTPChat &chat);
+PeerData *feedChats(const MTPVector<MTPChat> &chats); // returns last chat
 
-	void feedParticipants(const MTPChatParticipants &p, bool requestBotInfos);
-	void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d);
-	void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d);
-	void feedChatAdmins(const MTPDupdateChatAdmins &d);
-	void feedParticipantAdmin(const MTPDupdateChatParticipantAdmin &d);
-	bool checkEntitiesAndViewsUpdate(const MTPDmessage &m); // returns true if item found and it is not detached
-	void updateEditedMessage(const MTPMessage &m);
-	void addSavedGif(DocumentData *doc);
-	void checkSavedGif(HistoryItem *item);
-	void feedMsgs(const QVector<MTPMessage> &msgs, NewMessageType type);
-	void feedMsgs(const MTPVector<MTPMessage> &msgs, NewMessageType type);
-	void feedInboxRead(const PeerId &peer, MsgId upTo);
-	void feedOutboxRead(const PeerId &peer, MsgId upTo, TimeId when);
-	void feedWereDeleted(ChannelId channelId, const QVector<MTPint> &msgsIds);
-	void feedUserLink(MTPint userId, const MTPContactLink &myLink, const MTPContactLink &foreignLink);
+void feedParticipants(const MTPChatParticipants &p, bool requestBotInfos);
+void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d);
+void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d);
+void feedChatAdmins(const MTPDupdateChatAdmins &d);
+void feedParticipantAdmin(const MTPDupdateChatParticipantAdmin &d);
+bool checkEntitiesAndViewsUpdate(const MTPDmessage &m); // returns true if item found and it is not detached
+void updateEditedMessage(const MTPMessage &m);
+void addSavedGif(DocumentData *doc);
+void checkSavedGif(HistoryItem *item);
+void feedMsgs(const QVector<MTPMessage> &msgs, NewMessageType type);
+void feedMsgs(const MTPVector<MTPMessage> &msgs, NewMessageType type);
+void feedInboxRead(const PeerId &peer, MsgId upTo);
+void feedOutboxRead(const PeerId &peer, MsgId upTo, TimeId when);
+void feedWereDeleted(ChannelId channelId, const QVector<MTPint> &msgsIds);
+void feedUserLink(MTPint userId, const MTPContactLink &myLink, const MTPContactLink &foreignLink);
 
-	ImagePtr image(const MTPPhotoSize &size);
-	StorageImageLocation imageLocation(qint32 w, qint32 h, const MTPFileLocation &loc);
-	StorageImageLocation imageLocation(const MTPPhotoSize &size);
+ImagePtr image(const MTPPhotoSize &size);
+StorageImageLocation imageLocation(qint32 w, qint32 h, const MTPFileLocation &loc);
+StorageImageLocation imageLocation(const MTPPhotoSize &size);
 
-	PhotoData *feedPhoto(const MTPPhoto &photo, const PreparedPhotoThumbs &thumbs);
-	PhotoData *feedPhoto(const MTPPhoto &photo, PhotoData *convert = nullptr);
-	PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert = nullptr);
-	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb);
-	DocumentData *feedDocument(const MTPdocument &document, DocumentData *convert = nullptr);
-	DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert = nullptr);
-	WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert = nullptr);
-	WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert = nullptr);
-	WebPageData *feedWebPage(const MTPWebPage &webpage);
-	WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content);
-	GameData *feedGame(const MTPDgame &game, GameData *convert = nullptr);
+PhotoData *feedPhoto(const MTPPhoto &photo, const PreparedPhotoThumbs &thumbs);
+PhotoData *feedPhoto(const MTPPhoto &photo, PhotoData *convert = nullptr);
+PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert = nullptr);
+DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb);
+DocumentData *feedDocument(const MTPdocument &document, DocumentData *convert = nullptr);
+DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert = nullptr);
+WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert = nullptr);
+WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert = nullptr);
+WebPageData *feedWebPage(const MTPWebPage &webpage);
+WebPageData *feedWebPage(WebPageId webPageId, const QString &siteName, const TextWithEntities &content);
+GameData *feedGame(const MTPDgame &game, GameData *convert = nullptr);
 
-	PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded);
-	inline UserData *user(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asUser(peer(id, restriction));
-	}
-	inline ChatData *chat(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asChat(peer(id, restriction));
-	}
-	inline ChannelData *channel(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asChannel(peer(id, restriction));
-	}
-	inline UserData *user(UserId userId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asUser(peer(peerFromUser(userId), restriction));
-	}
-	inline ChatData *chat(ChatId chatId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asChat(peer(peerFromChat(chatId), restriction));
-	}
-	inline ChannelData *channel(ChannelId channelId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
-		return asChannel(peer(peerFromChannel(channelId), restriction));
-	}
-	inline PeerData *peerLoaded(const PeerId &id) {
-		return peer(id, PeerData::FullLoaded);
-	}
-	inline UserData *userLoaded(const PeerId &id) {
-		return user(id, PeerData::FullLoaded);
-	}
-	inline ChatData *chatLoaded(const PeerId &id) {
-		return chat(id, PeerData::FullLoaded);
-	}
-	inline ChannelData *channelLoaded(const PeerId &id) {
-		return channel(id, PeerData::FullLoaded);
-	}
-	inline UserData *userLoaded(UserId userId) {
-		return user(userId, PeerData::FullLoaded);
-	}
-	inline ChatData *chatLoaded(ChatId chatId) {
-		return chat(chatId, PeerData::FullLoaded);
-	}
-	inline ChannelData *channelLoaded(ChannelId channelId) {
-		return channel(channelId, PeerData::FullLoaded);
-	}
-	void enumerateUsers(base::lambda<void(UserData*)> action);
+PeerData *peer(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded);
+inline UserData *user(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asUser(peer(id, restriction));
+}
+inline ChatData *chat(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asChat(peer(id, restriction));
+}
+inline ChannelData *channel(const PeerId &id, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asChannel(peer(id, restriction));
+}
+inline UserData *user(UserId userId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asUser(peer(peerFromUser(userId), restriction));
+}
+inline ChatData *chat(ChatId chatId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asChat(peer(peerFromChat(chatId), restriction));
+}
+inline ChannelData *channel(ChannelId channelId, PeerData::LoadedStatus restriction = PeerData::NotLoaded) {
+	return asChannel(peer(peerFromChannel(channelId), restriction));
+}
+inline PeerData *peerLoaded(const PeerId &id) {
+	return peer(id, PeerData::FullLoaded);
+}
+inline UserData *userLoaded(const PeerId &id) {
+	return user(id, PeerData::FullLoaded);
+}
+inline ChatData *chatLoaded(const PeerId &id) {
+	return chat(id, PeerData::FullLoaded);
+}
+inline ChannelData *channelLoaded(const PeerId &id) {
+	return channel(id, PeerData::FullLoaded);
+}
+inline UserData *userLoaded(UserId userId) {
+	return user(userId, PeerData::FullLoaded);
+}
+inline ChatData *chatLoaded(ChatId chatId) {
+	return chat(chatId, PeerData::FullLoaded);
+}
+inline ChannelData *channelLoaded(ChannelId channelId) {
+	return channel(channelId, PeerData::FullLoaded);
+}
+void enumerateUsers(base::lambda<void(UserData *)> action);
 
-	UserData *self();
-	PeerData *peerByName(const QString &username);
-	QString peerName(const PeerData *peer, bool forDialogs = false);
-	PhotoData *photo(const PhotoId &photo);
-	PhotoData *photoSet(const PhotoId &photo, PhotoData *convert, const quint64 &access, qint32 date, const ImagePtr &thumb, const ImagePtr &medium, const ImagePtr &full);
-	DocumentData *document(const DocumentId &document);
-	DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const quint64 &access, qint32 version, qint32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, qint32 dc, qint32 size, const StorageImageLocation &thumbLocation);
-	WebPageData *webPage(const WebPageId &webPage);
-	WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, PhotoData *photo, DocumentData *doc, qint32 duration, const QString &author, qint32 pendingTill);
-	GameData *game(const GameId &game);
-	GameData *gameSet(const GameId &game, GameData *convert, const quint64 &accessHash, const QString &shortName, const QString &title, const QString &description, PhotoData *photo, DocumentData *doc);
-	LocationData *location(const LocationCoords &coords);
-	void forgetMedia();
+UserData *self();
+PeerData *peerByName(const QString &username);
+QString peerName(const PeerData *peer, bool forDialogs = false);
+PhotoData *photo(const PhotoId &photo);
+PhotoData *photoSet(const PhotoId &photo, PhotoData *convert, const quint64 &access, qint32 date, const ImagePtr &thumb,
+                    const ImagePtr &medium, const ImagePtr &full);
+DocumentData *document(const DocumentId &document);
+DocumentData *documentSet(const DocumentId &document, DocumentData *convert, const quint64 &access, qint32 version,
+                          qint32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime,
+                          const ImagePtr &thumb, qint32 dc, qint32 size, const StorageImageLocation &thumbLocation);
+WebPageData *webPage(const WebPageId &webPage);
+WebPageData *webPageSet(const WebPageId &webPage, WebPageData *convert, const QString &type, const QString &url,
+                        const QString &displayUrl, const QString &siteName, const QString &title,
+                        const TextWithEntities &description, PhotoData *photo, DocumentData *doc, qint32 duration,
+                        const QString &author, qint32 pendingTill);
+GameData *game(const GameId &game);
+GameData *gameSet(const GameId &game, GameData *convert, const quint64 &accessHash, const QString &shortName,
+                  const QString &title, const QString &description, PhotoData *photo, DocumentData *doc);
+LocationData *location(const LocationCoords &coords);
+void forgetMedia();
 
-	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo);
+MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo);
 
-	Histories &histories();
-	not_null<History*> history(const PeerId &peer);
-	History *historyFromDialog(const PeerId &peer, qint32 unreadCnt, qint32 maxInboxRead, qint32 maxOutboxRead);
-	History *historyLoaded(const PeerId &peer);
-	HistoryItem *histItemById(ChannelId channelId, MsgId itemId);
-	inline not_null<History*> history(const PeerData *peer) {
-		Assert(peer != nullptr);
-		return history(peer->id);
-	}
-	inline History *historyLoaded(const PeerData *peer) {
-		return peer ? historyLoaded(peer->id) : nullptr;
-	}
-	inline HistoryItem *histItemById(const ChannelData *channel, MsgId itemId) {
-		return histItemById(channel ? peerToChannel(channel->id) : 0, itemId);
-	}
-	inline HistoryItem *histItemById(const FullMsgId &msgId) {
-		return histItemById(msgId.channel, msgId.msg);
-	}
-	void historyRegItem(HistoryItem *item);
-	void historyItemDetached(HistoryItem *item);
-	void historyUnregItem(HistoryItem *item);
-	void historyUpdateDependent(HistoryItem *item);
-	void historyClearMsgs();
-	void historyClearItems();
-	void historyRegDependency(HistoryItem *dependent, HistoryItem *dependency);
-	void historyUnregDependency(HistoryItem *dependent, HistoryItem *dependency);
+Histories &histories();
+not_null<History *> history(const PeerId &peer);
+History *historyFromDialog(const PeerId &peer, qint32 unreadCnt, qint32 maxInboxRead, qint32 maxOutboxRead);
+History *historyLoaded(const PeerId &peer);
+HistoryItem *histItemById(ChannelId channelId, MsgId itemId);
+inline not_null<History *> history(const PeerData *peer) {
+	Assert(peer != nullptr);
+	return history(peer->id);
+}
+inline History *historyLoaded(const PeerData *peer) {
+	return peer ? historyLoaded(peer->id) : nullptr;
+}
+inline HistoryItem *histItemById(const ChannelData *channel, MsgId itemId) {
+	return histItemById(channel ? peerToChannel(channel->id) : 0, itemId);
+}
+inline HistoryItem *histItemById(const FullMsgId &msgId) {
+	return histItemById(msgId.channel, msgId.msg);
+}
+void historyRegItem(HistoryItem *item);
+void historyItemDetached(HistoryItem *item);
+void historyUnregItem(HistoryItem *item);
+void historyUpdateDependent(HistoryItem *item);
+void historyClearMsgs();
+void historyClearItems();
+void historyRegDependency(HistoryItem *dependent, HistoryItem *dependency);
+void historyUnregDependency(HistoryItem *dependent, HistoryItem *dependency);
 
-	void historyRegRandom(quint64 randomId, const FullMsgId &itemId);
-	void historyUnregRandom(quint64 randomId);
-	FullMsgId histItemByRandom(quint64 randomId);
-	void historyRegSentData(quint64 randomId, const PeerId &peerId, const QString &text);
-	void historyUnregSentData(quint64 randomId);
-	void histSentDataByItem(quint64 randomId, PeerId &peerId, QString &text);
+void historyRegRandom(quint64 randomId, const FullMsgId &itemId);
+void historyUnregRandom(quint64 randomId);
+FullMsgId histItemByRandom(quint64 randomId);
+void historyRegSentData(quint64 randomId, const PeerId &peerId, const QString &text);
+void historyUnregSentData(quint64 randomId);
+void histSentDataByItem(quint64 randomId, PeerId &peerId, QString &text);
 
-	void hoveredItem(HistoryItem *item);
-	HistoryItem *hoveredItem();
-	void pressedItem(HistoryItem *item);
-	HistoryItem *pressedItem();
-	void hoveredLinkItem(HistoryItem *item);
-	HistoryItem *hoveredLinkItem();
-	void pressedLinkItem(HistoryItem *item);
-	HistoryItem *pressedLinkItem();
-	void contextItem(HistoryItem *item);
-	HistoryItem *contextItem();
-	void mousedItem(HistoryItem *item);
-	HistoryItem *mousedItem();
-	void clearMousedItems();
+void hoveredItem(HistoryItem *item);
+HistoryItem *hoveredItem();
+void pressedItem(HistoryItem *item);
+HistoryItem *pressedItem();
+void hoveredLinkItem(HistoryItem *item);
+HistoryItem *hoveredLinkItem();
+void pressedLinkItem(HistoryItem *item);
+HistoryItem *pressedLinkItem();
+void contextItem(HistoryItem *item);
+HistoryItem *contextItem();
+void mousedItem(HistoryItem *item);
+HistoryItem *mousedItem();
+void clearMousedItems();
 
-	const style::font &monofont();
-	const QPixmap &emoji();
-	const QPixmap &emojiLarge();
-	const QPixmap &emojiSingle(EmojiPtr emoji, qint32 fontHeight);
+const style::font &monofont();
+const QPixmap &emoji();
+const QPixmap &emojiLarge();
+const QPixmap &emojiSingle(EmojiPtr emoji, qint32 fontHeight);
 
-	void clearHistories();
+void clearHistories();
 
-	void initMedia();
-	void deinitMedia();
+void initMedia();
+void deinitMedia();
 
-	void checkImageCacheSize();
+void checkImageCacheSize();
 
-	bool isValidPhone(QString phone);
-
-	enum LaunchState {
-		Launched = 0,
-		QuitRequested = 1,
-		QuitProcessed = 2,
-	};
-	void quit();
-	bool quitting();
-	LaunchState launchState();
-	void setLaunchState(LaunchState state);
-	void restart();
-
-	constexpr auto kFileSizeLimit = 1500 * 1024 * 1024; // Load files up to 1500mb
-	constexpr auto kImageSizeLimit = 64 * 1024 * 1024; // Open images up to 64mb jpg/png/gif
-	QImage readImage(QByteArray data, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr);
-	QImage readImage(const QString &file, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr, QByteArray *content = 0);
-	QPixmap pixmapFromImageInPlace(QImage &&image);
-
-	void regPhotoItem(PhotoData *data, HistoryItem *item);
-	void unregPhotoItem(PhotoData *data, HistoryItem *item);
-	const PhotoItems &photoItems();
-	const PhotosData &photosData();
-
-	void regDocumentItem(DocumentData *data, HistoryItem *item);
-	void unregDocumentItem(DocumentData *data, HistoryItem *item);
-	const DocumentItems &documentItems();
-	const DocumentsData &documentsData();
-
-	void regWebPageItem(WebPageData *data, HistoryItem *item);
-	void unregWebPageItem(WebPageData *data, HistoryItem *item);
-	const WebPageItems &webPageItems();
-
-	void regGameItem(GameData *data, HistoryItem *item);
-	void unregGameItem(GameData *data, HistoryItem *item);
-	const GameItems &gameItems();
-
-	void regSharedContactItem(qint32 userId, HistoryItem *item);
-	void unregSharedContactItem(qint32 userId, HistoryItem *item);
-	const SharedContactItems &sharedContactItems();
-	QString phoneFromSharedContact(qint32 userId);
-
-	void regGifItem(Media::Clip::Reader *reader, HistoryItem *item);
-	void unregGifItem(Media::Clip::Reader *reader);
-	void stopRoundVideoPlayback();
-	void stopGifItems();
-
-	void regMuted(PeerData *peer, qint32 changeIn);
-	void unregMuted(PeerData *peer);
-	void updateMuted();
-
-	void setProxySettings(QNetworkAccessManager &manager);
-#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-	QNetworkProxy getHttpProxySettings();
-#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
-	void setProxySettings(QTcpSocket &socket);
-
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners);
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners);
-
-	QImage *cornersMask(ImageRoundRadius radius);
-	void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, index, shadow, parts);
-	}
-	void roundShadow(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full);
-	inline void roundShadow(Painter &p, const QRect &rect, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full) {
-		return roundShadow(p, rect.x(), rect.y(), rect.width(), rect.height(), shadow, index, parts);
-	}
-	void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, radius, parts);
-	}
-
-	struct WallPaper {
-		WallPaper(qint32 id, ImagePtr thumb, ImagePtr full) : id(id), thumb(thumb), full(full) {
-		}
-		qint32 id;
-		ImagePtr thumb;
-		ImagePtr full;
-	};
-	typedef QList<WallPaper> WallPapers;
-	DeclareSetting(WallPapers, ServerBackgrounds);
+bool isValidPhone(QString phone);
 
+enum LaunchState {
+	Launched = 0,
+	QuitRequested = 1,
+	QuitProcessed = 2,
 };
+void quit();
+bool quitting();
+LaunchState launchState();
+void setLaunchState(LaunchState state);
+void restart();
+
+constexpr auto kFileSizeLimit = 1500 * 1024 * 1024; // Load files up to 1500mb
+constexpr auto kImageSizeLimit = 64 * 1024 * 1024; // Open images up to 64mb jpg/png/gif
+QImage readImage(QByteArray data, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr);
+QImage readImage(const QString &file, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr,
+                 QByteArray *content = 0);
+QPixmap pixmapFromImageInPlace(QImage &&image);
+
+void regPhotoItem(PhotoData *data, HistoryItem *item);
+void unregPhotoItem(PhotoData *data, HistoryItem *item);
+const PhotoItems &photoItems();
+const PhotosData &photosData();
+
+void regDocumentItem(DocumentData *data, HistoryItem *item);
+void unregDocumentItem(DocumentData *data, HistoryItem *item);
+const DocumentItems &documentItems();
+const DocumentsData &documentsData();
+
+void regWebPageItem(WebPageData *data, HistoryItem *item);
+void unregWebPageItem(WebPageData *data, HistoryItem *item);
+const WebPageItems &webPageItems();
+
+void regGameItem(GameData *data, HistoryItem *item);
+void unregGameItem(GameData *data, HistoryItem *item);
+const GameItems &gameItems();
+
+void regSharedContactItem(qint32 userId, HistoryItem *item);
+void unregSharedContactItem(qint32 userId, HistoryItem *item);
+const SharedContactItems &sharedContactItems();
+QString phoneFromSharedContact(qint32 userId);
+
+void regGifItem(Media::Clip::Reader *reader, HistoryItem *item);
+void unregGifItem(Media::Clip::Reader *reader);
+void stopRoundVideoPlayback();
+void stopGifItems();
+
+void regMuted(PeerData *peer, qint32 changeIn);
+void unregMuted(PeerData *peer);
+void updateMuted();
+
+void setProxySettings(QNetworkAccessManager &manager);
+#ifndef TDESKTOP_DISABLE_NETWORK_PROXY
+QNetworkProxy getHttpProxySettings();
+#endif // !TDESKTOP_DISABLE_NETWORK_PROXY
+void setProxySettings(QTcpSocket &socket);
+
+void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners);
+void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners);
+
+QImage *cornersMask(ImageRoundRadius radius);
+void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, RoundCorners index,
+               const style::color *shadow = nullptr, RectParts parts = RectPart::Full);
+inline void roundRect(Painter &p, const QRect &rect, style::color bg, RoundCorners index,
+                      const style::color *shadow = nullptr, RectParts parts = RectPart::Full) {
+	return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, index, shadow, parts);
+}
+void roundShadow(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color shadow, RoundCorners index,
+                 RectParts parts = RectPart::Full);
+inline void roundShadow(Painter &p, const QRect &rect, style::color shadow, RoundCorners index,
+                        RectParts parts = RectPart::Full) {
+	return roundShadow(p, rect.x(), rect.y(), rect.width(), rect.height(), shadow, index, parts);
+}
+void roundRect(Painter &p, qint32 x, qint32 y, qint32 w, qint32 h, style::color bg, ImageRoundRadius radius,
+               RectParts parts = RectPart::Full);
+inline void roundRect(Painter &p, const QRect &rect, style::color bg, ImageRoundRadius radius,
+                      RectParts parts = RectPart::Full) {
+	return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, radius, parts);
+}
+
+struct WallPaper {
+	WallPaper(qint32 id, ImagePtr thumb, ImagePtr full)
+	    : id(id)
+	    , thumb(thumb)
+	    , full(full) {}
+	qint32 id;
+	ImagePtr thumb;
+	ImagePtr full;
+};
+typedef QList<WallPaper> WallPapers;
+DeclareSetting(WallPapers, ServerBackgrounds);
+
+}; // namespace App
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index fceb20319..a66a2e83f 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "application.h"
 
-#include "platform/platform_specific.h"
+#include "base/timer.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
+#include "messenger.h"
+#include "platform/platform_specific.h"
 #include "storage/localstorage.h"
 #include "window/notifications_manager.h"
-#include "messenger.h"
-#include "base/timer.h"
 
 #include <QDesktopWidget>
 #include <QScreen>
@@ -50,7 +50,11 @@ QString _escapeTo7bit(const QString &str) {
 		QChar ch(str.at(i));
 		ushort uch(ch.unicode());
 		if (uch < 32 || uch > 127 || uch == ushort(uchar('%'))) {
-			result.append('%').append(_toHex(uch >> 12)).append(_toHex(uch >> 8)).append(_toHex(uch >> 4)).append(_toHex(uch));
+			result.append('%')
+			    .append(_toHex(uch >> 12))
+			    .append(_toHex(uch >> 8))
+			    .append(_toHex(uch >> 4))
+			    .append(_toHex(uch));
 		} else {
 			result.append(ch);
 		}
@@ -64,7 +68,8 @@ QString _escapeFrom7bit(const QString &str) {
 	for (int i = 0, l = str.size(); i != l; ++i) {
 		QChar ch(str.at(i));
 		if (ch == QChar::fromLatin1('%') && i + 4 < l) {
-			result.append(QChar(ushort((_fromHex(str.at(i + 1)) << 12) | (_fromHex(str.at(i + 2)) << 8) | (_fromHex(str.at(i + 3)) << 4) | _fromHex(str.at(i + 4)))));
+			result.append(QChar(ushort((_fromHex(str.at(i + 1)) << 12) | (_fromHex(str.at(i + 2)) << 8) |
+			                           (_fromHex(str.at(i + 3)) << 4) | _fromHex(str.at(i + 4)))));
 			i += 4;
 		} else {
 			result.append(ch);
@@ -75,9 +80,10 @@ QString _escapeFrom7bit(const QString &str) {
 
 } // namespace
 
-Application::Application(int &argc, char **argv) : QApplication(argc, argv) {
+Application::Application(int &argc, char **argv)
+    : QApplication(argc, argv) {
 	QByteArray d(QFile::encodeName(QDir(cWorkingDir()).absolutePath()));
-	char h[33] = { 0 };
+	char h[33] = {0};
 	hashMd5Hex(d.constData(), d.size(), h);
 #ifndef OS_MAC_STORE
 	_localServerName = psServerPrefix() + h + '-' + cGUIDStr();
@@ -88,7 +94,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) {
 
 	connect(&_localSocket, SIGNAL(connected()), this, SLOT(socketConnected()));
 	connect(&_localSocket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
-	connect(&_localSocket, SIGNAL(error(QLocalSocket::LocalSocketError)), this, SLOT(socketError(QLocalSocket::LocalSocketError)));
+	connect(&_localSocket, SIGNAL(error(QLocalSocket::LocalSocketError)), this,
+	        SLOT(socketError(QLocalSocket::LocalSocketError)));
 	connect(&_localSocket, SIGNAL(bytesWritten(qint64)), this, SLOT(socketWritten(qint64)));
 	connect(&_localSocket, SIGNAL(readyRead()), this, SLOT(socketReading()));
 	connect(&_localServer, SIGNAL(newConnection()), this, SLOT(newInstanceConnected()));
@@ -100,7 +107,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) {
 		LOG(("Many instance allowed, starting..."));
 		singleInstanceChecked();
 	} else {
-        LOG(("Connecting local socket to %1...").arg(_localServerName));
+		LOG(("Connecting local socket to %1...").arg(_localServerName));
 		_localSocket.connectToServer(_localServerName);
 	}
 }
@@ -132,7 +139,7 @@ void Application::socketConnected() {
 	_localSocket.write(commands.toLatin1());
 }
 
-void Application::socketWritten(qint64/* bytes*/) {
+void Application::socketWritten(qint64 /* bytes*/) {
 	if (_localSocket.state() != QLocalSocket::ConnectedState) {
 		LOG(("Socket is not connected %1").arg(_localSocket.state()));
 		return;
@@ -177,7 +184,9 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
 	psCheckLocalSocket(_localServerName);
 
 	if (!_localServer.listen(_localServerName)) {
-		LOG(("Failed to start listening to %1 server, error %2").arg(_localServerName).arg(int(_localServer.serverError())));
+		LOG(("Failed to start listening to %1 server, error %2")
+		        .arg(_localServerName)
+		        .arg(int(_localServer.serverError())));
 		return App::quit();
 	}
 #endif // !Q_OS_WINRT
@@ -223,7 +232,8 @@ void Application::socketDisconnected() {
 
 void Application::newInstanceConnected() {
 	DEBUG_LOG(("Application Info: new local socket connected"));
-	for (QLocalSocket *client = _localServer.nextPendingConnection(); client; client = _localServer.nextPendingConnection()) {
+	for (QLocalSocket *client = _localServer.nextPendingConnection(); client;
+	     client = _localServer.nextPendingConnection()) {
 		_localClients.push_back(LocalClient(client, QByteArray()));
 		connect(client, SIGNAL(readyRead()), this, SLOT(readClients()));
 		connect(client, SIGNAL(disconnected()), this, SLOT(removeClients()));
@@ -239,7 +249,8 @@ void Application::readClients() {
 		if (i->second.size()) {
 			QString cmds(QString::fromLatin1(i->second));
 			qint32 from = 0, l = cmds.length();
-			for (qint32 to = cmds.indexOf(QChar(';'), from); to >= from; to = (from < l) ? cmds.indexOf(QChar(';'), from) : -1) {
+			for (qint32 to = cmds.indexOf(QChar(';'), from); to >= from;
+			     to = (from < l) ? cmds.indexOf(QChar(';'), from) : -1) {
 				QStringRef cmd(&cmds, from, to - from);
 				if (cmd.startsWith(qsl("CMD:"))) {
 					Sandbox::execExternal(cmds.mid(from + 4, to - from - 4));
@@ -254,7 +265,8 @@ void Application::readClients() {
 						startUrl = _escapeFrom7bit(cmds.mid(from + 5, to - from - 5)).mid(0, 8192);
 					}
 				} else {
-					LOG(("Application Error: unknown command %1 passed in local socket").arg(QString(cmd.constData(), cmd.length())));
+					LOG(("Application Error: unknown command %1 passed in local socket")
+					        .arg(QString(cmd.constData(), cmd.length())));
 				}
 				from = to + 1;
 			}
@@ -324,7 +336,7 @@ void Application::closeApplication() {
 }
 
 inline Application *application() {
-	return qobject_cast<Application*>(QApplication::instance());
+	return qobject_cast<Application *>(QApplication::instance());
 }
 
 namespace Sandbox {
@@ -398,10 +410,13 @@ void launch() {
 	if (devicePixelRatio > 1.) {
 		if ((cPlatform() != dbipMac && cPlatform() != dbipMacOld) || (devicePixelRatio != 2.)) {
 			LOG(("Found non-trivial Device Pixel Ratio: %1").arg(devicePixelRatio));
-			LOG(("Environmental variables: QT_DEVICE_PIXEL_RATIO='%1'").arg(QString::fromLatin1(qgetenv("QT_DEVICE_PIXEL_RATIO"))));
+			LOG(("Environmental variables: QT_DEVICE_PIXEL_RATIO='%1'")
+			        .arg(QString::fromLatin1(qgetenv("QT_DEVICE_PIXEL_RATIO"))));
 			LOG(("Environmental variables: QT_SCALE_FACTOR='%1'").arg(QString::fromLatin1(qgetenv("QT_SCALE_FACTOR"))));
-			LOG(("Environmental variables: QT_AUTO_SCREEN_SCALE_FACTOR='%1'").arg(QString::fromLatin1(qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR"))));
-			LOG(("Environmental variables: QT_SCREEN_SCALE_FACTORS='%1'").arg(QString::fromLatin1(qgetenv("QT_SCREEN_SCALE_FACTORS"))));
+			LOG(("Environmental variables: QT_AUTO_SCREEN_SCALE_FACTOR='%1'")
+			        .arg(QString::fromLatin1(qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR"))));
+			LOG(("Environmental variables: QT_SCREEN_SCALE_FACTORS='%1'")
+			        .arg(QString::fromLatin1(qgetenv("QT_SCREEN_SCALE_FACTORS"))));
 		}
 		cSetRetina(true);
 		cSetRetinaFactor(devicePixelRatio);
diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h
index 268d55562..c61812563 100644
--- a/Telegram/SourceFiles/application.h
+++ b/Telegram/SourceFiles/application.h
@@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <memory>
 
 #include <QApplication>
-#include <QLocalSocket>
 #include <QLocalServer>
+#include <QLocalSocket>
 
 class Messenger;
 
@@ -43,7 +43,7 @@ public:
 signals:
 	void adjustSingleTimers();
 
-// Single instance application
+	// Single instance application
 public slots:
 	void socketConnected();
 	void socketError(QLocalSocket::LocalSocketError e);
@@ -59,7 +59,7 @@ public slots:
 	void closeApplication(); // will be done in aboutToQuit()
 
 private:
-	typedef QPair<QLocalSocket*, QByteArray> LocalClient;
+	typedef QPair<QLocalSocket *, QByteArray> LocalClient;
 	typedef QList<LocalClient> LocalClients;
 
 	std::unique_ptr<Messenger> _messengerInstance;
diff --git a/Telegram/SourceFiles/auth_session.cpp b/Telegram/SourceFiles/auth_session.cpp
index baa06dd49..b5b11b410 100644
--- a/Telegram/SourceFiles/auth_session.cpp
+++ b/Telegram/SourceFiles/auth_session.cpp
@@ -21,16 +21,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "auth_session.h"
 
 #include "apiwrap.h"
+#include "calls/calls_instance.h"
+#include "chat_helpers/tabbed_selector.h"
 #include "messenger.h"
+#include "platform/platform_specific.h"
 #include "storage/file_download.h"
 #include "storage/file_upload.h"
 #include "storage/localstorage.h"
 #include "storage/serialize_common.h"
 #include "window/notifications_manager.h"
-#include "platform/platform_specific.h"
-#include "calls/calls_instance.h"
 #include "window/section_widget.h"
-#include "chat_helpers/tabbed_selector.h"
 
 #include "app.h" // App::user
 
@@ -41,10 +41,9 @@ constexpr auto kAutoLockTimeoutLateMs = TimeMs(3000);
 } // namespace
 
 AuthSessionData::Variables::Variables()
-: selectorTab(ChatHelpers::SelectorTab::Emoji)
-, floatPlayerColumn(Window::Column::Second)
-, floatPlayerCorner(RectPart::TopRight) {
-}
+    : selectorTab(ChatHelpers::SelectorTab::Emoji)
+    , floatPlayerColumn(Window::Column::Second)
+    , floatPlayerCorner(RectPart::TopRight) {}
 
 QByteArray AuthSessionData::serialize() const {
 	auto size = sizeof(qint32) * 8;
@@ -170,17 +169,15 @@ AuthSession &Auth() {
 }
 
 AuthSession::AuthSession(UserId userId)
-: _userId(userId)
-, _autoLockTimer([this] { checkAutoLock(); })
-, _api(std::make_unique<ApiWrap>(this))
-, _calls(std::make_unique<Calls::Instance>())
-, _downloader(std::make_unique<Storage::Downloader>())
-, _uploader(std::make_unique<Storage::Uploader>())
-, _notifications(std::make_unique<Window::Notifications::System>(this)) {
+    : _userId(userId)
+    , _autoLockTimer([this] { checkAutoLock(); })
+    , _api(std::make_unique<ApiWrap>(this))
+    , _calls(std::make_unique<Calls::Instance>())
+    , _downloader(std::make_unique<Storage::Downloader>())
+    , _uploader(std::make_unique<Storage::Uploader>())
+    , _notifications(std::make_unique<Window::Notifications::System>(this)) {
 	Expects(_userId != 0);
-	_saveDataTimer.setCallback([this] {
-		Local::writeUserSettings();
-	});
+	_saveDataTimer.setCallback([this] { Local::writeUserSettings(); });
 	subscribe(Messenger::Instance().passcodedChanged(), [this] {
 		_shouldLockAt = 0;
 		notifications().updateAll();
diff --git a/Telegram/SourceFiles/auth_session.h b/Telegram/SourceFiles/auth_session.h
index 412de760a..0a47ef8b3 100644
--- a/Telegram/SourceFiles/auth_session.h
+++ b/Telegram/SourceFiles/auth_session.h
@@ -64,18 +64,18 @@ public:
 	base::Observable<void> &savedGifsUpdated() {
 		return _savedGifsUpdated;
 	}
-	base::Observable<not_null<History*>> &historyCleared() {
+	base::Observable<not_null<History *>> &historyCleared() {
 		return _historyCleared;
 	}
-	base::Observable<not_null<const HistoryItem*>> &repaintLogEntry() {
+	base::Observable<not_null<const HistoryItem *>> &repaintLogEntry() {
 		return _repaintLogEntry;
 	}
 	base::Observable<void> &pendingHistoryResize() {
 		return _pendingHistoryResize;
 	}
 	struct ItemVisibilityQuery {
-		not_null<HistoryItem*> item;
-		not_null<bool*> isVisible;
+		not_null<HistoryItem *> item;
+		not_null<bool *> isVisible;
 	};
 	base::Observable<ItemVisibilityQuery> &queryItemVisibility() {
 		return _queryItemVisibility;
@@ -160,18 +160,17 @@ private:
 		OrderedSet<PeerId> groupStickersSectionHidden;
 	};
 
-	base::Variable<bool> _contactsLoaded = { false };
-	base::Variable<bool> _allChatsLoaded = { false };
+	base::Variable<bool> _contactsLoaded = {false};
+	base::Variable<bool> _allChatsLoaded = {false};
 	base::Observable<void> _moreChatsLoaded;
 	base::Observable<void> _stickersUpdated;
 	base::Observable<void> _savedGifsUpdated;
-	base::Observable<not_null<History*>> _historyCleared;
-	base::Observable<not_null<const HistoryItem*>> _repaintLogEntry;
+	base::Observable<not_null<History *>> _historyCleared;
+	base::Observable<not_null<const HistoryItem *>> _repaintLogEntry;
 	base::Observable<void> _pendingHistoryResize;
 	base::Observable<ItemVisibilityQuery> _queryItemVisibility;
 	Variables _variables;
 	TimeMs _lastTimeVideoPlayedAt = 0;
-
 };
 
 // One per Messenger.
@@ -225,8 +224,8 @@ public:
 	void checkAutoLock();
 	void checkAutoLockIn(TimeMs time);
 
-	base::Observable<DocumentData*> documentUpdated;
-	base::Observable<std::pair<HistoryItem*, MsgId>> messageIdChanging;
+	base::Observable<DocumentData *> documentUpdated;
+	base::Observable<std::pair<HistoryItem *, MsgId>> messageIdChanging;
 
 	~AuthSession();
 
@@ -243,5 +242,4 @@ private:
 	const std::unique_ptr<Storage::Downloader> _downloader;
 	const std::unique_ptr<Storage::Uploader> _uploader;
 	const std::unique_ptr<Window::Notifications::System> _notifications;
-
 };
diff --git a/Telegram/SourceFiles/base/algorithm.h b/Telegram/SourceFiles/base/algorithm.h
index 0b03ec674..292fa1ecb 100644
--- a/Telegram/SourceFiles/base/algorithm.h
+++ b/Telegram/SourceFiles/base/algorithm.h
@@ -20,22 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <iterator>
 #include <algorithm>
+#include <iterator>
 
 namespace base {
 
 // @todo use ranges-v3 here
-template <typename Range, typename Method>
-decltype(auto) for_each(Range &&range, Method &&method) {
-	return std::for_each(
-		std::begin(std::forward<Range>(range)),
-		std::end(std::forward<Range>(range)),
-		std::forward<Method>(method));
+template <typename Range, typename Method> decltype(auto) for_each(Range &&range, Method &&method) {
+	return std::for_each(std::begin(std::forward<Range>(range)), std::end(std::forward<Range>(range)),
+	                     std::forward<Method>(method));
 }
 
-template <typename Method>
-decltype(auto) for_each_apply(Method &&method) {
+template <typename Method> decltype(auto) for_each_apply(Method &&method) {
 	return [&method](auto &&range) {
 		return for_each(std::forward<decltype(range)>(range), std::forward<Method>(method));
 	};
diff --git a/Telegram/SourceFiles/base/assertion.h b/Telegram/SourceFiles/base/assertion.h
index 2d0ea39a5..8479b8fb3 100644
--- a/Telegram/SourceFiles/base/assertion.h
+++ b/Telegram/SourceFiles/base/assertion.h
@@ -31,15 +31,15 @@ void log(const char *message, const char *file, int line);
 
 // Release build assertions.
 inline constexpr void noop() {
-  // MSVC2015 requires return to suppress warning: a constexpr function must contain exactly one return statement
-  return void();
+	// MSVC2015 requires return to suppress warning: a constexpr function must contain exactly one return statement
+	return void();
 }
 
 [[noreturn]] inline void fail(const char *message, const char *file, int line) {
 	log(message, file, line);
 
 	// Crash with access violation and generate crash report.
-	volatile auto nullptr_value = (int*)nullptr;
+	volatile auto nullptr_value = (int *)nullptr;
 	*nullptr_value = 0;
 
 	// Silent the possible failure to comply noreturn warning.
@@ -47,8 +47,8 @@ inline constexpr void noop() {
 }
 
 inline constexpr void validate(bool condition, const char *message, const char *file, int line) {
-  // MSVC2015 requires return to suppress error C3249: illegal statement or sub-expression for 'constexpr' function
-  return (GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop();
+	// MSVC2015 requires return to suppress error C3249: illegal statement or sub-expression for 'constexpr' function
+	return (GSL_UNLIKELY(!(condition))) ? fail(message, file, line) : noop();
 }
 
 
diff --git a/Telegram/SourceFiles/base/flags.h b/Telegram/SourceFiles/base/flags.h
index d51e84f1a..17d7c2623 100644
--- a/Telegram/SourceFiles/base/flags.h
+++ b/Telegram/SourceFiles/base/flags.h
@@ -30,49 +30,41 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace base {
 
-template <typename EnumType>
-class flags;
+template <typename EnumType> class flags;
 
-template <typename ExtendedEnum>
-struct extended_flags;
+template <typename ExtendedEnum> struct extended_flags;
 
-template <typename ExtendedEnum>
-using extended_flags_t = typename extended_flags<ExtendedEnum>::type;
+template <typename ExtendedEnum> using extended_flags_t = typename extended_flags<ExtendedEnum>::type;
 
 namespace details {
 
-struct flags_zero_helper_struct {
-};
+struct flags_zero_helper_struct {};
 
-using flags_zero_helper = void(base::details::flags_zero_helper_struct::*)();
+using flags_zero_helper = void (base::details::flags_zero_helper_struct::*)();
 
-template <typename ExtendedEnum,
-	typename Enum = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename Enum = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto extended_flag_convert(ExtendedEnum value) {
 	return static_cast<Enum>(value);
 }
 
-template <typename ExtendedEnum,
-	typename Enum = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename Enum = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto extended_flags_convert(ExtendedEnum value) {
 	return flags<Enum>(extended_flag_convert(value));
 }
 
 } // namespace details
 
-template <typename EnumType>
-class flags {
+template <typename EnumType> class flags {
 public:
 	using Enum = EnumType;
 	using Type = std::underlying_type_t<Enum>;
 
 	constexpr flags() = default;
-	constexpr flags(details::flags_zero_helper) noexcept {
-	}
-	constexpr flags(Enum value) noexcept : _value(static_cast<Type>(value)) {
-	}
-	explicit constexpr flags(Type value) noexcept : _value(value) {
-	}
+	constexpr flags(details::flags_zero_helper) noexcept {}
+	constexpr flags(Enum value) noexcept
+	    : _value(static_cast<Type>(value)) {}
+	explicit constexpr flags(Type value) noexcept
+	    : _value(value) {}
 
 	constexpr auto value() const noexcept {
 		return _value;
@@ -139,157 +131,131 @@ public:
 
 private:
 	Type _value = 0;
-
 };
 
-template <typename Enum>
-constexpr auto make_flags(Enum value) noexcept {
+template <typename Enum> constexpr auto make_flags(Enum value) noexcept {
 	return flags<Enum>(value);
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator|(Enum a, flags<Enum> b) noexcept {
 	return b | a;
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator&(Enum a, flags<Enum> b) noexcept {
 	return b & a;
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator^(Enum a, flags<Enum> b) noexcept {
 	return b ^ a;
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return a | details::extended_flags_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return b | a;
 }
 
-template <typename ExtendedEnum,
-	typename = extended_flags_t<ExtendedEnum>>
+template <typename ExtendedEnum, typename = extended_flags_t<ExtendedEnum>>
 inline constexpr auto operator&(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return a & details::extended_flags_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator&(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return b & a;
 }
 
-template <typename ExtendedEnum,
-	typename = extended_flags_t<ExtendedEnum>>
+template <typename ExtendedEnum, typename = extended_flags_t<ExtendedEnum>>
 inline constexpr auto operator^(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return a ^ details::extended_flags_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator^(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return b ^ a;
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto &operator&=(flags<extended_flags_t<ExtendedEnum>> &a, ExtendedEnum b) {
 	return (a &= details::extended_flags_convert(b));
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto &operator|=(flags<extended_flags_t<ExtendedEnum>> &a, ExtendedEnum b) {
 	return (a |= details::extended_flags_convert(b));
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto &operator^=(flags<extended_flags_t<ExtendedEnum>> &a, ExtendedEnum b) {
 	return (a ^= details::extended_flags_convert(b));
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator==(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return a == details::extended_flags_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator==(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return (b == a);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator!=(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return !(a == b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator!=(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return !(a == b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator<(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return a < details::extended_flags_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator<(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return details::extended_flags_convert(a) < b;
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator>(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return (b < a);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator>(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return (b < a);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator<=(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return !(b < a);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator<=(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return !(b < a);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator>=(flags<extended_flags_t<ExtendedEnum>> a, ExtendedEnum b) {
 	return !(a < b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator>=(ExtendedEnum a, flags<extended_flags_t<ExtendedEnum>> b) {
 	return !(a < b);
 }
@@ -298,73 +264,62 @@ inline constexpr auto operator>=(ExtendedEnum a, flags<extended_flags_t<Extended
 
 #undef FLAGS_CONSTEXPR
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator!(Enum a) noexcept {
 	return !base::make_flags(a);
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator~(Enum a) noexcept {
 	return ~base::make_flags(a);
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator|(Enum a, Enum b) noexcept {
 	return base::make_flags(a) | b;
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator|(Enum a, base::details::flags_zero_helper) noexcept {
 	return base::make_flags(a);
 }
 
-template <typename Enum,
-	typename = std::enable_if_t<std::is_enum<Enum>::value>,
-	typename = std::enable_if_t<is_flag_type(Enum{})>>
+template <typename Enum, typename = std::enable_if_t<std::is_enum<Enum>::value>,
+          typename = std::enable_if_t<is_flag_type(Enum{})>>
 inline constexpr auto operator|(base::details::flags_zero_helper, Enum b) noexcept {
 	return base::make_flags(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(ExtendedEnum a, ExtendedEnum b) {
 	return base::details::extended_flags_convert(a) | b;
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(ExtendedEnum a, typename base::extended_flags<ExtendedEnum>::type b) {
 	return base::details::extended_flags_convert(a) | b;
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(typename base::extended_flags<ExtendedEnum>::type a, ExtendedEnum b) {
 	return b | a;
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(base::details::flags_zero_helper, ExtendedEnum b) {
 	return 0 | base::details::extended_flag_convert(b);
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator|(ExtendedEnum a, base::details::flags_zero_helper) {
 	return base::details::extended_flag_convert(a) | 0;
 }
 
-template <typename ExtendedEnum,
-	typename = typename base::extended_flags<ExtendedEnum>::type>
+template <typename ExtendedEnum, typename = typename base::extended_flags<ExtendedEnum>::type>
 inline constexpr auto operator~(ExtendedEnum b) {
 	return ~base::details::extended_flags_convert(b);
 }
diff --git a/Telegram/SourceFiles/base/flat_map.h b/Telegram/SourceFiles/base/flat_map.h
index 4f90b5e63..1c8813a47 100644
--- a/Telegram/SourceFiles/base/flat_map.h
+++ b/Telegram/SourceFiles/base/flat_map.h
@@ -20,17 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <deque>
-#include <algorithm>
 #include "base/optional.h"
+#include <algorithm>
+#include <deque>
 
 namespace base {
 
-template <typename Key, typename Type>
-class flat_map;
+template <typename Key, typename Type> class flat_map;
 
-template <typename Key, typename Type>
-class flat_multi_map;
+template <typename Key, typename Type> class flat_multi_map;
 
 template <typename Key, typename Type, typename iterator_impl, typename pointer_impl, typename reference_impl>
 class flat_multi_map_iterator_base_impl;
@@ -47,8 +45,8 @@ public:
 	using reference = reference_impl;
 	using const_reference = typename flat_multi_map<Key, Type>::const_reference;
 
-	flat_multi_map_iterator_base_impl(iterator_impl impl = iterator_impl()) : _impl(impl) {
-	}
+	flat_multi_map_iterator_base_impl(iterator_impl impl = iterator_impl())
+	    : _impl(impl) {}
 
 	reference operator*() {
 		return *_impl;
@@ -113,89 +111,87 @@ public:
 private:
 	iterator_impl _impl;
 	friend class flat_multi_map<Key, Type>;
-
 };
 
-template <typename Key, typename Type>
-class flat_multi_map {
+template <typename Key, typename Type> class flat_multi_map {
 	using self = flat_multi_map<Key, Type>;
 	class key_const_wrap {
 	public:
-		key_const_wrap(const Key &value) : _value(value) {
-		}
-		key_const_wrap(Key &&value) : _value(std::move(value)) {
-		}
-		inline operator const Key&() const {
+		key_const_wrap(const Key &value)
+		    : _value(value) {}
+		key_const_wrap(Key &&value)
+		    : _value(std::move(value)) {}
+		inline operator const Key &() const {
 			return _value;
 		}
 
 		friend inline bool operator<(const Key &a, const key_const_wrap &b) {
-			return a < ((const Key&)b);
+			return a < ((const Key &)b);
 		}
 		friend inline bool operator<(const key_const_wrap &a, const Key &b) {
-			return ((const Key&)a) < b;
+			return ((const Key &)a) < b;
 		}
 		friend inline bool operator<(const key_const_wrap &a, const key_const_wrap &b) {
-			return ((const Key&)a) < ((const Key&)b);
+			return ((const Key &)a) < ((const Key &)b);
 		}
 
 	private:
 		Key _value;
-
 	};
 
 	using pair_type = std::pair<key_const_wrap, Type>;
 	using impl = std::deque<pair_type>;
 
-	using iterator_base = flat_multi_map_iterator_base_impl<Key, Type, typename impl::iterator, pair_type*, pair_type&>;
-	using const_iterator_base = flat_multi_map_iterator_base_impl<Key, Type, typename impl::const_iterator, const pair_type*, const pair_type&>;
-	using reverse_iterator_base = flat_multi_map_iterator_base_impl<Key, Type, typename impl::reverse_iterator, pair_type*, pair_type&>;
-	using const_reverse_iterator_base = flat_multi_map_iterator_base_impl<Key, Type, typename impl::const_reverse_iterator, const pair_type*, const pair_type&>;
+	using iterator_base =
+	    flat_multi_map_iterator_base_impl<Key, Type, typename impl::iterator, pair_type *, pair_type &>;
+	using const_iterator_base = flat_multi_map_iterator_base_impl<Key, Type, typename impl::const_iterator,
+	                                                              const pair_type *, const pair_type &>;
+	using reverse_iterator_base =
+	    flat_multi_map_iterator_base_impl<Key, Type, typename impl::reverse_iterator, pair_type *, pair_type &>;
+	using const_reverse_iterator_base =
+	    flat_multi_map_iterator_base_impl<Key, Type, typename impl::const_reverse_iterator, const pair_type *,
+	                                      const pair_type &>;
 
 public:
 	using value_type = pair_type;
 	using size_type = typename impl::size_type;
 	using difference_type = typename impl::difference_type;
-	using pointer = pair_type*;
-	using const_pointer = const pair_type*;
-	using reference = pair_type&;
-	using const_reference = const pair_type&;
+	using pointer = pair_type *;
+	using const_pointer = const pair_type *;
+	using reference = pair_type &;
+	using const_reference = const pair_type &;
 
 	class const_iterator;
 	class iterator : public iterator_base {
 	public:
 		using iterator_base::iterator_base;
-		iterator(const iterator_base &other) : iterator_base(other) {
-		}
+		iterator(const iterator_base &other)
+		    : iterator_base(other) {}
 		friend class const_iterator;
-
 	};
 	class const_iterator : public const_iterator_base {
 	public:
 		using const_iterator_base::const_iterator_base;
-		const_iterator(const_iterator_base other) : const_iterator_base(other) {
-		}
-		const_iterator(const iterator &other) : const_iterator_base(other._impl) {
-		}
-
+		const_iterator(const_iterator_base other)
+		    : const_iterator_base(other) {}
+		const_iterator(const iterator &other)
+		    : const_iterator_base(other._impl) {}
 	};
 	class const_reverse_iterator;
 	class reverse_iterator : public reverse_iterator_base {
 	public:
 		using reverse_iterator_base::reverse_iterator_base;
-		reverse_iterator(reverse_iterator_base other) : reverse_iterator_base(other) {
-		}
+		reverse_iterator(reverse_iterator_base other)
+		    : reverse_iterator_base(other) {}
 		friend class const_reverse_iterator;
-
 	};
 	class const_reverse_iterator : public const_reverse_iterator_base {
 	public:
 		using const_reverse_iterator_base::const_reverse_iterator_base;
-		const_reverse_iterator(const_reverse_iterator_base other) : const_reverse_iterator_base(other) {
-		}
-		const_reverse_iterator(const reverse_iterator &other) : const_reverse_iterator_base(other._impl) {
-		}
-
+		const_reverse_iterator(const_reverse_iterator_base other)
+		    : const_reverse_iterator_base(other) {}
+		const_reverse_iterator(const reverse_iterator &other)
+		    : const_reverse_iterator_base(other._impl) {}
 	};
 
 	size_type size() const {
@@ -280,8 +276,7 @@ public:
 		auto where = getUpperBound(value.first);
 		return _impl.insert(where, std::move(value));
 	}
-	template <typename... Args>
-	iterator emplace(Args&&... args) {
+	template <typename... Args> iterator emplace(Args &&... args) {
 		return insert(value_type(std::forward<Args>(args)...));
 	}
 
@@ -372,11 +367,9 @@ private:
 	std::pair<typename impl::const_iterator, typename impl::const_iterator> getEqualRange(const Key &key) const {
 		return std::equal_range(_impl.begin(), _impl.end(), key, Comparator());
 	}
-
 };
 
-template <typename Key, typename Type>
-class flat_map : public flat_multi_map<Key, Type> {
+template <typename Key, typename Type> class flat_map : public flat_multi_map<Key, Type> {
 	using parent = flat_multi_map<Key, Type>;
 	using pair_type = typename parent::pair_type;
 
@@ -414,8 +407,7 @@ public:
 		}
 		return this->end();
 	}
-	template <typename... Args>
-	iterator emplace(Args&&... args) {
+	template <typename... Args> iterator emplace(Args &&... args) {
 		return this->insert(value_type(std::forward<Args>(args)...));
 	}
 
@@ -432,15 +424,15 @@ public:
 
 	Type &operator[](const Key &key) {
 		if (this->empty() || (key < this->front().first)) {
-			this->_impl.push_front({ key, Type() });
+			this->_impl.push_front({key, Type()});
 			return this->front().second;
 		} else if (this->back().first < key) {
-			this->_impl.push_back({ key, Type() });
+			this->_impl.push_back({key, Type()});
 			return this->back().second;
 		}
 		auto where = this->getLowerBound(key);
 		if (key < where->first) {
-			return this->_impl.insert(where, { key, Type() })->second;
+			return this->_impl.insert(where, {key, Type()})->second;
 		}
 		return where->second;
 	}
@@ -454,7 +446,6 @@ public:
 		this->erase(it);
 		return std::move(result);
 	}
-
 };
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/flat_set.h b/Telegram/SourceFiles/base/flat_set.h
index 449b680fe..ebf3f8d36 100644
--- a/Telegram/SourceFiles/base/flat_set.h
+++ b/Telegram/SourceFiles/base/flat_set.h
@@ -20,22 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <deque>
 #include <algorithm>
+#include <deque>
 
 namespace base {
 
-template <typename Type>
-class flat_set;
+template <typename Type> class flat_set;
 
-template <typename Type>
-class flat_multi_set;
+template <typename Type> class flat_multi_set;
 
-template <typename Type, typename iterator_impl>
-class flat_multi_set_iterator_base_impl;
+template <typename Type, typename iterator_impl> class flat_multi_set_iterator_base_impl;
 
-template <typename Type, typename iterator_impl>
-class flat_multi_set_iterator_base_impl {
+template <typename Type, typename iterator_impl> class flat_multi_set_iterator_base_impl {
 public:
 	using iterator_category = typename iterator_impl::iterator_category;
 
@@ -44,8 +40,8 @@ public:
 	using pointer = typename flat_multi_set<Type>::pointer;
 	using reference = typename flat_multi_set<Type>::reference;
 
-	flat_multi_set_iterator_base_impl(iterator_impl impl = iterator_impl()) : _impl(impl) {
-	}
+	flat_multi_set_iterator_base_impl(iterator_impl impl = iterator_impl())
+	    : _impl(impl) {}
 
 	reference operator*() const {
 		return *_impl;
@@ -101,35 +97,32 @@ public:
 private:
 	iterator_impl _impl;
 	friend class flat_multi_set<Type>;
-
 };
 
-template <typename Type>
-class flat_multi_set {
+template <typename Type> class flat_multi_set {
 	using self = flat_multi_set<Type>;
 	class const_wrap {
 	public:
-		const_wrap(const Type &value) : _value(value) {
-		}
-		const_wrap(Type &&value) : _value(std::move(value)) {
-		}
-		inline operator const Type&() const {
+		const_wrap(const Type &value)
+		    : _value(value) {}
+		const_wrap(Type &&value)
+		    : _value(std::move(value)) {}
+		inline operator const Type &() const {
 			return _value;
 		}
 
 		friend inline bool operator<(const Type &a, const const_wrap &b) {
-			return a < ((const Type&)b);
+			return a < ((const Type &)b);
 		}
 		friend inline bool operator<(const const_wrap &a, const Type &b) {
-			return ((const Type&)a) < b;
+			return ((const Type &)a) < b;
 		}
 		friend inline bool operator<(const const_wrap &a, const const_wrap &b) {
-			return ((const Type&)a) < ((const Type&)b);
+			return ((const Type &)a) < ((const Type &)b);
 		}
 
 	private:
 		Type _value;
-
 	};
 
 	using impl = std::deque<const_wrap>;
@@ -143,50 +136,47 @@ public:
 	using value_type = Type;
 	using size_type = typename impl::size_type;
 	using difference_type = typename impl::difference_type;
-	using pointer = const Type*;
-	using reference = const Type&;
+	using pointer = const Type *;
+	using reference = const Type &;
 
 	class const_iterator;
 	class iterator : public iterator_base {
 	public:
 		using iterator_base::iterator_base;
-		iterator(const iterator_base &other) : iterator_base(other) {
-		}
+		iterator(const iterator_base &other)
+		    : iterator_base(other) {}
 		friend class const_iterator;
-
 	};
 	class const_iterator : public const_iterator_base {
 	public:
 		using const_iterator_base::const_iterator_base;
-		const_iterator(const_iterator_base other) : const_iterator_base(other) {
-		}
-		const_iterator(const iterator &other) : const_iterator_base(other._impl) {
-		}
-
+		const_iterator(const_iterator_base other)
+		    : const_iterator_base(other) {}
+		const_iterator(const iterator &other)
+		    : const_iterator_base(other._impl) {}
 	};
 	class const_reverse_iterator;
 	class reverse_iterator : public reverse_iterator_base {
 	public:
 		using reverse_iterator_base::reverse_iterator_base;
-		reverse_iterator(reverse_iterator_base other) : reverse_iterator_base(other) {
-		}
+		reverse_iterator(reverse_iterator_base other)
+		    : reverse_iterator_base(other) {}
 		friend class const_reverse_iterator;
-
 	};
 	class const_reverse_iterator : public const_reverse_iterator_base {
 	public:
 		using const_reverse_iterator_base::const_reverse_iterator_base;
-		const_reverse_iterator(const_reverse_iterator_base other) : const_reverse_iterator_base(other) {
-		}
-		const_reverse_iterator(const reverse_iterator &other) : const_reverse_iterator_base(other._impl) {
-		}
-
+		const_reverse_iterator(const_reverse_iterator_base other)
+		    : const_reverse_iterator_base(other) {}
+		const_reverse_iterator(const reverse_iterator &other)
+		    : const_reverse_iterator_base(other._impl) {}
 	};
 
 	flat_multi_set() = default;
 
 	template <typename Iterator, typename = typename std::iterator_traits<Iterator>::iterator_category>
-	flat_multi_set(Iterator first, Iterator last) : _impl(first, last) {
+	flat_multi_set(Iterator first, Iterator last)
+	    : _impl(first, last) {
 		std::sort(_impl.begin(), _impl.end());
 	}
 
@@ -266,8 +256,7 @@ public:
 		auto where = getUpperBound(value);
 		return _impl.insert(where, std::move(value));
 	}
-	template <typename... Args>
-	iterator emplace(Args&&... args) {
+	template <typename... Args> iterator emplace(Args &&... args) {
 		return insert(Type(std::forward<Args>(args)...));
 	}
 
@@ -350,11 +339,9 @@ private:
 	std::pair<typename impl::const_iterator, typename impl::const_iterator> getEqualRange(const Type &value) const {
 		return std::equal_range(_impl.begin(), _impl.end(), value);
 	}
-
 };
 
-template <typename Type>
-class flat_set : public flat_multi_set<Type> {
+template <typename Type> class flat_set : public flat_multi_set<Type> {
 	using parent = flat_multi_set<Type>;
 
 public:
@@ -365,10 +352,11 @@ public:
 	flat_set() = default;
 
 	template <typename Iterator, typename = typename std::iterator_traits<Iterator>::iterator_category>
-	flat_set(Iterator first, Iterator last) : parent(first, last) {
-		this->_impl.erase(std::unique(this->_impl.begin(), this->_impl.end(), [](auto &&a, auto &&b) {
-			return !(a < b);
-		}), this->_impl.end());
+	flat_set(Iterator first, Iterator last)
+	    : parent(first, last) {
+		this->_impl.erase(
+		    std::unique(this->_impl.begin(), this->_impl.end(), [](auto &&a, auto &&b) { return !(a < b); }),
+		    this->_impl.end());
 	}
 
 	iterator insert(const Type &value) {
@@ -399,8 +387,7 @@ public:
 		}
 		return this->end();
 	}
-	template <typename... Args>
-	iterator emplace(Args&&... args) {
+	template <typename... Args> iterator emplace(Args &&... args) {
 		return this->insert(Type(std::forward<Args>(args)...));
 	}
 
@@ -414,7 +401,6 @@ public:
 	const_iterator find(const Type &value) const {
 		return this->findFirst(value);
 	}
-
 };
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/functors.h b/Telegram/SourceFiles/base/functors.h
index 72f161b7c..b95da28b3 100644
--- a/Telegram/SourceFiles/base/functors.h
+++ b/Telegram/SourceFiles/base/functors.h
@@ -26,17 +26,14 @@ namespace base {
 namespace functors {
 
 struct abs_helper {
-	template <typename Type,
-		typename = decltype(0 < std::declval<Type>()),
-		typename = decltype(-std::declval<Type>())>
-		constexpr Type operator()(Type value) const {
+	template <typename Type, typename = decltype(0 < std::declval<Type>()), typename = decltype(-std::declval<Type>())>
+	constexpr Type operator()(Type value) const {
 		return (0 < value) ? value : (-value);
 	}
 };
-constexpr auto abs = abs_helper {};
+constexpr auto abs = abs_helper{};
 
-template <typename Type>
-inline auto add(Type a) {
+template <typename Type> inline auto add(Type a) {
 	return [a](auto b) { return a + b; };
 };
 
diff --git a/Telegram/SourceFiles/base/lambda.h b/Telegram/SourceFiles/base/lambda.h
index 115aea9c0..016039352 100644
--- a/Telegram/SourceFiles/base/lambda.h
+++ b/Telegram/SourceFiles/base/lambda.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
 #include <cstddef> // std::max_align_t
+#include <memory>
 
 #ifndef Assert
 #define LambdaAssertDefined
@@ -42,31 +42,26 @@ template <typename Function> class lambda;
 
 namespace lambda_internal {
 
-template <typename FunctionType>
-struct type_resolver;
+template <typename FunctionType> struct type_resolver;
 
-template <typename Lambda, typename R, typename ...Args>
-struct type_resolver<R(Lambda::*)(Args...) const> {
+template <typename Lambda, typename R, typename... Args> struct type_resolver<R (Lambda::*)(Args...) const> {
 	using type = lambda<R(Args...)>;
 	static constexpr auto is_mutable = false;
 };
 
-template <typename Lambda, typename R, typename ...Args>
-struct type_resolver<R(Lambda::*)(Args...)> {
+template <typename Lambda, typename R, typename... Args> struct type_resolver<R (Lambda::*)(Args...)> {
 	using type = lambda_once<R(Args...)>;
 	static constexpr auto is_mutable = true;
 };
 
-template <typename Lambda>
-struct type_helper {
+template <typename Lambda> struct type_helper {
 	using type = typename type_resolver<decltype(&Lambda::operator())>::type;
 	static constexpr auto is_mutable = type_resolver<decltype(&Lambda::operator())>::is_mutable;
 };
 
 } // namespace lambda_internal
 
-template <typename Lambda>
-using lambda_type = typename lambda_internal::type_helper<std::decay_t<Lambda>>::type;
+template <typename Lambda> using lambda_type = typename lambda_internal::type_helper<std::decay_t<Lambda>>::type;
 
 template <typename Lambda>
 constexpr bool lambda_is_mutable = lambda_internal::type_helper<std::decay_t<Lambda>>::is_mutable;
@@ -74,205 +69,165 @@ constexpr bool lambda_is_mutable = lambda_internal::type_helper<std::decay_t<Lam
 namespace lambda_internal {
 
 constexpr auto kFullStorageSize = 32U;
-static_assert(kFullStorageSize % sizeof(void*) == 0, "Invalid pointer size!");
+static_assert(kFullStorageSize % sizeof(void *) == 0, "Invalid pointer size!");
 
-constexpr auto kStorageSize = kFullStorageSize - sizeof(void*);
+constexpr auto kStorageSize = kFullStorageSize - sizeof(void *);
 using alignment = std::max_align_t;
 
-template <typename Lambda>
-constexpr bool is_large = (sizeof(std::decay_t<Lambda>) > kStorageSize);
+template <typename Lambda> constexpr bool is_large = (sizeof(std::decay_t<Lambda>) > kStorageSize);
 
 [[noreturn]] inline void bad_construct_copy(void *lambda, const void *source) {
 	Unexpected("base::lambda bad_construct_copy() called!");
 }
 
-template <typename Return, typename ...Args>
-[[noreturn]] Return bad_const_call(const void *lambda, Args...) {
-	Unexpected("base::lambda bad_const_call() called!");
-}
+template <typename Return, typename... Args>
+[[noreturn]] Return bad_const_call(const void *lambda, Args...) { Unexpected("base::lambda bad_const_call() called!"); }
 
-template <typename Return, typename ...Args>
+template <typename Return, typename... Args>
 struct vtable_base {
-	using construct_copy_other_type = void(*)(void *, const void *); // dst, src
-	using construct_move_other_type = void(*)(void *, void *); // dst, src
-	using const_call_type = Return(*)(const void *, Args...);
-	using call_type = Return(*)(void *, Args...);
-	using destruct_type = void(*)(const void *);
+	using construct_copy_other_type = void (*)(void *, const void *); // dst, src
+	using construct_move_other_type = void (*)(void *, void *); // dst, src
+	using const_call_type = Return (*)(const void *, Args...);
+	using call_type = Return (*)(void *, Args...);
+	using destruct_type = void (*)(const void *);
 
 	vtable_base() = delete;
 	vtable_base(const vtable_base &other) = delete;
 	vtable_base &operator=(const vtable_base &other) = delete;
 
-	vtable_base(
-		construct_copy_other_type construct_copy_other,
-		construct_move_other_type construct_move_other,
-		const_call_type const_call,
-		call_type call,
-		destruct_type destruct)
-		: construct_copy_other(construct_copy_other)
-		, construct_move_other(construct_move_other)
-		, const_call(const_call)
-		, call(call)
-		, destruct(destruct) {
-	}
+	vtable_base(construct_copy_other_type construct_copy_other, construct_move_other_type construct_move_other,
+	            const_call_type const_call, call_type call, destruct_type destruct)
+	    : construct_copy_other(construct_copy_other)
+	    , construct_move_other(construct_move_other)
+	    , const_call(const_call)
+	    , call(call)
+	    , destruct(destruct) {}
 
 	const construct_copy_other_type construct_copy_other;
 	const construct_move_other_type construct_move_other;
 	const const_call_type const_call;
 	const call_type call;
 	const destruct_type destruct;
-
 };
 
-template <typename Lambda, bool IsLarge, typename Return, typename ...Args> struct vtable_once_impl;
+template <typename Lambda, bool IsLarge, typename Return, typename... Args> struct vtable_once_impl;
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable_once_impl<Lambda, true, Return, Args...> : public vtable_base<Return, Args...> {
 	using JustLambda = std::decay_t<Lambda>;
 	using LambdaPtr = std::unique_ptr<JustLambda>;
 	using Parent = vtable_base<Return, Args...>;
 	static void construct_move_other_method(void *storage, void *source) {
-		auto source_lambda_ptr = static_cast<LambdaPtr*>(source);
+		auto source_lambda_ptr = static_cast<LambdaPtr *>(source);
 		new (storage) LambdaPtr(std::move(*source_lambda_ptr));
 	}
 	static Return call_method(void *storage, Args... args) {
-		return (**static_cast<LambdaPtr*>(storage))(std::forward<Args>(args)...);
+		return (**static_cast<LambdaPtr *>(storage))(std::forward<Args>(args)...);
 	}
 	static void destruct_method(const void *storage) {
-		static_cast<const LambdaPtr*>(storage)->~LambdaPtr();
-	}
-	vtable_once_impl() : Parent(
-		&bad_construct_copy,
-		&vtable_once_impl::construct_move_other_method,
-		&bad_const_call<Return, Args...>,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
+		static_cast<const LambdaPtr *>(storage)->~LambdaPtr();
 	}
+	vtable_once_impl()
+	    : Parent(&bad_construct_copy, &vtable_once_impl::construct_move_other_method, &bad_const_call<Return, Args...>,
+	             &vtable_once_impl::call_method, &vtable_once_impl::destruct_method) {}
 
 	// Used directly.
 	static void construct_move_lambda_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) LambdaPtr(std::make_unique<JustLambda>(static_cast<JustLambda&&>(*source_lambda)));
+		auto source_lambda = static_cast<JustLambda *>(source);
+		new (storage) LambdaPtr(std::make_unique<JustLambda>(static_cast<JustLambda &&>(*source_lambda)));
 	}
 
 protected:
-	vtable_once_impl(
-		typename Parent::construct_copy_other_type construct_copy_other,
-		typename Parent::const_call_type const_call
-	) : Parent(
-		construct_copy_other,
-		&vtable_once_impl::construct_move_other_method,
-		const_call,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
+	vtable_once_impl(typename Parent::construct_copy_other_type construct_copy_other,
+	                 typename Parent::const_call_type const_call)
+	    : Parent(construct_copy_other, &vtable_once_impl::construct_move_other_method, const_call,
+	             &vtable_once_impl::call_method, &vtable_once_impl::destruct_method) {}
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable_once_impl<Lambda, false, Return, Args...> : public vtable_base<Return, Args...> {
 	using JustLambda = std::decay_t<Lambda>;
 	using Parent = vtable_base<Return, Args...>;
 	static void construct_move_other_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) JustLambda(static_cast<JustLambda&&>(*source_lambda));
+		auto source_lambda = static_cast<JustLambda *>(source);
+		new (storage) JustLambda(static_cast<JustLambda &&>(*source_lambda));
 	}
 	static Return call_method(void *storage, Args... args) {
-		return (*static_cast<JustLambda*>(storage))(std::forward<Args>(args)...);
+		return (*static_cast<JustLambda *>(storage))(std::forward<Args>(args)...);
 	}
 	static void destruct_method(const void *storage) {
-		static_cast<const JustLambda*>(storage)->~JustLambda();
-	}
-	vtable_once_impl() : Parent(
-		&bad_construct_copy,
-		&vtable_once_impl::construct_move_other_method,
-		&bad_const_call<Return, Args...>,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
+		static_cast<const JustLambda *>(storage)->~JustLambda();
 	}
+	vtable_once_impl()
+	    : Parent(&bad_construct_copy, &vtable_once_impl::construct_move_other_method, &bad_const_call<Return, Args...>,
+	             &vtable_once_impl::call_method, &vtable_once_impl::destruct_method) {}
 
 	// Used directly.
 	static void construct_move_lambda_method(void *storage, void *source) {
-		auto source_lambda = static_cast<JustLambda*>(source);
-		new (storage) JustLambda(static_cast<JustLambda&&>(*source_lambda));
+		auto source_lambda = static_cast<JustLambda *>(source);
+		new (storage) JustLambda(static_cast<JustLambda &&>(*source_lambda));
 	}
 
 protected:
-	vtable_once_impl(
-		typename Parent::construct_copy_other_type construct_copy_other,
-		typename Parent::const_call_type const_call
-	) : Parent(
-		construct_copy_other,
-		&vtable_once_impl::construct_move_other_method,
-		const_call,
-		&vtable_once_impl::call_method,
-		&vtable_once_impl::destruct_method) {
-	}
-
+	vtable_once_impl(typename Parent::construct_copy_other_type construct_copy_other,
+	                 typename Parent::const_call_type const_call)
+	    : Parent(construct_copy_other, &vtable_once_impl::construct_move_other_method, const_call,
+	             &vtable_once_impl::call_method, &vtable_once_impl::destruct_method) {}
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable_once : public vtable_once_impl<Lambda, is_large<Lambda>, Return, Args...> {
 	static const vtable_once instance;
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 const vtable_once<Lambda, Return, Args...> vtable_once<Lambda, Return, Args...>::instance = {};
 
-template <typename Lambda, bool IsLarge, typename Return, typename ...Args> struct vtable_impl;
+template <typename Lambda, bool IsLarge, typename Return, typename... Args> struct vtable_impl;
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable_impl<Lambda, true, Return, Args...> : public vtable_once_impl<Lambda, true, Return, Args...> {
 	using JustLambda = std::decay_t<Lambda>;
 	using LambdaPtr = std::unique_ptr<JustLambda>;
 	using Parent = vtable_once_impl<Lambda, true, Return, Args...>;
 	static void construct_copy_other_method(void *storage, const void *source) {
-		auto source_lambda = static_cast<const LambdaPtr*>(source);
+		auto source_lambda = static_cast<const LambdaPtr *>(source);
 		new (storage) LambdaPtr(std::make_unique<JustLambda>(*source_lambda->get()));
 	}
 	static Return const_call_method(const void *storage, Args... args) {
-		auto lambda_ptr = static_cast<const LambdaPtr*>(storage)->get();
-		return (*static_cast<const JustLambda*>(lambda_ptr))(std::forward<Args>(args)...);
+		auto lambda_ptr = static_cast<const LambdaPtr *>(storage)->get();
+		return (*static_cast<const JustLambda *>(lambda_ptr))(std::forward<Args>(args)...);
 	}
-	vtable_impl() : Parent(
-		&vtable_impl::construct_copy_other_method,
-		&vtable_impl::const_call_method
-	) {
-	}
-
+	vtable_impl()
+	    : Parent(&vtable_impl::construct_copy_other_method, &vtable_impl::const_call_method) {}
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable_impl<Lambda, false, Return, Args...> : public vtable_once_impl<Lambda, false, Return, Args...> {
 	using JustLambda = std::decay_t<Lambda>;
 	using Parent = vtable_once_impl<Lambda, false, Return, Args...>;
 	static void construct_copy_other_method(void *storage, const void *source) {
-		auto source_lambda = static_cast<const JustLambda*>(source);
+		auto source_lambda = static_cast<const JustLambda *>(source);
 		new (storage) JustLambda(static_cast<const JustLambda &>(*source_lambda));
 	}
 	static Return const_call_method(const void *storage, Args... args) {
-		return (*static_cast<const JustLambda*>(storage))(std::forward<Args>(args)...);
+		return (*static_cast<const JustLambda *>(storage))(std::forward<Args>(args)...);
 	}
-	vtable_impl() : Parent(
-		&vtable_impl::construct_copy_other_method,
-		&vtable_impl::const_call_method
-	) {
-	}
-
+	vtable_impl()
+	    : Parent(&vtable_impl::construct_copy_other_method, &vtable_impl::const_call_method) {}
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 struct vtable : public vtable_impl<Lambda, is_large<Lambda>, Return, Args...> {
 	static const vtable instance;
 };
 
-template <typename Lambda, typename Return, typename ...Args>
+template <typename Lambda, typename Return, typename... Args>
 const vtable<Lambda, Return, Args...> vtable<Lambda, Return, Args...>::instance = {};
 
 } // namespace lambda_internal
 
-template <typename Return, typename ...Args>
-class lambda_once<Return(Args...)> {
+template <typename Return, typename... Args> class lambda_once<Return(Args...)> {
 	using VTable = lambda_internal::vtable_base<Return, Args...>;
 
 public:
@@ -345,12 +300,14 @@ public:
 	}
 
 	// Copy / move construct / assign from an arbitrary type.
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
+	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<
+	                               decltype(std::declval<Lambda>()(std::declval<Args>()...)), Return>::value>>
 	lambda_once(Lambda other) {
 		data_.vtable = &lambda_internal::vtable_once<Lambda, Return, Args...>::instance;
 		lambda_internal::vtable_once<Lambda, Return, Args...>::construct_move_lambda_method(data_.storage, &other);
 	}
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
+	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<
+	                               decltype(std::declval<Lambda>()(std::declval<Args>()...)), Return>::value>>
 	lambda_once &operator=(Lambda other) {
 		if (data_.vtable) {
 			data_.vtable->destruct(data_.storage);
@@ -382,8 +339,7 @@ public:
 	}
 
 protected:
-	struct Private {
-	};
+	struct Private {};
 	lambda_once(const VTable *vtable, const Private &) {
 		data_.vtable = vtable;
 	}
@@ -397,38 +353,39 @@ protected:
 		char raw_[lambda_internal::kFullStorageSize];
 		Data data_;
 	};
-
 };
 
-template <typename Return, typename ...Args>
-class lambda<Return(Args...)> final : public lambda_once<Return(Args...)> {
+template <typename Return, typename... Args> class lambda<Return(Args...)> final : public lambda_once<Return(Args...)> {
 	using Parent = lambda_once<Return(Args...)>;
 
 public:
 	lambda() = default;
 
 	// Move construct / assign from the same type.
-	lambda(lambda<Return(Args...)> &&other) : Parent(std::move(other)) {
-	}
+	lambda(lambda<Return(Args...)> &&other)
+	    : Parent(std::move(other)) {}
 	lambda &operator=(lambda<Return(Args...)> &&other) {
 		Parent::operator=(std::move(other));
 		return *this;
 	}
 
 	// Copy construct / assign from the same type.
-	lambda(const lambda<Return(Args...)> &other) : Parent(other) {
-	}
+	lambda(const lambda<Return(Args...)> &other)
+	    : Parent(other) {}
 	lambda &operator=(const lambda<Return(Args...)> &other) {
 		Parent::operator=(other);
 		return *this;
 	}
 
 	// Copy / move construct / assign from an arbitrary type.
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
-	lambda(Lambda other) : Parent(&lambda_internal::vtable<Lambda, Return, Args...>::instance, typename Parent::Private()) {
+	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<
+	                               decltype(std::declval<Lambda>()(std::declval<Args>()...)), Return>::value>>
+	lambda(Lambda other)
+	    : Parent(&lambda_internal::vtable<Lambda, Return, Args...>::instance, typename Parent::Private()) {
 		lambda_internal::vtable<Lambda, Return, Args...>::construct_move_lambda_method(this->data_.storage, &other);
 	}
-	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>>
+	template <typename Lambda, typename = std::enable_if_t<std::is_convertible<
+	                               decltype(std::declval<Lambda>()(std::declval<Args>()...)), Return>::value>>
 	lambda &operator=(Lambda other) {
 		if (this->data_.vtable) {
 			this->data_.vtable->destruct(this->data_.storage);
@@ -448,7 +405,6 @@ public:
 			std::swap(*this, other);
 		}
 	}
-
 };
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/lambda_guard.h b/Telegram/SourceFiles/base/lambda_guard.h
index c28a5ed40..7b38d3d9a 100644
--- a/Telegram/SourceFiles/base/lambda_guard.h
+++ b/Telegram/SourceFiles/base/lambda_guard.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QPointer>
 #include "base/lambda.h"
+#include <QPointer>
 
 namespace base {
 
@@ -29,23 +29,22 @@ namespace base {
 
 namespace lambda_internal {
 
-template <int N, typename Lambda>
-class guard_data {
+template <int N, typename Lambda> class guard_data {
 public:
 	using return_type = typename lambda_type<Lambda>::return_type;
 
-	template <typename ...PointersAndLambda>
-	inline guard_data(PointersAndLambda&&... qobjectsAndLambda) : _lambda(init(_pointers, std::forward<PointersAndLambda>(qobjectsAndLambda)...)) {
-	}
+	template <typename... PointersAndLambda>
+	inline guard_data(PointersAndLambda &&... qobjectsAndLambda)
+	    : _lambda(init(_pointers, std::forward<PointersAndLambda>(qobjectsAndLambda)...)) {}
 
-	inline guard_data(const guard_data &other) : _lambda(other._lambda) {
+	inline guard_data(const guard_data &other)
+	    : _lambda(other._lambda) {
 		for (auto i = 0; i != N; ++i) {
 			_pointers[i] = other._pointers[i];
 		}
 	}
 
-	template <typename ...Args>
-	inline return_type operator()(Args&&... args) {
+	template <typename... Args> inline return_type operator()(Args &&... args) {
 		for (int i = 0; i != N; ++i) {
 			if (!_pointers[i]) {
 				return return_type();
@@ -54,8 +53,7 @@ public:
 		return _lambda(std::forward<Args>(args)...);
 	}
 
-	template <typename ...Args>
-	inline return_type operator()(Args&&... args) const {
+	template <typename... Args> inline return_type operator()(Args &&... args) const {
 		for (int i = 0; i != N; ++i) {
 			if (!_pointers[i]) {
 				return return_type();
@@ -65,8 +63,8 @@ public:
 	}
 
 private:
-	template <typename ...PointersAndLambda>
-	Lambda init(QPointer<QObject> *pointers, QObject *qobject, PointersAndLambda&&... qobjectsAndLambda) {
+	template <typename... PointersAndLambda>
+	Lambda init(QPointer<QObject> *pointers, QObject *qobject, PointersAndLambda &&... qobjectsAndLambda) {
 		*pointers = qobject;
 		return init(++pointers, std::forward<PointersAndLambda>(qobjectsAndLambda)...);
 	}
@@ -76,24 +74,24 @@ private:
 
 	QPointer<QObject> _pointers[N];
 	Lambda _lambda;
-
 };
 
-template <int N, typename Lambda>
-class guard {
+template <int N, typename Lambda> class guard {
 public:
 	using return_type = typename lambda_type<Lambda>::return_type;
 
-	template <typename Pointer, typename Other, typename ...PointersAndLambda>
-	inline guard(Pointer &&qobject, Other &&other, PointersAndLambda&&... qobjectsAndLambda) : _data(std::make_unique<guard_data<N, Lambda>>(std::forward<Pointer>(qobject), std::forward<Other>(other), std::forward<PointersAndLambda>(qobjectsAndLambda)...)) {
+	template <typename Pointer, typename Other, typename... PointersAndLambda>
+	inline guard(Pointer &&qobject, Other &&other, PointersAndLambda &&... qobjectsAndLambda)
+	    : _data(std::make_unique<guard_data<N, Lambda>>(std::forward<Pointer>(qobject), std::forward<Other>(other),
+	                                                    std::forward<PointersAndLambda>(qobjectsAndLambda)...)) {
 		static_assert(1 + 1 + sizeof...(PointersAndLambda) == N + 1, "Wrong argument count!");
 	}
 
-	inline guard(const guard &other) : _data(std::make_unique<guard_data<N, Lambda>>(static_cast<const guard_data<N, Lambda> &>(*other._data))) {
-	}
+	inline guard(const guard &other)
+	    : _data(std::make_unique<guard_data<N, Lambda>>(static_cast<const guard_data<N, Lambda> &>(*other._data))) {}
 
-	inline guard(guard &&other) : _data(std::move(other._data)) {
-	}
+	inline guard(guard &&other)
+	    : _data(std::move(other._data)) {}
 
 	inline guard &operator=(const guard &&other) {
 		_data = std::move(other._data);
@@ -105,13 +103,11 @@ public:
 		return *this;
 	}
 
-	template <typename ...Args>
-	inline return_type operator()(Args&&... args) {
+	template <typename... Args> inline return_type operator()(Args &&... args) {
 		return (*_data)(std::forward<Args>(args)...);
 	}
 
-	template <typename ...Args>
-	inline return_type operator()(Args&&... args) const {
+	template <typename... Args> inline return_type operator()(Args &&... args) const {
 		return (*_data)(std::forward<Args>(args)...);
 	}
 
@@ -121,41 +117,33 @@ public:
 
 private:
 	mutable std::unique_ptr<guard_data<N, Lambda>> _data;
-
 };
 
-template <int N, int K, typename ...PointersAndLambda>
-struct guard_type;
+template <int N, int K, typename... PointersAndLambda> struct guard_type;
 
-template <int N, int K, typename Pointer, typename ...PointersAndLambda>
+template <int N, int K, typename Pointer, typename... PointersAndLambda>
 struct guard_type<N, K, Pointer, PointersAndLambda...> {
 	using type = typename guard_type<N, K - 1, PointersAndLambda...>::type;
 };
 
-template <int N, typename Lambda>
-struct guard_type<N, 0, Lambda> {
-	using type = guard<N, Lambda>;
-};
+template <int N, typename Lambda> struct guard_type<N, 0, Lambda> { using type = guard<N, Lambda>; };
 
-template <typename ...PointersAndLambda>
-struct guard_type_helper {
+template <typename... PointersAndLambda> struct guard_type_helper {
 	static constexpr int N = sizeof...(PointersAndLambda);
 	using type = typename guard_type<N - 1, N - 1, PointersAndLambda...>::type;
 };
 
-template <typename ...PointersAndLambda>
-using guard_t = typename guard_type_helper<PointersAndLambda...>::type;
+template <typename... PointersAndLambda> using guard_t = typename guard_type_helper<PointersAndLambda...>::type;
 
-template <int N, typename Lambda>
-struct type_helper<guard<N, Lambda>> {
+template <int N, typename Lambda> struct type_helper<guard<N, Lambda>> {
 	using type = typename type_helper<Lambda>::type;
 	static constexpr auto is_mutable = type_helper<Lambda>::is_mutable;
 };
 
 } // namespace lambda_internal
 
-template <typename ...PointersAndLambda>
-inline lambda_internal::guard_t<PointersAndLambda...> lambda_guarded(PointersAndLambda&&... qobjectsAndLambda) {
+template <typename... PointersAndLambda>
+inline lambda_internal::guard_t<PointersAndLambda...> lambda_guarded(PointersAndLambda &&... qobjectsAndLambda) {
 	static_assert(sizeof...(PointersAndLambda) > 0, "Lambda should be passed here.");
 	return lambda_internal::guard_t<PointersAndLambda...>(std::forward<PointersAndLambda>(qobjectsAndLambda)...);
 }
diff --git a/Telegram/SourceFiles/base/object_ptr.h b/Telegram/SourceFiles/base/object_ptr.h
index ad04c7ddc..a0bd000ae 100644
--- a/Telegram/SourceFiles/base/object_ptr.h
+++ b/Telegram/SourceFiles/base/object_ptr.h
@@ -20,27 +20,25 @@ Copyright (c) 2018 pro.cxx Community
 */
 #pragma once
 
+#include "core/utils.h" // @todo used for base::take
 #include <QObject>
 #include <QPointer>
-#include "core/utils.h" // @todo used for base::take
 
 // Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent.
-template <typename Object>
-class object_ptr {
+template <typename Object> class object_ptr {
 public:
-	object_ptr(std::nullptr_t) {
-	}
+	object_ptr(std::nullptr_t) {}
 
 	// No default constructor, but constructors with at least
 	// one argument are simply make functions.
 	template <typename Parent, typename... Args>
-	explicit object_ptr(Parent &&parent, Args&&... args) : _object(new Object(std::forward<Parent>(parent), std::forward<Args>(args)...)) {
-	}
+	explicit object_ptr(Parent &&parent, Args &&... args)
+	    : _object(new Object(std::forward<Parent>(parent), std::forward<Args>(args)...)) {}
 
 	object_ptr(const object_ptr &other) = delete;
 	object_ptr &operator=(const object_ptr &other) = delete;
-	object_ptr(object_ptr &&other) : _object(base::take(other._object)) {
-	}
+	object_ptr(object_ptr &&other)
+	    : _object(base::take(other._object)) {}
 	object_ptr &operator=(object_ptr &&other) {
 		auto temp = std::move(other);
 		destroy();
@@ -49,8 +47,8 @@ public:
 	}
 
 	template <typename OtherObject, typename = std::enable_if_t<std::is_base_of<Object, OtherObject>::value>>
-	object_ptr(object_ptr<OtherObject> &&other) : _object(base::take(other._object)) {
-	}
+	object_ptr(object_ptr<OtherObject> &&other)
+	    : _object(base::take(other._object)) {}
 
 	template <typename OtherObject, typename = std::enable_if_t<std::is_base_of<Object, OtherObject>::value>>
 	object_ptr &operator=(object_ptr<OtherObject> &&other) {
@@ -65,9 +63,9 @@ public:
 
 	// So we can pass this pointer to methods like connect().
 	Object *data() const {
-		return static_cast<Object*>(_object.data());
+		return static_cast<Object *>(_object.data());
 	}
-	operator Object*() const {
+	operator Object *() const {
 		return data();
 	}
 
@@ -83,8 +81,7 @@ public:
 	}
 
 	// Use that instead "= new Object(parent, ...)"
-	template <typename Parent, typename... Args>
-	void create(Parent &&parent, Args&&... args) {
+	template <typename Parent, typename... Args> void create(Parent &&parent, Args &&... args) {
 		destroy();
 		_object = new Object(std::forward<Parent>(parent), std::forward<Args>(args)...);
 	}
@@ -93,7 +90,7 @@ public:
 	}
 	void destroyDelayed() {
 		if (_object) {
-			if (auto widget = base::up_cast<QWidget*>(data())) {
+			if (auto widget = base::up_cast<QWidget *>(data())) {
 				widget->hide();
 			}
 			base::take(_object)->deleteLater();
@@ -112,16 +109,14 @@ public:
 	friend object_ptr<ResultType> static_object_cast(object_ptr<SourceType> source);
 
 private:
-	template <typename OtherObject>
-	friend class object_ptr;
+	template <typename OtherObject> friend class object_ptr;
 
 	QPointer<QObject> _object;
-
 };
 
 template <typename ResultType, typename SourceType>
 inline object_ptr<ResultType> static_object_cast(object_ptr<SourceType> source) {
 	auto result = object_ptr<ResultType>(nullptr);
-	result._object = static_cast<ResultType*>(base::take(source._object).data());
+	result._object = static_cast<ResultType *>(base::take(source._object).data());
 	return std::move(result);
 }
diff --git a/Telegram/SourceFiles/base/observer.cpp b/Telegram/SourceFiles/base/observer.cpp
index 377ef0101..9705713b5 100644
--- a/Telegram/SourceFiles/base/observer.cpp
+++ b/Telegram/SourceFiles/base/observer.cpp
@@ -31,7 +31,7 @@ struct ObservableListWrap {
 	~ObservableListWrap() {
 		CantUseObservables = true;
 	}
-	OrderedSet<ObservableCallHandlers*> list;
+	OrderedSet<ObservableCallHandlers *> list;
 };
 
 ObservableListWrap &PendingObservables() {
diff --git a/Telegram/SourceFiles/base/observer.h b/Telegram/SourceFiles/base/observer.h
index c0d6cf0cb..52ddd4204 100644
--- a/Telegram/SourceFiles/base/observer.h
+++ b/Telegram/SourceFiles/base/observer.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <vector>
-#include <deque>
-#include <QSharedPointer>
 #include "base/assertion.h"
 #include "base/lambda.h"
 #include "base/type_traits.h"
 #include "core/utils.h"
+#include <QSharedPointer>
+#include <deque>
+#include <vector>
 
 namespace base {
 namespace internal {
@@ -36,28 +36,20 @@ void RegisterPendingObservable(ObservableCallHandlers *handlers);
 void UnregisterActiveObservable(ObservableCallHandlers *handlers);
 void UnregisterObservable(ObservableCallHandlers *handlers);
 
-template <typename EventType>
-struct SubscriptionHandlerHelper {
+template <typename EventType> struct SubscriptionHandlerHelper {
 	using type = base::lambda<void(parameter_type<EventType>)>;
 };
 
-template <>
-struct SubscriptionHandlerHelper<void> {
-	using type = base::lambda<void()>;
-};
+template <> struct SubscriptionHandlerHelper<void> { using type = base::lambda<void()>; };
 
-template <typename EventType>
-using SubscriptionHandler = typename SubscriptionHandlerHelper<EventType>::type;
+template <typename EventType> using SubscriptionHandler = typename SubscriptionHandlerHelper<EventType>::type;
 
 // Required because QShared/WeakPointer can't point to void.
-class BaseObservableData {
-};
+class BaseObservableData {};
 
-template <typename EventType, typename Handler>
-class CommonObservableData;
+template <typename EventType, typename Handler> class CommonObservableData;
 
-template <typename EventType, typename Handler>
-class ObservableData;
+template <typename EventType, typename Handler> class ObservableData;
 
 } // namespace internal
 
@@ -66,8 +58,9 @@ public:
 	Subscription() = default;
 	Subscription(const Subscription &) = delete;
 	Subscription &operator=(const Subscription &) = delete;
-	Subscription(Subscription &&other) : _node(base::take(other._node)), _removeAndDestroyMethod(other._removeAndDestroyMethod) {
-	}
+	Subscription(Subscription &&other)
+	    : _node(base::take(other._node))
+	    , _removeAndDestroyMethod(other._removeAndDestroyMethod) {}
 	Subscription &operator=(Subscription &&other) {
 		qSwap(_node, other._node);
 		qSwap(_removeAndDestroyMethod, other._removeAndDestroyMethod);
@@ -87,34 +80,30 @@ public:
 
 private:
 	struct Node {
-		Node(const QSharedPointer<internal::BaseObservableData> &observable) : observable(observable) {
-		}
+		Node(const QSharedPointer<internal::BaseObservableData> &observable)
+		    : observable(observable) {}
 		Node *next = nullptr;
 		Node *prev = nullptr;
 		QWeakPointer<internal::BaseObservableData> observable;
 	};
-	using RemoveAndDestroyMethod = void(*)(Node*);
-	Subscription(Node *node, RemoveAndDestroyMethod removeAndDestroyMethod) : _node(node), _removeAndDestroyMethod(removeAndDestroyMethod) {
-	}
+	using RemoveAndDestroyMethod = void (*)(Node *);
+	Subscription(Node *node, RemoveAndDestroyMethod removeAndDestroyMethod)
+	    : _node(node)
+	    , _removeAndDestroyMethod(removeAndDestroyMethod) {}
 
 	Node *_node = nullptr;
 	RemoveAndDestroyMethod _removeAndDestroyMethod;
 
-	template <typename EventType, typename Handler>
-	friend class internal::CommonObservableData;
-
-	template <typename EventType, typename Handler>
-	friend class internal::ObservableData;
+	template <typename EventType, typename Handler> friend class internal::CommonObservableData;
 
+	template <typename EventType, typename Handler> friend class internal::ObservableData;
 };
 
 namespace internal {
 
-template <typename EventType, typename Handler, bool EventTypeIsSimple>
-class BaseObservable;
+template <typename EventType, typename Handler, bool EventTypeIsSimple> class BaseObservable;
 
-template <typename EventType, typename Handler>
-class CommonObservable {
+template <typename EventType, typename Handler> class CommonObservable {
 public:
 	Subscription add_subscription(Handler &&handler) {
 		if (!_data) {
@@ -128,7 +117,6 @@ private:
 
 	friend class CommonObservableData<EventType, Handler>;
 	friend class BaseObservable<EventType, Handler, base::type_traits<EventType>::is_fast_copy_type::value>;
-
 };
 
 template <typename EventType, typename Handler>
@@ -139,7 +127,6 @@ public:
 			this->_data->notify(std::move(event), sync);
 		}
 	}
-
 };
 
 template <typename EventType, typename Handler>
@@ -156,18 +143,16 @@ public:
 			this->_data->notify(std::move(event_copy), sync);
 		}
 	}
-
 };
 
 } // namespace internal
 
 namespace internal {
 
-template <typename EventType, typename Handler>
-class CommonObservableData : public BaseObservableData {
+template <typename EventType, typename Handler> class CommonObservableData : public BaseObservableData {
 public:
-	CommonObservableData(CommonObservable<EventType, Handler> *observable) : _observable(observable) {
-	}
+	CommonObservableData(CommonObservable<EventType, Handler> *observable)
+	    : _observable(observable) {}
 
 	Subscription append(Handler &&handler) {
 		auto node = new Node(_observable->_data, std::move(handler));
@@ -178,7 +163,7 @@ public:
 		} else {
 			_begin = _end = node;
 		}
-		return { _end, &CommonObservableData::removeAndDestroyNode };
+		return {_end, &CommonObservableData::removeAndDestroyNode};
 	}
 
 	bool empty() const {
@@ -187,8 +172,9 @@ public:
 
 private:
 	struct Node : public Subscription::Node {
-		Node(const QSharedPointer<BaseObservableData> &observer, Handler &&handler) : Subscription::Node(observer), handler(std::move(handler)) {
-		}
+		Node(const QSharedPointer<BaseObservableData> &observer, Handler &&handler)
+		    : Subscription::Node(observer)
+		    , handler(std::move(handler)) {}
 		Handler handler;
 	};
 
@@ -200,13 +186,13 @@ private:
 			node->next->prev = node->prev;
 		}
 		if (_begin == node) {
-			_begin = static_cast<Node*>(node->next);
+			_begin = static_cast<Node *>(node->next);
 		}
 		if (_end == node) {
-			_end = static_cast<Node*>(node->prev);
+			_end = static_cast<Node *>(node->prev);
 		}
 		if (_current == node) {
-			_current = static_cast<Node*>(node->prev);
+			_current = static_cast<Node *>(node->prev);
 		} else if (!_begin) {
 			_observable->_data.reset();
 		}
@@ -214,18 +200,17 @@ private:
 
 	static void removeAndDestroyNode(Subscription::Node *node) {
 		if (auto that = node->observable.toStrongRef()) {
-			static_cast<CommonObservableData*>(that.data())->remove(node);
+			static_cast<CommonObservableData *>(that.data())->remove(node);
 		}
-		delete static_cast<Node*>(node);
+		delete static_cast<Node *>(node);
 	}
 
-	template <typename CallCurrent>
-	void notifyEnumerate(CallCurrent callCurrent) {
+	template <typename CallCurrent> void notifyEnumerate(CallCurrent callCurrent) {
 		_current = _begin;
 		do {
 			callCurrent();
 			if (_current) {
-				_current = static_cast<Node*>(_current->next);
+				_current = static_cast<Node *>(_current->next);
 			} else if (_begin) {
 				_current = _begin;
 			} else {
@@ -249,11 +234,9 @@ private:
 	ObservableCallHandlers _callHandlers;
 
 	friend class ObservableData<EventType, Handler>;
-
 };
 
-template <typename EventType, typename Handler>
-class ObservableData : public CommonObservableData<EventType, Handler> {
+template <typename EventType, typename Handler> class ObservableData : public CommonObservableData<EventType, Handler> {
 public:
 	using CommonObservableData<EventType, Handler>::CommonObservableData;
 
@@ -266,9 +249,7 @@ public:
 			callHandlers();
 		} else {
 			if (!this->_callHandlers) {
-				this->_callHandlers = [this]() {
-					callHandlers();
-				};
+				this->_callHandlers = [this]() { callHandlers(); };
 			}
 			if (_events.empty()) {
 				RegisterPendingObservable(&this->_callHandlers);
@@ -286,9 +267,7 @@ private:
 		_handling = true;
 		auto events = base::take(_events);
 		for (auto &event : events) {
-			this->notifyEnumerate([this, &event]() {
-				this->_current->handler(event);
-			});
+			this->notifyEnumerate([this, &event]() { this->_current->handler(event); });
 			if (this->destroyMeIfEmpty()) {
 				return;
 			}
@@ -299,11 +278,9 @@ private:
 
 	std::deque<EventType> _events;
 	bool _handling = false;
-
 };
 
-template <class Handler>
-class ObservableData<void, Handler> : public CommonObservableData<void, Handler> {
+template <class Handler> class ObservableData<void, Handler> : public CommonObservableData<void, Handler> {
 public:
 	using CommonObservableData<void, Handler>::CommonObservableData;
 
@@ -316,9 +293,7 @@ public:
 			callHandlers();
 		} else {
 			if (!this->_callHandlers) {
-				this->_callHandlers = [this]() {
-					callHandlers();
-				};
+				this->_callHandlers = [this]() { callHandlers(); };
 			}
 			if (!_eventsCount) {
 				RegisterPendingObservable(&this->_callHandlers);
@@ -336,9 +311,7 @@ private:
 		_handling = true;
 		auto eventsCount = base::take(_eventsCount);
 		for (int i = 0; i != eventsCount; ++i) {
-			this->notifyEnumerate([this]() {
-				this->_current->handler();
-			});
+			this->notifyEnumerate([this]() { this->_current->handler(); });
 			if (this->destroyMeIfEmpty()) {
 				return;
 			}
@@ -349,38 +322,36 @@ private:
 
 	int _eventsCount = 0;
 	bool _handling = false;
-
 };
 
 template <typename Handler>
-class BaseObservable<void, Handler, base::type_traits<void>::is_fast_copy_type::value> : public internal::CommonObservable<void, Handler> {
+class BaseObservable<void, Handler, base::type_traits<void>::is_fast_copy_type::value>
+    : public internal::CommonObservable<void, Handler> {
 public:
 	void notify(bool sync = false) {
 		if (this->_data) {
 			this->_data->notify(sync);
 		}
 	}
-
 };
 
 } // namespace internal
 
 template <typename EventType, typename Handler = internal::SubscriptionHandler<EventType>>
-class Observable : public internal::BaseObservable<EventType, Handler, base::type_traits<EventType>::is_fast_copy_type::value> {
+class Observable
+    : public internal::BaseObservable<EventType, Handler, base::type_traits<EventType>::is_fast_copy_type::value> {
 public:
 	Observable() = default;
 	Observable(const Observable &other) = delete;
 	Observable(Observable &&other) = delete;
 	Observable &operator=(const Observable &other) = delete;
 	Observable &operator=(Observable &&other) = delete;
-
 };
 
-template <typename Type>
-class Variable {
+template <typename Type> class Variable {
 public:
-	Variable(parameter_type<Type> startValue = Type()) : _value(startValue) {
-	}
+	Variable(parameter_type<Type> startValue = Type())
+	    : _value(startValue) {}
 	Variable(Variable &&other) = default;
 	Variable &operator=(Variable &&other) = default;
 
@@ -399,8 +370,7 @@ public:
 		}
 	}
 
-	template <typename Callback>
-	void process(Callback callback, bool sync = false) {
+	template <typename Callback> void process(Callback callback, bool sync = false) {
 		callback(_value);
 		changed().notify(_value, sync);
 	}
@@ -412,7 +382,6 @@ public:
 private:
 	Type _value;
 	mutable Observable<Type> _changed;
-
 };
 
 class Subscriber {
@@ -428,13 +397,11 @@ protected:
 		return subscribe(*observable, std::forward<Lambda>(handler));
 	}
 
-	template <typename Type, typename Lambda>
-	size_t subscribe(const base::Variable<Type> &variable, Lambda &&handler) {
+	template <typename Type, typename Lambda> size_t subscribe(const base::Variable<Type> &variable, Lambda &&handler) {
 		return subscribe(variable.changed(), std::forward<Lambda>(handler));
 	}
 
-	template <typename Type, typename Lambda>
-	size_t subscribe(const base::Variable<Type> *variable, Lambda &&handler) {
+	template <typename Type, typename Lambda> size_t subscribe(const base::Variable<Type> *variable, Lambda &&handler) {
 		return subscribe(variable->changed(), std::forward<Lambda>(handler));
 	}
 
@@ -459,7 +426,6 @@ protected:
 
 private:
 	std::vector<base::Subscription> _subscriptions;
-
 };
 
 void HandleObservables();
diff --git a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h
index d00af74ea..c8020906c 100644
--- a/Telegram/SourceFiles/base/openssl_help.h
+++ b/Telegram/SourceFiles/base/openssl_help.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <openssl/bn.h>
-#include <openssl/sha.h>
 #include <openssl/rand.h>
+#include <openssl/sha.h>
 
 #include "base/assertion.h"
 #include "core/utils.h"
@@ -30,11 +30,11 @@ namespace openssl {
 
 class Context {
 public:
-	Context() : _data(BN_CTX_new()) {
-	}
+	Context()
+	    : _data(BN_CTX_new()) {}
 	Context(const Context &other) = delete;
-	Context(Context &&other) : _data(base::take(other._data)) {
-	}
+	Context(Context &&other)
+	    : _data(base::take(other._data)) {}
 	Context &operator=(const Context &other) = delete;
 	Context &operator=(Context &&other) {
 		_data = base::take(other._data);
@@ -52,14 +52,14 @@ public:
 
 private:
 	BN_CTX *_data = nullptr;
-
 };
 
 class BigNum {
 public:
-	BigNum() : _data(BN_new()) {
-	}
-	BigNum(const BigNum &other) : BigNum() {
+	BigNum()
+	    : _data(BN_new()) {}
+	BigNum(const BigNum &other)
+	    : BigNum() {
 		*this = other;
 	}
 	BigNum &operator=(const BigNum &other) {
@@ -72,10 +72,12 @@ public:
 		BN_clear_free(raw());
 	}
 
-	explicit BigNum(unsigned int word) : BigNum() {
+	explicit BigNum(unsigned int word)
+	    : BigNum() {
 		setWord(word);
 	}
-	explicit BigNum(base::const_byte_span bytes) : BigNum() {
+	explicit BigNum(base::const_byte_span bytes)
+	    : BigNum() {
 		setBytes(bytes);
 	}
 
@@ -85,18 +87,11 @@ public:
 		}
 	}
 	void setBytes(base::const_byte_span bytes) {
-		if (!BN_bin2bn(
-				reinterpret_cast<const unsigned char*>(bytes.data()),
-				bytes.size(),
-				raw())) {
+		if (!BN_bin2bn(reinterpret_cast<const unsigned char *>(bytes.data()), bytes.size(), raw())) {
 			_failed = true;
 		}
 	}
-	void setModExp(
-			const BigNum &a,
-			const BigNum &p,
-			const BigNum &m,
-			const Context &context = Context()) {
+	void setModExp(const BigNum &a, const BigNum &p, const BigNum &m, const Context &context = Context()) {
 		if (a.failed() || p.failed() || m.failed()) {
 			_failed = true;
 		} else if (a.isNegative() || p.isNegative() || m.isNegative()) {
@@ -143,11 +138,7 @@ public:
 			return false;
 		}
 		constexpr auto kMillerRabinIterationCount = 30;
-		auto result = BN_is_prime_ex(
-			raw(),
-			kMillerRabinIterationCount,
-			context.raw(),
-			NULL);
+		auto result = BN_is_prime_ex(raw(), kMillerRabinIterationCount, context.raw(), NULL);
 		if (result == 1) {
 			return true;
 		} else if (result != 0) {
@@ -182,9 +173,7 @@ public:
 		}
 		auto length = BN_num_bytes(raw());
 		auto result = base::byte_vector(length, gsl::byte());
-		auto resultSize = BN_bn2bin(
-			raw(),
-			reinterpret_cast<unsigned char*>(result.data()));
+		auto resultSize = BN_bn2bin(raw(), reinterpret_cast<unsigned char *>(result.data()));
 		Assert(resultSize == length);
 		return result;
 	}
@@ -212,7 +201,6 @@ public:
 private:
 	BIGNUM *_data = nullptr;
 	mutable bool _failed = false;
-
 };
 
 inline BigNum operator-(const BigNum &a, const BigNum &b) {
@@ -223,18 +211,20 @@ inline BigNum operator-(const BigNum &a, const BigNum &b) {
 
 inline base::byte_array<SHA256_DIGEST_LENGTH> Sha256(base::const_byte_span bytes) {
 	auto result = base::byte_array<SHA256_DIGEST_LENGTH>();
-	SHA256(reinterpret_cast<const unsigned char*>(bytes.data()), bytes.size(), reinterpret_cast<unsigned char*>(result.data()));
+	SHA256(reinterpret_cast<const unsigned char *>(bytes.data()), bytes.size(),
+	       reinterpret_cast<unsigned char *>(result.data()));
 	return result;
 }
 
 inline base::byte_array<SHA_DIGEST_LENGTH> Sha1(base::const_byte_span bytes) {
 	auto result = base::byte_array<SHA_DIGEST_LENGTH>();
-	SHA1(reinterpret_cast<const unsigned char*>(bytes.data()), bytes.size(), reinterpret_cast<unsigned char*>(result.data()));
+	SHA1(reinterpret_cast<const unsigned char *>(bytes.data()), bytes.size(),
+	     reinterpret_cast<unsigned char *>(result.data()));
 	return result;
 }
 
 inline int FillRandom(base::byte_span bytes) {
-	return RAND_bytes(reinterpret_cast<unsigned char*>(bytes.data()), bytes.size());
+	return RAND_bytes(reinterpret_cast<unsigned char *>(bytes.data()), bytes.size());
 }
 
 } // namespace openssl
diff --git a/Telegram/SourceFiles/base/optional.h b/Telegram/SourceFiles/base/optional.h
index 6f5ed9e1f..e04ef1a3c 100644
--- a/Telegram/SourceFiles/base/optional.h
+++ b/Telegram/SourceFiles/base/optional.h
@@ -44,23 +44,21 @@ struct none_type {
 	bool operator>=(none_type other) const {
 		return true;
 	}
-
 };
 
 constexpr none_type none = {};
 
-template <typename... Types>
-class optional_variant {
+template <typename... Types> class optional_variant {
 public:
-	optional_variant() : _impl(none) {
-	}
-	optional_variant(const optional_variant &other) : _impl(other._impl) {
-	}
-	optional_variant(optional_variant &&other) : _impl(std::move(other._impl)) {
-	}
+	optional_variant()
+	    : _impl(none) {}
+	optional_variant(const optional_variant &other)
+	    : _impl(other._impl) {}
+	optional_variant(optional_variant &&other)
+	    : _impl(std::move(other._impl)) {}
 	template <typename T, typename = std::enable_if_t<!std::is_base_of<optional_variant, std::decay_t<T>>::value>>
-	optional_variant(T &&value) : _impl(std::forward<T>(value)) {
-	}
+	optional_variant(T &&value)
+	    : _impl(std::forward<T>(value)) {}
 	optional_variant &operator=(const optional_variant &other) {
 		_impl = other._impl;
 		return *this;
@@ -97,65 +95,43 @@ public:
 		return _impl >= other._impl;
 	}
 
-	template <typename T>
-	decltype(auto) is() const {
+	template <typename T> decltype(auto) is() const {
 		return _impl.template is<T>();
 	}
-	template <typename T>
-	decltype(auto) get_unchecked() {
+	template <typename T> decltype(auto) get_unchecked() {
 		return _impl.template get_unchecked<T>();
 	}
-	template <typename T>
-	decltype(auto) get_unchecked() const {
+	template <typename T> decltype(auto) get_unchecked() const {
 		return _impl.template get_unchecked<T>();
 	}
 
 private:
 	variant<none_type, Types...> _impl;
-
 };
 
-template <typename T, typename... Types>
-inline T *get_if(optional_variant<Types...> *v) {
+template <typename T, typename... Types> inline T *get_if(optional_variant<Types...> *v) {
 	return (v && v->template is<T>()) ? &v->template get_unchecked<T>() : nullptr;
 }
 
-template <typename T, typename... Types>
-inline const T *get_if(const optional_variant<Types...> *v) {
+template <typename T, typename... Types> inline const T *get_if(const optional_variant<Types...> *v) {
 	return (v && v->template is<T>()) ? &v->template get_unchecked<T>() : nullptr;
 }
 
-template <typename Type>
-class optional;
+template <typename Type> class optional;
 
-template <typename Type>
-struct optional_wrap_once {
-	using type = optional<Type>;
-};
+template <typename Type> struct optional_wrap_once { using type = optional<Type>; };
 
-template <typename Type>
-struct optional_wrap_once<optional<Type>> {
-	using type = optional<Type>;
-};
+template <typename Type> struct optional_wrap_once<optional<Type>> { using type = optional<Type>; };
 
-template <typename Type>
-using optional_wrap_once_t = typename optional_wrap_once<std::decay_t<Type>>::type;
+template <typename Type> using optional_wrap_once_t = typename optional_wrap_once<std::decay_t<Type>>::type;
 
-template <typename Type>
-struct optional_chain_result {
-	using type = optional_wrap_once_t<Type>;
-};
+template <typename Type> struct optional_chain_result { using type = optional_wrap_once_t<Type>; };
 
-template <>
-struct optional_chain_result<void> {
-	using type = bool;
-};
+template <> struct optional_chain_result<void> { using type = bool; };
 
-template <typename Type>
-using optional_chain_result_t = typename optional_chain_result<Type>::type;
+template <typename Type> using optional_chain_result_t = typename optional_chain_result<Type>::type;
 
-template <typename Type>
-class optional : public optional_variant<Type> {
+template <typename Type> class optional : public optional_variant<Type> {
 public:
 	using optional_variant<Type>::optional_variant;
 
@@ -179,37 +155,28 @@ public:
 		Expects(result != nullptr);
 		return result;
 	}
-
 };
 
-template <typename Type>
-optional_wrap_once_t<Type> make_optional(Type &&value) {
-	return optional_wrap_once_t<Type> { std::forward<Type>(value) };
+template <typename Type> optional_wrap_once_t<Type> make_optional(Type &&value) {
+	return optional_wrap_once_t<Type>{std::forward<Type>(value)};
 }
 
 template <typename Type, typename Method>
-inline auto optional_chain(
-	const optional<Type> &value,
-	Method &method,
-	std::false_type)
--> optional_chain_result_t<decltype(method(*value))> {
+inline auto optional_chain(const optional<Type> &value, Method &method, std::false_type)
+    -> optional_chain_result_t<decltype(method(*value))> {
 	return value ? make_optional(method(*value)) : none;
 }
 
 template <typename Type, typename Method>
-inline auto optional_chain(
-	const optional<Type> &value,
-	Method &method,
-	std::true_type)
--> optional_chain_result_t<decltype(method(*value))> {
+inline auto optional_chain(const optional<Type> &value, Method &method, std::true_type)
+    -> optional_chain_result_t<decltype(method(*value))> {
 	return value ? (method(*value), true) : false;
 }
 
 template <typename Type, typename Method>
-inline auto operator|(const optional<Type> &value, Method method)
--> optional_chain_result_t<decltype(method(*value))> {
+inline auto operator|(const optional<Type> &value, Method method) -> optional_chain_result_t<decltype(method(*value))> {
 	using is_void_return = std::is_same<decltype(method(*value)), void>;
-	return optional_chain(value, method, is_void_return {});
+	return optional_chain(value, method, is_void_return{});
 }
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/ordered_set.h b/Telegram/SourceFiles/base/ordered_set.h
index 51c02c8ff..a643d916c 100644
--- a/Telegram/SourceFiles/base/ordered_set.h
+++ b/Telegram/SourceFiles/base/ordered_set.h
@@ -23,10 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <QMap>
 
 // ordered set template based on QMap
-template <typename T>
-class OrderedSet {
-	struct NullType {
-	};
+template <typename T> class OrderedSet {
+	struct NullType {};
 	using Self = OrderedSet<T>;
 	using Impl = QMap<T, NullType>;
 	using IteratorImpl = typename Impl::iterator;
@@ -41,16 +39,36 @@ public:
 	OrderedSet &operator=(OrderedSet &&other) = default;
 	~OrderedSet() = default;
 
-	inline bool operator==(const Self &other) const { return impl_ == other.impl_; }
-	inline bool operator!=(const Self &other) const { return impl_ != other.impl_; }
-	inline int size() const { return impl_.size(); }
-	inline bool isEmpty() const { return impl_.isEmpty(); }
-	inline void detach() { return impl_.detach(); }
-	inline bool isDetached() const { return impl_.isDetached(); }
-	inline void clear() { return impl_.clear(); }
-	inline QList<T> values() const { return impl_.keys(); }
-	inline const T &first() const { return impl_.firstKey(); }
-	inline const T &last() const { return impl_.lastKey(); }
+	inline bool operator==(const Self &other) const {
+		return impl_ == other.impl_;
+	}
+	inline bool operator!=(const Self &other) const {
+		return impl_ != other.impl_;
+	}
+	inline int size() const {
+		return impl_.size();
+	}
+	inline bool isEmpty() const {
+		return impl_.isEmpty();
+	}
+	inline void detach() {
+		return impl_.detach();
+	}
+	inline bool isDetached() const {
+		return impl_.isDetached();
+	}
+	inline void clear() {
+		return impl_.clear();
+	}
+	inline QList<T> values() const {
+		return impl_.keys();
+	}
+	inline const T &first() const {
+		return impl_.firstKey();
+	}
+	inline const T &last() const {
+		return impl_.lastKey();
+	}
 
 	class const_iterator;
 	class iterator {
@@ -64,29 +82,60 @@ public:
 		iterator() = default;
 		iterator(const iterator &other) = default;
 		iterator &operator=(const iterator &other) = default;
-		inline const T &operator*() const { return impl_.key(); }
-		inline const T *operator->() const { return &impl_.key(); }
-		inline bool operator==(const iterator &other) const { return impl_ == other.impl_; }
-		inline bool operator!=(const iterator &other) const { return impl_ != other.impl_; }
-		inline iterator &operator++() { ++impl_; return *this; }
-		inline iterator operator++(int) { return iterator(impl_++); }
-		inline iterator &operator--() { --impl_; return *this; }
-		inline iterator operator--(int) { return iterator(impl_--); }
-		inline iterator operator+(int j) const { return iterator(impl_ + j); }
-		inline iterator operator-(int j) const { return iterator(impl_ - j); }
-		inline iterator &operator+=(int j) { impl_ += j; return *this; }
-		inline iterator &operator-=(int j) { impl_ -= j; return *this; }
+		inline const T &operator*() const {
+			return impl_.key();
+		}
+		inline const T *operator->() const {
+			return &impl_.key();
+		}
+		inline bool operator==(const iterator &other) const {
+			return impl_ == other.impl_;
+		}
+		inline bool operator!=(const iterator &other) const {
+			return impl_ != other.impl_;
+		}
+		inline iterator &operator++() {
+			++impl_;
+			return *this;
+		}
+		inline iterator operator++(int) {
+			return iterator(impl_++);
+		}
+		inline iterator &operator--() {
+			--impl_;
+			return *this;
+		}
+		inline iterator operator--(int) {
+			return iterator(impl_--);
+		}
+		inline iterator operator+(int j) const {
+			return iterator(impl_ + j);
+		}
+		inline iterator operator-(int j) const {
+			return iterator(impl_ - j);
+		}
+		inline iterator &operator+=(int j) {
+			impl_ += j;
+			return *this;
+		}
+		inline iterator &operator-=(int j) {
+			impl_ -= j;
+			return *this;
+		}
 
 		friend class const_iterator;
-		inline bool operator==(const const_iterator &other) const { return impl_ == other.impl_; }
-		inline bool operator!=(const const_iterator &other) const { return impl_ != other.impl_; }
+		inline bool operator==(const const_iterator &other) const {
+			return impl_ == other.impl_;
+		}
+		inline bool operator!=(const const_iterator &other) const {
+			return impl_ != other.impl_;
+		}
 
 	private:
-		explicit iterator(const IteratorImpl &impl) : impl_(impl) {
-		}
+		explicit iterator(const IteratorImpl &impl)
+		    : impl_(impl) {}
 		IteratorImpl impl_;
 		friend class OrderedSet<T>;
-
 	};
 	friend class iterator;
 
@@ -101,66 +150,136 @@ public:
 		const_iterator() = default;
 		const_iterator(const const_iterator &other) = default;
 		const_iterator &operator=(const const_iterator &other) = default;
-		const_iterator(const iterator &other) : impl_(other.impl_) {
-		}
+		const_iterator(const iterator &other)
+		    : impl_(other.impl_) {}
 		const_iterator &operator=(const iterator &other) {
 			impl_ = other.impl_;
 			return *this;
 		}
-		inline const T &operator*() const { return impl_.key(); }
-		inline const T *operator->() const { return &impl_.key(); }
-		inline bool operator==(const const_iterator &other) const { return impl_ == other.impl_; }
-		inline bool operator!=(const const_iterator &other) const { return impl_ != other.impl_; }
-		inline const_iterator &operator++() { ++impl_; return *this; }
-		inline const_iterator operator++(int) { return const_iterator(impl_++); }
-		inline const_iterator &operator--() { --impl_; return *this; }
-		inline const_iterator operator--(int) { return const_iterator(impl_--); }
-		inline const_iterator operator+(int j) const { return const_iterator(impl_ + j); }
-		inline const_iterator operator-(int j) const { return const_iterator(impl_ - j); }
-		inline const_iterator &operator+=(int j) { impl_ += j; return *this; }
-		inline const_iterator &operator-=(int j) { impl_ -= j; return *this; }
+		inline const T &operator*() const {
+			return impl_.key();
+		}
+		inline const T *operator->() const {
+			return &impl_.key();
+		}
+		inline bool operator==(const const_iterator &other) const {
+			return impl_ == other.impl_;
+		}
+		inline bool operator!=(const const_iterator &other) const {
+			return impl_ != other.impl_;
+		}
+		inline const_iterator &operator++() {
+			++impl_;
+			return *this;
+		}
+		inline const_iterator operator++(int) {
+			return const_iterator(impl_++);
+		}
+		inline const_iterator &operator--() {
+			--impl_;
+			return *this;
+		}
+		inline const_iterator operator--(int) {
+			return const_iterator(impl_--);
+		}
+		inline const_iterator operator+(int j) const {
+			return const_iterator(impl_ + j);
+		}
+		inline const_iterator operator-(int j) const {
+			return const_iterator(impl_ - j);
+		}
+		inline const_iterator &operator+=(int j) {
+			impl_ += j;
+			return *this;
+		}
+		inline const_iterator &operator-=(int j) {
+			impl_ -= j;
+			return *this;
+		}
 
 		friend class iterator;
-		inline bool operator==(const iterator &other) const { return impl_ == other.impl_; }
-		inline bool operator!=(const iterator &other) const { return impl_ != other.impl_; }
+		inline bool operator==(const iterator &other) const {
+			return impl_ == other.impl_;
+		}
+		inline bool operator!=(const iterator &other) const {
+			return impl_ != other.impl_;
+		}
 
 	private:
-		explicit const_iterator(const ConstIteratorImpl &impl) : impl_(impl) {
-		}
+		explicit const_iterator(const ConstIteratorImpl &impl)
+		    : impl_(impl) {}
 		ConstIteratorImpl impl_;
 		friend class OrderedSet<T>;
-
 	};
 	friend class const_iterator;
 
 	// STL style
-	inline iterator begin() { return iterator(impl_.begin()); }
-	inline const_iterator begin() const { return const_iterator(impl_.cbegin()); }
-	inline const_iterator constBegin() const { return const_iterator(impl_.cbegin()); }
-	inline const_iterator cbegin() const { return const_iterator(impl_.cbegin()); }
-	inline iterator end() { detach(); return iterator(impl_.end()); }
-	inline const_iterator end() const { return const_iterator(impl_.cend()); }
-	inline const_iterator constEnd() const { return const_iterator(impl_.cend()); }
-	inline const_iterator cend() const { return const_iterator(impl_.cend()); }
-	inline iterator erase(iterator it) { return iterator(impl_.erase(it.impl_)); }
+	inline iterator begin() {
+		return iterator(impl_.begin());
+	}
+	inline const_iterator begin() const {
+		return const_iterator(impl_.cbegin());
+	}
+	inline const_iterator constBegin() const {
+		return const_iterator(impl_.cbegin());
+	}
+	inline const_iterator cbegin() const {
+		return const_iterator(impl_.cbegin());
+	}
+	inline iterator end() {
+		detach();
+		return iterator(impl_.end());
+	}
+	inline const_iterator end() const {
+		return const_iterator(impl_.cend());
+	}
+	inline const_iterator constEnd() const {
+		return const_iterator(impl_.cend());
+	}
+	inline const_iterator cend() const {
+		return const_iterator(impl_.cend());
+	}
+	inline iterator erase(iterator it) {
+		return iterator(impl_.erase(it.impl_));
+	}
 
-	inline iterator insert(const T &value) { return iterator(impl_.insert(value, NullType())); }
-	inline iterator insert(const_iterator pos, const T &value) { return iterator(impl_.insert(pos.impl_, value, NullType())); }
-	inline int remove(const T &value) { return impl_.remove(value); }
-	inline bool contains(const T &value) const { return impl_.contains(value); }
+	inline iterator insert(const T &value) {
+		return iterator(impl_.insert(value, NullType()));
+	}
+	inline iterator insert(const_iterator pos, const T &value) {
+		return iterator(impl_.insert(pos.impl_, value, NullType()));
+	}
+	inline int remove(const T &value) {
+		return impl_.remove(value);
+	}
+	inline bool contains(const T &value) const {
+		return impl_.contains(value);
+	}
 
 	// more Qt
 	typedef iterator Iterator;
 	typedef const_iterator ConstIterator;
-	inline int count() const { return impl_.count(); }
-	inline iterator find(const T &value) { return iterator(impl_.find(value)); }
-	inline const_iterator find(const T &value) const { return const_iterator(impl_.constFind(value)); }
-	inline const_iterator constFind(const T &value) const { return const_iterator(impl_.constFind(value)); }
-	inline Self &unite(const Self &other) { impl_.unite(other.impl_); return *this; }
+	inline int count() const {
+		return impl_.count();
+	}
+	inline iterator find(const T &value) {
+		return iterator(impl_.find(value));
+	}
+	inline const_iterator find(const T &value) const {
+		return const_iterator(impl_.constFind(value));
+	}
+	inline const_iterator constFind(const T &value) const {
+		return const_iterator(impl_.constFind(value));
+	}
+	inline Self &unite(const Self &other) {
+		impl_.unite(other.impl_);
+		return *this;
+	}
 
 	// STL compatibility
 	typedef typename Impl::difference_type difference_type;
 	typedef typename Impl::size_type size_type;
-	inline bool empty() const { return impl_.empty(); }
-
+	inline bool empty() const {
+		return impl_.empty();
+	}
 };
diff --git a/Telegram/SourceFiles/base/parse_helper.h b/Telegram/SourceFiles/base/parse_helper.h
index 7b1b553a9..5e7bb9c84 100644
--- a/Telegram/SourceFiles/base/parse_helper.h
+++ b/Telegram/SourceFiles/base/parse_helper.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/assertion.h"
 #include <QByteArray>
 #include <QLatin1String>
-#include "base/assertion.h"
 
 
 namespace base {
@@ -33,11 +33,7 @@ QByteArray stripComments(const QByteArray &content);
 
 inline bool skipWhitespaces(const char *&from, const char *end) {
 	Assert(from <= end);
-	while (from != end && (
-		(*from == ' ') ||
-		(*from == '\n') ||
-		(*from == '\t') ||
-		(*from == '\r'))) {
+	while (from != end && ((*from == ' ') || (*from == '\n') || (*from == '\t') || (*from == '\r'))) {
 		++from;
 	}
 	return (from != end);
@@ -46,11 +42,8 @@ inline bool skipWhitespaces(const char *&from, const char *end) {
 inline QLatin1String readName(const char *&from, const char *end) {
 	Assert(from <= end);
 	auto start = from;
-	while (from != end && (
-		(*from >= 'a' && *from <= 'z') ||
-		(*from >= 'A' && *from <= 'Z') ||
-		(*from >= '0' && *from <= '9') ||
-		(*from == '_'))) {
+	while (from != end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') ||
+	                       (*from >= '0' && *from <= '9') || (*from == '_'))) {
 		++from;
 	}
 	return QLatin1String(start, from - start);
diff --git a/Telegram/SourceFiles/base/qthelp_regex.h b/Telegram/SourceFiles/base/qthelp_regex.h
index 398503483..e47ebff81 100644
--- a/Telegram/SourceFiles/base/qthelp_regex.h
+++ b/Telegram/SourceFiles/base/qthelp_regex.h
@@ -30,10 +30,10 @@ class RegularExpressionMatch {
 public:
 	RegularExpressionMatch(const QRegularExpressionMatch &other) = delete;
 	RegularExpressionMatch(const RegularExpressionMatch &other) = delete;
-	RegularExpressionMatch(QRegularExpressionMatch &&match) : data_(std::move(match)) {
-	}
-	RegularExpressionMatch(RegularExpressionMatch &&other) : data_(std::move(other.data_)) {
-	}
+	RegularExpressionMatch(QRegularExpressionMatch &&match)
+	    : data_(std::move(match)) {}
+	RegularExpressionMatch(RegularExpressionMatch &&other)
+	    : data_(std::move(other.data_)) {}
 	RegularExpressionMatch &operator=(const QRegularExpressionMatch &match) = delete;
 	RegularExpressionMatch &operator=(const RegularExpressionMatch &other) = delete;
 	RegularExpressionMatch &operator=(QRegularExpressionMatch &&match) {
@@ -56,7 +56,6 @@ public:
 
 private:
 	QRegularExpressionMatch data_;
-
 };
 
 enum class RegExOption {
@@ -74,14 +73,17 @@ enum class RegExOption {
 #endif // OS_MAC_OLD
 };
 using RegExOptions = base::flags<RegExOption>;
-inline constexpr auto is_flag_type(RegExOption) { return true; };
+inline constexpr auto is_flag_type(RegExOption) {
+	return true;
+};
 
 inline RegularExpressionMatch regex_match(const QString &string, const QString &subject, RegExOptions options = 0) {
 	auto qtOptions = QRegularExpression::PatternOptions(static_cast<int>(options));
 	return RegularExpressionMatch(QRegularExpression(string, qtOptions).match(subject));
 }
 
-inline RegularExpressionMatch regex_match(const QString &string, const QStringRef &subjectRef, RegExOptions options = 0) {
+inline RegularExpressionMatch regex_match(const QString &string, const QStringRef &subjectRef,
+                                          RegExOptions options = 0) {
 	auto qtOptions = QRegularExpression::PatternOptions(static_cast<int>(options));
 #ifndef OS_MAC_OLD
 	return RegularExpressionMatch(QRegularExpression(string, qtOptions).match(subjectRef));
diff --git a/Telegram/SourceFiles/base/qthelp_url.cpp b/Telegram/SourceFiles/base/qthelp_url.cpp
index 4f04c013a..8db9ab5ef 100644
--- a/Telegram/SourceFiles/base/qthelp_url.cpp
+++ b/Telegram/SourceFiles/base/qthelp_url.cpp
@@ -18,9 +18,9 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QStringList>
-#include "core/utils.h"
 #include "base/qthelp_url.h"
+#include "core/utils.h"
+#include <QStringList>
 
 namespace qthelp {
 
@@ -34,7 +34,7 @@ QMap<QString, QString> url_parse_params(const QString &params, UrlParamNameTrans
 		return name;
 	};
 
-    auto paramsList = params.split('&');
+	auto paramsList = params.split('&');
 	for_const (auto &param, paramsList) {
 		// Skip params without a name (starting with '=').
 		if (auto separatorPosition = param.indexOf('=')) {
diff --git a/Telegram/SourceFiles/base/qthelp_url.h b/Telegram/SourceFiles/base/qthelp_url.h
index de86b77f3..33fbcaf39 100644
--- a/Telegram/SourceFiles/base/qthelp_url.h
+++ b/Telegram/SourceFiles/base/qthelp_url.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include <QMap>
 #include <QString>
 #include <QUrl>
-#include <QMap>
 
 namespace qthelp {
 
@@ -39,6 +39,7 @@ enum class UrlParamNameTransform {
 	ToLower,
 };
 // Parses a string like "p1=v1&p2=v2&..&pn=vn" to a map.
-QMap<QString, QString> url_parse_params(const QString &params, UrlParamNameTransform transform = UrlParamNameTransform::NoTransform);
+QMap<QString, QString> url_parse_params(const QString &params,
+                                        UrlParamNameTransform transform = UrlParamNameTransform::NoTransform);
 
 } // namespace qthelp
diff --git a/Telegram/SourceFiles/base/runtime_composer.cpp b/Telegram/SourceFiles/base/runtime_composer.cpp
index 2abbe86d6..5a5a3c933 100644
--- a/Telegram/SourceFiles/base/runtime_composer.cpp
+++ b/Telegram/SourceFiles/base/runtime_composer.cpp
@@ -18,15 +18,13 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QMutexLocker>
 #include "base/runtime_composer.h"
+#include <QMutexLocker>
 
 struct RuntimeComposerMetadatasMap {
-	QMap<quint64, RuntimeComposerMetadata*> data;
+	QMap<quint64, RuntimeComposerMetadata *> data;
 	~RuntimeComposerMetadatasMap() {
-		for_const (const RuntimeComposerMetadata *p, data) {
-			delete p;
-		}
+		for_const (const RuntimeComposerMetadata *p, data) { delete p; }
 	}
 };
 
diff --git a/Telegram/SourceFiles/base/runtime_composer.h b/Telegram/SourceFiles/base/runtime_composer.h
index 4af9ba0cd..b209be614 100644
--- a/Telegram/SourceFiles/base/runtime_composer.h
+++ b/Telegram/SourceFiles/base/runtime_composer.h
@@ -19,28 +19,28 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
-#include <cstddef>
 #include <QAtomicInt>
+#include <cstddef>
 
 #include "base/assertion.h"
 #include "core/utils.h"
 
 class RuntimeComposer;
-typedef void(*RuntimeComponentConstruct)(void *location, RuntimeComposer *composer);
-typedef void(*RuntimeComponentDestruct)(void *location);
-typedef void(*RuntimeComponentMove)(void *location, void *waslocation);
+typedef void (*RuntimeComponentConstruct)(void *location, RuntimeComposer *composer);
+typedef void (*RuntimeComponentDestruct)(void *location);
+typedef void (*RuntimeComponentMove)(void *location, void *waslocation);
 
 struct RuntimeComponentWrapStruct {
 	// Don't init any fields, because it is only created in
 	// global scope, so it will be filled by zeros from the start.
 	RuntimeComponentWrapStruct() = default;
-	RuntimeComponentWrapStruct(std::size_t size, std::size_t align, RuntimeComponentConstruct construct, RuntimeComponentDestruct destruct, RuntimeComponentMove move)
-		: Size(size)
-		, Align(align)
-		, Construct(construct)
-		, Destruct(destruct)
-		, Move(move) {
-	}
+	RuntimeComponentWrapStruct(std::size_t size, std::size_t align, RuntimeComponentConstruct construct,
+	                           RuntimeComponentDestruct destruct, RuntimeComponentMove move)
+	    : Size(size)
+	    , Align(align)
+	    , Construct(construct)
+	    , Destruct(destruct)
+	    , Move(move) {}
 	std::size_t Size;
 	std::size_t Align;
 	RuntimeComponentConstruct Construct;
@@ -48,16 +48,14 @@ struct RuntimeComponentWrapStruct {
 	RuntimeComponentMove Move;
 };
 
-template <int Value, int Denominator>
-struct CeilDivideMinimumOne {
+template <int Value, int Denominator> struct CeilDivideMinimumOne {
 	static constexpr int Result = ((Value / Denominator) + ((!Value || (Value % Denominator)) ? 1 : 0));
 };
 
 extern RuntimeComponentWrapStruct RuntimeComponentWraps[64];
 extern QAtomicInt RuntimeComponentIndexLast;
 
-template <typename Type>
-struct RuntimeComponent {
+template <typename Type> struct RuntimeComponent {
 	RuntimeComponent() {
 		// While there is no std::aligned_alloc().
 		static_assert(alignof(Type) <= alignof(std::max_align_t), "Components should align to std::max_align_t!");
@@ -77,12 +75,9 @@ struct RuntimeComponent {
 			if (RuntimeComponentIndexLast.testAndSetOrdered(last, last + 1)) {
 				Assert(last < 64);
 				if (MyIndex.testAndSetOrdered(0, last + 1)) {
-					RuntimeComponentWraps[last] = RuntimeComponentWrapStruct(
-						sizeof(Type),
-						alignof(Type),
-						Type::RuntimeComponentConstruct,
-						Type::RuntimeComponentDestruct,
-						Type::RuntimeComponentMove);
+					RuntimeComponentWraps[last] =
+					    RuntimeComponentWrapStruct(sizeof(Type), alignof(Type), Type::RuntimeComponentConstruct,
+					                               Type::RuntimeComponentDestruct, Type::RuntimeComponentMove);
 				}
 				break;
 			}
@@ -98,17 +93,17 @@ protected:
 		new (location) Type();
 	}
 	static void RuntimeComponentDestruct(void *location) {
-		((Type*)location)->~Type();
+		((Type *)location)->~Type();
 	}
 	static void RuntimeComponentMove(void *location, void *waslocation) {
-		*(Type*)location = std::move(*(Type*)waslocation);
+		*(Type *)location = std::move(*(Type *)waslocation);
 	}
-
 };
 
 class RuntimeComposerMetadata {
 public:
-	RuntimeComposerMetadata(quint64 mask) : _mask(mask) {
+	RuntimeComposerMetadata(quint64 mask)
+	    : _mask(mask) {
 		for (int i = 0; i != 64; ++i) {
 			auto componentBit = (1ULL << i);
 			if (_mask & componentBit) {
@@ -130,9 +125,9 @@ public:
 	}
 
 	// Meta pointer in the start.
-	std::size_t size = sizeof(const RuntimeComposerMetadata*);
-	std::size_t align = alignof(const RuntimeComposerMetadata*);
-	std::size_t offsets[64] = { 0 };
+	std::size_t size = sizeof(const RuntimeComposerMetadata *);
+	std::size_t align = alignof(const RuntimeComposerMetadata *);
+	std::size_t offsets[64] = {0};
 	int last = 64;
 
 	bool equals(quint64 mask) const {
@@ -147,14 +142,14 @@ public:
 
 private:
 	quint64 _mask;
-
 };
 
 const RuntimeComposerMetadata *GetRuntimeComposerMetadata(quint64 mask);
 
 class RuntimeComposer {
 public:
-	RuntimeComposer(quint64 mask = 0) : _data(zerodata()) {
+	RuntimeComposer(quint64 mask = 0)
+	    : _data(zerodata()) {
 		if (mask) {
 			auto meta = GetRuntimeComposerMetadata(mask);
 
@@ -202,18 +197,15 @@ public:
 		}
 	}
 
-	template <typename Type>
-	bool Has() const {
+	template <typename Type> bool Has() const {
 		return (_meta()->offsets[Type::Index()] >= sizeof(_meta()));
 	}
 
-	template <typename Type>
-	Type *Get() {
-		return static_cast<Type*>(_dataptr(_meta()->offsets[Type::Index()]));
+	template <typename Type> Type *Get() {
+		return static_cast<Type *>(_dataptr(_meta()->offsets[Type::Index()]));
 	}
-	template <typename Type>
-	const Type *Get() const {
-		return static_cast<const Type*>(_dataptr(_meta()->offsets[Type::Index()]));
+	template <typename Type> const Type *Get() const {
+		return static_cast<const Type *>(_dataptr(_meta()->offsets[Type::Index()]));
 	}
 
 protected:
@@ -247,18 +239,17 @@ private:
 	}
 
 	void *_dataptrunsafe(size_t skip) const {
-		return (char*)_data + skip;
+		return (char *)_data + skip;
 	}
 	void *_dataptr(size_t skip) const {
 		return (skip >= sizeof(_meta())) ? _dataptrunsafe(skip) : nullptr;
 	}
 	const RuntimeComposerMetadata *&_meta() const {
-		return *static_cast<const RuntimeComposerMetadata**>(_data);
+		return *static_cast<const RuntimeComposerMetadata **>(_data);
 	}
 	void *_data = nullptr;
 
 	void swap(RuntimeComposer &other) {
 		std::swap(_data, other._data);
 	}
-
 };
diff --git a/Telegram/SourceFiles/base/task_queue.cpp b/Telegram/SourceFiles/base/task_queue.cpp
index c54ae16db..a9d73583f 100644
--- a/Telegram/SourceFiles/base/task_queue.cpp
+++ b/Telegram/SourceFiles/base/task_queue.cpp
@@ -19,14 +19,14 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 
-#include <algorithm>
-#include <thread>
-#include <condition_variable>
+#include "base/task_queue.h"
+#include "base/assertion.h"
+#include "facades.h"
 #include <QMutex>
 #include <QWaitCondition>
-#include "base/assertion.h"
-#include "base/task_queue.h"
-#include "facades.h"
+#include <algorithm>
+#include <condition_variable>
+#include <thread>
 
 namespace base {
 namespace {
@@ -51,20 +51,22 @@ private:
 	void Insert(TaskQueue *queue, int list_index_);
 	void Remove(TaskQueue *queue, int list_index_);
 
-	TaskQueue *Tail() { return &tail_; }
-	const TaskQueue *Tail() const { return &tail_; }
+	TaskQueue *Tail() {
+		return &tail_;
+	}
+	const TaskQueue *Tail() const {
+		return &tail_;
+	}
 
-	TaskQueue tail_ = { Type::Special, Priority::Normal };
+	TaskQueue tail_ = {Type::Special, Priority::Normal};
 	TaskQueue *(lists_[kQueuesListsCount]);
-
 };
 
 class TaskQueue::TaskThreadPool {
-	struct Private {
-	};
+	struct Private {};
 
 public:
-	TaskThreadPool(const Private &) { }
+	TaskThreadPool(const Private &) {}
 	static const std::shared_ptr<TaskThreadPool> &Instance();
 
 	void AddQueueTask(TaskQueue *queue, Task &&task);
@@ -85,7 +87,6 @@ private:
 	bool stopped_ = false;
 	int tasks_in_process_ = 0;
 	int background_tasks_in_process_ = 0;
-
 };
 
 TaskQueue::TaskQueueList::TaskQueueList() {
@@ -175,7 +176,7 @@ TaskQueue *TaskQueue::TaskQueueList::TakeFirst(int list_index_) {
 
 	auto queue = lists_[list_index_];
 	Unregister(queue);
-//	log_msgs.push_back("Unregistered from list in TakeFirst");
+	//	log_msgs.push_back("Unregistered from list in TakeFirst");
 	return queue;
 }
 
@@ -195,9 +196,7 @@ void TaskQueue::TaskThreadPool::AddQueueTask(TaskQueue *queue, Task &&task) {
 		}
 	}
 	if (will_create_thread) {
-		threads_.emplace_back([this]() {
-			ThreadFunction();
-		});
+		threads_.emplace_back([this]() { ThreadFunction(); });
 	} else if (some_threads_are_vacant) {
 		Assert(threads_count > tasks_in_process_);
 		thread_condition_.wakeOne();
@@ -309,8 +308,8 @@ void TaskQueue::TaskThreadPool::ThreadFunction() {
 }
 
 TaskQueue::TaskQueue(Type type, Priority priority)
-: type_(type)
-, priority_(priority) {
+    : type_(type)
+    , priority_(priority) {
 	if (type_ != Type::Main && type_ != Type::Special) {
 		weak_thread_pool_ = TaskThreadPool::Instance();
 	}
@@ -381,17 +380,17 @@ bool TaskQueue::IsMyThread() const {
 
 // Default queues.
 TaskQueue &TaskQueue::Main() { // static
-	static TaskQueue MainQueue { Type::Main, Priority::Normal };
+	static TaskQueue MainQueue{Type::Main, Priority::Normal};
 	return MainQueue;
 }
 
 TaskQueue &TaskQueue::Normal() { // static
-	static TaskQueue NormalQueue { Type::Concurrent, Priority::Normal };
+	static TaskQueue NormalQueue{Type::Concurrent, Priority::Normal};
 	return NormalQueue;
 }
 
 TaskQueue &TaskQueue::Background() { // static
-	static TaskQueue BackgroundQueue { Type::Concurrent, Priority::Background };
+	static TaskQueue BackgroundQueue{Type::Concurrent, Priority::Background};
 	return BackgroundQueue;
 }
 
diff --git a/Telegram/SourceFiles/base/task_queue.h b/Telegram/SourceFiles/base/task_queue.h
index 00425b9ad..7699fee99 100644
--- a/Telegram/SourceFiles/base/task_queue.h
+++ b/Telegram/SourceFiles/base/task_queue.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <deque>
-#include <QMutex>
 #include "base/lambda.h"
 #include "base/timer.h"
+#include <QMutex>
+#include <deque>
+#include <memory>
 
 namespace base {
 
@@ -47,8 +47,8 @@ public:
 	};
 
 	// Creating custom serial queues.
-	TaskQueue(Priority priority) : TaskQueue(Type::Serial, priority) {
-	}
+	TaskQueue(Priority priority)
+	    : TaskQueue(Type::Serial, priority) {}
 
 	// Default main and two concurrent queues.
 	static TaskQueue &Main();
@@ -100,7 +100,6 @@ private:
 
 	// Only for Serial queues: non-null value means a task is currently processed.
 	bool *destroyed_flag_ = nullptr;
-
 };
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/tests/flags_tests.cpp b/Telegram/SourceFiles/base/tests/flags_tests.cpp
index bed795d2e..a9d596580 100644
--- a/Telegram/SourceFiles/base/tests/flags_tests.cpp
+++ b/Telegram/SourceFiles/base/tests/flags_tests.cpp
@@ -25,8 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace MethodNamespace {
 
-template <typename Enum>
-void TestFlags(Enum a, Enum b, Enum c) {
+template <typename Enum> void TestFlags(Enum a, Enum b, Enum c) {
 	auto abc = a | b;
 	abc |= c;
 	auto test = abc != a;
@@ -66,7 +65,9 @@ enum class Flag : int {
 	two = (1 << 1),
 	three = (1 << 2),
 };
-inline constexpr auto is_flag_type(Flag) { return true; }
+inline constexpr auto is_flag_type(Flag) {
+	return true;
+}
 
 class Class {
 public:
@@ -75,7 +76,9 @@ public:
 		two = (1 << 1),
 		three = (1 << 0),
 	};
-	friend inline constexpr auto is_flag_type(Public) { return true; }
+	friend inline constexpr auto is_flag_type(Public) {
+		return true;
+	}
 
 	static void TestPrivate();
 
@@ -85,8 +88,9 @@ private:
 		two = (1 << 1),
 		three = (1 << 2),
 	};
-	friend inline constexpr auto is_flag_type(Private) { return true; }
-
+	friend inline constexpr auto is_flag_type(Private) {
+		return true;
+	}
 };
 
 void Class::TestPrivate() {
@@ -107,34 +111,24 @@ enum class Flag : int {
 
 namespace base {
 
-template<>
-struct extended_flags<ExtendedNamespace::Flag> {
-	using type = FlagsNamespace::Flag;
-};
+template <> struct extended_flags<ExtendedNamespace::Flag> { using type = FlagsNamespace::Flag; };
 
 } // namespace base
 
 TEST_CASE("flags operators on scoped enums", "[flags]") {
 	SECTION("testing non-member flags") {
-		MethodNamespace::TestFlags(
-			FlagsNamespace::Flag::one,
-			FlagsNamespace::Flag::two,
-			FlagsNamespace::Flag::three);
+		MethodNamespace::TestFlags(FlagsNamespace::Flag::one, FlagsNamespace::Flag::two, FlagsNamespace::Flag::three);
 	}
 	SECTION("testing public member flags") {
-		MethodNamespace::TestFlags(
-			FlagsNamespace::Class::Public::one,
-			FlagsNamespace::Class::Public::two,
-			FlagsNamespace::Class::Public::three);
+		MethodNamespace::TestFlags(FlagsNamespace::Class::Public::one, FlagsNamespace::Class::Public::two,
+		                           FlagsNamespace::Class::Public::three);
 	}
 	SECTION("testing private member flags") {
 		FlagsNamespace::Class::TestPrivate();
 	}
 	SECTION("testing extended flags") {
-		MethodNamespace::TestFlags(
-			ExtendedNamespace::Flag::one,
-			ExtendedNamespace::Flag::two,
-			ExtendedNamespace::Flag::three);
+		MethodNamespace::TestFlags(ExtendedNamespace::Flag::one, ExtendedNamespace::Flag::two,
+		                           ExtendedNamespace::Flag::three);
 
 		auto onetwo = FlagsNamespace::Flag::one | ExtendedNamespace::Flag::two;
 		auto twoone = ExtendedNamespace::Flag::two | FlagsNamespace::Flag::one;
diff --git a/Telegram/SourceFiles/base/timer.cpp b/Telegram/SourceFiles/base/timer.cpp
index c590c5c78..7798a93d1 100644
--- a/Telegram/SourceFiles/base/timer.cpp
+++ b/Telegram/SourceFiles/base/timer.cpp
@@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QTimerEvent>
 #include "base/timer.h"
+#include <QTimerEvent>
 
 namespace base {
 namespace {
@@ -31,10 +31,11 @@ QObject *TimersAdjuster() {
 
 } // namespace
 
-Timer::Timer(base::lambda<void()> callback) : QObject(nullptr)
-, _callback(std::move(callback))
-, _type(Qt::PreciseTimer)
-, _adjusted(false) {
+Timer::Timer(base::lambda<void()> callback)
+    : QObject(nullptr)
+    , _callback(std::move(callback))
+    , _type(Qt::PreciseTimer)
+    , _adjusted(false) {
 	setRepeat(Repeat::Interval);
 	connect(TimersAdjuster(), &QObject::destroyed, this, [this] { adjust(); }, Qt::QueuedConnection);
 }
diff --git a/Telegram/SourceFiles/base/timer.h b/Telegram/SourceFiles/base/timer.h
index c4882cd38..489f045f6 100644
--- a/Telegram/SourceFiles/base/timer.h
+++ b/Telegram/SourceFiles/base/timer.h
@@ -70,7 +70,7 @@ protected:
 
 private:
 	enum class Repeat : unsigned {
-		Interval   = 0,
+		Interval = 0,
 		SingleShot = 1,
 	};
 	void start(TimeMs timeout, Qt::TimerType type, Repeat repeat);
@@ -94,7 +94,6 @@ private:
 	Qt::TimerType _type : 2;
 	bool _adjusted : 1;
 	unsigned _repeat : 1;
-
 };
 
 class DelayedCallTimer final : private QObject {
@@ -111,7 +110,6 @@ protected:
 
 private:
 	std::map<int, lambda_once<void()>> _callbacks; // Better to use flatmap.
-
 };
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/type_traits.h b/Telegram/SourceFiles/base/type_traits.h
index b2c779686..9271403c7 100644
--- a/Telegram/SourceFiles/base/type_traits.h
+++ b/Telegram/SourceFiles/base/type_traits.h
@@ -24,9 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace base {
 
-template <typename T>
-struct custom_is_fast_copy_type : public std::false_type {
-};
+template <typename T> struct custom_is_fast_copy_type : public std::false_type {};
 // To make your own type a fast copy type just write:
 // template <>
 // struct base::custom_is_fast_copy_type<MyTinyType> : public std::true_type {
@@ -34,28 +32,24 @@ struct custom_is_fast_copy_type : public std::false_type {
 
 namespace internal {
 
-template <typename ...Types>
-struct type_list_contains;
+template <typename... Types> struct type_list_contains;
 
-template <typename T>
-struct type_list_contains<T> : public std::false_type {
-};
+template <typename T> struct type_list_contains<T> : public std::false_type {};
 
-template <typename T, typename Head, typename ...Types>
-struct type_list_contains<T, Head, Types...> : public std::integral_constant<bool, std::is_same<Head, T>::value || type_list_contains<T, Types...>::value> {
-};
+template <typename T, typename Head, typename... Types>
+struct type_list_contains<T, Head, Types...>
+    : public std::integral_constant<bool, std::is_same<Head, T>::value || type_list_contains<T, Types...>::value> {};
 
 template <typename T>
 using is_std_unsigned_int = type_list_contains<T, unsigned char, unsigned short int, unsigned int, unsigned long int>;
 
-template <typename T>
-using is_std_signed_int = type_list_contains<T, signed char, short int, int, long int>;
+template <typename T> using is_std_signed_int = type_list_contains<T, signed char, short int, int, long int>;
 
 template <typename T>
-using is_std_integral = std::integral_constant<bool, is_std_unsigned_int<T>::value || is_std_signed_int<T>::value || type_list_contains<T, bool, char, wchar_t>::value>;
+using is_std_integral = std::integral_constant<bool, is_std_unsigned_int<T>::value || is_std_signed_int<T>::value ||
+                                                         type_list_contains<T, bool, char, wchar_t>::value>;
 
-template <typename T>
-using is_std_float = type_list_contains<T, float, double, long double>;
+template <typename T> using is_std_float = type_list_contains<T, float, double, long double>;
 
 template <typename T>
 using is_std_arith = std::integral_constant<bool, is_std_integral<T>::value || is_std_float<T>::value>;
@@ -63,55 +57,34 @@ using is_std_arith = std::integral_constant<bool, is_std_integral<T>::value || i
 template <typename T>
 using is_std_fundamental = std::integral_constant<bool, is_std_arith<T>::value || std::is_same<T, void>::value>;
 
-template <typename T>
-struct is_pointer : public std::false_type {
-};
+template <typename T> struct is_pointer : public std::false_type {};
+
+template <typename T> struct is_pointer<T *> : public std::true_type {};
+
+template <typename T> struct is_member_pointer : public std::false_type {};
+
+template <typename T, typename C> struct is_member_pointer<T C::*> : public std::true_type {};
 
 template <typename T>
-struct is_pointer<T*> : public std::true_type {
-};
+using is_fast_copy_type =
+    std::integral_constant<bool, is_std_fundamental<T>::value || is_pointer<T>::value || is_member_pointer<T>::value ||
+                                     custom_is_fast_copy_type<T>::value>;
 
-template <typename T>
-struct is_member_pointer : public std::false_type {
-};
+template <typename T> struct add_const_reference { using type = const T &; };
 
-template <typename T, typename C>
-struct is_member_pointer<T C::*> : public std::true_type {
-};
+template <> struct add_const_reference<void> { using type = void; };
 
-template <typename T>
-using is_fast_copy_type = std::integral_constant<bool, is_std_fundamental<T>::value || is_pointer<T>::value || is_member_pointer<T>::value || custom_is_fast_copy_type<T>::value>;
+template <typename T> using add_const_reference_t = typename add_const_reference<T>::type;
 
-template <typename T>
-struct add_const_reference {
-	using type = const T &;
-};
+template <typename T> struct remove_pointer { using type = T; };
 
-template <>
-struct add_const_reference<void> {
-	using type = void;
-};
+template <typename T> struct remove_pointer<T *> { using type = T; };
 
-template <typename T>
-using add_const_reference_t = typename add_const_reference<T>::type;
-
-template <typename T>
-struct remove_pointer {
-	using type = T;
-};
-
-template <typename T>
-struct remove_pointer<T*> {
-	using type = T;
-};
-
-template <typename T>
-using remove_pointer_t = typename remove_pointer<T>::type;
+template <typename T> using remove_pointer_t = typename remove_pointer<T>::type;
 
 } // namespace internal
 
-template <typename T>
-struct type_traits {
+template <typename T> struct type_traits {
 	using is_std_unsigned_int = internal::is_std_unsigned_int<T>;
 	using is_std_signed_int = internal::is_std_signed_int<T>;
 	using is_std_integral = internal::is_std_integral<T>;
@@ -126,7 +99,6 @@ struct type_traits {
 	using pointed_type = internal::remove_pointer_t<T>;
 };
 
-template <typename T>
-using parameter_type = typename type_traits<T>::parameter_type;
+template <typename T> using parameter_type = typename type_traits<T>::parameter_type;
 
 } // namespace base
diff --git a/Telegram/SourceFiles/base/variant.h b/Telegram/SourceFiles/base/variant.h
index 02a005c19..4ec1a0e55 100644
--- a/Telegram/SourceFiles/base/variant.h
+++ b/Telegram/SourceFiles/base/variant.h
@@ -25,16 +25,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 // We use base::variant<> alias and base::get_if() helper while we don't have std::variant<>.
 namespace base {
 
-template <typename... Types>
-using variant = mapbox::util::variant<Types...>;
+template <typename... Types> using variant = mapbox::util::variant<Types...>;
 
-template <typename T, typename... Types>
-inline T *get_if(variant<Types...> *v) {
+template <typename T, typename... Types> inline T *get_if(variant<Types...> *v) {
 	return (v && v->template is<T>()) ? &v->template get_unchecked<T>() : nullptr;
 }
 
-template <typename T, typename... Types>
-inline const T *get_if(const variant<Types...> *v) {
+template <typename T, typename... Types> inline const T *get_if(const variant<Types...> *v) {
 	return (v && v->template is<T>()) ? &v->template get_unchecked<T>() : nullptr;
 }
 
diff --git a/Telegram/SourceFiles/base/weak_unique_ptr.h b/Telegram/SourceFiles/base/weak_unique_ptr.h
index 0bdf7f69d..5347d95ab 100644
--- a/Telegram/SourceFiles/base/weak_unique_ptr.h
+++ b/Telegram/SourceFiles/base/weak_unique_ptr.h
@@ -22,23 +22,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include <memory>
 // @todo replace this with std::experimental::observer_ptr
-#include <utility>
 #include <QCoreApplication>
+#include <utility>
 
 namespace base {
 
 class enable_weak_from_this;
 
-template <typename T>
-class weak_unique_ptr;
+template <typename T> class weak_unique_ptr;
 
 class enable_weak_from_this {
 public:
 	enable_weak_from_this() = default;
-	enable_weak_from_this(const enable_weak_from_this &other) noexcept {
-	}
-	enable_weak_from_this(enable_weak_from_this &&other) noexcept {
-	}
+	enable_weak_from_this(const enable_weak_from_this &other) noexcept {}
+	enable_weak_from_this(enable_weak_from_this &&other) noexcept {}
 	enable_weak_from_this &operator=(const enable_weak_from_this &other) noexcept {
 		return *this;
 	}
@@ -47,31 +44,28 @@ public:
 	}
 
 private:
-	template <typename Child>
-	friend class weak_unique_ptr;
+	template <typename Child> friend class weak_unique_ptr;
 
-	std::shared_ptr<enable_weak_from_this*> getGuarded() {
+	std::shared_ptr<enable_weak_from_this *> getGuarded() {
 		if (!_guarded) {
-			_guarded = std::make_shared<enable_weak_from_this*>(static_cast<enable_weak_from_this*>(this));
+			_guarded = std::make_shared<enable_weak_from_this *>(static_cast<enable_weak_from_this *>(this));
 		}
 		return _guarded;
 	}
 
-	std::shared_ptr<enable_weak_from_this*> _guarded;
-
+	std::shared_ptr<enable_weak_from_this *> _guarded;
 };
 
-template <typename T>
-class weak_unique_ptr {
+template <typename T> class weak_unique_ptr {
 public:
 	weak_unique_ptr() = default;
-	weak_unique_ptr(T *value) : _guarded(value ? value->getGuarded() : std::shared_ptr<enable_weak_from_this*>()) {
-	}
-	weak_unique_ptr(const std::unique_ptr<T> &value) : weak_unique_ptr(value.get()) {
-	}
+	weak_unique_ptr(T *value)
+	    : _guarded(value ? value->getGuarded() : std::shared_ptr<enable_weak_from_this *>()) {}
+	weak_unique_ptr(const std::unique_ptr<T> &value)
+	    : weak_unique_ptr(value.get()) {}
 
 	weak_unique_ptr &operator=(T *value) {
-		_guarded = value ? value->getGuarded() : std::shared_ptr<enable_weak_from_this*>();
+		_guarded = value ? value->getGuarded() : std::shared_ptr<enable_weak_from_this *>();
 		return *this;
 	}
 	weak_unique_ptr &operator=(const std::unique_ptr<T> &value) {
@@ -80,7 +74,7 @@ public:
 
 	T *get() const noexcept {
 		if (auto shared = _guarded.lock()) {
-			return static_cast<T*>(*shared);
+			return static_cast<T *>(*shared);
 		}
 		return nullptr;
 	}
@@ -95,50 +89,44 @@ public:
 	}
 
 private:
-	std::weak_ptr<enable_weak_from_this*> _guarded;
-
+	std::weak_ptr<enable_weak_from_this *> _guarded;
 };
 
-template <typename T>
-inline bool operator==(const weak_unique_ptr<T> &pointer, std::nullptr_t) {
+template <typename T> inline bool operator==(const weak_unique_ptr<T> &pointer, std::nullptr_t) {
 	return (pointer.get() == nullptr);
 }
 
-template <typename T>
-inline bool operator==(std::nullptr_t, const weak_unique_ptr<T> &pointer) {
+template <typename T> inline bool operator==(std::nullptr_t, const weak_unique_ptr<T> &pointer) {
 	return (pointer == nullptr);
 }
 
-template <typename T>
-inline bool operator!=(const weak_unique_ptr<T> &pointer, std::nullptr_t) {
+template <typename T> inline bool operator!=(const weak_unique_ptr<T> &pointer, std::nullptr_t) {
 	return !(pointer == nullptr);
 }
 
-template <typename T>
-inline bool operator!=(std::nullptr_t, const weak_unique_ptr<T> &pointer) {
+template <typename T> inline bool operator!=(std::nullptr_t, const weak_unique_ptr<T> &pointer) {
 	return !(pointer == nullptr);
 }
 
-template <typename T>
-weak_unique_ptr<T> make_weak_unique(T *value) {
+template <typename T> weak_unique_ptr<T> make_weak_unique(T *value) {
 	return weak_unique_ptr<T>(value);
 }
 
-template <typename T>
-weak_unique_ptr<T> make_weak_unique(const std::unique_ptr<T> &value) {
+template <typename T> weak_unique_ptr<T> make_weak_unique(const std::unique_ptr<T> &value) {
 	return weak_unique_ptr<T>(value);
 }
 
 } // namespace base
 
 #ifdef QT_VERSION
-template <typename Lambda>
-inline void InvokeQueued(base::enable_weak_from_this *context, Lambda &&lambda) {
-    QObject proxy;
-    QObject::connect(&proxy, &QObject::destroyed, QCoreApplication::instance(), [guard = base::make_weak_unique(context), lambda = std::forward<Lambda>(lambda)] {
-        if (guard) {
-            lambda();
-        }
-    }, Qt::QueuedConnection);
+template <typename Lambda> inline void InvokeQueued(base::enable_weak_from_this *context, Lambda &&lambda) {
+	QObject proxy;
+	QObject::connect(&proxy, &QObject::destroyed, QCoreApplication::instance(),
+	                 [guard = base::make_weak_unique(context), lambda = std::forward<Lambda>(lambda)] {
+		                 if (guard) {
+			                 lambda();
+		                 }
+	                 },
+	                 Qt::QueuedConnection);
 }
 #endif // QT_VERSION
diff --git a/Telegram/SourceFiles/base/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h
index 6873142b1..7a20a0057 100644
--- a/Telegram/SourceFiles/base/zlib_help.h
+++ b/Telegram/SourceFiles/base/zlib_help.h
@@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include <QByteArray>
 
-#include "minizip/zip.h"
 #include "minizip/unzip.h"
+#include "minizip/zip.h"
 
 #include "logs.h"
 
@@ -35,8 +35,8 @@ namespace internal {
 
 class InMemoryFile {
 public:
-	InMemoryFile(const QByteArray &data = QByteArray()) : _data(data) {
-	}
+	InMemoryFile(const QByteArray &data = QByteArray())
+	    : _data(data) {}
 
 	zlib_filefunc_def funcs() {
 		zlib_filefunc_def result;
@@ -74,7 +74,7 @@ private:
 		return this;
 	}
 
-	uLong read(voidpf stream, void* buf, uLong size) {
+	uLong read(voidpf stream, void *buf, uLong size) {
 		uLong toRead = 0;
 		if (!_error) {
 			if (_data.size() > int(_position)) {
@@ -89,7 +89,7 @@ private:
 		return toRead;
 	}
 
-	uLong write(voidpf stream, const void* buf, uLong size) {
+	uLong write(voidpf stream, const void *buf, uLong size) {
 		if (_data.size() < int(_position + size)) {
 			_data.resize(_position + size);
 		}
@@ -127,38 +127,37 @@ private:
 		return _error;
 	}
 
-	static voidpf Open(voidpf opaque, const char* filename, int mode) {
-		return static_cast<InMemoryFile*>(opaque)->open(filename, mode);
+	static voidpf Open(voidpf opaque, const char *filename, int mode) {
+		return static_cast<InMemoryFile *>(opaque)->open(filename, mode);
 	}
 
-	static uLong Read(voidpf opaque, voidpf stream, void* buf, uLong size) {
-		return static_cast<InMemoryFile*>(opaque)->read(stream, buf, size);
+	static uLong Read(voidpf opaque, voidpf stream, void *buf, uLong size) {
+		return static_cast<InMemoryFile *>(opaque)->read(stream, buf, size);
 	}
 
-	static uLong Write(voidpf opaque, voidpf stream, const void* buf, uLong size) {
-		return static_cast<InMemoryFile*>(opaque)->write(stream, buf, size);
+	static uLong Write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
+		return static_cast<InMemoryFile *>(opaque)->write(stream, buf, size);
 	}
 
 	static int Close(voidpf opaque, voidpf stream) {
-		return static_cast<InMemoryFile*>(opaque)->close(stream);
+		return static_cast<InMemoryFile *>(opaque)->close(stream);
 	}
 
 	static int Error(voidpf opaque, voidpf stream) {
-		return static_cast<InMemoryFile*>(opaque)->error(stream);
+		return static_cast<InMemoryFile *>(opaque)->error(stream);
 	}
 
 	static long Tell(voidpf opaque, voidpf stream) {
-		return static_cast<InMemoryFile*>(opaque)->tell(stream);
+		return static_cast<InMemoryFile *>(opaque)->tell(stream);
 	}
 
 	static long Seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
-		return static_cast<InMemoryFile*>(opaque)->seek(stream, offset, origin);
+		return static_cast<InMemoryFile *>(opaque)->seek(stream, offset, origin);
 	}
 
 	uLong _position = 0;
 	int _error = 0;
 	QByteArray _data;
-
 };
 
 } // namespace internal
@@ -168,7 +167,8 @@ constexpr int kCaseInsensitive = 2;
 
 class FileToRead {
 public:
-	FileToRead(const QByteArray &content) : _data(content) {
+	FileToRead(const QByteArray &content)
+	    : _data(content) {
 		auto funcs = _data.funcs();
 		if (!(_handle = unzOpen2(nullptr, &funcs))) {
 			_error = -1;
@@ -189,26 +189,12 @@ public:
 		return error();
 	}
 
-	int getCurrentFileInfo(
-		unz_file_info *pfile_info,
-		char *szFileName,
-		uLong fileNameBufferSize,
-		void *extraField,
-		uLong extraFieldBufferSize,
-		char *szComment,
-		uLong commentBufferSize
-	) {
+	int getCurrentFileInfo(unz_file_info *pfile_info, char *szFileName, uLong fileNameBufferSize, void *extraField,
+	                       uLong extraFieldBufferSize, char *szComment, uLong commentBufferSize) {
 		if (error() == UNZ_OK) {
-			_error = _handle ? unzGetCurrentFileInfo(
-				_handle,
-				pfile_info,
-				szFileName,
-				fileNameBufferSize,
-				extraField,
-				extraFieldBufferSize,
-				szComment,
-				commentBufferSize
-			) : -1;
+			_error = _handle ? unzGetCurrentFileInfo(_handle, pfile_info, szFileName, fileNameBufferSize, extraField,
+			                                         extraFieldBufferSize, szComment, commentBufferSize) :
+			                   -1;
 		}
 		return error();
 	}
@@ -240,7 +226,7 @@ public:
 	}
 
 	QByteArray readCurrentFileContent(int fileSizeLimit) {
-		unz_file_info fileInfo = { 0 };
+		unz_file_info fileInfo = {0};
 		if (getCurrentFileInfo(&fileInfo, nullptr, 0, nullptr, 0, nullptr, 0) != UNZ_OK) {
 			LOG(("Error: could not get current file info in a zip file."));
 			return QByteArray();
@@ -249,7 +235,9 @@ public:
 		auto size = fileInfo.uncompressed_size;
 		if (size > static_cast<quint32>(fileSizeLimit)) {
 			if (_error == UNZ_OK) _error = -1;
-			LOG(("Error: current file is too large (should be less than %1, got %2) in a zip file.").arg(fileSizeLimit).arg(size));
+			LOG(("Error: current file is too large (should be less than %1, got %2) in a zip file.")
+			        .arg(fileSizeLimit)
+			        .arg(size));
 			return QByteArray();
 		}
 		if (openCurrentFile() != UNZ_OK) {
@@ -308,7 +296,6 @@ private:
 	internal::InMemoryFile _data;
 	unzFile _handle = nullptr;
 	int _error = 0;
-
 };
 
 class FileToWrite {
@@ -320,35 +307,18 @@ public:
 		}
 	}
 
-	int openNewFile(
-		const char *filename,
-		const zip_fileinfo *zipfi,
-		const void *extrafield_local,
-		uInt size_extrafield_local,
-		const void* extrafield_global,
-		uInt size_extrafield_global,
-		const char* comment,
-		int method,
-		int level
-	) {
+	int openNewFile(const char *filename, const zip_fileinfo *zipfi, const void *extrafield_local,
+	                uInt size_extrafield_local, const void *extrafield_global, uInt size_extrafield_global,
+	                const char *comment, int method, int level) {
 		if (error() == ZIP_OK) {
-			_error = _handle ? zipOpenNewFileInZip(
-				_handle,
-				filename,
-				zipfi,
-				extrafield_local,
-				size_extrafield_local,
-				extrafield_global,
-				size_extrafield_global,
-				comment,
-				method,
-				level
-			) : -1;
+			_error = _handle ? zipOpenNewFileInZip(_handle, filename, zipfi, extrafield_local, size_extrafield_local,
+			                                       extrafield_global, size_extrafield_global, comment, method, level) :
+			                   -1;
 		}
 		return error();
 	}
 
-	int writeInFile(const void* buf, unsigned len) {
+	int writeInFile(const void *buf, unsigned len) {
 		if (error() == ZIP_OK) {
 			_error = _handle ? zipWriteInFileInZip(_handle, buf, len) : -1;
 		}
@@ -388,7 +358,6 @@ private:
 	internal::InMemoryFile _data;
 	zipFile _handle = nullptr;
 	int _error = 0;
-
 };
 
 } // namespace zlib
diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 5b395bd5b..620e6b4bb 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -18,38 +18,43 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QDesktopServices>
 #include "boxes/about_box.h"
+#include <QDesktopServices>
 
+#include "application.h"
+#include "boxes/confirm_box.h"
 #include "config.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "boxes/confirm_box.h"
-#include "application.h"
+#include "platform/platform_file_utilities.h"
+#include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "styles/style_boxes.h"
-#include "platform/platform_file_utilities.h"
 
 AboutBox::AboutBox(QWidget *parent)
-: _version(this, lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) + (cAlphaVersion() ? " alpha" : "") + (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())), st::aboutVersionLink)
-, _text1(this, lang(lng_about_text_1), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
-, _text2(this, lang(lng_about_text_2), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
-, _text3(this, st::aboutLabel) {
-}
+    : _version(this,
+               lng_about_version(lt_version, QString::fromLatin1(AppVersionStr.c_str()) +
+                                                 (cAlphaVersion() ? " alpha" : "") +
+                                                 (cBetaVersion() ? qsl(" beta %1").arg(cBetaVersion()) : QString())),
+               st::aboutVersionLink)
+    , _text1(this, lang(lng_about_text_1), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
+    , _text2(this, lang(lng_about_text_2), Ui::FlatLabel::InitType::Rich, st::aboutLabel)
+    , _text3(this, st::aboutLabel) {}
 
 void AboutBox::prepare() {
-	constexpr auto test = std::is_convertible<const char*, QString>::value;
+	constexpr auto test = std::is_convertible<const char *, QString>::value;
 	setTitle([] { return str_const_toString(AppName); });
 
 	addButton(langFactory(lng_close), [this] { closeBox(); });
 
-	_text3->setRichText(lng_about_text_3(lt_faq_open, qsl("[a href=\"%1\"]").arg(telegramFaqLink()), lt_faq_close, qsl("[/a]")));
+	_text3->setRichText(
+	    lng_about_text_3(lt_faq_open, qsl("[a href=\"%1\"]").arg(telegramFaqLink()), lt_faq_close, qsl("[/a]")));
 
 	_version->setClickedCallback([this] { showVersionHistory(); });
 
-	setDimensions(st::aboutWidth, st::aboutTextTop + _text1->height() + st::aboutSkip + _text2->height() + st::aboutSkip + _text3->height());
+	setDimensions(st::aboutWidth, st::aboutTextTop + _text1->height() + st::aboutSkip + _text2->height() +
+	                                  st::aboutSkip + _text3->height());
 }
 
 void AboutBox::resizeEvent(QResizeEvent *e) {
@@ -76,7 +81,7 @@ void AboutBox::keyPressEvent(QKeyEvent *e) {
 QString telegramFaqLink() {
 	auto result = qsl("https://telegram.org/faq");
 	auto language = Lang::Current().id();
-	for (auto faqLanguage : { "de", "es", "it", "ko", "br" }) {
+	for (auto faqLanguage : {"de", "es", "it", "ko", "br"}) {
 		if (language.startsWith(QLatin1String(faqLanguage))) {
 			result.append('/').append(faqLanguage);
 		}
diff --git a/Telegram/SourceFiles/boxes/about_box.h b/Telegram/SourceFiles/boxes/about_box.h
index 624eab40c..4a2937a0a 100644
--- a/Telegram/SourceFiles/boxes/about_box.h
+++ b/Telegram/SourceFiles/boxes/about_box.h
@@ -29,7 +29,7 @@ class FlatLabel;
 
 class AboutBox : public BoxContent {
 public:
-	AboutBox(QWidget*);
+	AboutBox(QWidget *);
 
 protected:
 	void prepare() override;
@@ -44,7 +44,6 @@ private:
 	object_ptr<Ui::FlatLabel> _text1;
 	object_ptr<Ui::FlatLabel> _text2;
 	object_ptr<Ui::FlatLabel> _text3;
-
 };
 
 QString telegramFaqLink();
diff --git a/Telegram/SourceFiles/boxes/abstract_box.cpp b/Telegram/SourceFiles/boxes/abstract_box.cpp
index 6a69446a6..e368e5497 100644
--- a/Telegram/SourceFiles/boxes/abstract_box.cpp
+++ b/Telegram/SourceFiles/boxes/abstract_box.cpp
@@ -18,25 +18,27 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <algorithm>
 #include "boxes/abstract_box.h"
+#include <algorithm>
 
-#include "styles/style_boxes.h"
-#include "styles/style_profile.h"
-#include "storage/localstorage.h"
 #include "lang/lang_keys.h"
-#include "ui/effects/widget_fade_wrap.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/labels.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_profile.h"
+#include "ui/effects/widget_fade_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
 
-QPointer<Ui::RoundButton> BoxContent::addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback) {
+QPointer<Ui::RoundButton> BoxContent::addButton(base::lambda<QString()> textFactory,
+                                                base::lambda<void()> clickCallback) {
 	return addButton(std::move(textFactory), std::move(clickCallback), st::defaultBoxButton);
 }
 
-QPointer<Ui::RoundButton> BoxContent::addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback) {
+QPointer<Ui::RoundButton> BoxContent::addLeftButton(base::lambda<QString()> textFactory,
+                                                    base::lambda<void()> clickCallback) {
 	return getDelegate()->addLeftButton(std::move(textFactory), std::move(clickCallback), st::defaultBoxButton);
 }
 
@@ -105,12 +107,13 @@ void BoxContent::onDraggingScrollDelta(int delta) {
 }
 
 void BoxContent::onDraggingScrollTimer() {
-	auto delta = (_draggingScrollDelta > 0) ? std::min(_draggingScrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) : std::max(_draggingScrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
+	auto delta = (_draggingScrollDelta > 0) ? std::min(_draggingScrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) :
+	                                          std::max(_draggingScrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + delta);
 }
 
 void BoxContent::updateInnerVisibleTopBottom() {
-	if (auto widget = static_cast<TWidget*>(_scroll ? _scroll->widget() : nullptr)) {
+	if (auto widget = static_cast<TWidget *>(_scroll ? _scroll->widget() : nullptr)) {
 		auto top = _scroll->scrollTop();
 		widget->setVisibleTopBottom(top, top + _scroll->height());
 	}
@@ -210,9 +213,10 @@ void BoxContent::paintEvent(QPaintEvent *e) {
 	}
 }
 
-AbstractBox::AbstractBox(QWidget *parent, Window::Controller *controller, object_ptr<BoxContent> content) : LayerWidget(parent)
-, _controller(controller)
-, _content(std::move(content)) {
+AbstractBox::AbstractBox(QWidget *parent, Window::Controller *controller, object_ptr<BoxContent> content)
+    : LayerWidget(parent)
+    , _controller(controller)
+    , _content(std::move(content)) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 	_content->setParent(this);
 	_content->setDelegate(this);
@@ -263,7 +267,9 @@ void AbstractBox::paintEvent(QPaintEvent *e) {
 void AbstractBox::paintAdditionalTitle(Painter &p) {
 	p.setFont(st::boxLayerTitleAdditionalFont);
 	p.setPen(st::boxTitleAdditionalFg);
-	p.drawTextLeft(_titleLeft + (_title ? _title->width() : 0) + st::boxLayerTitleAdditionalSkip, _titleTop + st::boxTitleFont->ascent - st::boxLayerTitleAdditionalFont->ascent, width(), _additionalTitle);
+	p.drawTextLeft(_titleLeft + (_title ? _title->width() : 0) + st::boxLayerTitleAdditionalSkip,
+	               _titleTop + st::boxTitleFont->ascent - st::boxLayerTitleAdditionalFont->ascent, width(),
+	               _additionalTitle);
 }
 
 void AbstractBox::parentResized() {
@@ -349,7 +355,8 @@ void AbstractBox::clearButtons() {
 	_leftButton.destroy();
 }
 
-QPointer<Ui::RoundButton> AbstractBox::addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+QPointer<Ui::RoundButton> AbstractBox::addButton(base::lambda<QString()> textFactory,
+                                                 base::lambda<void()> clickCallback, const style::RoundButton &st) {
 	_buttons.push_back(object_ptr<Ui::RoundButton>(this, std::move(textFactory), st));
 	auto result = QPointer<Ui::RoundButton>(_buttons.back());
 	result->setClickedCallback(std::move(clickCallback));
@@ -358,7 +365,8 @@ QPointer<Ui::RoundButton> AbstractBox::addButton(base::lambda<QString()> textFac
 	return result;
 }
 
-QPointer<Ui::RoundButton> AbstractBox::addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+QPointer<Ui::RoundButton> AbstractBox::addLeftButton(base::lambda<QString()> textFactory,
+                                                     base::lambda<void()> clickCallback, const style::RoundButton &st) {
 	_leftButton = object_ptr<Ui::RoundButton>(this, std::move(textFactory), st);
 	auto result = QPointer<Ui::RoundButton>(_leftButton);
 	result->setClickedCallback(std::move(clickCallback));
@@ -379,7 +387,8 @@ void AbstractBox::setDimensions(int newWidth, int maxHeight) {
 			auto newGeometry = geometry();
 			auto parentHeight = parentWidget()->height();
 			if (newGeometry.top() + newGeometry.height() + st::boxVerticalMargin > parentHeight) {
-				auto newTop = std::max(parentHeight - int(st::boxVerticalMargin) - newGeometry.height(), (parentHeight - newGeometry.height()) / 2);
+				auto newTop = std::max(parentHeight - int(st::boxVerticalMargin) - newGeometry.height(),
+				                       (parentHeight - newGeometry.height()) / 2);
 				if (newTop != newGeometry.top()) {
 					move(newGeometry.left(), newTop);
 				}
@@ -422,11 +431,11 @@ void AbstractBox::keyPressEvent(QKeyEvent *e) {
 	}
 }
 
-BoxLayerTitleShadow::BoxLayerTitleShadow(QWidget *parent) : Ui::PlainShadow(parent, st::boxLayerTitleShadow) {
-}
+BoxLayerTitleShadow::BoxLayerTitleShadow(QWidget *parent)
+    : Ui::PlainShadow(parent, st::boxLayerTitleShadow) {}
 
-BoxContentDivider::BoxContentDivider(QWidget *parent) : TWidget(parent) {
-}
+BoxContentDivider::BoxContentDivider(QWidget *parent)
+    : TWidget(parent) {}
 
 int BoxContentDivider::resizeGetHeight(int newWidth) {
 	return st::rightsDividerHeight;
@@ -437,6 +446,7 @@ void BoxContentDivider::paintEvent(QPaintEvent *e) {
 	p.fillRect(e->rect(), st::contactsAboutBg);
 	auto dividerFillTop = myrtlrect(0, 0, width(), st::profileDividerTop.height());
 	st::profileDividerTop.fill(p, dividerFillTop);
-	auto dividerFillBottom = myrtlrect(0, height() - st::profileDividerBottom.height(), width(), st::profileDividerBottom.height());
+	auto dividerFillBottom =
+	    myrtlrect(0, height() - st::profileDividerBottom.height(), width(), st::profileDividerBottom.height());
 	st::profileDividerBottom.fill(p, dividerFillBottom);
 }
diff --git a/Telegram/SourceFiles/boxes/abstract_box.h b/Telegram/SourceFiles/boxes/abstract_box.h
index 4bc14265d..e2ff7e808 100644
--- a/Telegram/SourceFiles/boxes/abstract_box.h
+++ b/Telegram/SourceFiles/boxes/abstract_box.h
@@ -22,18 +22,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/lambda.h"
 #include "base/observer.h"
-#include "ui/text/text_entity.h"
-#include "ui/widgets/shadow.h"
-#include "ui/twidget.h"
 #include "layerwidget.h"
+#include "ui/text/text_entity.h"
+#include "ui/twidget.h"
+#include "ui/widgets/shadow.h"
 
 namespace Ui {
 class RoundButton;
 class IconButton;
 class ScrollArea;
 class FlatLabel;
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 } // namespace Ui
 
 namespace Window {
@@ -51,15 +50,17 @@ public:
 	virtual void setAdditionalTitle(base::lambda<QString()> additionalFactory) = 0;
 
 	virtual void clearButtons() = 0;
-	virtual QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) = 0;
-	virtual QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) = 0;
+	virtual QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback,
+	                                            const style::RoundButton &st) = 0;
+	virtual QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory,
+	                                                base::lambda<void()> clickCallback,
+	                                                const style::RoundButton &st) = 0;
 	virtual void updateButtonsPositions() = 0;
 
 	virtual void setDimensions(int newWidth, int maxHeight) = 0;
 	virtual void setNoContentMargin(bool noContentMargin) = 0;
 	virtual bool isBoxShown() const = 0;
 	virtual void closeBox() = 0;
-
 };
 
 class BoxContent : public TWidget, protected base::Subscriber {
@@ -79,7 +80,7 @@ public:
 
 	void setTitle(base::lambda<QString()> titleFactory) {
 		if (titleFactory) {
-			getDelegate()->setTitle([titleFactory] { return TextWithEntities { titleFactory(), EntitiesInText() }; });
+			getDelegate()->setTitle([titleFactory] { return TextWithEntities{titleFactory(), EntitiesInText()}; });
 		} else {
 			getDelegate()->setTitle(base::lambda<TextWithEntities()>());
 		}
@@ -96,7 +97,8 @@ public:
 	}
 	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback);
 	QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback);
-	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) {
+	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback,
+	                                    const style::RoundButton &st) {
 		return getDelegate()->addButton(std::move(textFactory), std::move(clickCallback), st);
 	}
 	void updateButtonsGeometry() {
@@ -152,16 +154,14 @@ protected:
 		return result;
 	}
 
-	template <typename Widget>
-	QPointer<Widget> setInnerWidget(object_ptr<Widget> inner, int topSkip = 0) {
+	template <typename Widget> QPointer<Widget> setInnerWidget(object_ptr<Widget> inner, int topSkip = 0) {
 		auto result = QPointer<Widget>(inner.data());
 		setInnerTopSkip(topSkip);
 		setInner(std::move(inner));
 		return result;
 	}
 
-	template <typename Widget>
-	object_ptr<Widget> takeInnerWidget() {
+	template <typename Widget> object_ptr<Widget> takeInnerWidget() {
 		return static_object_cast<Widget>(doTakeInnerWidget());
 	}
 
@@ -196,13 +196,12 @@ private:
 	bool _preparing = false;
 	bool _noContentMargin = false;
 	int _innerTopSkip = 0;
-	object_ptr<Ui::ScrollArea> _scroll = { nullptr };
-	object_ptr<Ui::WidgetFadeWrap<BoxLayerTitleShadow>> _topShadow = { nullptr };
-	object_ptr<Ui::WidgetFadeWrap<BoxLayerTitleShadow>> _bottomShadow = { nullptr };
+	object_ptr<Ui::ScrollArea> _scroll = {nullptr};
+	object_ptr<Ui::WidgetFadeWrap<BoxLayerTitleShadow>> _topShadow = {nullptr};
+	object_ptr<Ui::WidgetFadeWrap<BoxLayerTitleShadow>> _bottomShadow = {nullptr};
 
-	object_ptr<QTimer> _draggingScrollTimer = { nullptr };
+	object_ptr<QTimer> _draggingScrollTimer = {nullptr};
 	int _draggingScrollDelta = 0;
-
 };
 
 class AbstractBox : public LayerWidget, public BoxContentDelegate, protected base::Subscriber {
@@ -219,8 +218,10 @@ public:
 	void setAdditionalTitle(base::lambda<QString()> additionalFactory) override;
 
 	void clearButtons() override;
-	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) override;
-	QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback, const style::RoundButton &st) override;
+	QPointer<Ui::RoundButton> addButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback,
+	                                    const style::RoundButton &st) override;
+	QPointer<Ui::RoundButton> addLeftButton(base::lambda<QString()> textFactory, base::lambda<void()> clickCallback,
+	                                        const style::RoundButton &st) override;
 	void updateButtonsPositions() override;
 
 	void setDimensions(int newWidth, int maxHeight) override;
@@ -274,7 +275,7 @@ private:
 	int _maxContentHeight = 0;
 	object_ptr<BoxContent> _content;
 
-	object_ptr<Ui::FlatLabel> _title = { nullptr };
+	object_ptr<Ui::FlatLabel> _title = {nullptr};
 	base::lambda<TextWithEntities()> _titleFactory;
 	QString _additionalTitle;
 	base::lambda<QString()> _additionalTitleFactory;
@@ -283,14 +284,12 @@ private:
 	bool _layerType = false;
 
 	std::vector<object_ptr<Ui::RoundButton>> _buttons;
-	object_ptr<Ui::RoundButton> _leftButton = { nullptr };
-
+	object_ptr<Ui::RoundButton> _leftButton = {nullptr};
 };
 
 class BoxLayerTitleShadow : public Ui::PlainShadow {
 public:
 	BoxLayerTitleShadow(QWidget *parent);
-
 };
 
 class BoxContentDivider : public TWidget {
@@ -300,7 +299,6 @@ public:
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void paintEvent(QPaintEvent *e) override;
-
 };
 
 enum CreatingGroupType {
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index a17636701..00caade87 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -20,29 +20,29 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/add_contact_box.h"
 
-#include "styles/style_boxes.h"
-#include "styles/style_dialogs.h"
-#include "lang/lang_keys.h"
-#include "messenger.h"
-#include "mtproto/sender.h"
+#include "apiwrap.h"
+#include "auth_session.h"
 #include "base/flat_set.h"
 #include "boxes/confirm_box.h"
-#include "boxes/photo_crop_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/photo_crop_box.h"
 #include "core/file_utilities.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
-#include "ui/widgets/labels.h"
-#include "ui/toast/toast.h"
-#include "ui/special_buttons.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "apiwrap.h"
+#include "messenger.h"
+#include "mtproto/sender.h"
 #include "observer_peer.h"
-#include "auth_session.h"
-#include <QGuiApplication>
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "ui/special_buttons.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/input_fields.h"
+#include "ui/widgets/labels.h"
 #include <QClipboard>
+#include <QGuiApplication>
 
 namespace {
 
@@ -59,9 +59,7 @@ style::InputField CreateBioFieldStyle() {
 } // namespace
 
 QString PeerFloodErrorText(PeerFloodType type) {
-	auto link = textcmdLink(
-		Messenger::Instance().createInternalLinkFull(qsl("spambot")),
-		lang(lng_cant_more_info));
+	auto link = textcmdLink(Messenger::Instance().createInternalLinkFull(qsl("spambot")), lang(lng_cant_more_info));
 	if (type == PeerFloodType::InviteGroup) {
 		return lng_cant_invite_not_contact(lt_more_info, link);
 	}
@@ -80,10 +78,10 @@ protected:
 
 private:
 	struct ChatRow {
-		ChatRow(not_null<PeerData*> peer) : peer(peer) {
-		}
+		ChatRow(not_null<PeerData *> peer)
+		    : peer(peer) {}
 
-		not_null<PeerData*> peer;
+		not_null<PeerData *> peer;
 		Text name, status;
 	};
 	void paintChat(Painter &p, const ChatRow &row, bool selected) const;
@@ -101,25 +99,24 @@ private:
 	base::lambda<void()> _revokeCallback;
 	mtpRequestId _revokeRequestId = 0;
 	QPointer<ConfirmBox> _weakRevokeConfirmBox;
-
 };
 
-AddContactBox::AddContactBox(QWidget*, QString fname, QString lname, QString phone)
-: _first(this, st::defaultInputField, langFactory(lng_signup_firstname), fname)
-, _last(this, st::defaultInputField, langFactory(lng_signup_lastname), lname)
-, _phone(this, st::defaultInputField, langFactory(lng_contact_phone), phone)
-, _invertOrder(langFirstNameGoesSecond()) {
+AddContactBox::AddContactBox(QWidget *, QString fname, QString lname, QString phone)
+    : _first(this, st::defaultInputField, langFactory(lng_signup_firstname), fname)
+    , _last(this, st::defaultInputField, langFactory(lng_signup_lastname), lname)
+    , _phone(this, st::defaultInputField, langFactory(lng_contact_phone), phone)
+    , _invertOrder(langFirstNameGoesSecond()) {
 	if (!phone.isEmpty()) {
 		_phone->setDisabled(true);
 	}
 }
 
-AddContactBox::AddContactBox(QWidget*, UserData *user)
-: _user(user)
-, _first(this, st::defaultInputField, langFactory(lng_signup_firstname), user->firstName)
-, _last(this, st::defaultInputField, langFactory(lng_signup_lastname), user->lastName)
-, _phone(this, st::defaultInputField, langFactory(lng_contact_phone), user->phone())
-, _invertOrder(langFirstNameGoesSecond()) {
+AddContactBox::AddContactBox(QWidget *, UserData *user)
+    : _user(user)
+    , _first(this, st::defaultInputField, langFactory(lng_signup_firstname), user->firstName)
+    , _last(this, st::defaultInputField, langFactory(lng_signup_lastname), user->lastName)
+    , _phone(this, st::defaultInputField, langFactory(lng_contact_phone), user->phone())
+    , _invertOrder(langFirstNameGoesSecond()) {
 	_phone->setDisabled(true);
 }
 
@@ -130,7 +127,8 @@ void AddContactBox::prepare() {
 	if (_user) {
 		setTitle(langFactory(lng_edit_contact_title));
 	} else {
-		auto readyToAdd = !_phone->getLastText().isEmpty() && (!_first->getLastText().isEmpty() || !_last->getLastText().isEmpty());
+		auto readyToAdd =
+		    !_phone->getLastText().isEmpty() && (!_first->getLastText().isEmpty() || !_last->getLastText().isEmpty());
 		setTitle(langFactory(readyToAdd ? lng_confirm_contact_data : lng_enter_contact_data));
 	}
 	updateButtons();
@@ -139,7 +137,9 @@ void AddContactBox::prepare() {
 	connect(_last, SIGNAL(submitted(bool)), this, SLOT(onSubmit()));
 	connect(_phone, SIGNAL(submitted(bool)), this, SLOT(onSubmit()));
 
-	setDimensions(st::boxWideWidth, st::contactPadding.top() + _first->height() + st::contactSkip + _last->height() + st::contactPhoneSkip + _phone->height() + st::contactPadding.bottom() + st::boxPadding.bottom());
+	setDimensions(st::boxWideWidth, st::contactPadding.top() + _first->height() + st::contactSkip + _last->height() +
+	                                    st::contactPhoneSkip + _phone->height() + st::contactPadding.bottom() +
+	                                    st::boxPadding.bottom());
 }
 
 void AddContactBox::setInnerFocus() {
@@ -159,7 +159,9 @@ void AddContactBox::paintEvent(QPaintEvent *e) {
 		p.setPen(st::boxTextFg);
 		p.setFont(st::boxTextFont);
 		auto textHeight = height() - st::contactPadding.top() - st::contactPadding.bottom() - st::boxPadding.bottom();
-		p.drawText(QRect(st::boxPadding.left(), st::contactPadding.top(), width() - st::boxPadding.left() - st::boxPadding.right(), textHeight), lng_contact_not_joined(lt_name, _sentName), style::al_topleft);
+		p.drawText(QRect(st::boxPadding.left(), st::contactPadding.top(),
+		                 width() - st::boxPadding.left() - st::boxPadding.right(), textHeight),
+		           lng_contact_not_joined(lt_name, _sentName), style::al_topleft);
 	} else {
 		st::contactUserIcon.paint(p, st::boxPadding.left(), _first->y() + st::contactIconTop, width());
 		st::contactPhoneIcon.paint(p, st::boxPadding.left(), _phone->y() + st::contactIconTop, width());
@@ -169,17 +171,22 @@ void AddContactBox::paintEvent(QPaintEvent *e) {
 void AddContactBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_first->resize(width() - st::boxPadding.left() - st::contactPadding.left() - st::boxPadding.right(), _first->height());
+	_first->resize(width() - st::boxPadding.left() - st::contactPadding.left() - st::boxPadding.right(),
+	               _first->height());
 	_last->resize(_first->width(), _last->height());
 	_phone->resize(_first->width(), _last->height());
 	if (_invertOrder) {
 		_last->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), st::contactPadding.top());
-		_first->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), _last->y() + _last->height() + st::contactSkip);
-		_phone->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), _first->y() + _first->height() + st::contactPhoneSkip);
+		_first->moveToLeft(st::boxPadding.left() + st::contactPadding.left(),
+		                   _last->y() + _last->height() + st::contactSkip);
+		_phone->moveToLeft(st::boxPadding.left() + st::contactPadding.left(),
+		                   _first->y() + _first->height() + st::contactPhoneSkip);
 	} else {
 		_first->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), st::contactPadding.top());
-		_last->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), _first->y() + _first->height() + st::contactSkip);
-		_phone->moveToLeft(st::boxPadding.left() + st::contactPadding.left(), _last->y() + _last->height() + st::contactPhoneSkip);
+		_last->moveToLeft(st::boxPadding.left() + st::contactPadding.left(),
+		                  _first->y() + _first->height() + st::contactSkip);
+		_phone->moveToLeft(st::boxPadding.left() + st::contactPadding.left(),
+		                   _last->y() + _last->height() + st::contactPhoneSkip);
 	}
 }
 
@@ -224,12 +231,16 @@ void AddContactBox::onSave() {
 	_sentName = firstName;
 	if (_user) {
 		_contactId = rand_value<quint64>();
-		QVector<MTPInputContact> v(1, MTP_inputPhoneContact(MTP_long(_contactId), MTP_string(_user->phone()), MTP_string(firstName), MTP_string(lastName)));
-		_addRequest = MTP::send(MTPcontacts_ImportContacts(MTP_vector<MTPInputContact>(v)), rpcDone(&AddContactBox::onSaveUserDone), rpcFail(&AddContactBox::onSaveUserFail));
+		QVector<MTPInputContact> v(1, MTP_inputPhoneContact(MTP_long(_contactId), MTP_string(_user->phone()),
+		                                                    MTP_string(firstName), MTP_string(lastName)));
+		_addRequest = MTP::send(MTPcontacts_ImportContacts(MTP_vector<MTPInputContact>(v)),
+		                        rpcDone(&AddContactBox::onSaveUserDone), rpcFail(&AddContactBox::onSaveUserFail));
 	} else {
 		_contactId = rand_value<quint64>();
-		QVector<MTPInputContact> v(1, MTP_inputPhoneContact(MTP_long(_contactId), MTP_string(phone), MTP_string(firstName), MTP_string(lastName)));
-		_addRequest = MTP::send(MTPcontacts_ImportContacts(MTP_vector<MTPInputContact>(v)), rpcDone(&AddContactBox::onImportDone));
+		QVector<MTPInputContact> v(1, MTP_inputPhoneContact(MTP_long(_contactId), MTP_string(phone),
+		                                                    MTP_string(firstName), MTP_string(lastName)));
+		_addRequest = MTP::send(MTPcontacts_ImportContacts(MTP_vector<MTPInputContact>(v)),
+		                        rpcDone(&AddContactBox::onImportDone));
 	}
 }
 
@@ -307,12 +318,12 @@ void AddContactBox::updateButtons() {
 	}
 }
 
-GroupInfoBox::GroupInfoBox(QWidget*, CreatingGroupType creating, bool fromTypeChoose)
-: _creating(creating)
-, _fromTypeChoose(fromTypeChoose)
-, _photo(this, st::newGroupPhotoSize, st::newGroupPhotoIconPosition)
-, _title(this, st::defaultInputField, langFactory(_creating == CreatingGroupChannel ? lng_dlg_new_channel_name : lng_dlg_new_group_name)) {
-}
+GroupInfoBox::GroupInfoBox(QWidget *, CreatingGroupType creating, bool fromTypeChoose)
+    : _creating(creating)
+    , _fromTypeChoose(fromTypeChoose)
+    , _photo(this, st::newGroupPhotoSize, st::newGroupPhotoIconPosition)
+    , _title(this, st::defaultInputField,
+             langFactory(_creating == CreatingGroupChannel ? lng_dlg_new_channel_name : lng_dlg_new_group_name)) {}
 
 void GroupInfoBox::prepare() {
 	setMouseTracking(true);
@@ -331,7 +342,8 @@ void GroupInfoBox::prepare() {
 
 	connect(_title, SIGNAL(submitted(bool)), this, SLOT(onNameSubmit()));
 
-	addButton(langFactory(_creating == CreatingGroupChannel ? lng_create_group_create : lng_create_group_next), [this] { onNext(); });
+	addButton(langFactory(_creating == CreatingGroupChannel ? lng_create_group_create : lng_create_group_next),
+	          [this] { onNext(); });
 	addButton(langFactory(_fromTypeChoose ? lng_create_group_back : lng_cancel), [this] { closeBox(); });
 
 	setupPhotoButton();
@@ -343,23 +355,26 @@ void GroupInfoBox::setupPhotoButton() {
 	_photo->setClickedCallback(App::LambdaDelayed(st::defaultActiveButton.ripple.hideDuration, this, [this] {
 		auto imgExtensions = cImgExtensions();
 		auto filter = qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + FileDialog::AllFilesFilter();
-		FileDialog::GetOpenPath(lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-			if (result.remoteContent.isEmpty() && result.paths.isEmpty()) {
-				return;
-			}
+		FileDialog::GetOpenPath(
+		    lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+			    if (result.remoteContent.isEmpty() && result.paths.isEmpty()) {
+				    return;
+			    }
 
-			QImage img;
-			if (!result.remoteContent.isEmpty()) {
-				img = App::readImage(result.remoteContent);
-			} else {
-				img = App::readImage(result.paths.front());
-			}
-			if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) {
-				return;
-			}
-			auto box = Ui::show(Box<PhotoCropBox>(img, (_creating == CreatingGroupChannel) ? peerFromChannel(0) : peerFromChat(0)), KeepOtherLayers);
-			connect(box, SIGNAL(ready(const QImage&)), this, SLOT(onPhotoReady(const QImage&)));
-		}));
+			    QImage img;
+			    if (!result.remoteContent.isEmpty()) {
+				    img = App::readImage(result.remoteContent);
+			    } else {
+				    img = App::readImage(result.paths.front());
+			    }
+			    if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) {
+				    return;
+			    }
+			    auto box = Ui::show(
+			        Box<PhotoCropBox>(img, (_creating == CreatingGroupChannel) ? peerFromChannel(0) : peerFromChat(0)),
+			        KeepOtherLayers);
+			    connect(box, SIGNAL(ready(const QImage &)), this, SLOT(onPhotoReady(const QImage &)));
+		    }));
 	}));
 }
 
@@ -370,14 +385,20 @@ void GroupInfoBox::setInnerFocus() {
 void GroupInfoBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_photo->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::boxPadding.top() + st::newGroupInfoPadding.top());
+	_photo->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                   st::boxPadding.top() + st::newGroupInfoPadding.top());
 
 	auto nameLeft = st::newGroupPhotoSize + st::newGroupNamePosition.x();
-	_title->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right() - nameLeft, _title->height());
-	_title->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left() + nameLeft, st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupNamePosition.y());
+	_title->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right() - nameLeft,
+	               _title->height());
+	_title->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left() + nameLeft,
+	                   st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupNamePosition.y());
 	if (_description) {
-		_description->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _description->height());
-		_description->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupPhotoSize + st::newGroupDescriptionPadding.top());
+		_description->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(),
+		                     _description->height());
+		_description->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                         st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupPhotoSize +
+		                             st::newGroupDescriptionPadding.top());
 	}
 }
 
@@ -392,7 +413,8 @@ void GroupInfoBox::onNameSubmit() {
 	}
 }
 
-void GroupInfoBox::createGroup(not_null<PeerListBox*> selectUsersBox, const QString &title, const std::vector<not_null<PeerData*>> &users) {
+void GroupInfoBox::createGroup(not_null<PeerListBox *> selectUsersBox, const QString &title,
+                               const std::vector<not_null<PeerData *>> &users) {
 	if (_creationRequestId) return;
 
 	auto inputs = QVector<MTPInputUser>();
@@ -404,61 +426,61 @@ void GroupInfoBox::createGroup(not_null<PeerListBox*> selectUsersBox, const QStr
 			inputs.push_back(user->inputUser);
 		}
 	}
-	_creationRequestId = request(MTPmessages_CreateChat(MTP_vector<MTPInputUser>(inputs), MTP_string(title))).done([this](const MTPUpdates &result) {
-		Ui::hideLayer();
+	_creationRequestId =
+	    request(MTPmessages_CreateChat(MTP_vector<MTPInputUser>(inputs), MTP_string(title)))
+	        .done([this](const MTPUpdates &result) {
+		        Ui::hideLayer();
 
-		App::main()->sentUpdatesReceived(result);
+		        App::main()->sentUpdatesReceived(result);
 
-		auto success = base::make_optional(&result)
-			| [](auto updates) -> base::optional<const QVector<MTPChat>*> {
-				switch (updates->type()) {
-				case mtpc_updates:
-					return &updates->c_updates().vchats.v;
-				case mtpc_updatesCombined:
-					return &updates->c_updatesCombined().vchats.v;
-				}
-				LOG(("API Error: unexpected update cons %1 (GroupInfoBox::creationDone)").arg(updates->type()));
-				return base::none;
-			}
-			| [](auto chats) {
-				return (!chats->empty() && chats->front().type() == mtpc_chat)
-					? base::make_optional(chats)
-					: base::none;
-			}
-			| [](auto chats) {
-				return App::chat(chats->front().c_chat().vid.v);
-			}
-			| [this](not_null<ChatData*> chat) {
-				if (!_photoImage.isNull()) {
-					Messenger::Instance().uploadProfilePhoto(_photoImage, chat->id);
-				}
-				Ui::showPeerHistory(chat, ShowAtUnreadMsgId);
-			};
-		if (!success) {
-			LOG(("API Error: chat not found in updates (ContactsBox::creationDone)"));
-		}
-	}).fail([this, selectUsersBox](const RPCError &error) {
-		_creationRequestId = 0;
-		if (error.type() == qstr("NO_CHAT_TITLE")) {
-			auto guard = weak(this);
-			selectUsersBox->closeBox();
-			if (guard) {
-				_title->showError();
-			}
-		} else if (error.type() == qstr("USERS_TOO_FEW")) {
-		} else if (error.type() == qstr("PEER_FLOOD")) {
-			Ui::show(Box<InformBox>(PeerFloodErrorText(PeerFloodType::InviteGroup)), KeepOtherLayers);
-		} else if (error.type() == qstr("USER_RESTRICTED")) {
-			Ui::show(Box<InformBox>(lang(lng_cant_do_this)), KeepOtherLayers);
-		}
-	}).send();
+		        auto success =
+		            base::make_optional(&result) | [](auto updates) -> base::optional<const QVector<MTPChat> *> {
+			        switch (updates->type()) {
+			        case mtpc_updates: return &updates->c_updates().vchats.v;
+			        case mtpc_updatesCombined: return &updates->c_updatesCombined().vchats.v;
+			        }
+			        LOG(("API Error: unexpected update cons %1 (GroupInfoBox::creationDone)").arg(updates->type()));
+			        return base::none;
+		        } | [](auto chats) {
+			        return (!chats->empty() && chats->front().type() == mtpc_chat) ? base::make_optional(chats) :
+			                                                                         base::none;
+		        } | [](auto chats) {
+			        return App::chat(chats->front().c_chat().vid.v);
+		        } | [this](not_null<ChatData *> chat) {
+			        if (!_photoImage.isNull()) {
+				        Messenger::Instance().uploadProfilePhoto(_photoImage, chat->id);
+			        }
+			        Ui::showPeerHistory(chat, ShowAtUnreadMsgId);
+		        };
+		        if (!success) {
+			        LOG(("API Error: chat not found in updates (ContactsBox::creationDone)"));
+		        }
+	        })
+	        .fail([this, selectUsersBox](const RPCError &error) {
+		        _creationRequestId = 0;
+		        if (error.type() == qstr("NO_CHAT_TITLE")) {
+			        auto guard = weak(this);
+			        selectUsersBox->closeBox();
+			        if (guard) {
+				        _title->showError();
+			        }
+		        } else if (error.type() == qstr("USERS_TOO_FEW")) {
+		        } else if (error.type() == qstr("PEER_FLOOD")) {
+			        Ui::show(Box<InformBox>(PeerFloodErrorText(PeerFloodType::InviteGroup)), KeepOtherLayers);
+		        } else if (error.type() == qstr("USER_RESTRICTED")) {
+			        Ui::show(Box<InformBox>(lang(lng_cant_do_this)), KeepOtherLayers);
+		        }
+	        })
+	        .send();
 }
 
 void GroupInfoBox::onNext() {
 	if (_creationRequestId) return;
 
 	auto title = TextUtilities::PrepareForSending(_title->getLastText());
-	auto description = _description ? TextUtilities::PrepareForSending(_description->getLastText(), TextUtilities::PrepareTextOption::CheckLinks) : QString();
+	auto description = _description ? TextUtilities::PrepareForSending(_description->getLastText(),
+	                                                                   TextUtilities::PrepareTextOption::CheckLinks) :
+	                                  QString();
 	if (title.isEmpty()) {
 		_title->setFocus();
 		_title->showError();
@@ -467,7 +489,7 @@ void GroupInfoBox::onNext() {
 	if (_creating != CreatingGroupGroup) {
 		createChannel(title, description);
 	} else {
-		auto initBox = [title, weak = weak(this)](not_null<PeerListBox*> box) {
+		auto initBox = [title, weak = weak(this)](not_null<PeerListBox *> box) {
 			box->addButton(langFactory(lng_create_group_create), [box, title, weak] {
 				if (weak) {
 					auto rows = box->peerListCollectSelectedRows();
@@ -478,68 +500,65 @@ void GroupInfoBox::onNext() {
 			});
 			box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
 		};
-		Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(nullptr), std::move(initBox)), KeepOtherLayers);
+		Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(nullptr), std::move(initBox)),
+		         KeepOtherLayers);
 	}
 }
 
 void GroupInfoBox::createChannel(const QString &title, const QString &description) {
 	bool mega = false;
 	auto flags = mega ? MTPchannels_CreateChannel::Flag::f_megagroup : MTPchannels_CreateChannel::Flag::f_broadcast;
-	_creationRequestId = request(MTPchannels_CreateChannel(MTP_flags(flags), MTP_string(title), MTP_string(description))).done([this](const MTPUpdates &result) {
-		App::main()->sentUpdatesReceived(result);
+	_creationRequestId =
+	    request(MTPchannels_CreateChannel(MTP_flags(flags), MTP_string(title), MTP_string(description)))
+	        .done([this](const MTPUpdates &result) {
+		        App::main()->sentUpdatesReceived(result);
 
-		auto success = base::make_optional(&result)
-			| [](auto updates) -> base::optional<const QVector<MTPChat>*> {
-				switch (updates->type()) {
-				case mtpc_updates:
-					return &updates->c_updates().vchats.v;
-				case mtpc_updatesCombined:
-					return &updates->c_updatesCombined().vchats.v;
-				}
-				LOG(("API Error: unexpected update cons %1 (GroupInfoBox::createChannel)").arg(updates->type()));
-				return base::none;
-			}
-			| [](auto chats) {
-				return (!chats->empty() && chats->front().type() == mtpc_channel)
-					? base::make_optional(chats)
-					: base::none;
-			}
-			| [](auto chats) {
-				return App::channel(chats->front().c_channel().vid.v);
-			}
-			| [this](not_null<ChannelData*> channel) {
-				if (!_photoImage.isNull()) {
-					Messenger::Instance().uploadProfilePhoto(
-						_photoImage,
-						channel->id);
-				}
-				_createdChannel = channel;
-				_creationRequestId = request(
-					MTPchannels_ExportInvite(_createdChannel->inputChannel)
-				).done([this](const MTPExportedChatInvite &result) {
-					_creationRequestId = 0;
-					if (result.type() == mtpc_chatInviteExported) {
-						auto link = qs(result.c_chatInviteExported().vlink);
-						_createdChannel->setInviteLink(link);
-					}
-					Ui::show(Box<SetupChannelBox>(_createdChannel));
-				}).send();
-			};
-		if (!success) {
-			LOG(("API Error: channel not found in updates (GroupInfoBox::creationDone)"));
-			closeBox();
-		}
-	}).fail([this](const RPCError &error) {
-		_creationRequestId = 0;
-		if (error.type() == "NO_CHAT_TITLE") {
-			_title->setFocus();
-			_title->showError();
-		} else if (error.type() == qstr("USER_RESTRICTED")) {
-			Ui::show(Box<InformBox>(lang(lng_cant_do_this)));
-		} else if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
-			Ui::show(Box<InformBox>(lang(lng_cant_do_this))); // TODO
-		}
-	}).send();
+		        auto success =
+		            base::make_optional(&result) | [](auto updates) -> base::optional<const QVector<MTPChat> *> {
+			        switch (updates->type()) {
+			        case mtpc_updates: return &updates->c_updates().vchats.v;
+			        case mtpc_updatesCombined: return &updates->c_updatesCombined().vchats.v;
+			        }
+			        LOG(("API Error: unexpected update cons %1 (GroupInfoBox::createChannel)").arg(updates->type()));
+			        return base::none;
+		        } | [](auto chats) {
+			        return (!chats->empty() && chats->front().type() == mtpc_channel) ? base::make_optional(chats) :
+			                                                                            base::none;
+		        } | [](auto chats) {
+			        return App::channel(chats->front().c_channel().vid.v);
+		        } | [this](not_null<ChannelData *> channel) {
+			        if (!_photoImage.isNull()) {
+				        Messenger::Instance().uploadProfilePhoto(_photoImage, channel->id);
+			        }
+			        _createdChannel = channel;
+			        _creationRequestId = request(MTPchannels_ExportInvite(_createdChannel->inputChannel))
+			                                 .done([this](const MTPExportedChatInvite &result) {
+				                                 _creationRequestId = 0;
+				                                 if (result.type() == mtpc_chatInviteExported) {
+					                                 auto link = qs(result.c_chatInviteExported().vlink);
+					                                 _createdChannel->setInviteLink(link);
+				                                 }
+				                                 Ui::show(Box<SetupChannelBox>(_createdChannel));
+			                                 })
+			                                 .send();
+		        };
+		        if (!success) {
+			        LOG(("API Error: channel not found in updates (GroupInfoBox::creationDone)"));
+			        closeBox();
+		        }
+	        })
+	        .fail([this](const RPCError &error) {
+		        _creationRequestId = 0;
+		        if (error.type() == "NO_CHAT_TITLE") {
+			        _title->setFocus();
+			        _title->showError();
+		        } else if (error.type() == qstr("USER_RESTRICTED")) {
+			        Ui::show(Box<InformBox>(lang(lng_cant_do_this)));
+		        } else if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
+			        Ui::show(Box<InformBox>(lang(lng_cant_do_this))); // TODO
+		        }
+	        })
+	        .send();
 }
 
 void GroupInfoBox::onDescriptionResized() {
@@ -548,9 +567,11 @@ void GroupInfoBox::onDescriptionResized() {
 }
 
 void GroupInfoBox::updateMaxHeight() {
-	auto newHeight = st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupPhotoSize + st::boxPadding.bottom() + st::newGroupInfoPadding.bottom();
+	auto newHeight = st::boxPadding.top() + st::newGroupInfoPadding.top() + st::newGroupPhotoSize +
+	                 st::boxPadding.bottom() + st::newGroupInfoPadding.bottom();
 	if (_description) {
-		newHeight += st::newGroupDescriptionPadding.top() + _description->height() + st::newGroupDescriptionPadding.bottom();
+		newHeight +=
+		    st::newGroupDescriptionPadding.top() + _description->height() + st::newGroupDescriptionPadding.bottom();
 	}
 	setDimensions(st::boxWideWidth, newHeight);
 }
@@ -560,24 +581,34 @@ void GroupInfoBox::onPhotoReady(const QImage &img) {
 	_photo->setImage(_photoImage);
 }
 
-SetupChannelBox::SetupChannelBox(QWidget*, ChannelData *channel, bool existing)
-: _channel(channel)
-, _existing(existing)
-, _privacyGroup(std::make_shared<Ui::RadioenumGroup<Privacy>>(Privacy::Public))
-, _public(this, _privacyGroup, Privacy::Public, lang(channel->isMegagroup() ? lng_create_public_group_title : lng_create_public_channel_title), st::defaultBoxCheckbox)
-, _private(this, _privacyGroup, Privacy::Private, lang(channel->isMegagroup() ? lng_create_private_group_title : lng_create_private_channel_title), st::defaultBoxCheckbox)
-, _aboutPublicWidth(st::boxWideWidth - st::boxPadding.left() - st::boxButtonPadding.right() - st::newGroupPadding.left() - st::defaultRadio.diameter - st::defaultBoxCheckbox.textPosition.x())
-, _aboutPublic(st::defaultTextStyle, lang(channel->isMegagroup() ? lng_create_public_group_about : lng_create_public_channel_about), _defaultOptions, _aboutPublicWidth)
-, _aboutPrivate(st::defaultTextStyle, lang(channel->isMegagroup() ? lng_create_private_group_about : lng_create_private_channel_about), _defaultOptions, _aboutPublicWidth)
-, _link(this, st::setupChannelLink, base::lambda<QString()>(), channel->username, true) {
-}
+SetupChannelBox::SetupChannelBox(QWidget *, ChannelData *channel, bool existing)
+    : _channel(channel)
+    , _existing(existing)
+    , _privacyGroup(std::make_shared<Ui::RadioenumGroup<Privacy>>(Privacy::Public))
+    , _public(this, _privacyGroup, Privacy::Public,
+              lang(channel->isMegagroup() ? lng_create_public_group_title : lng_create_public_channel_title),
+              st::defaultBoxCheckbox)
+    , _private(this, _privacyGroup, Privacy::Private,
+               lang(channel->isMegagroup() ? lng_create_private_group_title : lng_create_private_channel_title),
+               st::defaultBoxCheckbox)
+    , _aboutPublicWidth(st::boxWideWidth - st::boxPadding.left() - st::boxButtonPadding.right() -
+                        st::newGroupPadding.left() - st::defaultRadio.diameter -
+                        st::defaultBoxCheckbox.textPosition.x())
+    , _aboutPublic(st::defaultTextStyle,
+                   lang(channel->isMegagroup() ? lng_create_public_group_about : lng_create_public_channel_about),
+                   _defaultOptions, _aboutPublicWidth)
+    , _aboutPrivate(st::defaultTextStyle,
+                    lang(channel->isMegagroup() ? lng_create_private_group_about : lng_create_private_channel_about),
+                    _defaultOptions, _aboutPublicWidth)
+    , _link(this, st::setupChannelLink, base::lambda<QString()>(), channel->username, true) {}
 
 void SetupChannelBox::prepare() {
 	_aboutPublicHeight = _aboutPublic.countHeight(_aboutPublicWidth);
 
 	setMouseTracking(true);
 
-	_checkRequestId = MTP::send(MTPchannels_CheckUsername(_channel->inputChannel, MTP_string("preston")), RPCDoneHandlerPtr(), rpcFail(&SetupChannelBox::onFirstCheckFail));
+	_checkRequestId = MTP::send(MTPchannels_CheckUsername(_channel->inputChannel, MTP_string("preston")),
+	                            RPCDoneHandlerPtr(), rpcFail(&SetupChannelBox::onFirstCheckFail));
 
 	addButton(langFactory(lng_settings_save), [this] { onSave(); });
 	addButton(langFactory(_existing ? lng_cancel : lng_create_group_skip), [this] { closeBox(); });
@@ -589,11 +620,12 @@ void SetupChannelBox::prepare() {
 	connect(&_checkTimer, SIGNAL(timeout()), this, SLOT(onCheck()));
 
 	_privacyGroup->setChangedCallback([this](Privacy value) { privacyChanged(value); });
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::InviteLinkChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _channel) {
-			rtlupdate(_invitationLink);
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::InviteLinkChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _channel) {
+			                                                            rtlupdate(_invitationLink);
+		                                                            }
+	                                                            }));
 	subscribe(boxClosing, [this] {
 		if (!_existing) {
 			AddParticipantsBoxController::Start(_channel);
@@ -612,7 +644,9 @@ void SetupChannelBox::setInnerFocus() {
 }
 
 void SetupChannelBox::updateMaxHeight() {
-	auto newHeight = st::boxPadding.top() + st::newGroupPadding.top() + _public->heightNoMargins() + _aboutPublicHeight + st::newGroupSkip + _private->heightNoMargins() + _aboutPrivate.countHeight(_aboutPublicWidth) + st::newGroupSkip + st::newGroupPadding.bottom();
+	auto newHeight = st::boxPadding.top() + st::newGroupPadding.top() + _public->heightNoMargins() +
+	                 _aboutPublicHeight + st::newGroupSkip + _private->heightNoMargins() +
+	                 _aboutPrivate.countHeight(_aboutPublicWidth) + st::newGroupSkip + st::newGroupPadding.bottom();
 	if (!_channel->isMegagroup() || _privacyGroup->value() == Privacy::Public) {
 		newHeight += st::newGroupLinkPadding.top() + _link->height() + st::newGroupLinkPadding.bottom();
 	}
@@ -640,16 +674,22 @@ void SetupChannelBox::paintEvent(QPaintEvent *e) {
 	p.fillRect(e->rect(), st::boxBg);
 	p.setPen(st::newGroupAboutFg);
 
-	QRect aboutPublic(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultRadio.diameter + st::defaultBoxCheckbox.textPosition.x(), _public->bottomNoMargins(), _aboutPublicWidth, _aboutPublicHeight);
+	QRect aboutPublic(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultRadio.diameter +
+	                      st::defaultBoxCheckbox.textPosition.x(),
+	                  _public->bottomNoMargins(), _aboutPublicWidth, _aboutPublicHeight);
 	_aboutPublic.drawLeft(p, aboutPublic.x(), aboutPublic.y(), aboutPublic.width(), width());
 
-	QRect aboutPrivate(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultRadio.diameter + st::defaultBoxCheckbox.textPosition.x(), _private->bottomNoMargins(), _aboutPublicWidth, _aboutPublicHeight);
+	QRect aboutPrivate(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultRadio.diameter +
+	                       st::defaultBoxCheckbox.textPosition.x(),
+	                   _private->bottomNoMargins(), _aboutPublicWidth, _aboutPublicHeight);
 	_aboutPrivate.drawLeft(p, aboutPrivate.x(), aboutPrivate.y(), aboutPrivate.width(), width());
 
 	if (!_channel->isMegagroup() || !_link->isHidden()) {
 		p.setPen(st::boxTextFg);
 		p.setFont(st::newGroupLinkFont);
-		p.drawTextLeft(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultInputField.textMargins.left(), _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop, width(), lang(_link->isHidden() ? lng_create_group_invite_link : lng_create_group_link));
+		p.drawTextLeft(st::boxPadding.left() + st::newGroupPadding.left() + st::defaultInputField.textMargins.left(),
+		               _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop, width(),
+		               lang(_link->isHidden() ? lng_create_group_invite_link : lng_create_group_link));
 	}
 
 	if (_link->isHidden()) {
@@ -658,18 +698,25 @@ void SetupChannelBox::paintEvent(QPaintEvent *e) {
 			option.setWrapMode(QTextOption::WrapAnywhere);
 			p.setFont(_linkOver ? st::boxTextFont->underline() : st::boxTextFont);
 			p.setPen(st::defaultLinkButton.color);
-			auto inviteLinkText = _channel->inviteLink().isEmpty() ? lang(lng_group_invite_create) : _channel->inviteLink();
+			auto inviteLinkText =
+			    _channel->inviteLink().isEmpty() ? lang(lng_group_invite_create) : _channel->inviteLink();
 			p.drawText(_invitationLink, inviteLinkText, option);
 		}
 	} else {
 		if (!_errorText.isEmpty()) {
 			p.setPen(st::boxTextFgError);
 			p.setFont(st::boxTextFont);
-			p.drawTextRight(st::boxPadding.right(), _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop + st::newGroupLinkFont->ascent - st::boxTextFont->ascent, width(), _errorText);
+			p.drawTextRight(st::boxPadding.right(),
+			                _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop +
+			                    st::newGroupLinkFont->ascent - st::boxTextFont->ascent,
+			                width(), _errorText);
 		} else if (!_goodText.isEmpty()) {
 			p.setPen(st::boxTextFgGood);
 			p.setFont(st::boxTextFont);
-			p.drawTextRight(st::boxPadding.right(), _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop + st::newGroupLinkFont->ascent - st::boxTextFont->ascent, width(), _goodText);
+			p.drawTextRight(st::boxPadding.right(),
+			                _link->y() - st::newGroupLinkPadding.top() + st::newGroupLinkTop +
+			                    st::newGroupLinkFont->ascent - st::boxTextFont->ascent,
+			                width(), _goodText);
 		}
 	}
 }
@@ -677,12 +724,18 @@ void SetupChannelBox::paintEvent(QPaintEvent *e) {
 void SetupChannelBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_public->moveToLeft(st::boxPadding.left() + st::newGroupPadding.left(), st::boxPadding.top() + st::newGroupPadding.top());
-	_private->moveToLeft(st::boxPadding.left() + st::newGroupPadding.left(), _public->bottomNoMargins() + _aboutPublicHeight + st::newGroupSkip);
+	_public->moveToLeft(st::boxPadding.left() + st::newGroupPadding.left(),
+	                    st::boxPadding.top() + st::newGroupPadding.top());
+	_private->moveToLeft(st::boxPadding.left() + st::newGroupPadding.left(),
+	                     _public->bottomNoMargins() + _aboutPublicHeight + st::newGroupSkip);
 
-	_link->resize(width() - st::boxPadding.left() - st::newGroupLinkPadding.left() - st::boxPadding.right(), _link->height());
-	_link->moveToLeft(st::boxPadding.left() + st::newGroupLinkPadding.left(), _private->bottomNoMargins() + _aboutPrivate.countHeight(_aboutPublicWidth) + st::newGroupSkip + st::newGroupPadding.bottom() + st::newGroupLinkPadding.top());
-	_invitationLink = QRect(_link->x(), _link->y() + (_link->height() / 2) - st::boxTextFont->height, _link->width(), 2 * st::boxTextFont->height);
+	_link->resize(width() - st::boxPadding.left() - st::newGroupLinkPadding.left() - st::boxPadding.right(),
+	              _link->height());
+	_link->moveToLeft(st::boxPadding.left() + st::newGroupLinkPadding.left(),
+	                  _private->bottomNoMargins() + _aboutPrivate.countHeight(_aboutPublicWidth) + st::newGroupSkip +
+	                      st::newGroupPadding.bottom() + st::newGroupLinkPadding.top());
+	_invitationLink = QRect(_link->x(), _link->y() + (_link->height() / 2) - st::boxTextFont->height, _link->width(),
+	                        2 * st::boxTextFont->height);
 }
 
 void SetupChannelBox::mouseMoveEvent(QMouseEvent *e) {
@@ -719,7 +772,9 @@ void SetupChannelBox::onSave() {
 	if (_privacyGroup->value() == Privacy::Private) {
 		if (_existing) {
 			_sentUsername = QString();
-			_saveRequestId = MTP::send(MTPchannels_UpdateUsername(_channel->inputChannel, MTP_string(_sentUsername)), rpcDone(&SetupChannelBox::onUpdateDone), rpcFail(&SetupChannelBox::onUpdateFail));
+			_saveRequestId =
+			    MTP::send(MTPchannels_UpdateUsername(_channel->inputChannel, MTP_string(_sentUsername)),
+			              rpcDone(&SetupChannelBox::onUpdateDone), rpcFail(&SetupChannelBox::onUpdateFail));
 		} else {
 			closeBox();
 		}
@@ -735,7 +790,8 @@ void SetupChannelBox::onSave() {
 	}
 
 	_sentUsername = link;
-	_saveRequestId = MTP::send(MTPchannels_UpdateUsername(_channel->inputChannel, MTP_string(_sentUsername)), rpcDone(&SetupChannelBox::onUpdateDone), rpcFail(&SetupChannelBox::onUpdateFail));
+	_saveRequestId = MTP::send(MTPchannels_UpdateUsername(_channel->inputChannel, MTP_string(_sentUsername)),
+	                           rpcDone(&SetupChannelBox::onUpdateDone), rpcFail(&SetupChannelBox::onUpdateFail));
 }
 
 void SetupChannelBox::onChange() {
@@ -782,7 +838,8 @@ void SetupChannelBox::onCheck() {
 	QString link = _link->text().trimmed();
 	if (link.size() >= MinUsernameLength) {
 		_checkUsername = link;
-		_checkRequestId = MTP::send(MTPchannels_CheckUsername(_channel->inputChannel, MTP_string(link)), rpcDone(&SetupChannelBox::onCheckDone), rpcFail(&SetupChannelBox::onCheckFail));
+		_checkRequestId = MTP::send(MTPchannels_CheckUsername(_channel->inputChannel, MTP_string(link)),
+		                            rpcDone(&SetupChannelBox::onCheckDone), rpcFail(&SetupChannelBox::onCheckFail));
 	}
 }
 
@@ -790,11 +847,13 @@ void SetupChannelBox::privacyChanged(Privacy value) {
 	if (value == Privacy::Public) {
 		if (_tooMuchUsernames) {
 			_privacyGroup->setValue(Privacy::Private);
-			Ui::show(Box<RevokePublicLinkBox>(base::lambda_guarded(this, [this] {
-				_tooMuchUsernames = false;
-				_privacyGroup->setValue(Privacy::Public);
-				onCheck();
-			})), KeepOtherLayers);
+			Ui::show(Box<RevokePublicLinkBox>(base::lambda_guarded(this,
+			                                                       [this] {
+				                                                       _tooMuchUsernames = false;
+				                                                       _privacyGroup->setValue(Privacy::Public);
+				                                                       onCheck();
+			                                                       })),
+			         KeepOtherLayers);
 			return;
 		}
 		_link->show();
@@ -843,7 +902,9 @@ bool SetupChannelBox::onUpdateFail(const RPCError &error) {
 
 void SetupChannelBox::onCheckDone(const MTPBool &result) {
 	_checkRequestId = 0;
-	QString newError = (mtpIsTrue(result) || _checkUsername == _channel->username) ? QString() : lang(lng_create_channel_link_occupied);
+	QString newError = (mtpIsTrue(result) || _checkUsername == _channel->username) ?
+	                       QString() :
+	                       lang(lng_create_channel_link_occupied);
 	QString newGood = newError.isEmpty() ? lang(lng_create_channel_link_available) : QString();
 	if (_errorText != newError || _goodText != newGood) {
 		_errorText = newError;
@@ -885,8 +946,9 @@ bool SetupChannelBox::onCheckFail(const RPCError &error) {
 void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 	closeBox();
 	Ui::show(Box<RevokePublicLinkBox>([channel = _channel, existing = _existing]() {
-		Ui::show(Box<SetupChannelBox>(channel, existing), KeepOtherLayers);
-	}), KeepOtherLayers);
+		         Ui::show(Box<SetupChannelBox>(channel, existing), KeepOtherLayers);
+	         }),
+	         KeepOtherLayers);
 }
 
 bool SetupChannelBox::onFirstCheckFail(const RPCError &error) {
@@ -911,12 +973,13 @@ bool SetupChannelBox::onFirstCheckFail(const RPCError &error) {
 	return true;
 }
 
-EditNameTitleBox::EditNameTitleBox(QWidget*, not_null<PeerData*> peer)
-: _peer(peer)
-, _first(this, st::defaultInputField, langFactory(_peer->isUser() ? lng_signup_firstname : lng_dlg_new_group_name), _peer->isUser() ? _peer->asUser()->firstName : _peer->name)
-, _last(this, st::defaultInputField, langFactory(lng_signup_lastname), peer->isUser() ? peer->asUser()->lastName : QString())
-, _invertOrder(!peer->isChat() && langFirstNameGoesSecond()) {
-}
+EditNameTitleBox::EditNameTitleBox(QWidget *, not_null<PeerData *> peer)
+    : _peer(peer)
+    , _first(this, st::defaultInputField, langFactory(_peer->isUser() ? lng_signup_firstname : lng_dlg_new_group_name),
+             _peer->isUser() ? _peer->asUser()->firstName : _peer->name)
+    , _last(this, st::defaultInputField, langFactory(lng_signup_lastname),
+            peer->isUser() ? peer->asUser()->lastName : QString())
+    , _invertOrder(!peer->isChat() && langFirstNameGoesSecond()) {}
 
 void EditNameTitleBox::prepare() {
 	auto newHeight = st::contactPadding.top() + _first->height();
@@ -974,14 +1037,17 @@ void EditNameTitleBox::onSubmit() {
 void EditNameTitleBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_first->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _first->height());
+	_first->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(),
+	               _first->height());
 	_last->resize(_first->size());
 	if (_invertOrder) {
 		_last->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::contactPadding.top());
-		_first->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _last->y() + _last->height() + st::contactSkip);
+		_first->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                   _last->y() + _last->height() + st::contactSkip);
 	} else {
 		_first->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::contactPadding.top());
-		_last->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _first->y() + _first->height() + st::contactSkip);
+		_last->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                  _first->y() + _first->height() + st::contactSkip);
 	}
 }
 
@@ -1007,9 +1073,12 @@ void EditNameTitleBox::onSave() {
 	_sentName = first;
 	if (_peer == App::self()) {
 		auto flags = MTPaccount_UpdateProfile::Flag::f_first_name | MTPaccount_UpdateProfile::Flag::f_last_name;
-		_requestId = MTP::send(MTPaccount_UpdateProfile(MTP_flags(flags), MTP_string(first), MTP_string(last), MTPstring()), rpcDone(&EditNameTitleBox::onSaveSelfDone), rpcFail(&EditNameTitleBox::onSaveSelfFail));
+		_requestId =
+		    MTP::send(MTPaccount_UpdateProfile(MTP_flags(flags), MTP_string(first), MTP_string(last), MTPstring()),
+		              rpcDone(&EditNameTitleBox::onSaveSelfDone), rpcFail(&EditNameTitleBox::onSaveSelfFail));
 	} else if (_peer->isChat()) {
-		_requestId = MTP::send(MTPmessages_EditChatTitle(_peer->asChat()->inputChat, MTP_string(first)), rpcDone(&EditNameTitleBox::onSaveChatDone), rpcFail(&EditNameTitleBox::onSaveChatFail));
+		_requestId = MTP::send(MTPmessages_EditChatTitle(_peer->asChat()->inputChat, MTP_string(first)),
+		                       rpcDone(&EditNameTitleBox::onSaveChatDone), rpcFail(&EditNameTitleBox::onSaveChatFail));
 	}
 }
 
@@ -1066,13 +1135,13 @@ void EditNameTitleBox::onSaveChatDone(const MTPUpdates &updates) {
 	closeBox();
 }
 
-EditBioBox::EditBioBox(QWidget*, not_null<UserData*> self) : BoxContent()
-, _dynamicFieldStyle(CreateBioFieldStyle())
-, _self(self)
-, _bio(this, _dynamicFieldStyle, langFactory(lng_bio_placeholder), _self->about())
-, _countdown(this, QString(), Ui::FlatLabel::InitType::Simple, st::editBioCountdownLabel)
-, _about(this, lang(lng_bio_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) {
-}
+EditBioBox::EditBioBox(QWidget *, not_null<UserData *> self)
+    : BoxContent()
+    , _dynamicFieldStyle(CreateBioFieldStyle())
+    , _self(self)
+    , _bio(this, _dynamicFieldStyle, langFactory(lng_bio_placeholder), _self->about())
+    , _countdown(this, QString(), Ui::FlatLabel::InitType::Simple, st::editBioCountdownLabel)
+    , _about(this, lang(lng_bio_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel) {}
 
 void EditBioBox::prepare() {
 	setTitle(langFactory(lng_bio_title));
@@ -1092,7 +1161,8 @@ void EditBioBox::prepare() {
 }
 
 void EditBioBox::updateMaxHeight() {
-	auto newHeight = st::contactPadding.top() + _bio->height() + st::boxLittleSkip + _about->height() + st::boxPadding.bottom() + st::contactPadding.bottom();
+	auto newHeight = st::contactPadding.top() + _bio->height() + st::boxLittleSkip + _about->height() +
+	                 st::boxPadding.bottom() + st::contactPadding.bottom();
 	setDimensions(st::boxWideWidth, newHeight);
 }
 
@@ -1116,7 +1186,8 @@ void EditBioBox::setInnerFocus() {
 void EditBioBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_bio->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _bio->height());
+	_bio->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(),
+	             _bio->height());
 	_bio->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::contactPadding.top());
 	_countdown->moveToRight(st::boxPadding.right(), _bio->y() + _dynamicFieldStyle.textMargins.top());
 	_about->moveToLeft(st::boxPadding.left(), _bio->y() + _bio->height() + st::boxLittleSkip);
@@ -1129,23 +1200,27 @@ void EditBioBox::save() {
 	_sentBio = text;
 
 	auto flags = MTPaccount_UpdateProfile::Flag::f_about;
-	_requestId = request(MTPaccount_UpdateProfile(MTP_flags(flags), MTPstring(), MTPstring(), MTP_string(text))).done([this](const MTPUser &result) {
-		App::feedUsers(MTP_vector<MTPUser>(1, result));
-		_self->setAbout(_sentBio);
-		closeBox();
-	}).send();
+	_requestId = request(MTPaccount_UpdateProfile(MTP_flags(flags), MTPstring(), MTPstring(), MTP_string(text)))
+	                 .done([this](const MTPUser &result) {
+		                 App::feedUsers(MTP_vector<MTPUser>(1, result));
+		                 _self->setAbout(_sentBio);
+		                 closeBox();
+	                 })
+	                 .send();
 }
 
-EditChannelBox::EditChannelBox(QWidget*, not_null<ChannelData*> channel)
-: _channel(channel)
-, _title(this, st::defaultInputField, langFactory(_channel->isMegagroup() ? lng_dlg_new_group_name : lng_dlg_new_channel_name), _channel->name)
-, _description(this, st::newGroupDescription, langFactory(lng_create_group_description), _channel->about())
-, _sign(this, lang(lng_edit_sign_messages), channel->addsSignature(), st::defaultBoxCheckbox)
-, _inviteGroup(std::make_shared<Ui::RadioenumGroup<Invites>>(channel->anyoneCanAddMembers() ? Invites::Everybody : Invites::OnlyAdmins))
-, _inviteEverybody(this, _inviteGroup, Invites::Everybody, lang(lng_edit_group_invites_everybody))
-, _inviteOnlyAdmins(this, _inviteGroup, Invites::OnlyAdmins, lang(lng_edit_group_invites_only_admins))
-, _publicLink(this, lang(channel->isPublic() ? lng_profile_edit_public_link : lng_profile_create_public_link), st::boxLinkButton) {
-}
+EditChannelBox::EditChannelBox(QWidget *, not_null<ChannelData *> channel)
+    : _channel(channel)
+    , _title(this, st::defaultInputField,
+             langFactory(_channel->isMegagroup() ? lng_dlg_new_group_name : lng_dlg_new_channel_name), _channel->name)
+    , _description(this, st::newGroupDescription, langFactory(lng_create_group_description), _channel->about())
+    , _sign(this, lang(lng_edit_sign_messages), channel->addsSignature(), st::defaultBoxCheckbox)
+    , _inviteGroup(std::make_shared<Ui::RadioenumGroup<Invites>>(channel->anyoneCanAddMembers() ? Invites::Everybody :
+                                                                                                  Invites::OnlyAdmins))
+    , _inviteEverybody(this, _inviteGroup, Invites::Everybody, lang(lng_edit_group_invites_everybody))
+    , _inviteOnlyAdmins(this, _inviteGroup, Invites::OnlyAdmins, lang(lng_edit_group_invites_only_admins))
+    , _publicLink(this, lang(channel->isPublic() ? lng_profile_edit_public_link : lng_profile_create_public_link),
+                  st::boxLinkButton) {}
 
 void EditChannelBox::prepare() {
 	setTitle(langFactory(_channel->isMegagroup() ? lng_edit_group : lng_edit_channel_title));
@@ -1153,11 +1228,12 @@ void EditChannelBox::prepare() {
 	addButton(langFactory(lng_settings_save), [this] { onSave(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _channel) {
-			handleChannelNameChange();
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _channel) {
+			                                                            handleChannelNameChange();
+		                                                            }
+	                                                            }));
 
 	setMouseTracking(true);
 
@@ -1211,16 +1287,19 @@ bool EditChannelBox::canEditInvites() const {
 
 void EditChannelBox::updateMaxHeight() {
 	auto newHeight = st::newGroupInfoPadding.top() + _title->height();
-	newHeight += st::newGroupDescriptionPadding.top() + _description->height() + st::newGroupDescriptionPadding.bottom();
+	newHeight +=
+	    st::newGroupDescriptionPadding.top() + _description->height() + st::newGroupDescriptionPadding.bottom();
 	if (canEditSignatures()) {
-		newHeight += st::newGroupPublicLinkPadding.top() + _sign->heightNoMargins() + st::newGroupPublicLinkPadding.bottom();
+		newHeight +=
+		    st::newGroupPublicLinkPadding.top() + _sign->heightNoMargins() + st::newGroupPublicLinkPadding.bottom();
 	}
 	if (canEditInvites()) {
 		newHeight += st::boxTitleHeight + _inviteEverybody->heightNoMargins();
 		newHeight += st::boxLittleSkip + _inviteOnlyAdmins->heightNoMargins();
 	}
 	if (_channel->canEditUsername()) {
-		newHeight += st::newGroupPublicLinkPadding.top() + _publicLink->height() + st::newGroupPublicLinkPadding.bottom();
+		newHeight +=
+		    st::newGroupPublicLinkPadding.top() + _publicLink->height() + st::newGroupPublicLinkPadding.bottom();
 	}
 	newHeight += st::boxPadding.bottom() + st::newGroupInfoPadding.bottom();
 	setDimensions(st::boxWideWidth, newHeight);
@@ -1229,23 +1308,37 @@ void EditChannelBox::updateMaxHeight() {
 void EditChannelBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_title->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _title->height());
-	_title->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), st::newGroupInfoPadding.top() + st::newGroupNamePosition.y());
+	_title->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(),
+	               _title->height());
+	_title->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                   st::newGroupInfoPadding.top() + st::newGroupNamePosition.y());
 
-	_description->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(), _description->height());
-	_description->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _title->y() + _title->height() + st::newGroupDescriptionPadding.top());
+	_description->resize(width() - st::boxPadding.left() - st::newGroupInfoPadding.left() - st::boxPadding.right(),
+	                     _description->height());
+	_description->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                         _title->y() + _title->height() + st::newGroupDescriptionPadding.top());
 
-	_sign->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _description->y() + _description->height() + st::newGroupDescriptionPadding.bottom() + st::newGroupPublicLinkPadding.top());
+	_sign->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                  _description->y() + _description->height() + st::newGroupDescriptionPadding.bottom() +
+	                      st::newGroupPublicLinkPadding.top());
 
-	_inviteEverybody->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _description->y() + _description->height() + st::boxTitleHeight);
-	_inviteOnlyAdmins->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _inviteEverybody->bottomNoMargins() + st::boxLittleSkip);
+	_inviteEverybody->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                             _description->y() + _description->height() + st::boxTitleHeight);
+	_inviteOnlyAdmins->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+	                              _inviteEverybody->bottomNoMargins() + st::boxLittleSkip);
 
 	if (canEditSignatures()) {
-		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _sign->bottomNoMargins() + st::newGroupDescriptionPadding.bottom() + st::newGroupPublicLinkPadding.top());
+		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                        _sign->bottomNoMargins() + st::newGroupDescriptionPadding.bottom() +
+		                            st::newGroupPublicLinkPadding.top());
 	} else if (canEditInvites()) {
-		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _inviteOnlyAdmins->bottomNoMargins() + st::newGroupDescriptionPadding.bottom() + st::newGroupPublicLinkPadding.top());
+		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                        _inviteOnlyAdmins->bottomNoMargins() + st::newGroupDescriptionPadding.bottom() +
+		                            st::newGroupPublicLinkPadding.top());
 	} else {
-		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(), _description->y() + _description->height() + st::newGroupDescriptionPadding.bottom() + st::newGroupPublicLinkPadding.top());
+		_publicLink->moveToLeft(st::boxPadding.left() + st::newGroupInfoPadding.left(),
+		                        _description->y() + _description->height() + st::newGroupDescriptionPadding.bottom() +
+		                            st::newGroupPublicLinkPadding.top());
 	}
 }
 
@@ -1256,7 +1349,8 @@ void EditChannelBox::paintEvent(QPaintEvent *e) {
 		Painter p(this);
 		p.setPen(st::boxTitleFg);
 		p.setFont(st::autoDownloadTitleFont);
-		p.drawTextLeft(st::boxTitlePosition.x(), _description->y() + _description->height() + st::boxTitlePosition.y(), width(), lang(lng_edit_group_who_invites));
+		p.drawTextLeft(st::boxTitlePosition.x(), _description->y() + _description->height() + st::boxTitlePosition.y(),
+		               width(), lang(lng_edit_group_who_invites));
 	}
 }
 
@@ -1264,7 +1358,8 @@ void EditChannelBox::onSave() {
 	if (_saveTitleRequestId || _saveDescriptionRequestId || _saveSignRequestId || _saveInvitesRequestId) return;
 
 	auto title = TextUtilities::PrepareForSending(_title->getLastText());
-	auto description = TextUtilities::PrepareForSending(_description->getLastText(), TextUtilities::PrepareTextOption::CheckLinks);
+	auto description =
+	    TextUtilities::PrepareForSending(_description->getLastText(), TextUtilities::PrepareTextOption::CheckLinks);
 	if (title.isEmpty()) {
 		_title->setFocus();
 		_title->showError();
@@ -1275,7 +1370,9 @@ void EditChannelBox::onSave() {
 	if (_sentTitle == _channel->name) {
 		saveDescription();
 	} else {
-		_saveTitleRequestId = MTP::send(MTPchannels_EditTitle(_channel->inputChannel, MTP_string(_sentTitle)), rpcDone(&EditChannelBox::onSaveTitleDone), rpcFail(&EditChannelBox::onSaveFail));
+		_saveTitleRequestId =
+		    MTP::send(MTPchannels_EditTitle(_channel->inputChannel, MTP_string(_sentTitle)),
+		              rpcDone(&EditChannelBox::onSaveTitleDone), rpcFail(&EditChannelBox::onSaveFail));
 	}
 }
 
@@ -1287,7 +1384,9 @@ void EditChannelBox::saveDescription() {
 	if (_sentDescription == _channel->about()) {
 		saveSign();
 	} else {
-		_saveDescriptionRequestId = MTP::send(MTPchannels_EditAbout(_channel->inputChannel, MTP_string(_sentDescription)), rpcDone(&EditChannelBox::onSaveDescriptionDone), rpcFail(&EditChannelBox::onSaveFail));
+		_saveDescriptionRequestId =
+		    MTP::send(MTPchannels_EditAbout(_channel->inputChannel, MTP_string(_sentDescription)),
+		              rpcDone(&EditChannelBox::onSaveDescriptionDone), rpcFail(&EditChannelBox::onSaveFail));
 	}
 }
 
@@ -1295,7 +1394,8 @@ void EditChannelBox::saveSign() {
 	if (!canEditSignatures() || _channel->addsSignature() == _sign->checked()) {
 		saveInvites();
 	} else {
-		_saveSignRequestId = MTP::send(MTPchannels_ToggleSignatures(_channel->inputChannel, MTP_bool(_sign->checked())), rpcDone(&EditChannelBox::onSaveSignDone), rpcFail(&EditChannelBox::onSaveFail));
+		_saveSignRequestId = MTP::send(MTPchannels_ToggleSignatures(_channel->inputChannel, MTP_bool(_sign->checked())),
+		                               rpcDone(&EditChannelBox::onSaveSignDone), rpcFail(&EditChannelBox::onSaveFail));
 	}
 }
 
@@ -1303,7 +1403,9 @@ void EditChannelBox::saveInvites() {
 	if (!canEditInvites() || _channel->anyoneCanAddMembers() == (_inviteGroup->value() == Invites::Everybody)) {
 		closeBox();
 	} else {
-		_saveInvitesRequestId = MTP::send(MTPchannels_ToggleInvites(_channel->inputChannel, MTP_bool(_inviteGroup->value() == Invites::Everybody)), rpcDone(&EditChannelBox::onSaveInvitesDone), rpcFail(&EditChannelBox::onSaveFail));
+		_saveInvitesRequestId = MTP::send(
+		    MTPchannels_ToggleInvites(_channel->inputChannel, MTP_bool(_inviteGroup->value() == Invites::Everybody)),
+		    rpcDone(&EditChannelBox::onSaveInvitesDone), rpcFail(&EditChannelBox::onSaveFail));
 	}
 }
 
@@ -1377,48 +1479,55 @@ void EditChannelBox::onSaveInvitesDone(const MTPUpdates &result) {
 	closeBox();
 }
 
-RevokePublicLinkBox::Inner::Inner(QWidget *parent, base::lambda<void()> revokeCallback) : TWidget(parent)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
-, _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke)))
-, _revokeCallback(std::move(revokeCallback)) {
+RevokePublicLinkBox::Inner::Inner(QWidget *parent, base::lambda<void()> revokeCallback)
+    : TWidget(parent)
+    , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
+    , _revokeWidth(st::normalFont->width(lang(lng_channels_too_much_public_revoke)))
+    , _revokeCallback(std::move(revokeCallback)) {
 	setMouseTracking(true);
 
 	resize(width(), 5 * _rowHeight);
 
-	request(MTPchannels_GetAdminedPublicChannels()).done([this](const MTPmessages_Chats &result) {
-		if (auto chats = Api::getChatsFromMessagesChats(result)) {
-			for_const (auto &chat, chats->v) {
-				if (auto peer = App::feedChat(chat)) {
-					if (!peer->isChannel() || peer->userName().isEmpty()) {
-						continue;
-					}
+	request(MTPchannels_GetAdminedPublicChannels())
+	    .done([this](const MTPmessages_Chats &result) {
+		    if (auto chats = Api::getChatsFromMessagesChats(result)) {
+			    for_const (auto &chat, chats->v) {
+				    if (auto peer = App::feedChat(chat)) {
+					    if (!peer->isChannel() || peer->userName().isEmpty()) {
+						    continue;
+					    }
 
-					auto row = ChatRow(peer);
-					row.peer = peer;
-					row.name.setText(st::contactsNameStyle, peer->name, _textNameOptions);
-					row.status.setText(st::defaultTextStyle, Messenger::Instance().createInternalLink(textcmdLink(1, peer->userName())), _textDlgOptions);
-					_rows.push_back(std::move(row));
-				}
-			}
-		}
-		resize(width(), _rows.size() * _rowHeight);
-		update();
-	}).send();
+					    auto row = ChatRow(peer);
+					    row.peer = peer;
+					    row.name.setText(st::contactsNameStyle, peer->name, _textNameOptions);
+					    row.status.setText(st::defaultTextStyle,
+					                       Messenger::Instance().createInternalLink(textcmdLink(1, peer->userName())),
+					                       _textDlgOptions);
+					    _rows.push_back(std::move(row));
+				    }
+			    }
+		    }
+		    resize(width(), _rows.size() * _rowHeight);
+		    update();
+	    })
+	    .send();
 }
 
-RevokePublicLinkBox::RevokePublicLinkBox(QWidget*, base::lambda<void()> revokeCallback)
-: _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple, st::aboutRevokePublicLabel)
-, _revokeCallback(std::move(revokeCallback)) {
-}
+RevokePublicLinkBox::RevokePublicLinkBox(QWidget *, base::lambda<void()> revokeCallback)
+    : _aboutRevoke(this, lang(lng_channels_too_much_public_about), Ui::FlatLabel::InitType::Simple,
+                   st::aboutRevokePublicLabel)
+    , _revokeCallback(std::move(revokeCallback)) {}
 
 void RevokePublicLinkBox::prepare() {
 	_innerTop = st::boxPadding.top() + _aboutRevoke->height() + st::boxPadding.top();
-	_inner = setInnerWidget(object_ptr<Inner>(this, [this] {
-		closeBox();
-		if (_revokeCallback) {
-			_revokeCallback();
-		}
-	}), st::boxLayerScroll, _innerTop);
+	_inner = setInnerWidget(object_ptr<Inner>(this,
+	                                          [this] {
+		                                          closeBox();
+		                                          if (_revokeCallback) {
+			                                          _revokeCallback();
+		                                          }
+	                                          }),
+	                        st::boxLayerScroll, _innerTop);
 
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
@@ -1437,7 +1546,10 @@ void RevokePublicLinkBox::Inner::updateSelected() {
 	PeerData *selected = nullptr;
 	auto top = _rowsTop;
 	for_const (auto &row, _rows) {
-		auto revokeLink = rtlrect(width() - st::contactsPadding.right() - st::contactsCheckPosition.x() - _revokeWidth, top + st::contactsPadding.top() + (st::contactsPhotoSize - st::normalFont->height) / 2, _revokeWidth, st::normalFont->height, width());
+		auto revokeLink =
+		    rtlrect(width() - st::contactsPadding.right() - st::contactsCheckPosition.x() - _revokeWidth,
+		            top + st::contactsPadding.top() + (st::contactsPhotoSize - st::normalFont->height) / 2,
+		            _revokeWidth, st::normalFont->height, width());
 		if (revokeLink.contains(point)) {
 			selected = row.peer;
 			break;
@@ -1462,20 +1574,31 @@ void RevokePublicLinkBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 	auto pressed = base::take(_pressed);
 	setCursor((_selected || _pressed) ? style::cur_pointer : style::cur_default);
 	if (pressed && pressed == _selected) {
-		auto text_method = pressed->isMegagroup() ? lng_channels_too_much_public_revoke_confirm_group : lng_channels_too_much_public_revoke_confirm_channel;
-		auto text = text_method(lt_link, Messenger::Instance().createInternalLink(pressed->userName()), lt_group, pressed->name);
+		auto text_method = pressed->isMegagroup() ? lng_channels_too_much_public_revoke_confirm_group :
+		                                            lng_channels_too_much_public_revoke_confirm_channel;
+		auto text = text_method(lt_link, Messenger::Instance().createInternalLink(pressed->userName()), lt_group,
+		                        pressed->name);
 		auto confirmText = lang(lng_channels_too_much_public_revoke);
-		_weakRevokeConfirmBox = Ui::show(Box<ConfirmBox>(text, confirmText, base::lambda_guarded(this, [this, pressed]() {
-			if (_revokeRequestId) return;
-			_revokeRequestId = request(MTPchannels_UpdateUsername(pressed->asChannel()->inputChannel, MTP_string(""))).done([this](const MTPBool &result) {
-				if (_weakRevokeConfirmBox) {
-					_weakRevokeConfirmBox->closeBox();
-				}
-				if (_revokeCallback) {
-					_revokeCallback();
-				}
-			}).send();
-		})), KeepOtherLayers);
+		_weakRevokeConfirmBox =
+		    Ui::show(Box<ConfirmBox>(text, confirmText,
+		                             base::lambda_guarded(this,
+		                                                  [this, pressed]() {
+			                                                  if (_revokeRequestId) return;
+			                                                  _revokeRequestId =
+			                                                      request(MTPchannels_UpdateUsername(
+			                                                                  pressed->asChannel()->inputChannel,
+			                                                                  MTP_string("")))
+			                                                          .done([this](const MTPBool &result) {
+				                                                          if (_weakRevokeConfirmBox) {
+					                                                          _weakRevokeConfirmBox->closeBox();
+				                                                          }
+				                                                          if (_revokeCallback) {
+					                                                          _revokeCallback();
+				                                                          }
+			                                                          })
+			                                                          .send();
+		                                                  })),
+		             KeepOtherLayers);
 	}
 }
 
@@ -1505,13 +1628,16 @@ void RevokePublicLinkBox::Inner::paintChat(Painter &p, const ChatRow &row, bool
 	if (peer->isVerified()) {
 		auto icon = &st::dialogsVerifiedIcon;
 		namew -= icon->width();
-		icon->paint(p, namex + std::min(row.name.maxWidth(), namew), st::contactsPadding.top() + st::contactsNameTop, width());
+		icon->paint(p, namex + std::min(row.name.maxWidth(), namew), st::contactsPadding.top() + st::contactsNameTop,
+		            width());
 	}
 	row.name.drawLeftElided(p, namex, st::contactsPadding.top() + st::contactsNameTop, namew, width());
 
 	p.setFont(selected ? st::linkOverFont : st::linkFont);
 	p.setPen(selected ? st::defaultLinkButton.overColor : st::defaultLinkButton.color);
-	p.drawTextRight(st::contactsPadding.right() + st::contactsCheckPosition.x(), st::contactsPadding.top() + (st::contactsPhotoSize - st::normalFont->height) / 2, width(), lang(lng_channels_too_much_public_revoke), _revokeWidth);
+	p.drawTextRight(st::contactsPadding.right() + st::contactsCheckPosition.x(),
+	                st::contactsPadding.top() + (st::contactsPhotoSize - st::normalFont->height) / 2, width(),
+	                lang(lng_channels_too_much_public_revoke), _revokeWidth);
 
 	p.setPen(st::contactsStatusFg);
 	p.setTextPalette(st::revokePublicLinkStatusPalette);
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h
index 61b93559a..72dd67f1c 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@@ -33,10 +33,8 @@ class PhoneInput;
 class InputArea;
 class UsernameInput;
 class Checkbox;
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
 class LinkButton;
 class NewAvatarButton;
 } // namespace Ui
@@ -52,8 +50,8 @@ class AddContactBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	AddContactBox(QWidget*, QString fname = QString(), QString lname = QString(), QString phone = QString());
-	AddContactBox(QWidget*, UserData *user);
+	AddContactBox(QWidget *, QString fname = QString(), QString lname = QString(), QString phone = QString());
+	AddContactBox(QWidget *, UserData *user);
 
 protected:
 	void prepare() override;
@@ -88,14 +86,13 @@ private:
 
 	mtpRequestId _addRequest = 0;
 	QString _sentName;
-
 };
 
 class GroupInfoBox : public BoxContent, private MTP::Sender {
 	Q_OBJECT
 
 public:
-	GroupInfoBox(QWidget*, CreatingGroupType creating, bool fromTypeChoose);
+	GroupInfoBox(QWidget *, CreatingGroupType creating, bool fromTypeChoose);
 
 protected:
 	void prepare() override;
@@ -116,7 +113,8 @@ private slots:
 private:
 	void setupPhotoButton();
 	void createChannel(const QString &title, const QString &description);
-	void createGroup(not_null<PeerListBox*> selectUsersBox, const QString &title, const std::vector<not_null<PeerData*>> &users);
+	void createGroup(not_null<PeerListBox *> selectUsersBox, const QString &title,
+	                 const std::vector<not_null<PeerData *>> &users);
 
 	void updateMaxHeight();
 	void updateSelected(const QPoint &cursorGlobalPosition);
@@ -126,21 +124,20 @@ private:
 
 	object_ptr<Ui::NewAvatarButton> _photo;
 	object_ptr<Ui::InputField> _title;
-	object_ptr<Ui::InputArea> _description = { nullptr };
+	object_ptr<Ui::InputArea> _description = {nullptr};
 
 	QImage _photoImage;
 
 	// group / channel creation
 	mtpRequestId _creationRequestId = 0;
 	ChannelData *_createdChannel = nullptr;
-
 };
 
 class SetupChannelBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	SetupChannelBox(QWidget*, ChannelData *channel, bool existing = false);
+	SetupChannelBox(QWidget *, ChannelData *channel, bool existing = false);
 
 	void setInnerFocus() override;
 
@@ -199,14 +196,13 @@ private:
 	QString _sentUsername, _checkUsername, _errorText, _goodText;
 
 	QTimer _checkTimer;
-
 };
 
 class EditNameTitleBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	EditNameTitleBox(QWidget*, not_null<PeerData*> peer);
+	EditNameTitleBox(QWidget *, not_null<PeerData *> peer);
 
 protected:
 	void setInnerFocus() override;
@@ -225,7 +221,7 @@ private:
 	void onSaveChatDone(const MTPUpdates &updates);
 	bool onSaveChatFail(const RPCError &e);
 
-	not_null<PeerData*> _peer;
+	not_null<PeerData *> _peer;
 
 	object_ptr<Ui::InputField> _first;
 	object_ptr<Ui::InputField> _last;
@@ -234,12 +230,11 @@ private:
 
 	mtpRequestId _requestId = 0;
 	QString _sentName;
-
 };
 
 class EditBioBox : public BoxContent, private MTP::Sender {
 public:
-	EditBioBox(QWidget*, not_null<UserData*> self);
+	EditBioBox(QWidget *, not_null<UserData *> self);
 
 protected:
 	void setInnerFocus() override;
@@ -253,21 +248,20 @@ private:
 	void save();
 
 	style::InputField _dynamicFieldStyle;
-	not_null<UserData*> _self;
+	not_null<UserData *> _self;
 
 	object_ptr<Ui::InputArea> _bio;
 	object_ptr<Ui::FlatLabel> _countdown;
 	object_ptr<Ui::FlatLabel> _about;
 	mtpRequestId _requestId = 0;
 	QString _sentBio;
-
 };
 
 class EditChannelBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	EditChannelBox(QWidget*, not_null<ChannelData*> channel);
+	EditChannelBox(QWidget *, not_null<ChannelData *> channel);
 
 protected:
 	void prepare() override;
@@ -301,7 +295,7 @@ private:
 	void saveSign();
 	void saveInvites();
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 
 	object_ptr<Ui::InputField> _title;
 	object_ptr<Ui::InputArea> _description;
@@ -323,12 +317,11 @@ private:
 	mtpRequestId _saveInvitesRequestId = 0;
 
 	QString _sentTitle, _sentDescription;
-
 };
 
 class RevokePublicLinkBox : public BoxContent, public RPCSender {
 public:
-	RevokePublicLinkBox(QWidget*, base::lambda<void()> revokeCallback);
+	RevokePublicLinkBox(QWidget *, base::lambda<void()> revokeCallback);
 
 protected:
 	void prepare() override;
@@ -343,5 +336,4 @@ private:
 
 	int _innerTop = 0;
 	base::lambda<void()> _revokeCallback;
-
 };
diff --git a/Telegram/SourceFiles/boxes/autolock_box.cpp b/Telegram/SourceFiles/boxes/autolock_box.cpp
index 9c9f9b91a..fbc57e98f 100644
--- a/Telegram/SourceFiles/boxes/autolock_box.cpp
+++ b/Telegram/SourceFiles/boxes/autolock_box.cpp
@@ -20,31 +20,36 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/autolock_box.h"
 
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "mainwindow.h"
-#include "ui/widgets/checkbox.h"
-#include "styles/style_boxes.h"
 #include "facades.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "ui/widgets/checkbox.h"
 void AutoLockBox::prepare() {
 	setTitle(langFactory(lng_passcode_autolock));
 
 	addButton(langFactory(lng_box_ok), [this] { closeBox(); });
 
-	auto options = { 60, 300, 3600, 18000 };
+	auto options = {60, 300, 3600, 18000};
 
 	auto group = std::make_shared<Ui::RadiobuttonGroup>(Global::AutoLock());
 	auto y = st::boxOptionListPadding.top() + st::langsButton.margin.top();
 	auto count = int(options.size());
 	_options.reserve(count);
 	for (auto seconds : options) {
-		_options.emplace_back(this, group, seconds, (seconds % 3600) ? lng_passcode_autolock_minutes(lt_count, seconds / 60) : lng_passcode_autolock_hours(lt_count, seconds / 3600), st::langsButton);
+		_options.emplace_back(this, group, seconds,
+		                      (seconds % 3600) ? lng_passcode_autolock_minutes(lt_count, seconds / 60) :
+		                                         lng_passcode_autolock_hours(lt_count, seconds / 3600),
+		                      st::langsButton);
 		_options.back()->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), y);
 		y += _options.back()->heightNoMargins() + st::boxOptionListSkip;
 	}
 	group->setChangedCallback([this](int value) { durationChanged(value); });
 
-	setDimensions(st::langsWidth, st::boxOptionListPadding.top() + count * _options.back()->heightNoMargins() + (count - 1) * st::boxOptionListSkip + st::boxOptionListPadding.bottom() + st::boxPadding.bottom());
+	setDimensions(st::langsWidth, st::boxOptionListPadding.top() + count * _options.back()->heightNoMargins() +
+	                                  (count - 1) * st::boxOptionListSkip + st::boxOptionListPadding.bottom() +
+	                                  st::boxPadding.bottom());
 }
 
 void AutoLockBox::durationChanged(int seconds) {
diff --git a/Telegram/SourceFiles/boxes/autolock_box.h b/Telegram/SourceFiles/boxes/autolock_box.h
index 6ec547324..4203a8fec 100644
--- a/Telegram/SourceFiles/boxes/autolock_box.h
+++ b/Telegram/SourceFiles/boxes/autolock_box.h
@@ -30,8 +30,7 @@ class AutoLockBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	AutoLockBox(QWidget*) {
-	}
+	AutoLockBox(QWidget*) {}
 
 protected:
 	void prepare() override;
@@ -40,5 +39,4 @@ private:
 	void durationChanged(int seconds);
 
 	std::vector<object_ptr<Ui::Radiobutton>> _options;
-
 };
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 2c9dd890e..e6da96216 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/background_box.h"
 
+#include "auth_session.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "window/themes/window_theme.h"
-#include "styles/style_overview.h"
 #include "styles/style_boxes.h"
+#include "styles/style_overview.h"
 #include "ui/effects/round_checkbox.h"
-#include "auth_session.h"
+#include "window/themes/window_theme.h"
 
 class BackgroundBox::Inner : public TWidget, public RPCSender, private base::Subscriber {
 public:
@@ -56,11 +56,9 @@ private:
 	int _over = -1;
 	int _overDown = -1;
 	std::unique_ptr<Ui::RoundCheckbox> _check; // this is not a widget
-
 };
 
-BackgroundBox::BackgroundBox(QWidget*) {
-}
+BackgroundBox::BackgroundBox(QWidget *) {}
 
 void BackgroundBox::prepare() {
 	setTitle(langFactory(lng_backgrounds_header));
@@ -84,11 +82,13 @@ void BackgroundBox::backgroundChosen(int index) {
 	closeBox();
 }
 
-BackgroundBox::Inner::Inner(QWidget *parent) : TWidget(parent)
-, _check(std::make_unique<Ui::RoundCheckbox>(st::overviewCheck, [this] { update(); })) {
+BackgroundBox::Inner::Inner(QWidget *parent)
+    : TWidget(parent)
+    , _check(std::make_unique<Ui::RoundCheckbox>(st::overviewCheck, [this] { update(); })) {
 	_check->setChecked(true, Ui::RoundCheckbox::SetStyle::Fast);
 	if (App::cServerBackgrounds().isEmpty()) {
-		resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding, 2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
+		resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding,
+		       2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
 		MTP::send(MTPaccount_GetWallPapers(), rpcDone(&Inner::gotWallpapers));
 	} else {
 		updateWallpapers();
@@ -136,7 +136,8 @@ void BackgroundBox::Inner::gotWallpapers(const MTPVector<MTPWallPaper> &result)
 				}
 				if (!size || !w || !h) continue;
 
-				qint32 newThumbLevel = qAbs((st::backgroundSize.width() * cIntRetinaFactor()) - w), newFullLevel = qAbs(2560 - w);
+				qint32 newThumbLevel = qAbs((st::backgroundSize.width() * cIntRetinaFactor()) - w),
+				       newFullLevel = qAbs(2560 - w);
 				if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
 					thumbLevel = newThumbLevel;
 					thumb = &(*j);
@@ -147,7 +148,8 @@ void BackgroundBox::Inner::gotWallpapers(const MTPVector<MTPWallPaper> &result)
 				}
 			}
 			if (thumb && full && full->type() != mtpc_photoSizeEmpty) {
-				wallpapers.push_back(App::WallPaper(d.vid.v ? d.vid.v : INT_MAX, App::image(*thumb), App::image(*full)));
+				wallpapers.push_back(
+				    App::WallPaper(d.vid.v ? d.vid.v : INT_MAX, App::image(*thumb), App::image(*full)));
 			}
 		} break;
 
@@ -166,7 +168,8 @@ void BackgroundBox::Inner::updateWallpapers() {
 	_rows = _bgCount / BackgroundsInRow;
 	if (_bgCount % BackgroundsInRow) ++_rows;
 
-	resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding, _rows * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
+	resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding,
+	       _rows * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
 	for (int i = 0; i < BackgroundsInRow * 3; ++i) {
 		if (i >= _bgCount) break;
 
@@ -211,10 +214,14 @@ void BackgroundBox::Inner::paintEvent(QPaintEvent *e) {
 void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 	int x = e->pos().x(), y = e->pos().y();
 	int row = int((y - st::backgroundPadding) / (st::backgroundSize.height() + st::backgroundPadding));
-	if (y - row * (st::backgroundSize.height() + st::backgroundPadding) > st::backgroundPadding + st::backgroundSize.height()) row = _rows + 1;
+	if (y - row * (st::backgroundSize.height() + st::backgroundPadding) >
+	    st::backgroundPadding + st::backgroundSize.height())
+		row = _rows + 1;
 
 	int col = int((x - st::backgroundPadding) / (st::backgroundSize.width() + st::backgroundPadding));
-	if (x - col * (st::backgroundSize.width() + st::backgroundPadding) > st::backgroundPadding + st::backgroundSize.width()) row = _rows + 1;
+	if (x - col * (st::backgroundSize.width() + st::backgroundPadding) >
+	    st::backgroundPadding + st::backgroundSize.width())
+		row = _rows + 1;
 
 	int newOver = row * BackgroundsInRow + col;
 	if (newOver >= _bgCount) newOver = -1;
diff --git a/Telegram/SourceFiles/boxes/background_box.h b/Telegram/SourceFiles/boxes/background_box.h
index f24331dd8..741787616 100644
--- a/Telegram/SourceFiles/boxes/background_box.h
+++ b/Telegram/SourceFiles/boxes/background_box.h
@@ -38,5 +38,4 @@ private:
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
diff --git a/Telegram/SourceFiles/boxes/calendar_box.cpp b/Telegram/SourceFiles/boxes/calendar_box.cpp
index 8d4af760e..a01af4934 100644
--- a/Telegram/SourceFiles/boxes/calendar_box.cpp
+++ b/Telegram/SourceFiles/boxes/calendar_box.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/calendar_box.h"
 
-#include "ui/widgets/buttons.h"
+#include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
-#include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/widgets/buttons.h"
 
 namespace {
 
@@ -92,10 +92,10 @@ private:
 	int _daysCount = 0;
 	int _daysShift = 0;
 	int _rowsCount = 0;
-
 };
 
-CalendarBox::Context::Context(QDate month, QDate highlighted) : _highlighted(highlighted) {
+CalendarBox::Context::Context(QDate month, QDate highlighted)
+    : _highlighted(highlighted) {
 	showMonth(month);
 }
 
@@ -176,7 +176,8 @@ QDate CalendarBox::Context::dateFromIndex(int index) const {
 		}
 		index += QDate(year, month, 1).daysInMonth();
 	}
-	for (auto maxIndex = QDate(year, month, 1).daysInMonth(); index >= maxIndex; maxIndex = QDate(year, month, 1).daysInMonth()) {
+	for (auto maxIndex = QDate(year, month, 1).daysInMonth(); index >= maxIndex;
+	     maxIndex = QDate(year, month, 1).daysInMonth()) {
 		index -= maxIndex;
 		if (month++ == kMonthsCount) {
 			month -= kMonthsCount;
@@ -236,11 +237,11 @@ private:
 	static constexpr auto kEmptySelection = -kDaysInWeek;
 	int _selected = kEmptySelection;
 	int _pressed = kEmptySelection;
-
 };
 
-CalendarBox::Inner::Inner(QWidget *parent, Context *context) : TWidget(parent)
-, _context(context) {
+CalendarBox::Inner::Inner(QWidget *parent, Context *context)
+    : TWidget(parent)
+    , _context(context) {
 	setMouseTracking(true);
 	subscribe(context->month(), [this](QDate month) { monthChanged(month); });
 }
@@ -295,11 +296,11 @@ void CalendarBox::Inner::paintRows(Painter &p, QRect clip) {
 	auto y = rowsTop();
 	auto index = -_context->daysShift();
 	auto highlightedIndex = _context->highlightedIndex();
-	for (auto row = 0, rowsCount = _context->rowsCount(), daysCount = _context->daysCount()
-		; row != rowsCount
-		; ++row, y += st::calendarCellSize.height()) {
+	for (auto row = 0, rowsCount = _context->rowsCount(), daysCount = _context->daysCount(); row != rowsCount;
+	     ++row, y += st::calendarCellSize.height()) {
 		auto x = rowsLeft();
-		if (!myrtlrect(x, y, st::calendarCellSize.width() * kDaysInWeek, st::calendarCellSize.height()).intersects(clip)) {
+		if (!myrtlrect(x, y, st::calendarCellSize.width() * kDaysInWeek, st::calendarCellSize.height())
+		         .intersects(clip)) {
 			index += kDaysInWeek;
 			continue;
 		}
@@ -364,14 +365,20 @@ void CalendarBox::Inner::mousePressEvent(QMouseEvent *e) {
 
 		auto row = index / kDaysInWeek;
 		auto col = index % kDaysInWeek;
-		auto cell = QRect(rowsLeft() + col * st::calendarCellSize.width(), rowsTop() + row * st::calendarCellSize.height(), st::calendarCellSize.width(), st::calendarCellSize.height());
+		auto cell =
+		    QRect(rowsLeft() + col * st::calendarCellSize.width(), rowsTop() + row * st::calendarCellSize.height(),
+		          st::calendarCellSize.width(), st::calendarCellSize.height());
 		auto it = _ripples.find(_selected);
 		if (it == _ripples.cend()) {
 			auto mask = Ui::RippleAnimation::ellipseMask(QSize(st::calendarCellInner, st::calendarCellInner));
 			auto update = [this, cell] { rtlupdate(cell); };
-			it = _ripples.emplace(_selected, std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation, std::move(mask), std::move(update))).first;
+			it = _ripples
+			         .emplace(_selected, std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation,
+			                                                                   std::move(mask), std::move(update)))
+			         .first;
 		}
-		auto ripplePosition = QPoint(cell.x() + (st::calendarCellSize.width() - st::calendarCellInner) / 2, cell.y() + (st::calendarCellSize.height() - st::calendarCellInner) / 2);
+		auto ripplePosition = QPoint(cell.x() + (st::calendarCellSize.width() - st::calendarCellInner) / 2,
+		                             cell.y() + (st::calendarCellSize.height() - st::calendarCellInner) / 2);
 		it->second->add(e->pos() - ripplePosition);
 	}
 }
@@ -400,7 +407,9 @@ CalendarBox::Inner::~Inner() = default;
 
 class CalendarBox::Title : public TWidget, private base::Subscriber {
 public:
-	Title(QWidget *parent, Context *context) : TWidget(parent), _context(context) {
+	Title(QWidget *parent, Context *context)
+	    : TWidget(parent)
+	    , _context(context) {
 		subscribe(_context->month(), [this](QDate date) { monthChanged(date); });
 	}
 
@@ -414,7 +423,6 @@ private:
 
 	QString _text;
 	int _textWidth = 0;
-
 };
 
 void CalendarBox::Title::monthChanged(QDate month) {
@@ -428,17 +436,17 @@ void CalendarBox::Title::paintEvent(QPaintEvent *e) {
 
 	p.setFont(st::calendarTitleFont);
 	p.setPen(st::boxTitleFg);
-	p.drawTextLeft((width() - _textWidth) / 2, (height() - st::calendarTitleFont->height) / 2, width(), _text, _textWidth);
+	p.drawTextLeft((width() - _textWidth) / 2, (height() - st::calendarTitleFont->height) / 2, width(), _text,
+	               _textWidth);
 }
 
-CalendarBox::CalendarBox(QWidget*, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback)
-: _context(std::make_unique<Context>(month, highlighted))
-, _inner(this, _context.get())
-, _title(this, _context.get())
-, _previous(this, st::calendarPrevious)
-, _next(this, st::calendarNext)
-, _callback(std::move(callback)) {
-}
+CalendarBox::CalendarBox(QWidget *, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback)
+    : _context(std::make_unique<Context>(month, highlighted))
+    , _inner(this, _context.get())
+    , _title(this, _context.get())
+    , _previous(this, st::calendarPrevious)
+    , _next(this, st::calendarNext)
+    , _callback(std::move(callback)) {}
 
 void CalendarBox::setMinDate(QDate date) {
 	_context->setMinDate(date);
@@ -460,7 +468,7 @@ void CalendarBox::prepare() {
 		}
 	});
 
-//	_inner = setInnerWidget(object_ptr<Inner>(this, _context.get()), st::calendarScroll, st::calendarTitleHeight);
+	//	_inner = setInnerWidget(object_ptr<Inner>(this, _context.get()), st::calendarScroll, st::calendarTitleHeight);
 	_inner->setDateChosenCallback(std::move(_callback));
 
 	addButton(langFactory(lng_close), [this] { closeBox(); });
@@ -493,7 +501,8 @@ void CalendarBox::monthChanged(QDate month) {
 void CalendarBox::resizeEvent(QResizeEvent *e) {
 	_previous->moveToLeft(0, 0);
 	_next->moveToRight(0, 0);
-	_title->setGeometryToLeft(_previous->width(), 0, width() - _previous->width() - _next->width(), st::calendarTitleHeight);
+	_title->setGeometryToLeft(_previous->width(), 0, width() - _previous->width() - _next->width(),
+	                          st::calendarTitleHeight);
 	_inner->setGeometryToLeft(0, st::calendarTitleHeight, width(), height() - st::calendarTitleHeight);
 	BoxContent::resizeEvent(e);
 }
diff --git a/Telegram/SourceFiles/boxes/calendar_box.h b/Telegram/SourceFiles/boxes/calendar_box.h
index 1cb326024..841df6092 100644
--- a/Telegram/SourceFiles/boxes/calendar_box.h
+++ b/Telegram/SourceFiles/boxes/calendar_box.h
@@ -28,7 +28,7 @@ class IconButton;
 
 class CalendarBox : public BoxContent {
 public:
-	CalendarBox(QWidget*, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback);
+	CalendarBox(QWidget *, QDate month, QDate highlighted, base::lambda<void(QDate date)> callback);
 
 	void setMinDate(QDate date);
 	void setMaxDate(QDate date);
@@ -58,5 +58,4 @@ private:
 	object_ptr<Ui::IconButton> _next;
 
 	base::lambda<void(QDate date)> _callback;
-
 };
diff --git a/Telegram/SourceFiles/boxes/change_phone_box.cpp b/Telegram/SourceFiles/boxes/change_phone_box.cpp
index 6a52fe357..d3dfb39a6 100644
--- a/Telegram/SourceFiles/boxes/change_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp
@@ -18,22 +18,23 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "base/lambda_guard.h"
 #include "boxes/change_phone_box.h"
+#include "app.h" // For formatPhone
+#include "base/lambda_guard.h"
+#include "boxes/confirm_box.h"
+#include "boxes/confirm_phone_box.h"
+#include "facades.h"
 #include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/input_fields.h"
 #include "ui/effects/widget_fade_wrap.h"
-#include "boxes/confirm_phone_box.h"
 #include "ui/toast/toast.h"
-#include "boxes/confirm_box.h"
-#include "facades.h"
-#include "app.h" // For formatPhone
+#include "ui/widgets/input_fields.h"
+#include "ui/widgets/labels.h"
 
 namespace {
 
-void createErrorLabel(QWidget *parent, object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> &label, const QString &text, int x, int y) {
+void createErrorLabel(QWidget *parent, object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> &label, const QString &text, int x,
+                      int y) {
 	if (label) {
 		auto errorFadeOut = std::move(label);
 		errorFadeOut->setUpdateCallback([label = errorFadeOut.data()] {
@@ -44,7 +45,8 @@ void createErrorLabel(QWidget *parent, object_ptr<Ui::WidgetFadeWrap<Ui::FlatLab
 		errorFadeOut->hideAnimated();
 	}
 	if (!text.isEmpty()) {
-		label.create(parent, object_ptr<Ui::FlatLabel>(parent, text, Ui::FlatLabel::InitType::Simple, st::changePhoneError));
+		label.create(parent,
+		             object_ptr<Ui::FlatLabel>(parent, text, Ui::FlatLabel::InitType::Simple, st::changePhoneError));
 		label->hideFast();
 		label->moveToLeft(x, y);
 		label->showAnimated();
@@ -55,8 +57,7 @@ void createErrorLabel(QWidget *parent, object_ptr<Ui::WidgetFadeWrap<Ui::FlatLab
 
 class ChangePhoneBox::EnterPhone : public BoxContent {
 public:
-	EnterPhone(QWidget*) {
-	}
+	EnterPhone(QWidget *) {}
 
 	void setInnerFocus() override {
 		_phone->setFocusFast();
@@ -74,15 +75,14 @@ private:
 		showError(QString());
 	}
 
-	object_ptr<Ui::PhoneInput> _phone = { nullptr };
-	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = { nullptr };
+	object_ptr<Ui::PhoneInput> _phone = {nullptr};
+	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = {nullptr};
 	mtpRequestId _requestId = 0;
-
 };
 
 class ChangePhoneBox::EnterCode : public BoxContent {
 public:
-	EnterCode(QWidget*, const QString &phone, const QString &hash, int codeLength, int callTimeout);
+	EnterCode(QWidget *, const QString &phone, const QString &hash, int codeLength, int callTimeout);
 
 	void setInnerFocus() override {
 		_code->setFocusFast();
@@ -106,12 +106,11 @@ private:
 	QString _hash;
 	int _codeLength = 0;
 	int _callTimeout = 0;
-	object_ptr<SentCodeField> _code = { nullptr };
-	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = { nullptr };
-	object_ptr<Ui::FlatLabel> _callLabel = { nullptr };
+	object_ptr<SentCodeField> _code = {nullptr};
+	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = {nullptr};
+	object_ptr<Ui::FlatLabel> _callLabel = {nullptr};
 	mtpRequestId _requestId = 0;
 	SentCodeCall _call;
-
 };
 
 void ChangePhoneBox::EnterPhone::prepare() {
@@ -124,7 +123,8 @@ void ChangePhoneBox::EnterPhone::prepare() {
 	_phone->moveToLeft(st::boxPadding.left(), st::boxLittleSkip);
 	connect(_phone, &Ui::PhoneInput::submitted, this, [this] { submit(); });
 
-	auto description = object_ptr<Ui::FlatLabel>(this, lang(lng_change_phone_new_description), Ui::FlatLabel::InitType::Simple, st::changePhoneLabel);
+	auto description = object_ptr<Ui::FlatLabel>(this, lang(lng_change_phone_new_description),
+	                                             Ui::FlatLabel::InitType::Simple, st::changePhoneLabel);
 	auto errorSkip = st::boxLittleSkip + st::changePhoneError.style.font->height;
 	description->moveToLeft(st::boxPadding.left(), _phone->y() + _phone->height() + errorSkip + st::boxLittleSkip);
 
@@ -141,11 +141,12 @@ void ChangePhoneBox::EnterPhone::submit() {
 	hideError();
 
 	auto phoneNumber = _phone->getLastText().trimmed();
-	_requestId = MTP::send(MTPaccount_SendChangePhoneCode(MTP_flags(0), MTP_string(phoneNumber), MTP_bool(false)), rpcDone(base::lambda_guarded(this, [this, phoneNumber](const MTPauth_SentCode &result) {
-		return sendPhoneDone(phoneNumber, result);
-	})), rpcFail(base::lambda_guarded(this, [this, phoneNumber](const RPCError &error) {
-		return sendPhoneFail(phoneNumber, error);
-	})));
+	_requestId = MTP::send(
+	    MTPaccount_SendChangePhoneCode(MTP_flags(0), MTP_string(phoneNumber), MTP_bool(false)),
+	    rpcDone(base::lambda_guarded(
+	        this, [this, phoneNumber](const MTPauth_SentCode &result) { return sendPhoneDone(phoneNumber, result); })),
+	    rpcFail(base::lambda_guarded(
+	        this, [this, phoneNumber](const RPCError &error) { return sendPhoneFail(phoneNumber, error); })));
 }
 
 void ChangePhoneBox::EnterPhone::sendPhoneDone(const QString &phoneNumber, const MTPauth_SentCode &result) {
@@ -199,19 +200,21 @@ void ChangePhoneBox::EnterPhone::showError(const QString &text) {
 	}
 }
 
-ChangePhoneBox::EnterCode::EnterCode(QWidget*, const QString &phone, const QString &hash, int codeLength, int callTimeout)
-: _phone(phone)
-, _hash(hash)
-, _codeLength(codeLength)
-, _callTimeout(callTimeout)
-, _call(this, [this] { sendCall(); }, [this] { updateCall(); }) {
-}
+ChangePhoneBox::EnterCode::EnterCode(QWidget *, const QString &phone, const QString &hash, int codeLength,
+                                     int callTimeout)
+    : _phone(phone)
+    , _hash(hash)
+    , _codeLength(codeLength)
+    , _callTimeout(callTimeout)
+    , _call(this, [this] { sendCall(); }, [this] { updateCall(); }) {}
 
 void ChangePhoneBox::EnterCode::prepare() {
 	setTitle(langFactory(lng_change_phone_title));
 
-	auto descriptionText = lng_change_phone_code_description(lt_phone, textcmdStartSemibold() + App::formatPhone(_phone) + textcmdStopSemibold());
-	auto description = object_ptr<Ui::FlatLabel>(this, descriptionText, Ui::FlatLabel::InitType::Rich, st::changePhoneLabel);
+	auto descriptionText = lng_change_phone_code_description(
+	    lt_phone, textcmdStartSemibold() + App::formatPhone(_phone) + textcmdStopSemibold());
+	auto description =
+	    object_ptr<Ui::FlatLabel>(this, descriptionText, Ui::FlatLabel::InitType::Rich, st::changePhoneLabel);
 	description->moveToLeft(st::boxPadding.left(), 0);
 
 	auto phoneValue = QString();
@@ -226,7 +229,7 @@ void ChangePhoneBox::EnterCode::prepare() {
 	setDimensions(st::boxWidth, countHeight());
 
 	if (_callTimeout > 0) {
-		_call.setStatus({ SentCodeCall::State::Waiting, _callTimeout });
+		_call.setStatus({SentCodeCall::State::Waiting, _callTimeout});
 		updateCall();
 	}
 
@@ -246,21 +249,21 @@ void ChangePhoneBox::EnterCode::submit() {
 	hideError();
 
 	auto code = _code->getLastText().trimmed();
-	_requestId = MTP::send(MTPaccount_ChangePhone(MTP_string(_phone), MTP_string(_hash), MTP_string(code)), rpcDone([weak = weak(this)](const MTPUser &result) {
-		App::feedUser(result);
-		if (weak) {
-			Ui::hideLayer();
-		}
-		Ui::Toast::Show(lang(lng_change_phone_success));
-	}), rpcFail(base::lambda_guarded(this, [this](const RPCError &error) {
-		return sendCodeFail(error);
-	})));
+	_requestId =
+	    MTP::send(MTPaccount_ChangePhone(MTP_string(_phone), MTP_string(_hash), MTP_string(code)),
+	              rpcDone([weak = weak(this)](const MTPUser &result) {
+		              App::feedUser(result);
+		              if (weak) {
+			              Ui::hideLayer();
+		              }
+		              Ui::Toast::Show(lang(lng_change_phone_success));
+	              }),
+	              rpcFail(base::lambda_guarded(this, [this](const RPCError &error) { return sendCodeFail(error); })));
 }
 
 void ChangePhoneBox::EnterCode::sendCall() {
-	MTP::send(MTPauth_ResendCode(MTP_string(_phone), MTP_string(_hash)), rpcDone(base::lambda_guarded(this, [this] {
-		_call.callDone();
-	})));
+	MTP::send(MTPauth_ResendCode(MTP_string(_phone), MTP_string(_hash)),
+	          rpcDone(base::lambda_guarded(this, [this] { _call.callDone(); })));
 }
 
 void ChangePhoneBox::EnterCode::updateCall() {
@@ -305,16 +308,12 @@ bool ChangePhoneBox::EnterCode::sendCodeFail(const RPCError &error) {
 
 void ChangePhoneBox::prepare() {
 	setTitle(langFactory(lng_change_phone_title));
-	addButton(langFactory(lng_change_phone_button), [] {
-		Ui::show(Box<ConfirmBox>(lang(lng_change_phone_warning), [] {
-			Ui::show(Box<EnterPhone>());
-		}));
-	});
-	addButton(langFactory(lng_cancel), [this] {
-		closeBox();
-	});
+	addButton(langFactory(lng_change_phone_button),
+	          [] { Ui::show(Box<ConfirmBox>(lang(lng_change_phone_warning), [] { Ui::show(Box<EnterPhone>()); })); });
+	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	auto label = object_ptr<Ui::FlatLabel>(this, lang(lng_change_phone_description), Ui::FlatLabel::InitType::Rich, st::changePhoneDescription);
+	auto label = object_ptr<Ui::FlatLabel>(this, lang(lng_change_phone_description), Ui::FlatLabel::InitType::Rich,
+	                                       st::changePhoneDescription);
 	label->moveToLeft((st::boxWideWidth - label->width()) / 2, st::changePhoneDescriptionTop);
 
 	setDimensions(st::boxWideWidth, label->bottomNoMargins() + st::boxLittleSkip);
diff --git a/Telegram/SourceFiles/boxes/change_phone_box.h b/Telegram/SourceFiles/boxes/change_phone_box.h
index 0c64f7e7c..8d18b4fe4 100644
--- a/Telegram/SourceFiles/boxes/change_phone_box.h
+++ b/Telegram/SourceFiles/boxes/change_phone_box.h
@@ -24,8 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 class ChangePhoneBox : public BoxContent {
 public:
-	ChangePhoneBox(QWidget*) {
-	}
+	ChangePhoneBox(QWidget *) {}
 
 protected:
 	void prepare() override;
@@ -35,6 +34,4 @@ protected:
 private:
 	class EnterPhone;
 	class EnterCode;
-
 };
-
diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index 791ca403a..eb2243bb0 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -20,85 +20,93 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/confirm_box.h"
 
-#include "styles/style_boxes.h"
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "core/click_handler_types.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "apiwrap.h"
-#include "application.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/toast/toast.h"
-#include "core/click_handler_types.h"
-#include "storage/localstorage.h"
-#include "auth_session.h"
 #include "observer_peer.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
 
 TextParseOptions _confirmBoxTextOptions = {
-	TextParseLinks | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
-: _confirmText(lang(lng_box_ok))
-, _cancelText(lang(lng_cancel))
-, _confirmStyle(st::defaultBoxButton)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(std::move(confirmedCallback))
-, _cancelledCallback(std::move(cancelledCallback)) {
+ConfirmBox::ConfirmBox(QWidget *, const QString &text, base::lambda_once<void()> confirmedCallback,
+                       base::lambda_once<void()> cancelledCallback)
+    : _confirmText(lang(lng_box_ok))
+    , _cancelText(lang(lng_cancel))
+    , _confirmStyle(st::defaultBoxButton)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(std::move(confirmedCallback))
+    , _cancelledCallback(std::move(cancelledCallback)) {
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
-: _confirmText(confirmText)
-, _cancelText(lang(lng_cancel))
-, _confirmStyle(st::defaultBoxButton)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(std::move(confirmedCallback))
-, _cancelledCallback(std::move(cancelledCallback)) {
+ConfirmBox::ConfirmBox(QWidget *, const QString &text, const QString &confirmText,
+                       base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+    : _confirmText(confirmText)
+    , _cancelText(lang(lng_cancel))
+    , _confirmStyle(st::defaultBoxButton)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(std::move(confirmedCallback))
+    , _cancelledCallback(std::move(cancelledCallback)) {
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
-: _confirmText(confirmText)
-, _cancelText(lang(lng_cancel))
-, _confirmStyle(confirmStyle)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(std::move(confirmedCallback))
-, _cancelledCallback(std::move(cancelledCallback)) {
+ConfirmBox::ConfirmBox(QWidget *, const QString &text, const QString &confirmText,
+                       const style::RoundButton &confirmStyle, base::lambda_once<void()> confirmedCallback,
+                       base::lambda_once<void()> cancelledCallback)
+    : _confirmText(confirmText)
+    , _cancelText(lang(lng_cancel))
+    , _confirmStyle(confirmStyle)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(std::move(confirmedCallback))
+    , _cancelledCallback(std::move(cancelledCallback)) {
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
-: _confirmText(confirmText)
-, _cancelText(cancelText)
-, _confirmStyle(st::defaultBoxButton)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(std::move(confirmedCallback))
-, _cancelledCallback(std::move(cancelledCallback)) {
+ConfirmBox::ConfirmBox(QWidget *, const QString &text, const QString &confirmText, const QString &cancelText,
+                       base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+    : _confirmText(confirmText)
+    , _cancelText(cancelText)
+    , _confirmStyle(st::defaultBoxButton)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(std::move(confirmedCallback))
+    , _cancelledCallback(std::move(cancelledCallback)) {
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
-: _confirmText(confirmText)
-, _cancelText(cancelText)
-, _confirmStyle(st::defaultBoxButton)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(std::move(confirmedCallback))
-, _cancelledCallback(std::move(cancelledCallback)) {
+ConfirmBox::ConfirmBox(QWidget *, const QString &text, const QString &confirmText,
+                       const style::RoundButton &confirmStyle, const QString &cancelText,
+                       base::lambda_once<void()> confirmedCallback, base::lambda_once<void()> cancelledCallback)
+    : _confirmText(confirmText)
+    , _cancelText(cancelText)
+    , _confirmStyle(st::defaultBoxButton)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(std::move(confirmedCallback))
+    , _cancelledCallback(std::move(cancelledCallback)) {
 	init(text);
 }
 
-ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda<void()> closedCallback)
-: _confirmText(doneText)
-, _confirmStyle(st::defaultBoxButton)
-, _informative(true)
-, _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
-, _confirmedCallback(generateInformCallback(closedCallback))
-, _cancelledCallback(generateInformCallback(closedCallback)) {
+ConfirmBox::ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText,
+                       base::lambda<void()> closedCallback)
+    : _confirmText(doneText)
+    , _confirmStyle(st::defaultBoxButton)
+    , _informative(true)
+    , _text(st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right())
+    , _confirmedCallback(generateInformCallback(closedCallback))
+    , _cancelledCallback(generateInformCallback(closedCallback)) {
 	init(text);
 }
 
@@ -118,7 +126,11 @@ void ConfirmBox::init(const QString &text) {
 void ConfirmBox::prepare() {
 	addButton([this] { return _confirmText; }, [this] { confirmed(); }, _confirmStyle);
 	if (!_informative) {
-		addButton([this] { return _cancelText; }, [this] { _cancelled = true; closeBox(); });
+		addButton([this] { return _cancelText; },
+		          [this] {
+			          _cancelled = true;
+			          closeBox();
+		          });
 	}
 	subscribe(boxClosing, [this] {
 		if (!_confirmed && (!_strictCancel || _cancelled) && _cancelledCallback) {
@@ -210,16 +222,17 @@ void ConfirmBox::paintEvent(QPaintEvent *e) {
 	_text.drawLeftElided(p, st::boxPadding.left(), st::boxPadding.top(), _textWidth, width(), 16, style::al_left);
 }
 
-InformBox::InformBox(QWidget*, const QString &text, base::lambda<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) {
-}
+InformBox::InformBox(QWidget *, const QString &text, base::lambda<void()> closedCallback)
+    : ConfirmBox(ConfirmBox::InformBoxTag(), text, lang(lng_box_ok), std::move(closedCallback)) {}
 
-InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
-}
+InformBox::InformBox(QWidget *, const QString &text, const QString &doneText, base::lambda<void()> closedCallback)
+    : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {}
 
-MaxInviteBox::MaxInviteBox(QWidget*, not_null<ChannelData*> channel) : BoxContent()
-, _channel(channel)
-, _text(st::boxLabelStyle, lng_participant_invite_sorry(lt_count, Global::ChatSizeMax()), _confirmBoxTextOptions, st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right()) {
-}
+MaxInviteBox::MaxInviteBox(QWidget *, not_null<ChannelData *> channel)
+    : BoxContent()
+    , _channel(channel)
+    , _text(st::boxLabelStyle, lng_participant_invite_sorry(lt_count, Global::ChatSizeMax()), _confirmBoxTextOptions,
+            st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right()) {}
 
 void MaxInviteBox::prepare() {
 	setMouseTracking(true);
@@ -228,13 +241,15 @@ void MaxInviteBox::prepare() {
 
 	_textWidth = st::boxWidth - st::boxPadding.left() - st::boxButtonPadding.right();
 	_textHeight = std::min(_text.countHeight(_textWidth), 16 * st::boxLabelStyle.lineHeight);
-	setDimensions(st::boxWidth, st::boxPadding.top() + _textHeight + st::boxTextFont->height + st::boxTextFont->height * 2 + st::newGroupLinkPadding.bottom());
+	setDimensions(st::boxWidth, st::boxPadding.top() + _textHeight + st::boxTextFont->height +
+	                                st::boxTextFont->height * 2 + st::newGroupLinkPadding.bottom());
 
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::InviteLinkChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _channel) {
-			rtlupdate(_invitationLink);
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::InviteLinkChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _channel) {
+			                                                            rtlupdate(_invitationLink);
+		                                                            }
+	                                                            }));
 }
 
 void MaxInviteBox::mouseMoveEvent(QMouseEvent *e) {
@@ -287,14 +302,14 @@ void MaxInviteBox::paintEvent(QPaintEvent *e) {
 
 void MaxInviteBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
-	_invitationLink = myrtlrect(st::boxPadding.left(), st::boxPadding.top() + _textHeight + st::boxTextFont->height, width() - st::boxPadding.left() - st::boxPadding.right(), 2 * st::boxTextFont->height);
+	_invitationLink = myrtlrect(st::boxPadding.left(), st::boxPadding.top() + _textHeight + st::boxTextFont->height,
+	                            width() - st::boxPadding.left() - st::boxPadding.right(), 2 * st::boxTextFont->height);
 }
 
-ConvertToSupergroupBox::ConvertToSupergroupBox(QWidget*, ChatData *chat)
-: _chat(chat)
-, _text(100)
-, _note(100) {
-}
+ConvertToSupergroupBox::ConvertToSupergroupBox(QWidget *, ChatData *chat)
+    : _chat(chat)
+    , _text(100)
+    , _note(100) {}
 
 void ConvertToSupergroupBox::prepare() {
 	QStringList text;
@@ -309,14 +324,18 @@ void ConvertToSupergroupBox::prepare() {
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
 	_text.setText(st::boxLabelStyle, text.join('\n'), _confirmBoxTextOptions);
-	_note.setText(st::boxLabelStyle, lng_profile_convert_warning(lt_bold_start, textcmdStartSemibold(), lt_bold_end, textcmdStopSemibold()), _confirmBoxTextOptions);
+	_note.setText(
+	    st::boxLabelStyle,
+	    lng_profile_convert_warning(lt_bold_start, textcmdStartSemibold(), lt_bold_end, textcmdStopSemibold()),
+	    _confirmBoxTextOptions);
 	_textWidth = st::boxWideWidth - st::boxPadding.left() - st::boxButtonPadding.right();
 	_textHeight = _text.countHeight(_textWidth);
 	setDimensions(st::boxWideWidth, _textHeight + st::boxPadding.bottom() + _note.countHeight(_textWidth));
 }
 
 void ConvertToSupergroupBox::convertToSupergroup() {
-	MTP::send(MTPmessages_MigrateChat(_chat->inputChat), rpcDone(&ConvertToSupergroupBox::convertDone), rpcFail(&ConvertToSupergroupBox::convertFail));
+	MTP::send(MTPmessages_MigrateChat(_chat->inputChat), rpcDone(&ConvertToSupergroupBox::convertDone),
+	          rpcFail(&ConvertToSupergroupBox::convertFail));
 }
 
 void ConvertToSupergroupBox::convertDone(const MTPUpdates &updates) {
@@ -336,7 +355,9 @@ void ConvertToSupergroupBox::convertDone(const MTPUpdates &updates) {
 	switch (updates.type()) {
 	case mtpc_updates: handleChats(updates.c_updates().vchats); break;
 	case mtpc_updatesCombined: handleChats(updates.c_updatesCombined().vchats); break;
-	default: LOG(("API Error: unexpected update cons %1 (ConvertToSupergroupBox::convertDone)").arg(updates.type())); break;
+	default:
+		LOG(("API Error: unexpected update cons %1 (ConvertToSupergroupBox::convertDone)").arg(updates.type()));
+		break;
 	}
 }
 
@@ -365,18 +386,18 @@ void ConvertToSupergroupBox::paintEvent(QPaintEvent *e) {
 	_note.drawLeft(p, st::boxPadding.left(), _textHeight + st::boxPadding.bottom(), _textWidth, width());
 }
 
-PinMessageBox::PinMessageBox(QWidget*, ChannelData *channel, MsgId msgId)
-: _channel(channel)
-, _msgId(msgId)
-, _text(this, lang(lng_pinned_pin_sure), Ui::FlatLabel::InitType::Simple, st::boxLabel)
-, _notify(this, lang(lng_pinned_notify), true, st::defaultBoxCheckbox) {
-}
+PinMessageBox::PinMessageBox(QWidget *, ChannelData *channel, MsgId msgId)
+    : _channel(channel)
+    , _msgId(msgId)
+    , _text(this, lang(lng_pinned_pin_sure), Ui::FlatLabel::InitType::Simple, st::boxLabel)
+    , _notify(this, lang(lng_pinned_notify), true, st::defaultBoxCheckbox) {}
 
 void PinMessageBox::prepare() {
 	addButton(langFactory(lng_pinned_pin), [this] { pinMessage(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	setDimensions(st::boxWidth, st::boxPadding.top() + _text->height() + st::boxMediumSkip + _notify->heightNoMargins() + st::boxPadding.bottom());
+	setDimensions(st::boxWidth, st::boxPadding.top() + _text->height() + st::boxMediumSkip +
+	                                _notify->heightNoMargins() + st::boxPadding.bottom());
 }
 
 void PinMessageBox::resizeEvent(QResizeEvent *e) {
@@ -400,7 +421,8 @@ void PinMessageBox::pinMessage() {
 	if (!_notify->checked()) {
 		flags |= MTPchannels_UpdatePinnedMessage::Flag::f_silent;
 	}
-	_requestId = MTP::send(MTPchannels_UpdatePinnedMessage(MTP_flags(flags), _channel->inputChannel, MTP_int(_msgId)), rpcDone(&PinMessageBox::pinDone), rpcFail(&PinMessageBox::pinFail));
+	_requestId = MTP::send(MTPchannels_UpdatePinnedMessage(MTP_flags(flags), _channel->inputChannel, MTP_int(_msgId)),
+	                       rpcDone(&PinMessageBox::pinDone), rpcFail(&PinMessageBox::pinFail));
 }
 
 void PinMessageBox::pinDone(const MTPUpdates &updates) {
@@ -416,7 +438,8 @@ bool PinMessageBox::pinFail(const RPCError &error) {
 	return true;
 }
 
-DeleteMessagesBox::DeleteMessagesBox(QWidget*, HistoryItem *item, bool suggestModerateActions) : _singleItem(true) {
+DeleteMessagesBox::DeleteMessagesBox(QWidget *, HistoryItem *item, bool suggestModerateActions)
+    : _singleItem(true) {
 	_ids.push_back(item->fullId());
 	if (suggestModerateActions) {
 		_moderateBan = item->suggestBanReport();
@@ -428,13 +451,11 @@ DeleteMessagesBox::DeleteMessagesBox(QWidget*, HistoryItem *item, bool suggestMo
 	}
 }
 
-DeleteMessagesBox::DeleteMessagesBox(QWidget*, const SelectedItemSet &selected) {
+DeleteMessagesBox::DeleteMessagesBox(QWidget *, const SelectedItemSet &selected) {
 	auto count = selected.size();
 	Assert(count > 0);
 	_ids.reserve(count);
-	for_const (auto item, selected) {
-		_ids.push_back(item->fullId());
-	}
+	for_const (auto item, selected) { _ids.push_back(item->fullId()); }
 }
 
 void DeleteMessagesBox::prepare() {
@@ -453,8 +474,8 @@ void DeleteMessagesBox::prepare() {
 		text = _singleItem ? lang(lng_selected_delete_sure_this) : lng_selected_delete_sure(lt_count, _ids.size());
 		auto canDeleteAllForEveryone = true;
 		auto now = ::date(unixtime());
-		auto deleteForUser = (UserData*)nullptr;
-		auto peer = (PeerData*)nullptr;
+		auto deleteForUser = (UserData *)nullptr;
+		auto peer = (PeerData *)nullptr;
 		auto forEveryoneText = lang(lng_delete_for_everyone_check);
 		for_const (auto fullId, _ids) {
 			if (auto item = App::histItemById(fullId)) {
@@ -542,10 +563,12 @@ void DeleteMessagesBox::deleteAndClear() {
 
 	if (_moderateFrom) {
 		if (_banUser && _banUser->checked()) {
-			Auth().api().kickParticipant(_moderateInChannel, _moderateFrom, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
+			Auth().api().kickParticipant(_moderateInChannel, _moderateFrom,
+			                             MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
 		}
 		if (_reportSpam->checked()) {
-			MTP::send(MTPchannels_ReportSpam(_moderateInChannel->inputChannel, _moderateFrom->inputUser, MTP_vector<MTPint>(1, MTP_int(_ids[0].msg))));
+			MTP::send(MTPchannels_ReportSpam(_moderateInChannel->inputChannel, _moderateFrom->inputUser,
+			                                 MTP_vector<MTPint>(1, MTP_int(_ids[0].msg))));
 		}
 		if (_deleteAll && _deleteAll->checked()) {
 			App::main()->deleteAllFromUser(_moderateInChannel, _moderateFrom);
@@ -556,7 +579,7 @@ void DeleteMessagesBox::deleteAndClear() {
 		App::main()->clearSelectedItems();
 	}
 
-	QMap<PeerData*, QVector<MTPint>> idsByPeer;
+	QMap<PeerData *, QVector<MTPint>> idsByPeer;
 	for_const (auto fullId, _ids) {
 		if (auto item = App::histItemById(fullId)) {
 			auto history = item->history();
@@ -579,10 +602,11 @@ void DeleteMessagesBox::deleteAndClear() {
 	Ui::hideLayer();
 }
 
-ConfirmInviteBox::ConfirmInviteBox(QWidget*, const QString &title, bool isChannel, const MTPChatPhoto &photo, int count, const QVector<UserData*> &participants)
-: _title(this, st::confirmInviteTitle)
-, _status(this, st::confirmInviteStatus)
-, _participants(participants) {
+ConfirmInviteBox::ConfirmInviteBox(QWidget *, const QString &title, bool isChannel, const MTPChatPhoto &photo,
+                                   int count, const QVector<UserData *> &participants)
+    : _title(this, st::confirmInviteTitle)
+    , _status(this, st::confirmInviteStatus)
+    , _participants(participants) {
 	_title->setText(title);
 	QString status;
 	if (_participants.isEmpty() || _participants.size() >= count) {
@@ -655,15 +679,18 @@ void ConfirmInviteBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	if (_photo) {
-		p.drawPixmap((width() - st::confirmInvitePhotoSize) / 2, st::confirmInvitePhotoTop, _photo->pixCircled(st::confirmInvitePhotoSize, st::confirmInvitePhotoSize));
+		p.drawPixmap((width() - st::confirmInvitePhotoSize) / 2, st::confirmInvitePhotoTop,
+		             _photo->pixCircled(st::confirmInvitePhotoSize, st::confirmInvitePhotoSize));
 	} else {
-		_photoEmpty.paint(p, (width() - st::confirmInvitePhotoSize) / 2, st::confirmInvitePhotoTop, width(), st::confirmInvitePhotoSize);
+		_photoEmpty.paint(p, (width() - st::confirmInvitePhotoSize) / 2, st::confirmInvitePhotoTop, width(),
+		                  st::confirmInvitePhotoSize);
 	}
 
 	int sumWidth = _participants.size() * _userWidth;
 	int left = (width() - sumWidth) / 2;
 	for_const (auto user, _participants) {
-		user->paintUserpicLeft(p, left + (_userWidth - st::confirmInviteUserPhotoSize) / 2, st::confirmInviteUserPhotoTop, width(), st::confirmInviteUserPhotoSize);
+		user->paintUserpicLeft(p, left + (_userWidth - st::confirmInviteUserPhotoSize) / 2,
+		                       st::confirmInviteUserPhotoTop, width(), st::confirmInviteUserPhotoSize);
 		left += _userWidth;
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h
index 09814fe7c..bf9fd888f 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_box.h
@@ -31,11 +31,21 @@ class FlatLabel;
 class InformBox;
 class ConfirmBox : public BoxContent, public ClickHandlerHost {
 public:
-	ConfirmBox(QWidget*, const QString &text, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
-	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(), base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget *, const QString &text,
+	           base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(),
+	           base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget *, const QString &text, const QString &confirmText,
+	           base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(),
+	           base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget *, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle,
+	           base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(),
+	           base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget *, const QString &text, const QString &confirmText, const QString &cancelText,
+	           base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(),
+	           base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
+	ConfirmBox(QWidget *, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle,
+	           const QString &cancelText, base::lambda_once<void()> confirmedCallback = base::lambda_once<void()>(),
+	           base::lambda_once<void()> cancelledCallback = base::lambda_once<void()>());
 
 	void updateLink();
 
@@ -59,8 +69,7 @@ protected:
 	void leaveEventHook(QEvent *e) override;
 
 private:
-	struct InformBoxTag {
-	};
+	struct InformBoxTag {};
 	ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, base::lambda<void()> closedCallback);
 	base::lambda_once<void()> generateInformCallback(base::lambda<void()> closedCallback);
 	friend class InformBox;
@@ -87,19 +96,18 @@ private:
 	bool _strictCancel = false;
 	base::lambda_once<void()> _confirmedCallback;
 	base::lambda_once<void()> _cancelledCallback;
-
 };
 
 class InformBox : public ConfirmBox {
 public:
-	InformBox(QWidget*, const QString &text, base::lambda<void()> closedCallback = base::lambda<void()>());
-	InformBox(QWidget*, const QString &text, const QString &doneText, base::lambda<void()> closedCallback = base::lambda<void()>());
-
+	InformBox(QWidget *, const QString &text, base::lambda<void()> closedCallback = base::lambda<void()>());
+	InformBox(QWidget *, const QString &text, const QString &doneText,
+	          base::lambda<void()> closedCallback = base::lambda<void()>());
 };
 
 class MaxInviteBox : public BoxContent {
 public:
-	MaxInviteBox(QWidget*, not_null<ChannelData*> channel);
+	MaxInviteBox(QWidget *, not_null<ChannelData *> channel);
 
 protected:
 	void prepare() override;
@@ -113,7 +121,7 @@ protected:
 private:
 	void updateSelected(const QPoint &cursorGlobalPosition);
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 
 	Text _text;
 	qint32 _textWidth, _textHeight;
@@ -122,12 +130,11 @@ private:
 	bool _linkOver = false;
 
 	QPoint _lastMousePos;
-
 };
 
 class ConvertToSupergroupBox : public BoxContent, public RPCSender {
 public:
-	ConvertToSupergroupBox(QWidget*, ChatData *chat);
+	ConvertToSupergroupBox(QWidget *, ChatData *chat);
 
 protected:
 	void prepare() override;
@@ -143,12 +150,11 @@ private:
 	ChatData *_chat;
 	Text _text, _note;
 	qint32 _textWidth, _textHeight;
-
 };
 
 class PinMessageBox : public BoxContent, public RPCSender {
 public:
-	PinMessageBox(QWidget*, ChannelData *channel, MsgId msgId);
+	PinMessageBox(QWidget *, ChannelData *channel, MsgId msgId);
 
 protected:
 	void prepare() override;
@@ -168,13 +174,12 @@ private:
 	object_ptr<Ui::Checkbox> _notify;
 
 	mtpRequestId _requestId = 0;
-
 };
 
 class DeleteMessagesBox : public BoxContent, public RPCSender {
 public:
-	DeleteMessagesBox(QWidget*, HistoryItem *item, bool suggestModerateActions);
-	DeleteMessagesBox(QWidget*, const SelectedItemSet &selected);
+	DeleteMessagesBox(QWidget *, HistoryItem *item, bool suggestModerateActions);
+	DeleteMessagesBox(QWidget *, const SelectedItemSet &selected);
 
 protected:
 	void prepare() override;
@@ -192,17 +197,17 @@ private:
 	bool _moderateBan = false;
 	bool _moderateDeleteAll = false;
 
-	object_ptr<Ui::FlatLabel> _text = { nullptr };
-	object_ptr<Ui::Checkbox> _forEveryone = { nullptr };
-	object_ptr<Ui::Checkbox> _banUser = { nullptr };
-	object_ptr<Ui::Checkbox> _reportSpam = { nullptr };
-	object_ptr<Ui::Checkbox> _deleteAll = { nullptr };
-
+	object_ptr<Ui::FlatLabel> _text = {nullptr};
+	object_ptr<Ui::Checkbox> _forEveryone = {nullptr};
+	object_ptr<Ui::Checkbox> _banUser = {nullptr};
+	object_ptr<Ui::Checkbox> _reportSpam = {nullptr};
+	object_ptr<Ui::Checkbox> _deleteAll = {nullptr};
 };
 
 class ConfirmInviteBox : public BoxContent, public RPCSender {
 public:
-	ConfirmInviteBox(QWidget*, const QString &title, bool isChannel, const MTPChatPhoto &photo, int count, const QVector<UserData*> &participants);
+	ConfirmInviteBox(QWidget *, const QString &title, bool isChannel, const MTPChatPhoto &photo, int count,
+	                 const QVector<UserData *> &participants);
 
 protected:
 	void prepare() override;
@@ -215,8 +220,7 @@ private:
 	object_ptr<Ui::FlatLabel> _status;
 	ImagePtr _photo;
 	EmptyUserpic _photoEmpty;
-	QVector<UserData*> _participants;
+	QVector<UserData *> _participants;
 
 	int _userWidth = 0;
-
 };
diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
index 1b2724198..d72ddb527 100644
--- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/confirm_phone_box.h"
 
-#include "styles/style_boxes.h"
 #include "boxes/confirm_box.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
-#include "mainwidget.h"
-#include "lang/lang_keys.h"
 
 namespace {
 
-object_ptr<ConfirmPhoneBox> CurrentConfirmPhoneBox = { nullptr };
+object_ptr<ConfirmPhoneBox> CurrentConfirmPhoneBox = {nullptr};
 
 } // namespace
 
@@ -90,9 +90,9 @@ void SentCodeField::fix() {
 }
 
 SentCodeCall::SentCodeCall(QObject *parent, base::lambda_once<void()> callCallback, base::lambda<void()> updateCallback)
-: _timer(parent)
-, _call(std::move(callCallback))
-, _update(std::move(updateCallback)) {
+    : _timer(parent)
+    , _call(std::move(callCallback))
+    , _update(std::move(updateCallback)) {
 	_timer->connect(_timer, &QTimer::timeout, [this] {
 		if (_status.state == State::Waiting) {
 			if (--_status.timeout <= 0) {
@@ -120,9 +120,13 @@ QString SentCodeCall::getText() const {
 	switch (_status.state) {
 	case State::Waiting: {
 		if (_status.timeout >= 3600) {
-			return lng_code_call(lt_minutes, qsl("%1:%2").arg(_status.timeout / 3600).arg((_status.timeout / 60) % 60, 2, 10, QChar('0')), lt_seconds, qsl("%1").arg(_status.timeout % 60, 2, 10, QChar('0')));
+			return lng_code_call(
+			    lt_minutes,
+			    qsl("%1:%2").arg(_status.timeout / 3600).arg((_status.timeout / 60) % 60, 2, 10, QChar('0')),
+			    lt_seconds, qsl("%1").arg(_status.timeout % 60, 2, 10, QChar('0')));
 		}
-		return lng_code_call(lt_minutes, QString::number(_status.timeout / 60), lt_seconds, qsl("%1").arg(_status.timeout % 60, 2, 10, QChar('0')));
+		return lng_code_call(lt_minutes, QString::number(_status.timeout / 60), lt_seconds,
+		                     qsl("%1").arg(_status.timeout % 60, 2, 10, QChar('0')));
 	} break;
 	case State::Calling: return lang(lng_code_calling);
 	case State::Called: return lang(lng_code_called);
@@ -140,11 +144,10 @@ void ConfirmPhoneBox::start(const QString &phone, const QString &hash) {
 	CurrentConfirmPhoneBox->checkPhoneAndHash();
 }
 
-ConfirmPhoneBox::ConfirmPhoneBox(QWidget*, const QString &phone, const QString &hash)
-: _phone(phone)
-, _hash(hash)
-, _call(this, [this] { sendCall(); }, [this] { update(); }) {
-}
+ConfirmPhoneBox::ConfirmPhoneBox(QWidget *, const QString &phone, const QString &hash)
+    : _phone(phone)
+    , _hash(hash)
+    , _call(this, [this] { sendCall(); }, [this] { update(); }) {}
 
 void ConfirmPhoneBox::sendCall() {
 	MTP::send(MTPauth_ResendCode(MTP_string(_phone), MTP_string(_phoneHash)), rpcDone(&ConfirmPhoneBox::callDone));
@@ -154,7 +157,8 @@ void ConfirmPhoneBox::checkPhoneAndHash() {
 	if (_sendCodeRequestId) {
 		return;
 	}
-	_sendCodeRequestId = MTP::send(MTPaccount_SendConfirmPhoneCode(MTP_flags(0), MTP_string(_hash), MTPBool()), rpcDone(&ConfirmPhoneBox::sendCodeDone), rpcFail(&ConfirmPhoneBox::sendCodeFail));
+	_sendCodeRequestId = MTP::send(MTPaccount_SendConfirmPhoneCode(MTP_flags(0), MTP_string(_hash), MTPBool()),
+	                               rpcDone(&ConfirmPhoneBox::sendCodeDone), rpcFail(&ConfirmPhoneBox::sendCodeFail));
 }
 
 void ConfirmPhoneBox::sendCodeDone(const MTPauth_SentCode &result) {
@@ -170,7 +174,7 @@ void ConfirmPhoneBox::sendCodeDone(const MTPauth_SentCode &result) {
 	}
 	_phoneHash = qs(resultInner.vphone_code_hash);
 	if (resultInner.has_next_type() && resultInner.vnext_type.type() == mtpc_auth_codeTypeCall) {
-		_call.setStatus({ SentCodeCall::State::Waiting, resultInner.has_timeout() ? resultInner.vtimeout.v : 60 });
+		_call.setStatus({SentCodeCall::State::Waiting, resultInner.has_timeout() ? resultInner.vtimeout.v : 60});
 	}
 	launch();
 }
@@ -219,7 +223,8 @@ void ConfirmPhoneBox::prepare() {
 	addButton(langFactory(lng_confirm_phone_send), [this] { onSendCode(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	setDimensions(st::boxWidth, st::usernamePadding.top() + _code->height() + st::usernameSkip + _about->height() + st::usernameSkip);
+	setDimensions(st::boxWidth,
+	              st::usernamePadding.top() + _code->height() + st::usernameSkip + _about->height() + st::usernameSkip);
 
 	connect(_code, SIGNAL(submitted(bool)), this, SLOT(onSendCode()));
 
@@ -245,7 +250,8 @@ void ConfirmPhoneBox::onSendCode() {
 
 	showError(QString());
 
-	_sendCodeRequestId = MTP::send(MTPaccount_ConfirmPhone(MTP_string(_phoneHash), MTP_string(_code->getLastText())), rpcDone(&ConfirmPhoneBox::confirmDone), rpcFail(&ConfirmPhoneBox::confirmFail));
+	_sendCodeRequestId = MTP::send(MTPaccount_ConfirmPhone(MTP_string(_phoneHash), MTP_string(_code->getLastText())),
+	                               rpcDone(&ConfirmPhoneBox::confirmDone), rpcFail(&ConfirmPhoneBox::confirmFail));
 }
 
 void ConfirmPhoneBox::confirmDone(const MTPBool &result) {
diff --git a/Telegram/SourceFiles/boxes/confirm_phone_box.h b/Telegram/SourceFiles/boxes/confirm_phone_box.h
index 88554f4de..b72a34c21 100644
--- a/Telegram/SourceFiles/boxes/confirm_phone_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_phone_box.h
@@ -30,7 +30,10 @@ class FlatLabel;
 
 class SentCodeField : public Ui::InputField {
 public:
-	SentCodeField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString()) : Ui::InputField(parent, st, std::move(placeholderFactory), val) {
+	SentCodeField(QWidget *parent, const style::InputField &st,
+	              base::lambda<QString()> placeholderFactory = base::lambda<QString()>(),
+	              const QString &val = QString())
+	    : Ui::InputField(parent, st, std::move(placeholderFactory), val) {
 		connect(this, &Ui::InputField::changed, [this] { fix(); });
 	}
 
@@ -51,7 +54,6 @@ private:
 	int _autoSubmitLength = 0;
 	base::lambda<void()> _submitCallback;
 	base::lambda<void()> _changedCallback;
-
 };
 
 class SentCodeCall {
@@ -65,10 +67,10 @@ public:
 		Disabled,
 	};
 	struct Status {
-		Status() {
-		}
-		Status(State state, int timeout) : state(state), timeout(timeout) {
-		}
+		Status() {}
+		Status(State state, int timeout)
+		    : state(state)
+		    , timeout(timeout) {}
 
 		State state = State::Disabled;
 		int timeout = 0;
@@ -91,7 +93,6 @@ private:
 	object_ptr<QTimer> _timer;
 	base::lambda_once<void()> _call;
 	base::lambda<void()> _update;
-
 };
 
 class ConfirmPhoneBox : public BoxContent, public RPCSender {
@@ -113,7 +114,7 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	ConfirmPhoneBox(QWidget*, const QString &phone, const QString &hash);
+	ConfirmPhoneBox(QWidget *, const QString &phone, const QString &hash);
 	friend class object_ptr<ConfirmPhoneBox>;
 
 	void sendCall();
@@ -146,10 +147,9 @@ private:
 
 	mtpRequestId _checkCodeRequestId = 0;
 
-	object_ptr<Ui::FlatLabel> _about = { nullptr };
-	object_ptr<SentCodeField> _code = { nullptr };
+	object_ptr<Ui::FlatLabel> _about = {nullptr};
+	object_ptr<SentCodeField> _code = {nullptr};
 
 	QString _error;
 	SentCodeCall _call;
-
 };
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 56aa55b6f..7a7cd3bfb 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -21,52 +21,58 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/connection_box.h"
 
 #include "boxes/confirm_box.h"
+#include "history/history_location_manager.h"
 #include "lang/lang_keys.h"
-#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
-#include "history/history_location_manager.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/input_fields.h"
 
 void ConnectionBox::ShowApplyProxyConfirmation(const QMap<QString, QString> &fields) {
 	auto server = fields.value(qsl("server"));
 	auto port = fields.value(qsl("port")).toInt();
 	if (!server.isEmpty() && port != 0) {
 		auto weakBox = std::make_shared<QPointer<ConfirmBox>>(nullptr);
-		auto box = Ui::show(Box<ConfirmBox>(lng_sure_enable_socks(lt_server, server, lt_port, QString::number(port)), lang(lng_sure_enable), [fields, weakBox] {
-			auto p = ProxyData();
-			p.host = fields.value(qsl("server"));
-			p.user = fields.value(qsl("user"));
-			p.password = fields.value(qsl("pass"));
-			p.port = fields.value(qsl("port")).toInt();
-			Global::SetConnectionType(dbictTcpProxy);
-			Global::SetLastProxyType(dbictTcpProxy);
-			Global::SetConnectionProxy(p);
-			Local::writeSettings();
-			Global::RefConnectionTypeChanged().notify();
-			MTP::restart();
-			reinitLocationManager();
-			reinitWebLoadManager();
-			if (*weakBox) (*weakBox)->closeBox();
-		}), KeepOtherLayers);
+		auto box = Ui::show(Box<ConfirmBox>(lng_sure_enable_socks(lt_server, server, lt_port, QString::number(port)),
+		                                    lang(lng_sure_enable),
+		                                    [fields, weakBox] {
+			                                    auto p = ProxyData();
+			                                    p.host = fields.value(qsl("server"));
+			                                    p.user = fields.value(qsl("user"));
+			                                    p.password = fields.value(qsl("pass"));
+			                                    p.port = fields.value(qsl("port")).toInt();
+			                                    Global::SetConnectionType(dbictTcpProxy);
+			                                    Global::SetLastProxyType(dbictTcpProxy);
+			                                    Global::SetConnectionProxy(p);
+			                                    Local::writeSettings();
+			                                    Global::RefConnectionTypeChanged().notify();
+			                                    MTP::restart();
+			                                    reinitLocationManager();
+			                                    reinitWebLoadManager();
+			                                    if (*weakBox) (*weakBox)->closeBox();
+		                                    }),
+		                    KeepOtherLayers);
 		*weakBox = box;
 	}
 }
 
 ConnectionBox::ConnectionBox(QWidget *parent)
-: _hostInput(this, st::connectionHostInputField, langFactory(lng_connection_host_ph), Global::ConnectionProxy().host)
-, _portInput(this, st::connectionPortInputField, langFactory(lng_connection_port_ph), QString::number(Global::ConnectionProxy().port))
-, _userInput(this, st::connectionUserInputField, langFactory(lng_connection_user_ph), Global::ConnectionProxy().user)
-, _passwordInput(this, st::connectionPasswordInputField, langFactory(lng_connection_password_ph), Global::ConnectionProxy().password)
-, _typeGroup(std::make_shared<Ui::RadioenumGroup<DBIConnectionType>>(Global::ConnectionType()))
-, _autoRadio(this, _typeGroup, dbictAuto, lang(lng_connection_auto_rb), st::defaultBoxCheckbox)
-, _httpProxyRadio(this, _typeGroup, dbictHttpProxy, lang(lng_connection_http_proxy_rb), st::defaultBoxCheckbox)
-, _tcpProxyRadio(this, _typeGroup, dbictTcpProxy, lang(lng_connection_tcp_proxy_rb), st::defaultBoxCheckbox)
-, _tryIPv6(this, lang(lng_connection_try_ipv6), Global::TryIPv6(), st::defaultBoxCheckbox) {
-}
+    : _hostInput(this, st::connectionHostInputField, langFactory(lng_connection_host_ph),
+                 Global::ConnectionProxy().host)
+    , _portInput(this, st::connectionPortInputField, langFactory(lng_connection_port_ph),
+                 QString::number(Global::ConnectionProxy().port))
+    , _userInput(this, st::connectionUserInputField, langFactory(lng_connection_user_ph),
+                 Global::ConnectionProxy().user)
+    , _passwordInput(this, st::connectionPasswordInputField, langFactory(lng_connection_password_ph),
+                     Global::ConnectionProxy().password)
+    , _typeGroup(std::make_shared<Ui::RadioenumGroup<DBIConnectionType>>(Global::ConnectionType()))
+    , _autoRadio(this, _typeGroup, dbictAuto, lang(lng_connection_auto_rb), st::defaultBoxCheckbox)
+    , _httpProxyRadio(this, _typeGroup, dbictHttpProxy, lang(lng_connection_http_proxy_rb), st::defaultBoxCheckbox)
+    , _tcpProxyRadio(this, _typeGroup, dbictTcpProxy, lang(lng_connection_tcp_proxy_rb), st::defaultBoxCheckbox)
+    , _tryIPv6(this, lang(lng_connection_try_ipv6), Global::TryIPv6(), st::defaultBoxCheckbox) {}
 
 void ConnectionBox::prepare() {
 	setTitle(langFactory(lng_connection_header));
@@ -93,7 +99,10 @@ bool ConnectionBox::badProxyValue() const {
 }
 
 void ConnectionBox::updateControlsVisibility() {
-	auto newHeight = st::boxOptionListPadding.top() + _autoRadio->heightNoMargins() + st::boxOptionListSkip + _httpProxyRadio->heightNoMargins() + st::boxOptionListSkip + _tcpProxyRadio->heightNoMargins() + st::boxOptionListSkip + st::connectionIPv6Skip + _tryIPv6->heightNoMargins() + st::defaultCheckbox.margin.bottom() + st::boxOptionListPadding.bottom() + st::boxPadding.bottom();
+	auto newHeight = st::boxOptionListPadding.top() + _autoRadio->heightNoMargins() + st::boxOptionListSkip +
+	                 _httpProxyRadio->heightNoMargins() + st::boxOptionListSkip + _tcpProxyRadio->heightNoMargins() +
+	                 st::boxOptionListSkip + st::connectionIPv6Skip + _tryIPv6->heightNoMargins() +
+	                 st::defaultCheckbox.margin.bottom() + st::boxOptionListPadding.bottom() + st::boxPadding.bottom();
 	if (_typeGroup->value() == dbictAuto && badProxyValue()) {
 		_hostInput->hide();
 		_portInput->hide();
@@ -127,31 +136,42 @@ void ConnectionBox::resizeEvent(QResizeEvent *e) {
 
 void ConnectionBox::updateControlsPosition() {
 	auto type = _typeGroup->value();
-	_autoRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _autoRadio->getMargins().top() + st::boxOptionListPadding.top());
-	_httpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _autoRadio->bottomNoMargins() + st::boxOptionListSkip);
+	_autoRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                       _autoRadio->getMargins().top() + st::boxOptionListPadding.top());
+	_httpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                            _autoRadio->bottomNoMargins() + st::boxOptionListSkip);
 
 	auto inputy = 0;
 	auto fieldsVisible = (type != dbictAuto) || (!badProxyValue() && Global::LastProxyType() != dbictAuto);
-	auto fieldsBelowHttp = fieldsVisible && (type == dbictHttpProxy || (type == dbictAuto && Global::LastProxyType() == dbictHttpProxy));
-	auto fieldsBelowTcp = fieldsVisible && (type == dbictTcpProxy || (type == dbictAuto && Global::LastProxyType() == dbictTcpProxy));
+	auto fieldsBelowHttp =
+	    fieldsVisible && (type == dbictHttpProxy || (type == dbictAuto && Global::LastProxyType() == dbictHttpProxy));
+	auto fieldsBelowTcp =
+	    fieldsVisible && (type == dbictTcpProxy || (type == dbictAuto && Global::LastProxyType() == dbictTcpProxy));
 	if (fieldsBelowHttp) {
 		inputy = _httpProxyRadio->bottomNoMargins() + st::boxOptionInputSkip;
-		_tcpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), inputy + st::boxOptionInputSkip + 2 * _hostInput->height() + st::boxOptionListSkip);
+		_tcpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+		                           inputy + st::boxOptionInputSkip + 2 * _hostInput->height() + st::boxOptionListSkip);
 	} else {
-		_tcpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _httpProxyRadio->bottomNoMargins() + st::boxOptionListSkip);
+		_tcpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+		                           _httpProxyRadio->bottomNoMargins() + st::boxOptionListSkip);
 		if (fieldsBelowTcp) {
 			inputy = _tcpProxyRadio->bottomNoMargins() + st::boxOptionInputSkip;
 		}
 	}
 
 	if (inputy) {
-		_hostInput->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x() - st::defaultInputField.textMargins.left(), inputy);
+		_hostInput->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter +
+		                           st::defaultBoxCheckbox.textPosition.x() - st::defaultInputField.textMargins.left(),
+		                       inputy);
 		_portInput->moveToRight(st::boxPadding.right(), inputy);
-		_userInput->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x() - st::defaultInputField.textMargins.left(), _hostInput->y() + _hostInput->height() + st::boxOptionInputSkip);
+		_userInput->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter +
+		                           st::defaultBoxCheckbox.textPosition.x() - st::defaultInputField.textMargins.left(),
+		                       _hostInput->y() + _hostInput->height() + st::boxOptionInputSkip);
 		_passwordInput->moveToRight(st::boxPadding.right(), _userInput->y());
 	}
 
-	auto tryipv6y = (fieldsBelowTcp ? _userInput->bottomNoMargins() : _tcpProxyRadio->bottomNoMargins()) + st::boxOptionListSkip + st::connectionIPv6Skip;
+	auto tryipv6y = (fieldsBelowTcp ? _userInput->bottomNoMargins() : _tcpProxyRadio->bottomNoMargins()) +
+	                st::boxOptionListSkip + st::connectionIPv6Skip;
 	_tryIPv6->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), tryipv6y);
 }
 
@@ -162,7 +182,8 @@ void ConnectionBox::typeChanged(DBIConnectionType type) {
 	updateControlsVisibility();
 	if (type != dbictAuto) {
 		Global::SetLastProxyType(type);
-		if (!_hostInput->hasFocus() && !_portInput->hasFocus() && !_userInput->hasFocus() && !_passwordInput->hasFocus()) {
+		if (!_hostInput->hasFocus() && !_portInput->hasFocus() && !_userInput->hasFocus() &&
+		    !_passwordInput->hasFocus()) {
 			_hostInput->setFocusFast();
 		}
 		if ((type == dbictHttpProxy) && !_portInput->getLastText().toInt()) {
@@ -257,21 +278,24 @@ void ConnectionBox::onSave() {
 }
 
 AutoDownloadBox::AutoDownloadBox(QWidget *parent)
-: _photoPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadPhoto() & dbiadNoPrivate), st::defaultBoxCheckbox)
-, _photoGroups(this,  lang(lng_media_auto_groups), !(cAutoDownloadPhoto() & dbiadNoGroups), st::defaultBoxCheckbox)
-, _audioPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadAudio() & dbiadNoPrivate), st::defaultBoxCheckbox)
-, _audioGroups(this, lang(lng_media_auto_groups), !(cAutoDownloadAudio() & dbiadNoGroups), st::defaultBoxCheckbox)
-, _gifPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadGif() & dbiadNoPrivate), st::defaultBoxCheckbox)
-, _gifGroups(this, lang(lng_media_auto_groups), !(cAutoDownloadGif() & dbiadNoGroups), st::defaultBoxCheckbox)
-, _gifPlay(this, lang(lng_media_auto_play), cAutoPlayGif(), st::defaultBoxCheckbox)
-, _sectionHeight(st::boxTitleHeight + 2 * (st::defaultCheck.diameter + st::setLittleSkip)) {
-}
+    : _photoPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadPhoto() & dbiadNoPrivate),
+                    st::defaultBoxCheckbox)
+    , _photoGroups(this, lang(lng_media_auto_groups), !(cAutoDownloadPhoto() & dbiadNoGroups), st::defaultBoxCheckbox)
+    , _audioPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadAudio() & dbiadNoPrivate),
+                    st::defaultBoxCheckbox)
+    , _audioGroups(this, lang(lng_media_auto_groups), !(cAutoDownloadAudio() & dbiadNoGroups), st::defaultBoxCheckbox)
+    , _gifPrivate(this, lang(lng_media_auto_private_chats), !(cAutoDownloadGif() & dbiadNoPrivate),
+                  st::defaultBoxCheckbox)
+    , _gifGroups(this, lang(lng_media_auto_groups), !(cAutoDownloadGif() & dbiadNoGroups), st::defaultBoxCheckbox)
+    , _gifPlay(this, lang(lng_media_auto_play), cAutoPlayGif(), st::defaultBoxCheckbox)
+    , _sectionHeight(st::boxTitleHeight + 2 * (st::defaultCheck.diameter + st::setLittleSkip)) {}
 
 void AutoDownloadBox::prepare() {
 	addButton(langFactory(lng_connection_save), [this] { onSave(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	setDimensions(st::boxWidth, 3 * _sectionHeight - st::autoDownloadTopDelta + st::setLittleSkip + _gifPlay->heightNoMargins() + st::setLittleSkip);
+	setDimensions(st::boxWidth, 3 * _sectionHeight - st::autoDownloadTopDelta + st::setLittleSkip +
+	                                _gifPlay->heightNoMargins() + st::setLittleSkip);
 }
 
 void AutoDownloadBox::paintEvent(QPaintEvent *e) {
@@ -281,9 +305,12 @@ void AutoDownloadBox::paintEvent(QPaintEvent *e) {
 
 	p.setPen(st::boxTitleFg);
 	p.setFont(st::autoDownloadTitleFont);
-	p.drawTextLeft(st::autoDownloadTitlePosition.x(), st::autoDownloadTitlePosition.y(), width(), lang(lng_media_auto_photo));
-	p.drawTextLeft(st::autoDownloadTitlePosition.x(), _sectionHeight + st::autoDownloadTitlePosition.y(), width(), lang(lng_media_auto_audio));
-	p.drawTextLeft(st::autoDownloadTitlePosition.x(), 2 * _sectionHeight + st::autoDownloadTitlePosition.y(), width(), lang(lng_media_auto_gif));
+	p.drawTextLeft(st::autoDownloadTitlePosition.x(), st::autoDownloadTitlePosition.y(), width(),
+	               lang(lng_media_auto_photo));
+	p.drawTextLeft(st::autoDownloadTitlePosition.x(), _sectionHeight + st::autoDownloadTitlePosition.y(), width(),
+	               lang(lng_media_auto_audio));
+	p.drawTextLeft(st::autoDownloadTitlePosition.x(), 2 * _sectionHeight + st::autoDownloadTitlePosition.y(), width(),
+	               lang(lng_media_auto_gif));
 }
 
 void AutoDownloadBox::resizeEvent(QResizeEvent *e) {
@@ -303,7 +330,8 @@ void AutoDownloadBox::resizeEvent(QResizeEvent *e) {
 
 void AutoDownloadBox::onSave() {
 	bool changed = false;
-	qint32 autoDownloadPhoto = (_photoPrivate->checked() ? 0 : dbiadNoPrivate) | (_photoGroups->checked() ? 0 : dbiadNoGroups);
+	qint32 autoDownloadPhoto =
+	    (_photoPrivate->checked() ? 0 : dbiadNoPrivate) | (_photoGroups->checked() ? 0 : dbiadNoGroups);
 	if (cAutoDownloadPhoto() != autoDownloadPhoto) {
 		bool enabledPrivate = ((cAutoDownloadPhoto() & dbiadNoPrivate) && !(autoDownloadPhoto & dbiadNoPrivate));
 		bool enabledGroups = ((cAutoDownloadPhoto() & dbiadNoGroups) && !(autoDownloadPhoto & dbiadNoGroups));
@@ -316,7 +344,8 @@ void AutoDownloadBox::onSave() {
 		}
 		changed = true;
 	}
-	qint32 autoDownloadAudio = (_audioPrivate->checked() ? 0 : dbiadNoPrivate) | (_audioGroups->checked() ? 0 : dbiadNoGroups);
+	qint32 autoDownloadAudio =
+	    (_audioPrivate->checked() ? 0 : dbiadNoPrivate) | (_audioGroups->checked() ? 0 : dbiadNoGroups);
 	if (cAutoDownloadAudio() != autoDownloadAudio) {
 		bool enabledPrivate = ((cAutoDownloadAudio() & dbiadNoPrivate) && !(autoDownloadAudio & dbiadNoPrivate));
 		bool enabledGroups = ((cAutoDownloadAudio() & dbiadNoGroups) && !(autoDownloadAudio & dbiadNoGroups));
@@ -330,7 +359,8 @@ void AutoDownloadBox::onSave() {
 		}
 		changed = true;
 	}
-	qint32 autoDownloadGif = (_gifPrivate->checked() ? 0 : dbiadNoPrivate) | (_gifGroups->checked() ? 0 : dbiadNoGroups);
+	qint32 autoDownloadGif =
+	    (_gifPrivate->checked() ? 0 : dbiadNoPrivate) | (_gifGroups->checked() ? 0 : dbiadNoGroups);
 	if (cAutoDownloadGif() != autoDownloadGif) {
 		bool enabledPrivate = ((cAutoDownloadGif() & dbiadNoPrivate) && !(autoDownloadGif & dbiadNoPrivate));
 		bool enabledGroups = ((cAutoDownloadGif() & dbiadNoGroups) && !(autoDownloadGif & dbiadNoGroups));
diff --git a/Telegram/SourceFiles/boxes/connection_box.h b/Telegram/SourceFiles/boxes/connection_box.h
index 2256db6fa..d5039c28b 100644
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@@ -27,10 +27,8 @@ class InputField;
 class PortInput;
 class PasswordInput;
 class Checkbox;
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
 } // namespace Ui
 
 class ConnectionBox : public BoxContent {
@@ -67,7 +65,6 @@ private:
 	object_ptr<Ui::Radioenum<DBIConnectionType>> _httpProxyRadio;
 	object_ptr<Ui::Radioenum<DBIConnectionType>> _tcpProxyRadio;
 	object_ptr<Ui::Checkbox> _tryIPv6;
-
 };
 
 class AutoDownloadBox : public BoxContent {
@@ -95,5 +92,4 @@ private:
 	object_ptr<Ui::Checkbox> _gifPlay;
 
 	int _sectionHeight = 0;
-
 };
diff --git a/Telegram/SourceFiles/boxes/download_path_box.cpp b/Telegram/SourceFiles/boxes/download_path_box.cpp
index ade2c5bd7..710ca390b 100644
--- a/Telegram/SourceFiles/boxes/download_path_box.cpp
+++ b/Telegram/SourceFiles/boxes/download_path_box.cpp
@@ -20,24 +20,23 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/download_path_box.h"
 
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
 #include "core/file_utilities.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "platform/platform_specific.h"
-#include "styles/style_boxes.h"
 #include "facades.h"
+#include "lang/lang_keys.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 
 DownloadPathBox::DownloadPathBox(QWidget *parent)
-: _path(Global::DownloadPath())
-, _pathBookmark(Global::DownloadPathBookmark())
-, _group(std::make_shared<Ui::RadioenumGroup<Directory>>(typeFromPath(_path)))
-, _default(this, _group, Directory::Downloads, lang(lng_download_path_default_radio), st::defaultBoxCheckbox)
-, _temp(this, _group, Directory::Temp, lang(lng_download_path_temp_radio), st::defaultBoxCheckbox)
-, _dir(this, _group, Directory::Custom, lang(lng_download_path_dir_radio), st::defaultBoxCheckbox)
-, _pathLink(this, QString(), st::boxLinkButton) {
-}
+    : _path(Global::DownloadPath())
+    , _pathBookmark(Global::DownloadPathBookmark())
+    , _group(std::make_shared<Ui::RadioenumGroup<Directory>>(typeFromPath(_path)))
+    , _default(this, _group, Directory::Downloads, lang(lng_download_path_default_radio), st::defaultBoxCheckbox)
+    , _temp(this, _group, Directory::Temp, lang(lng_download_path_temp_radio), st::defaultBoxCheckbox)
+    , _dir(this, _group, Directory::Custom, lang(lng_download_path_dir_radio), st::defaultBoxCheckbox)
+    , _pathLink(this, QString(), st::boxLinkButton) {}
 
 void DownloadPathBox::prepare() {
 	addButton(langFactory(lng_connection_save), [this] { save(); });
@@ -58,7 +57,8 @@ void DownloadPathBox::updateControlsVisibility() {
 	auto custom = (_group->value() == Directory::Custom);
 	_pathLink->setVisible(custom);
 
-	auto newHeight = st::boxOptionListPadding.top() + _default->getMargins().top() + _default->heightNoMargins() + st::boxOptionListSkip + _temp->heightNoMargins() + st::boxOptionListSkip + _dir->heightNoMargins();
+	auto newHeight = st::boxOptionListPadding.top() + _default->getMargins().top() + _default->heightNoMargins() +
+	                 st::boxOptionListSkip + _temp->heightNoMargins() + st::boxOptionListSkip + _dir->heightNoMargins();
 	if (custom) {
 		newHeight += st::downloadPathSkip + _pathLink->height();
 	}
@@ -70,10 +70,14 @@ void DownloadPathBox::updateControlsVisibility() {
 void DownloadPathBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_default->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top() + _default->getMargins().top());
-	_temp->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _default->bottomNoMargins() + st::boxOptionListSkip);
-	_dir->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _temp->bottomNoMargins() + st::boxOptionListSkip);
-	auto inputx = st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x();
+	_default->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                     st::boxOptionListPadding.top() + _default->getMargins().top());
+	_temp->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                  _default->bottomNoMargins() + st::boxOptionListSkip);
+	_dir->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                 _temp->bottomNoMargins() + st::boxOptionListSkip);
+	auto inputx = st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultCheck.diameter +
+	              st::defaultBoxCheckbox.textPosition.x();
 	auto inputy = _dir->bottomNoMargins() + st::downloadPathSkip;
 
 	_pathLink->moveToLeft(inputx, inputy);
@@ -99,18 +103,20 @@ void DownloadPathBox::radioChanged(Directory value) {
 void DownloadPathBox::onEditPath() {
 	auto initialPath = [] {
 		if (!Global::DownloadPath().isEmpty() && Global::DownloadPath() != qstr("tmp")) {
-			return Global::DownloadPath().left(Global::DownloadPath().size() - (Global::DownloadPath().endsWith('/') ? 1 : 0));
+			return Global::DownloadPath().left(Global::DownloadPath().size() -
+			                                   (Global::DownloadPath().endsWith('/') ? 1 : 0));
 		}
 		return QString();
 	};
-	FileDialog::GetFolder(lang(lng_download_path_choose), initialPath(), base::lambda_guarded(this, [this](const QString &result) {
-		if (!result.isEmpty()) {
-			_path = result + '/';
-			_pathBookmark = psDownloadPathBookmark(_path);
-			setPathText(QDir::toNativeSeparators(_path));
-			_group->setValue(Directory::Custom);
-		}
-	}));
+	FileDialog::GetFolder(lang(lng_download_path_choose), initialPath(),
+	                      base::lambda_guarded(this, [this](const QString &result) {
+		                      if (!result.isEmpty()) {
+			                      _path = result + '/';
+			                      _pathBookmark = psDownloadPathBookmark(_path);
+			                      setPathText(QDir::toNativeSeparators(_path));
+			                      _group->setValue(Directory::Custom);
+		                      }
+	                      }));
 }
 
 void DownloadPathBox::save() {
@@ -133,6 +139,7 @@ void DownloadPathBox::save() {
 }
 
 void DownloadPathBox::setPathText(const QString &text) {
-	auto availw = st::boxWideWidth - st::boxPadding.left() - st::defaultCheck.diameter - st::defaultBoxCheckbox.textPosition.x() - st::boxPadding.right();
+	auto availw = st::boxWideWidth - st::boxPadding.left() - st::defaultCheck.diameter -
+	              st::defaultBoxCheckbox.textPosition.x() - st::boxPadding.right();
 	_pathLink->setText(st::boxTextFont->elided(text, availw));
 }
diff --git a/Telegram/SourceFiles/boxes/download_path_box.h b/Telegram/SourceFiles/boxes/download_path_box.h
index d2a52ae10..fbebc5f03 100644
--- a/Telegram/SourceFiles/boxes/download_path_box.h
+++ b/Telegram/SourceFiles/boxes/download_path_box.h
@@ -20,14 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "boxes/abstract_box.h"
 #include "base/observer.h"
+#include "boxes/abstract_box.h"
 
 namespace Ui {
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
 class LinkButton;
 } // namespace Ui
 
@@ -73,5 +71,4 @@ private:
 	object_ptr<Ui::Radioenum<Directory>> _temp;
 	object_ptr<Ui::Radioenum<Directory>> _dir;
 	object_ptr<Ui::LinkButton> _pathLink;
-
 };
diff --git a/Telegram/SourceFiles/boxes/edit_color_box.cpp b/Telegram/SourceFiles/boxes/edit_color_box.cpp
index 35c4eb857..9cfacf9fb 100644
--- a/Telegram/SourceFiles/boxes/edit_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_color_box.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/edit_color_box.h"
 
+#include "app.h"
 #include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
-#include "ui/widgets/shadow.h"
 #include "styles/style_mediaview.h"
 #include "ui/widgets/input_fields.h"
-#include "app.h"
+#include "ui/widgets/shadow.h"
 
 class EditColorBox::Picker : public TWidget {
 public:
@@ -70,7 +70,6 @@ private:
 
 	bool _choosing = false;
 	base::Observable<void> _changed;
-
 };
 
 QCursor EditColorBox::Picker::generateCursor() {
@@ -97,7 +96,8 @@ QCursor EditColorBox::Picker::generateCursor() {
 	return QCursor(QPixmap::fromImage(cursor));
 }
 
-EditColorBox::Picker::Picker(QWidget *parent, QColor color) : TWidget(parent) {
+EditColorBox::Picker::Picker(QWidget *parent, QColor color)
+    : TWidget(parent) {
 	setCursor(generateCursor());
 
 	auto size = QSize(st::colorPickerSize, st::colorPickerSize);
@@ -128,7 +128,8 @@ void EditColorBox::Picker::paintEvent(QPaintEvent *e) {
 	auto y = anim::interpolate(0, height() - 1, _y);
 	PainterHighQualityEnabler hq(p);
 
-	p.drawEllipse(QRect(x - st::colorPickerMarkRadius, y - st::colorPickerMarkRadius, 2 * st::colorPickerMarkRadius, 2 * st::colorPickerMarkRadius));
+	p.drawEllipse(QRect(x - st::colorPickerMarkRadius, y - st::colorPickerMarkRadius, 2 * st::colorPickerMarkRadius,
+	                    2 * st::colorPickerMarkRadius));
 }
 
 void EditColorBox::Picker::mousePressEvent(QMouseEvent *e) {
@@ -151,7 +152,7 @@ void EditColorBox::Picker::preparePalette() {
 	_paletteInvalidated = false;
 
 	auto size = _palette.width();
-	auto ints = reinterpret_cast<quint32*>(_palette.bits());
+	auto ints = reinterpret_cast<quint32 *>(_palette.bits());
 	auto intsAddPerLine = (_palette.bytesPerLine() - size * sizeof(quint32)) / sizeof(quint32);
 
 	constexpr auto Large = 1024 * 1024;
@@ -280,15 +281,15 @@ private:
 
 	bool _choosing = false;
 	base::Observable<void> _changed;
-
 };
 
-EditColorBox::Slider::Slider(QWidget *parent, Direction direction, Type type, QColor color) : TWidget(parent)
-, _direction(direction)
-, _type(type)
-, _color(color.red(), color.green(), color.blue())
-, _value(valueFromColor(color))
-, _transparent((_type == Type::Hue) ? QBrush() : style::transparentPlaceholderBrush()) {
+EditColorBox::Slider::Slider(QWidget *parent, Direction direction, Type type, QColor color)
+    : TWidget(parent)
+    , _direction(direction)
+    , _type(type)
+    , _color(color.red(), color.green(), color.blue())
+    , _value(valueFromColor(color))
+    , _transparent((_type == Type::Hue) ? QBrush() : style::transparentPlaceholderBrush()) {
 	prepareMinSize();
 }
 
@@ -299,7 +300,8 @@ void EditColorBox::Slider::prepareMinSize() {
 
 void EditColorBox::Slider::paintEvent(QPaintEvent *e) {
 	Painter p(this);
-	auto to = rect().marginsRemoved(QMargins(st::colorSliderSkip, st::colorSliderSkip, st::colorSliderSkip, st::colorSliderSkip));
+	auto to = rect().marginsRemoved(
+	    QMargins(st::colorSliderSkip, st::colorSliderSkip, st::colorSliderSkip, st::colorSliderSkip));
 	Ui::Shadow::paint(p, to, width(), st::defaultRoundShadow);
 	if (_type == Type::Opacity) {
 		p.fillRect(to, _transparent);
@@ -308,11 +310,13 @@ void EditColorBox::Slider::paintEvent(QPaintEvent *e) {
 	if (isHorizontal()) {
 		auto x = st::colorSliderSkip + std::round(_value * to.width());
 		st::colorSliderArrowTop.paint(p, x - st::colorSliderArrowTop.width() / 2, 0, width());
-		st::colorSliderArrowBottom.paint(p, x - st::colorSliderArrowBottom.width() / 2, height() - st::colorSliderArrowBottom.height(), width());
+		st::colorSliderArrowBottom.paint(p, x - st::colorSliderArrowBottom.width() / 2,
+		                                 height() - st::colorSliderArrowBottom.height(), width());
 	} else {
 		auto y = st::colorSliderSkip + std::round(_value * to.height());
 		st::colorSliderArrowLeft.paint(p, 0, y - st::colorSliderArrowLeft.height() / 2, width());
-		st::colorSliderArrowRight.paint(p, width() - st::colorSliderArrowRight.width(), y - st::colorSliderArrowRight.height() / 2, width());
+		st::colorSliderArrowRight.paint(p, width() - st::colorSliderArrowRight.width(),
+		                                y - st::colorSliderArrowRight.height() / 2, width());
 	}
 }
 
@@ -340,7 +344,7 @@ void EditColorBox::Slider::generatePixmap() {
 	auto size = (isHorizontal() ? width() : height()) * cIntRetinaFactor();
 	auto image = QImage(size, cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	image.setDevicePixelRatio(cRetinaFactor());
-	auto ints = reinterpret_cast<quint32*>(image.bits());
+	auto ints = reinterpret_cast<quint32 *>(image.bits());
 	auto intsPerLine = image.bytesPerLine() / sizeof(quint32);
 	auto intsPerLineAdded = intsPerLine - size;
 
@@ -441,7 +445,8 @@ void EditColorBox::Slider::updateCurrentPoint(QPoint localPosition) {
 
 class EditColorBox::Field : public Ui::MaskedInputField {
 public:
-	Field(QWidget *parent, const style::InputField &st, const QString &placeholder, int limit, const QString &units = QString());
+	Field(QWidget *parent, const style::InputField &st, const QString &placeholder, int limit,
+	      const QString &units = QString());
 
 	int value() const {
 		return getLastText().toInt();
@@ -468,15 +473,15 @@ private:
 	int _limit = 0;
 	int _digitLimit = 1;
 	int _wheelDelta = 0;
-
 };
 
-EditColorBox::Field::Field(QWidget *parent, const style::InputField &st, const QString &placeholder, int limit, const QString &units) : Ui::MaskedInputField(parent, st)
-, _placeholder(placeholder)
-, _units(units)
-, _limit(limit)
-, _digitLimit(QString::number(_limit).size()) {
-}
+EditColorBox::Field::Field(QWidget *parent, const style::InputField &st, const QString &placeholder, int limit,
+                           const QString &units)
+    : Ui::MaskedInputField(parent, st)
+    , _placeholder(placeholder)
+    , _units(units)
+    , _limit(limit)
+    , _digitLimit(QString::number(_limit).size()) {}
 
 void EditColorBox::Field::correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) {
 	QString newText;
@@ -518,7 +523,8 @@ void EditColorBox::Field::correctValue(const QString &was, int wasCursor, QStrin
 void EditColorBox::Field::paintAdditionalPlaceholder(Painter &p, TimeMs ms) {
 	p.setFont(_st.font);
 	p.setPen(_st.placeholderFg);
-	auto inner = QRect(_st.textMargins.right(), _st.textMargins.top(), width() - 2 * _st.textMargins.right(), height() - _st.textMargins.top() - _st.textMargins.bottom());
+	auto inner = QRect(_st.textMargins.right(), _st.textMargins.top(), width() - 2 * _st.textMargins.right(),
+	                   height() - _st.textMargins.top() - _st.textMargins.bottom());
 	p.drawText(inner, _placeholder, style::al_topleft);
 	if (!_units.isEmpty()) {
 		p.drawText(inner, _units, style::al_topright);
@@ -580,11 +586,10 @@ public:
 protected:
 	void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) override;
 	void paintAdditionalPlaceholder(Painter &p, TimeMs ms) override;
-
 };
 
-EditColorBox::ResultField::ResultField(QWidget *parent, const style::InputField &st) : Ui::MaskedInputField(parent, st) {
-}
+EditColorBox::ResultField::ResultField(QWidget *parent, const style::InputField &st)
+    : Ui::MaskedInputField(parent, st) {}
 
 void EditColorBox::ResultField::correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) {
 	QString newText;
@@ -623,25 +628,27 @@ void EditColorBox::ResultField::correctValue(const QString &was, int wasCursor,
 void EditColorBox::ResultField::paintAdditionalPlaceholder(Painter &p, TimeMs ms) {
 	p.setFont(_st.font);
 	p.setPen(_st.placeholderFg);
-	p.drawText(QRect(_st.textMargins.right(), _st.textMargins.top(), width(), height() - _st.textMargins.top() - _st.textMargins.bottom()), "#", style::al_topleft);
+	p.drawText(QRect(_st.textMargins.right(), _st.textMargins.top(), width(),
+	                 height() - _st.textMargins.top() - _st.textMargins.bottom()),
+	           "#", style::al_topleft);
 }
 
-EditColorBox::EditColorBox(QWidget*, const QString &title, QColor current) : BoxContent()
-, _title(title)
-, _picker(this, current)
-, _hueSlider(this, Slider::Direction::Vertical, Slider::Type::Hue, current)
-, _opacitySlider(this, Slider::Direction::Horizontal, Slider::Type::Opacity, current)
-, _hueField(this, st::colorValueInput, "H", 360, QString() + QChar(176)) // degree character
-, _saturationField(this, st::colorValueInput, "S", 100, "%")
-, _brightnessField(this, st::colorValueInput, "B", 100, "%")
-, _redField(this, st::colorValueInput, "R", 255)
-, _greenField(this, st::colorValueInput, "G", 255)
-, _blueField(this, st::colorValueInput, "B", 255)
-, _result(this, st::colorResultInput)
-, _transparent(style::transparentPlaceholderBrush())
-, _current(current)
-, _new(current) {
-}
+EditColorBox::EditColorBox(QWidget *, const QString &title, QColor current)
+    : BoxContent()
+    , _title(title)
+    , _picker(this, current)
+    , _hueSlider(this, Slider::Direction::Vertical, Slider::Type::Hue, current)
+    , _opacitySlider(this, Slider::Direction::Horizontal, Slider::Type::Opacity, current)
+    , _hueField(this, st::colorValueInput, "H", 360, QString() + QChar(176)) // degree character
+    , _saturationField(this, st::colorValueInput, "S", 100, "%")
+    , _brightnessField(this, st::colorValueInput, "B", 100, "%")
+    , _redField(this, st::colorValueInput, "R", 255)
+    , _greenField(this, st::colorValueInput, "G", 255)
+    , _blueField(this, st::colorValueInput, "B", 255)
+    , _result(this, st::colorResultInput)
+    , _transparent(style::transparentPlaceholderBrush())
+    , _current(current)
+    , _new(current) {}
 
 void EditColorBox::prepare() {
 	setTitle([this] { return _title; });
@@ -665,7 +672,8 @@ void EditColorBox::prepare() {
 	addButton(langFactory(lng_settings_save), [this] { saveColor(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	auto height = st::colorEditSkip + st::colorPickerSize + st::colorEditSkip + st::colorSliderWidth + st::colorEditSkip;
+	auto height =
+	    st::colorEditSkip + st::colorPickerSize + st::colorEditSkip + st::colorSliderWidth + st::colorEditSkip;
 	setDimensions(st::colorEditWidth, height);
 
 	subscribe(_picker->changed(), [this] { updateFromControls(); });
@@ -708,15 +716,8 @@ void EditColorBox::onFieldChanged() {
 }
 
 void EditColorBox::onFieldSubmitted() {
-	Ui::MaskedInputField *fields[] = {
-		_hueField,
-		_saturationField,
-		_brightnessField,
-		_redField,
-		_greenField,
-		_blueField,
-		_result
-	};
+	Ui::MaskedInputField *fields[] = {_hueField,   _saturationField, _brightnessField, _redField,
+	                                  _greenField, _blueField,       _result};
 	for (auto i = 0, count = int(base::array_size(fields)); i + 1 != count; ++i) {
 		if (fields[i]->hasFocus()) {
 			fields[i + 1]->setFocus();
@@ -776,23 +777,33 @@ void EditColorBox::updateResultField() {
 }
 
 void EditColorBox::resizeEvent(QResizeEvent *e) {
-	auto fullwidth = _picker->width() + 2 * (st::colorEditSkip - st::colorSliderSkip) + _hueSlider->width() + st::colorSampleSize.width();
+	auto fullwidth = _picker->width() + 2 * (st::colorEditSkip - st::colorSliderSkip) + _hueSlider->width() +
+	                 st::colorSampleSize.width();
 	auto left = (width() - fullwidth) / 2;
 	_picker->moveToLeft(left, st::colorEditSkip);
-	_hueSlider->setGeometryToLeft(_picker->x() + _picker->width() + st::colorEditSkip - st::colorSliderSkip, st::colorEditSkip - st::colorSliderSkip, _hueSlider->width(), st::colorPickerSize + 2 * st::colorSliderSkip);
-	_opacitySlider->setGeometryToLeft(_picker->x() - st::colorSliderSkip, _picker->y() + _picker->height() + st::colorEditSkip - st::colorSliderSkip, _picker->width() + 2 * st::colorSliderSkip, _opacitySlider->height());
+	_hueSlider->setGeometryToLeft(_picker->x() + _picker->width() + st::colorEditSkip - st::colorSliderSkip,
+	                              st::colorEditSkip - st::colorSliderSkip, _hueSlider->width(),
+	                              st::colorPickerSize + 2 * st::colorSliderSkip);
+	_opacitySlider->setGeometryToLeft(_picker->x() - st::colorSliderSkip,
+	                                  _picker->y() + _picker->height() + st::colorEditSkip - st::colorSliderSkip,
+	                                  _picker->width() + 2 * st::colorSliderSkip, _opacitySlider->height());
 	auto fieldLeft = _hueSlider->x() + _hueSlider->width() - st::colorSliderSkip + st::colorEditSkip;
 	auto fieldWidth = st::colorSampleSize.width();
 	auto fieldHeight = _hueField->height();
 	_newRect = QRect(fieldLeft, st::colorEditSkip, fieldWidth, st::colorSampleSize.height());
 	_currentRect = _newRect.translated(0, st::colorSampleSize.height());
-	_hueField->setGeometryToLeft(fieldLeft, _currentRect.y() + _currentRect.height() + st::colorFieldSkip, fieldWidth, fieldHeight);
+	_hueField->setGeometryToLeft(fieldLeft, _currentRect.y() + _currentRect.height() + st::colorFieldSkip, fieldWidth,
+	                             fieldHeight);
 	_saturationField->setGeometryToLeft(fieldLeft, _hueField->y() + _hueField->height(), fieldWidth, fieldHeight);
-	_brightnessField->setGeometryToLeft(fieldLeft, _saturationField->y() + _saturationField->height(), fieldWidth, fieldHeight);
-	_redField->setGeometryToLeft(fieldLeft, _brightnessField->y() + _brightnessField->height() + st::colorFieldSkip, fieldWidth, fieldHeight);
+	_brightnessField->setGeometryToLeft(fieldLeft, _saturationField->y() + _saturationField->height(), fieldWidth,
+	                                    fieldHeight);
+	_redField->setGeometryToLeft(fieldLeft, _brightnessField->y() + _brightnessField->height() + st::colorFieldSkip,
+	                             fieldWidth, fieldHeight);
 	_greenField->setGeometryToLeft(fieldLeft, _redField->y() + _redField->height(), fieldWidth, fieldHeight);
 	_blueField->setGeometryToLeft(fieldLeft, _greenField->y() + _greenField->height(), fieldWidth, fieldHeight);
-	_result->setGeometryToLeft(fieldLeft - (st::colorEditSkip + st::colorSliderWidth), _opacitySlider->y() + _opacitySlider->height() - st::colorSliderSkip - _result->height(), fieldWidth + (st::colorEditSkip + st::colorSliderWidth), fieldHeight);
+	_result->setGeometryToLeft(fieldLeft - (st::colorEditSkip + st::colorSliderWidth),
+	                           _opacitySlider->y() + _opacitySlider->height() - st::colorSliderSkip - _result->height(),
+	                           fieldWidth + (st::colorEditSkip + st::colorSliderWidth), fieldHeight);
 }
 
 void EditColorBox::paintEvent(QPaintEvent *e) {
@@ -801,7 +812,8 @@ void EditColorBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	Ui::Shadow::paint(p, _picker->geometry(), width(), st::defaultRoundShadow);
 
-	Ui::Shadow::paint(p, QRect(_newRect.x(), _newRect.y(), _newRect.width(), _newRect.height() + _currentRect.height()), width(), st::defaultRoundShadow);
+	Ui::Shadow::paint(p, QRect(_newRect.x(), _newRect.y(), _newRect.width(), _newRect.height() + _currentRect.height()),
+	                  width(), st::defaultRoundShadow);
 	if (_new.alphaF() < 1.) {
 		p.fillRect(myrtlrect(_newRect), _transparent);
 	}
@@ -870,9 +882,7 @@ void EditColorBox::updateFromResultField() {
 		}
 		return code - '0';
 	};
-	auto fromChars = [fromHex](QChar a, QChar b) {
-		return fromHex(a) * 0x10 + fromHex(b);
-	};
+	auto fromChars = [fromHex](QChar a, QChar b) { return fromHex(a) * 0x10 + fromHex(b); };
 	auto red = fromChars(text[0], text[1]);
 	auto green = fromChars(text[2], text[3]);
 	auto blue = fromChars(text[4], text[5]);
diff --git a/Telegram/SourceFiles/boxes/edit_color_box.h b/Telegram/SourceFiles/boxes/edit_color_box.h
index b4aa2a64d..26740b5ab 100644
--- a/Telegram/SourceFiles/boxes/edit_color_box.h
+++ b/Telegram/SourceFiles/boxes/edit_color_box.h
@@ -26,7 +26,7 @@ class EditColorBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	EditColorBox(QWidget*, const QString &title, QColor current = QColor(255, 255, 255));
+	EditColorBox(QWidget *, const QString &title, QColor current = QColor(255, 255, 255));
 
 	void setSaveCallback(base::lambda<void(QColor)> callback) {
 		_saveCallback = std::move(callback);
@@ -105,5 +105,4 @@ private:
 
 	base::lambda<void(QColor)> _saveCallback;
 	base::lambda<void()> _cancelCallback;
-
 };
diff --git a/Telegram/SourceFiles/boxes/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/edit_participant_box.cpp
index 5f22a7f6e..caa1a7b09 100644
--- a/Telegram/SourceFiles/boxes/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_participant_box.cpp
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/edit_participant_box.h"
 
-#include "lang/lang_keys.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "styles/style_boxes.h"
-#include "ui/special_buttons.h"
+#include "app.h" // For App::peerName
 #include "boxes/calendar_box.h"
 #include "facades.h"
-#include "app.h" // For App::peerName
+#include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
+#include "ui/special_buttons.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
 
 namespace {
 
@@ -77,12 +77,11 @@ void ApplyDependencies(CheckboxesMap &checkboxes, DependenciesMap &dependencies,
 
 class EditParticipantBox::Inner : public TWidget {
 public:
-	Inner(QWidget *parent, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights);
+	Inner(QWidget *parent, not_null<ChannelData *> channel, not_null<UserData *> user, bool hasAdminRights);
 
-	template <typename Widget>
-	QPointer<Widget> addControl(object_ptr<Widget> widget, QMargins margin) {
+	template <typename Widget> QPointer<Widget> addControl(object_ptr<Widget> widget, QMargins margin) {
 		doAddControl(std::move(widget), margin);
-		return static_cast<Widget*>(_rows.back().widget.data());
+		return static_cast<Widget *>(_rows.back().widget.data());
 	}
 
 	void removeControl(QPointer<TWidget> widget);
@@ -94,8 +93,8 @@ protected:
 private:
 	void doAddControl(object_ptr<TWidget> widget, QMargins margin);
 
-	not_null<ChannelData*> _channel;
-	not_null<UserData*> _user;
+	not_null<ChannelData *> _channel;
+	not_null<UserData *> _user;
 	object_ptr<Ui::PeerAvatarButton> _userPhoto;
 	Text _userName;
 	bool _hasAdminRights = false;
@@ -104,22 +103,21 @@ private:
 		QMargins margin;
 	};
 	std::vector<Control> _rows;
-
 };
 
-EditParticipantBox::Inner::Inner(QWidget *parent, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights) : TWidget(parent)
-, _channel(channel)
-, _user(user)
-, _userPhoto(this, _user, st::rightsPhotoButton)
-, _hasAdminRights(hasAdminRights) {
+EditParticipantBox::Inner::Inner(QWidget *parent, not_null<ChannelData *> channel, not_null<UserData *> user,
+                                 bool hasAdminRights)
+    : TWidget(parent)
+    , _channel(channel)
+    , _user(user)
+    , _userPhoto(this, _user, st::rightsPhotoButton)
+    , _hasAdminRights(hasAdminRights) {
 	_userName.setText(st::rightsNameStyle, App::peerName(_user), _textNameOptions);
 	_userPhoto->setClickedCallback([this] { Ui::showPeerProfile(_user); });
 }
 
 void EditParticipantBox::Inner::removeControl(QPointer<TWidget> widget) {
-	auto row = std::find_if(_rows.begin(), _rows.end(), [widget](auto &&row) {
-		return (row.widget == widget);
-	});
+	auto row = std::find_if(_rows.begin(), _rows.end(), [widget](auto &&row) { return (row.widget == widget); });
 	Assert(row != _rows.end());
 	row->widget.destroy();
 	_rows.erase(row);
@@ -127,7 +125,7 @@ void EditParticipantBox::Inner::removeControl(QPointer<TWidget> widget) {
 
 void EditParticipantBox::Inner::doAddControl(object_ptr<TWidget> widget, QMargins margin) {
 	widget->setParent(this);
-	_rows.push_back({ std::move(widget), margin });
+	_rows.push_back({std::move(widget), margin});
 	_rows.back().widget->show();
 }
 
@@ -165,18 +163,18 @@ void EditParticipantBox::Inner::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(namex, st::rightsPhotoMargin.top() + st::rightsStatusTop, width(), statusText());
 }
 
-EditParticipantBox::EditParticipantBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights) : BoxContent()
-, _channel(channel)
-, _user(user)
-, _hasAdminRights(hasAdminRights) {
-}
+EditParticipantBox::EditParticipantBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user,
+                                       bool hasAdminRights)
+    : BoxContent()
+    , _channel(channel)
+    , _user(user)
+    , _hasAdminRights(hasAdminRights) {}
 
 void EditParticipantBox::prepare() {
 	_inner = setInnerWidget(object_ptr<Inner>(this, _channel, _user, hasAdminRights()));
 }
 
-template <typename Widget>
-QPointer<Widget> EditParticipantBox::addControl(object_ptr<Widget> widget, QMargins margin) {
+template <typename Widget> QPointer<Widget> EditParticipantBox::addControl(object_ptr<Widget> widget, QMargins margin) {
 	Expects(_inner != nullptr);
 	return _inner->addControl(std::move(widget), margin);
 }
@@ -191,8 +189,10 @@ void EditParticipantBox::resizeToContent() {
 	setDimensions(_inner->width(), std::min(_inner->height(), st::boxMaxListHeight));
 }
 
-EditAdminBox::EditAdminBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, const MTPChannelAdminRights &rights) : EditParticipantBox(nullptr, channel, user, (rights.c_channelAdminRights().vflags.v != 0))
-, _oldRights(rights) {
+EditAdminBox::EditAdminBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user,
+                           const MTPChannelAdminRights &rights)
+    : EditParticipantBox(nullptr, channel, user, (rights.c_channelAdminRights().vflags.v != 0))
+    , _oldRights(rights) {
 	auto dependency = [this](Flag dependent, Flag dependency) {
 		_dependencies.push_back(std::make_pair(dependent, dependency));
 	};
@@ -200,10 +200,12 @@ EditAdminBox::EditAdminBox(QWidget*, not_null<ChannelData*> channel, not_null<Us
 	dependency(Flag::f_invite_users, Flag::f_invite_link);
 }
 
-MTPChannelAdminRights EditAdminBox::DefaultRights(not_null<ChannelData*> channel) {
-	auto defaultRights = channel->isMegagroup()
-		? (Flag::f_change_info | Flag::f_delete_messages | Flag::f_ban_users | Flag::f_invite_users | Flag::f_invite_link | Flag::f_pin_messages)
-		: (Flag::f_change_info | Flag::f_post_messages | Flag::f_edit_messages | Flag::f_delete_messages | Flag::f_invite_users | Flag::f_invite_link);
+MTPChannelAdminRights EditAdminBox::DefaultRights(not_null<ChannelData *> channel) {
+	auto defaultRights = channel->isMegagroup() ?
+	                         (Flag::f_change_info | Flag::f_delete_messages | Flag::f_ban_users | Flag::f_invite_users |
+	                          Flag::f_invite_link | Flag::f_pin_messages) :
+	                         (Flag::f_change_info | Flag::f_post_messages | Flag::f_edit_messages |
+	                          Flag::f_delete_messages | Flag::f_invite_users | Flag::f_invite_link);
 	return MTP_channelAdminRights(MTP_flags(defaultRights));
 }
 
@@ -214,12 +216,15 @@ void EditAdminBox::prepare() {
 	setTitle(langFactory(hadRights ? lng_rights_edit_admin : lng_channel_add_admin));
 
 	addControl(object_ptr<BoxContentDivider>(this), QMargins());
-	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_edit_admin_header), Ui::FlatLabel::InitType::Simple, st::rightsHeaderLabel), st::rightsHeaderMargin);
+	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_edit_admin_header), Ui::FlatLabel::InitType::Simple,
+	                                     st::rightsHeaderLabel),
+	           st::rightsHeaderMargin);
 
 	auto prepareRights = (hadRights ? _oldRights : DefaultRights(channel()));
 	auto addCheckbox = [this, &prepareRights](Flags flags, const QString &text) {
 		auto checked = (prepareRights.c_channelAdminRights().vflags.v & flags) != 0;
-		auto control = addControl(object_ptr<Ui::Checkbox>(this, text, checked, st::rightsCheckbox, st::rightsToggle), st::rightsToggleMargin);
+		auto control = addControl(object_ptr<Ui::Checkbox>(this, text, checked, st::rightsCheckbox, st::rightsToggle),
+		                          st::rightsToggleMargin);
 		subscribe(control->checkedChanged, [this, control](bool checked) {
 			InvokeQueued(this, [this, control] { applyDependencies(control); });
 		});
@@ -237,7 +242,8 @@ void EditAdminBox::prepare() {
 		addCheckbox(Flag::f_change_info, lang(lng_rights_group_info));
 		addCheckbox(Flag::f_delete_messages, lang(lng_rights_group_delete));
 		addCheckbox(Flag::f_ban_users, lang(lng_rights_group_ban));
-		addCheckbox(Flag::f_invite_users | Flag::f_invite_link, lang(channel()->anyoneCanAddMembers() ? lng_rights_group_invite_link : lng_rights_group_invite));
+		addCheckbox(Flag::f_invite_users | Flag::f_invite_link,
+		            lang(channel()->anyoneCanAddMembers() ? lng_rights_group_invite_link : lng_rights_group_invite));
 		addCheckbox(Flag::f_pin_messages, lang(lng_rights_group_pin));
 		addCheckbox(Flag::f_add_admins, lang(lng_rights_add_admins));
 	} else {
@@ -253,9 +259,7 @@ void EditAdminBox::prepare() {
 	if (addAdmins != _checkboxes.end()) {
 		_aboutAddAdmins = addControl(object_ptr<Ui::FlatLabel>(this, st::boxLabel), st::rightsAboutMargin);
 		Assert(addAdmins != _checkboxes.end());
-		subscribe(addAdmins->second->checkedChanged, [this](bool checked) {
-			refreshAboutAddAdminsText();
-		});
+		subscribe(addAdmins->second->checkedChanged, [this](bool checked) { refreshAboutAddAdminsText(); });
 		refreshAboutAddAdminsText();
 	}
 
@@ -310,8 +314,10 @@ void EditAdminBox::refreshAboutAddAdminsText() {
 	resizeToContent();
 }
 
-EditRestrictedBox::EditRestrictedBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights, const MTPChannelBannedRights &rights) : EditParticipantBox(nullptr, channel, user, hasAdminRights)
-, _oldRights(rights) {
+EditRestrictedBox::EditRestrictedBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user,
+                                     bool hasAdminRights, const MTPChannelBannedRights &rights)
+    : EditParticipantBox(nullptr, channel, user, hasAdminRights)
+    , _oldRights(rights) {
 	auto dependency = [this](Flag dependent, Flag dependency) {
 		_dependencies.push_back(std::make_pair(dependent, dependency));
 	};
@@ -333,14 +339,17 @@ void EditRestrictedBox::prepare() {
 	setTitle(langFactory(lng_rights_user_restrictions));
 
 	addControl(object_ptr<BoxContentDivider>(this), QMargins());
-	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_user_restrictions_header), Ui::FlatLabel::InitType::Simple, st::rightsHeaderLabel), st::rightsHeaderMargin);
+	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_user_restrictions_header),
+	                                     Ui::FlatLabel::InitType::Simple, st::rightsHeaderLabel),
+	           st::rightsHeaderMargin);
 
 	auto prepareRights = (_oldRights.c_channelBannedRights().vflags.v ? _oldRights : DefaultRights(channel()));
 	_until = prepareRights.c_channelBannedRights().vuntil_date.v;
 
 	auto addCheckbox = [this, &prepareRights](Flags flags, const QString &text) {
 		auto checked = (prepareRights.c_channelBannedRights().vflags.v & flags) == 0;
-		auto control = addControl(object_ptr<Ui::Checkbox>(this, text, checked, st::rightsCheckbox, st::rightsToggle), st::rightsToggleMargin);
+		auto control = addControl(object_ptr<Ui::Checkbox>(this, text, checked, st::rightsCheckbox, st::rightsToggle),
+		                          st::rightsToggleMargin);
 		subscribe(control->checkedChanged, [this, control](bool checked) {
 			InvokeQueued(this, [this, control] { applyDependencies(control); });
 		});
@@ -352,14 +361,17 @@ void EditRestrictedBox::prepare() {
 	addCheckbox(Flag::f_view_messages, lang(lng_rights_chat_read));
 	addCheckbox(Flag::f_send_messages, lang(lng_rights_chat_send_text));
 	addCheckbox(Flag::f_send_media, lang(lng_rights_chat_send_media));
-	addCheckbox(Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline, lang(lng_rights_chat_send_stickers));
+	addCheckbox(Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline,
+	            lang(lng_rights_chat_send_stickers));
 	addCheckbox(Flag::f_embed_links, lang(lng_rights_chat_send_links));
 
 	addControl(object_ptr<BoxContentDivider>(this), st::rightsUntilMargin);
-	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_chat_banned_until_header), Ui::FlatLabel::InitType::Simple, st::rightsHeaderLabel), st::rightsHeaderMargin);
+	addControl(object_ptr<Ui::FlatLabel>(this, lang(lng_rights_chat_banned_until_header),
+	                                     Ui::FlatLabel::InitType::Simple, st::rightsHeaderLabel),
+	           st::rightsHeaderMargin);
 	setRestrictUntil(_until);
 
-	//addControl(object_ptr<Ui::LinkButton>(this, lang(lng_rights_chat_banned_block), st::boxLinkButton));
+	// addControl(object_ptr<Ui::LinkButton>(this, lang(lng_rights_chat_banned_block), st::boxLinkButton));
 
 	if (canSave()) {
 		addButton(langFactory(lng_settings_save), [this] {
@@ -393,8 +405,9 @@ void EditRestrictedBox::applyDependencies(QPointer<Ui::Checkbox> changed) {
 	ApplyDependencies(_checkboxes, _dependencies, changed);
 }
 
-MTPChannelBannedRights EditRestrictedBox::DefaultRights(not_null<ChannelData*> channel) {
-	auto defaultRights = Flag::f_send_messages | Flag::f_send_media | Flag::f_embed_links | Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline;
+MTPChannelBannedRights EditRestrictedBox::DefaultRights(not_null<ChannelData *> channel) {
+	auto defaultRights = Flag::f_send_messages | Flag::f_send_media | Flag::f_embed_links | Flag::f_send_stickers |
+	                     Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline;
 	return MTP_channelBannedRights(MTP_flags(defaultRights), MTP_int(0));
 }
 
@@ -402,7 +415,10 @@ void EditRestrictedBox::showRestrictUntil() {
 	auto tomorrow = QDate::currentDate().addDays(1);
 	auto highlighted = isUntilForever() ? tomorrow : date(getRealUntilValue()).date();
 	auto month = highlighted;
-	_restrictUntilBox = Ui::show(Box<CalendarBox>(month, highlighted, [this](const QDate &date) { setRestrictUntil(static_cast<int>(QDateTime(date).toTime_t())); }), KeepOtherLayers);
+	_restrictUntilBox = Ui::show(
+	    Box<CalendarBox>(month, highlighted,
+	                     [this](const QDate &date) { setRestrictUntil(static_cast<int>(QDateTime(date).toTime_t())); }),
+	    KeepOtherLayers);
 	_restrictUntilBox->setMaxDate(QDate::currentDate().addDays(kMaxRestrictDelayDays));
 	_restrictUntilBox->setMinDate(tomorrow);
 	_restrictUntilBox->addLeftButton(langFactory(lng_rights_chat_banned_forever), [this] { setRestrictUntil(0); });
@@ -442,7 +458,9 @@ void EditRestrictedBox::createUntilVariants() {
 		if (!canSave() && _untilGroup->value() != value) {
 			return;
 		}
-		_untilVariants.push_back(addControl(object_ptr<Ui::Radiobutton>(this, _untilGroup, value, text, st::defaultBoxCheckbox), st::rightsToggleMargin));
+		_untilVariants.push_back(
+		    addControl(object_ptr<Ui::Radiobutton>(this, _untilGroup, value, text, st::defaultBoxCheckbox),
+		               st::rightsToggleMargin));
 		if (!canSave()) {
 			_untilVariants.back()->setDisabled(true);
 		}
diff --git a/Telegram/SourceFiles/boxes/edit_participant_box.h b/Telegram/SourceFiles/boxes/edit_participant_box.h
index d4496b19b..91107e84c 100644
--- a/Telegram/SourceFiles/boxes/edit_participant_box.h
+++ b/Telegram/SourceFiles/boxes/edit_participant_box.h
@@ -34,22 +34,21 @@ class CalendarBox;
 
 class EditParticipantBox : public BoxContent {
 public:
-	EditParticipantBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights);
+	EditParticipantBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user, bool hasAdminRights);
 
 protected:
 	void prepare() override;
 
 	void resizeToContent();
 
-	not_null<UserData*> user() const {
+	not_null<UserData *> user() const {
 		return _user;
 	}
-	not_null<ChannelData*> channel() const {
+	not_null<ChannelData *> channel() const {
 		return _channel;
 	}
 
-	template <typename Widget>
-	QPointer<Widget> addControl(object_ptr<Widget> widget, QMargins margin);
+	template <typename Widget> QPointer<Widget> addControl(object_ptr<Widget> widget, QMargins margin);
 
 	void removeControl(QPointer<TWidget> widget);
 
@@ -58,18 +57,18 @@ protected:
 	}
 
 private:
-	not_null<ChannelData*> _channel;
-	not_null<UserData*> _user;
+	not_null<ChannelData *> _channel;
+	not_null<UserData *> _user;
 	bool _hasAdminRights = false;
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
 
 class EditAdminBox : public EditParticipantBox {
 public:
-	EditAdminBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, const MTPChannelAdminRights &rights);
+	EditAdminBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user,
+	             const MTPChannelAdminRights &rights);
 
 	void setSaveCallback(base::lambda<void(MTPChannelAdminRights, MTPChannelAdminRights)> callback) {
 		_saveCallback = std::move(callback);
@@ -82,7 +81,7 @@ private:
 	using Flag = MTPDchannelAdminRights::Flag;
 	using Flags = MTPDchannelAdminRights::Flags;
 
-	static MTPChannelAdminRights DefaultRights(not_null<ChannelData*> channel);
+	static MTPChannelAdminRights DefaultRights(not_null<ChannelData *> channel);
 
 	bool canSave() const {
 		return !!_saveCallback;
@@ -96,7 +95,6 @@ private:
 
 	std::map<Flags, QPointer<Ui::Checkbox>> _checkboxes;
 	QPointer<Ui::FlatLabel> _aboutAddAdmins;
-
 };
 
 // Restricted box works with flags in the opposite way.
@@ -104,7 +102,8 @@ private:
 
 class EditRestrictedBox : public EditParticipantBox {
 public:
-	EditRestrictedBox(QWidget*, not_null<ChannelData*> channel, not_null<UserData*> user, bool hasAdminRights, const MTPChannelBannedRights &rights);
+	EditRestrictedBox(QWidget *, not_null<ChannelData *> channel, not_null<UserData *> user, bool hasAdminRights,
+	                  const MTPChannelBannedRights &rights);
 
 	void setSaveCallback(base::lambda<void(MTPChannelBannedRights, MTPChannelBannedRights)> callback) {
 		_saveCallback = std::move(callback);
@@ -117,7 +116,7 @@ private:
 	using Flag = MTPDchannelBannedRights::Flag;
 	using Flags = MTPDchannelBannedRights::Flags;
 
-	static MTPChannelBannedRights DefaultRights(not_null<ChannelData*> channel);
+	static MTPChannelBannedRights DefaultRights(not_null<ChannelData *> channel);
 
 	bool canSave() const {
 		return !!_saveCallback;
@@ -147,5 +146,4 @@ private:
 	static constexpr auto kUntilOneDay = -1;
 	static constexpr auto kUntilOneWeek = -2;
 	static constexpr auto kUntilCustom = -3;
-
 };
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 5cdcb9649..c06446e48 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -18,52 +18,52 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "base/lambda_guard.h"
 #include "boxes/edit_privacy_box.h"
+#include "base/lambda_guard.h"
 
+#include "apiwrap.h"
+#include "app.h" // For App::user, App::feedUsers
+#include "auth_session.h"
+#include "boxes/peer_list_controllers.h"
+#include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "boxes/peer_list_controllers.h"
-#include "apiwrap.h"
-#include "auth_session.h"
-#include "lang/lang_keys.h"
-#include "app.h" // For App::user, App::feedUsers
 
 namespace {
 
 class PrivacyExceptionsBoxController : public ChatsListBoxController {
 public:
-	PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected);
-	void rowClicked(not_null<PeerListRow*> row) override;
+	PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory,
+	                               const std::vector<not_null<UserData *>> &selected);
+	void rowClicked(not_null<PeerListRow *> row) override;
 
-	std::vector<not_null<UserData*>> getResult() const;
+	std::vector<not_null<UserData *>> getResult() const;
 
 protected:
 	void prepareViewHook() override;
-	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+	std::unique_ptr<Row> createRow(not_null<History *> history) override;
 
 private:
 	base::lambda<QString()> _titleFactory;
-	std::vector<not_null<UserData*>> _selected;
-
+	std::vector<not_null<UserData *>> _selected;
 };
 
-PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory, const std::vector<not_null<UserData*>> &selected)
-: _titleFactory(std::move(titleFactory))
-, _selected(selected) {
-}
+PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(base::lambda<QString()> titleFactory,
+                                                               const std::vector<not_null<UserData *>> &selected)
+    : _titleFactory(std::move(titleFactory))
+    , _selected(selected) {}
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(_titleFactory);
 	delegate()->peerListAddSelectedRows(_selected);
 }
 
-std::vector<not_null<UserData*>> PrivacyExceptionsBoxController::getResult() const {
+std::vector<not_null<UserData *>> PrivacyExceptionsBoxController::getResult() const {
 	auto peers = delegate()->peerListCollectSelectedRows();
-	auto users = std::vector<not_null<UserData*>>();
+	auto users = std::vector<not_null<UserData *>>();
 	if (!peers.empty()) {
 		users.reserve(peers.size());
 		for_const (auto peer, peers) {
@@ -75,11 +75,12 @@ std::vector<not_null<UserData*>> PrivacyExceptionsBoxController::getResult() con
 	return users;
 }
 
-void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
+void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow *> row) {
 	delegate()->peerListSetRowChecked(row, !row->checked());
 }
 
-std::unique_ptr<PrivacyExceptionsBoxController::Row> PrivacyExceptionsBoxController::createRow(not_null<History*> history) {
+std::unique_ptr<PrivacyExceptionsBoxController::Row>
+PrivacyExceptionsBoxController::createRow(not_null<History *> history) {
 	if (history->peer->isSelf()) {
 		return nullptr;
 	}
@@ -91,10 +92,10 @@ std::unique_ptr<PrivacyExceptionsBoxController::Row> PrivacyExceptionsBoxControl
 
 } // namespace
 
-EditPrivacyBox::EditPrivacyBox(QWidget*, std::unique_ptr<Controller> controller) : BoxContent()
-, _controller(std::move(controller))
-, _loading(this, lang(lng_contacts_loading), Ui::FlatLabel::InitType::Simple, st::membersAbout) {
-}
+EditPrivacyBox::EditPrivacyBox(QWidget *, std::unique_ptr<Controller> controller)
+    : BoxContent()
+    , _controller(std::move(controller))
+    , _loading(this, lang(lng_contacts_loading), Ui::FlatLabel::InitType::Simple, st::membersAbout) {}
 
 void EditPrivacyBox::prepare() {
 	_controller->setView(this);
@@ -177,34 +178,34 @@ int EditPrivacyBox::countDefaultHeight(int newWidth) {
 }
 
 void EditPrivacyBox::editExceptionUsers(Exception exception) {
-	auto controller = std::make_unique<PrivacyExceptionsBoxController>(base::lambda_guarded(this, [this, exception] {
-		return _controller->exceptionBoxTitle(exception);
-	}), exceptionUsers(exception));
-	auto initBox = [this, exception, controller = controller.get()](not_null<PeerListBox*> box) {
+	auto controller = std::make_unique<PrivacyExceptionsBoxController>(
+	    base::lambda_guarded(this, [this, exception] { return _controller->exceptionBoxTitle(exception); }),
+	    exceptionUsers(exception));
+	auto initBox = [this, exception, controller = controller.get()](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_settings_save), base::lambda_guarded(this, [this, box, exception, controller] {
-			exceptionUsers(exception) = controller->getResult();
-			exceptionLink(exception)->entity()->setText(exceptionLinkText(exception));
-			auto removeFrom = ([exception] {
-				switch (exception) {
-				case Exception::Always: return Exception::Never;
-				case Exception::Never: return Exception::Always;
-				}
-				Unexpected("Invalid exception value.");
-			})();
-			auto &removeFromUsers = exceptionUsers(removeFrom);
-			auto removedSome = false;
-			for (auto user : exceptionUsers(exception)) {
-				auto removedStart = std::remove(removeFromUsers.begin(), removeFromUsers.end(), user);
-				if (removedStart != removeFromUsers.end()) {
-					removeFromUsers.erase(removedStart, removeFromUsers.end());
-					removedSome = true;
-				}
-			}
-			if (removedSome) {
-				exceptionLink(removeFrom)->entity()->setText(exceptionLinkText(removeFrom));
-			}
-			box->closeBox();
-		}));
+			               exceptionUsers(exception) = controller->getResult();
+			               exceptionLink(exception)->entity()->setText(exceptionLinkText(exception));
+			               auto removeFrom = ([exception] {
+				               switch (exception) {
+				               case Exception::Always: return Exception::Never;
+				               case Exception::Never: return Exception::Always;
+				               }
+				               Unexpected("Invalid exception value.");
+			               })();
+			               auto &removeFromUsers = exceptionUsers(removeFrom);
+			               auto removedSome = false;
+			               for (auto user : exceptionUsers(exception)) {
+				               auto removedStart = std::remove(removeFromUsers.begin(), removeFromUsers.end(), user);
+				               if (removedStart != removeFromUsers.end()) {
+					               removeFromUsers.erase(removedStart, removeFromUsers.end());
+					               removedSome = true;
+				               }
+			               }
+			               if (removedSome) {
+				               exceptionLink(removeFrom)->entity()->setText(exceptionLinkText(removeFrom));
+			               }
+			               box->closeBox();
+		               }));
 		box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
 	};
 	Ui::show(Box<PeerListBox>(std::move(controller), std::move(initBox)), KeepOtherLayers);
@@ -246,7 +247,7 @@ style::margins EditPrivacyBox::exceptionLinkMargins() const {
 	return st::editPrivacyLinkMargin;
 }
 
-std::vector<not_null<UserData*>> &EditPrivacyBox::exceptionUsers(Exception exception) {
+std::vector<not_null<UserData *>> &EditPrivacyBox::exceptionUsers(Exception exception) {
 	switch (exception) {
 	case Exception::Always: return _alwaysUsers;
 	case Exception::Never: return _neverUsers;
@@ -286,9 +287,8 @@ void EditPrivacyBox::createWidgets() {
 		widget.create(this, text, Ui::FlatLabel::InitType::Simple, st);
 	};
 	auto createExceptionLink = [this](Exception exception) {
-		exceptionLink(exception).create(this, object_ptr<Ui::LinkButton>(this, exceptionLinkText(exception)), exceptionLinkMargins(), [this] {
-			resizeGetHeight(width());
-		});
+		exceptionLink(exception).create(this, object_ptr<Ui::LinkButton>(this, exceptionLinkText(exception)),
+		                                exceptionLinkMargins(), [this] { resizeGetHeight(width()); });
 		exceptionLink(exception)->entity()->setClickedCallback([this, exception] { editExceptionUsers(exception); });
 	};
 
@@ -306,9 +306,9 @@ void EditPrivacyBox::createWidgets() {
 	addButton(langFactory(lng_settings_save), [this] {
 		auto someAreDisallowed = (_option != Option::Everyone) || !_neverUsers.empty();
 		_controller->confirmSave(someAreDisallowed, base::lambda_guarded(this, [this] {
-			Auth().api().savePrivacy(_controller->key(), collectResult());
-			closeBox();
-		}));
+			                         Auth().api().savePrivacy(_controller->key(), collectResult());
+			                         closeBox();
+		                         }));
 	});
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
@@ -326,53 +326,54 @@ void EditPrivacyBox::createWidgets() {
 }
 
 void EditPrivacyBox::loadData() {
-        request(MTPaccount_GetPrivacy(_controller->key())).done([this](const MTPaccount_PrivacyRules &result) {
-		Expects(result.type() == mtpc_account_privacyRules);
-		auto &rules = result.c_account_privacyRules();
-		App::feedUsers(rules.vusers);
+	request(MTPaccount_GetPrivacy(_controller->key()))
+	    .done([this](const MTPaccount_PrivacyRules &result) {
+		    Expects(result.type() == mtpc_account_privacyRules);
+		    auto &rules = result.c_account_privacyRules();
+		    App::feedUsers(rules.vusers);
 
-		// This is simplified version of privacy rules interpretation.
-		// But it should be fine for all the apps that use the same subset of features.
-		auto optionSet = false;
-		auto setOption = [this, &optionSet](Option option) {
-			if (optionSet) return;
-			optionSet = true;
-			_option = option;
-		};
-		auto feedRule = [this, &setOption](const MTPPrivacyRule &rule) {
-			switch (rule.type()) {
-			case mtpc_privacyValueAllowAll: setOption(Option::Everyone); break;
-			case mtpc_privacyValueAllowContacts: setOption(Option::Contacts); break;
-			case mtpc_privacyValueAllowUsers: {
-				auto &users = rule.c_privacyValueAllowUsers().vusers.v;
-				_alwaysUsers.reserve(_alwaysUsers.size() + users.size());
-				for (auto &userId : users) {
-					auto user = App::user(UserId(userId.v));
-					if (!base::contains(_neverUsers, user) && !base::contains(_alwaysUsers, user)) {
-						_alwaysUsers.push_back(user);
-					}
-				}
-			} break;
-			case mtpc_privacyValueDisallowContacts: // not supported, fall through
-			case mtpc_privacyValueDisallowAll: setOption(Option::Nobody); break;
-			case mtpc_privacyValueDisallowUsers: {
-				auto &users = rule.c_privacyValueDisallowUsers().vusers.v;
-				_neverUsers.reserve(_neverUsers.size() + users.size());
-				for (auto &userId : users) {
-					auto user = App::user(UserId(userId.v));
-					if (!base::contains(_alwaysUsers, user) && !base::contains(_neverUsers, user)) {
-						_neverUsers.push_back(user);
-					}
-				}
-			} break;
-			}
-		};
-		for (auto &rule : rules.vrules.v) {
-			feedRule(rule);
-		}
-		feedRule(MTP_privacyValueDisallowAll()); // disallow by default.
+		    // This is simplified version of privacy rules interpretation.
+		    // But it should be fine for all the apps that use the same subset of features.
+		    auto optionSet = false;
+		    auto setOption = [this, &optionSet](Option option) {
+			    if (optionSet) return;
+			    optionSet = true;
+			    _option = option;
+		    };
+		    auto feedRule = [this, &setOption](const MTPPrivacyRule &rule) {
+			    switch (rule.type()) {
+			    case mtpc_privacyValueAllowAll: setOption(Option::Everyone); break;
+			    case mtpc_privacyValueAllowContacts: setOption(Option::Contacts); break;
+			    case mtpc_privacyValueAllowUsers: {
+				    auto &users = rule.c_privacyValueAllowUsers().vusers.v;
+				    _alwaysUsers.reserve(_alwaysUsers.size() + users.size());
+				    for (auto &userId : users) {
+					    auto user = App::user(UserId(userId.v));
+					    if (!base::contains(_neverUsers, user) && !base::contains(_alwaysUsers, user)) {
+						    _alwaysUsers.push_back(user);
+					    }
+				    }
+			    } break;
+			    case mtpc_privacyValueDisallowContacts: // not supported, fall through
+			    case mtpc_privacyValueDisallowAll: setOption(Option::Nobody); break;
+			    case mtpc_privacyValueDisallowUsers: {
+				    auto &users = rule.c_privacyValueDisallowUsers().vusers.v;
+				    _neverUsers.reserve(_neverUsers.size() + users.size());
+				    for (auto &userId : users) {
+					    auto user = App::user(UserId(userId.v));
+					    if (!base::contains(_alwaysUsers, user) && !base::contains(_neverUsers, user)) {
+						    _neverUsers.push_back(user);
+					    }
+				    }
+			    } break;
+			    }
+		    };
+		    for (auto &rule : rules.vrules.v) {
+			    feedRule(rule);
+		    }
+		    feedRule(MTP_privacyValueDisallowAll()); // disallow by default.
 
-		createWidgets();
-        }).send();
+		    createWidgets();
+	    })
+	    .send();
 }
-
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.h b/Telegram/SourceFiles/boxes/edit_privacy_box.h
index 46eaae29f..a6d4d8b7d 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@@ -26,12 +26,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Ui {
 class FlatLabel;
 class LinkButton;
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
-template <typename Widget>
-class WidgetSlideWrap;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
+template <typename Widget> class WidgetSlideWrap;
 } // namespace Ui
 
 class EditPrivacyBox : public BoxContent, private MTP::Sender {
@@ -81,10 +78,9 @@ public:
 		EditPrivacyBox *_view = nullptr;
 
 		friend class EditPrivacyBox;
-
 	};
 
-	EditPrivacyBox(QWidget*, std::unique_ptr<Controller> controller);
+	EditPrivacyBox(QWidget *, std::unique_ptr<Controller> controller);
 
 protected:
 	void prepare() override;
@@ -102,7 +98,7 @@ private:
 
 	void editExceptionUsers(Exception exception);
 	QString exceptionLinkText(Exception exception);
-	std::vector<not_null<UserData*>> &exceptionUsers(Exception exception);
+	std::vector<not_null<UserData *>> &exceptionUsers(Exception exception);
 	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> &exceptionLink(Exception exception);
 
 	std::unique_ptr<Controller> _controller;
@@ -110,17 +106,16 @@ private:
 
 	std::shared_ptr<Ui::RadioenumGroup<Option>> _optionGroup;
 	object_ptr<Ui::FlatLabel> _loading;
-	object_ptr<Ui::FlatLabel> _description = { nullptr };
-	object_ptr<Ui::Radioenum<Option>> _everyone = { nullptr };
-	object_ptr<Ui::Radioenum<Option>> _contacts = { nullptr };
-	object_ptr<Ui::Radioenum<Option>> _nobody = { nullptr };
-	object_ptr<Ui::FlatLabel> _warning = { nullptr };
-	object_ptr<Ui::FlatLabel> _exceptionsTitle = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _alwaysLink = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _neverLink = { nullptr };
-	object_ptr<Ui::FlatLabel> _exceptionsDescription = { nullptr };
-
-	std::vector<not_null<UserData*>> _alwaysUsers;
-	std::vector<not_null<UserData*>> _neverUsers;
+	object_ptr<Ui::FlatLabel> _description = {nullptr};
+	object_ptr<Ui::Radioenum<Option>> _everyone = {nullptr};
+	object_ptr<Ui::Radioenum<Option>> _contacts = {nullptr};
+	object_ptr<Ui::Radioenum<Option>> _nobody = {nullptr};
+	object_ptr<Ui::FlatLabel> _warning = {nullptr};
+	object_ptr<Ui::FlatLabel> _exceptionsTitle = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _alwaysLink = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _neverLink = {nullptr};
+	object_ptr<Ui::FlatLabel> _exceptionsDescription = {nullptr};
 
+	std::vector<not_null<UserData *>> _alwaysUsers;
+	std::vector<not_null<UserData *>> _neverUsers;
 };
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index 0ce1be712..74a08b8fa 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -19,20 +19,20 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/language_box.h"
-#include "lang/lang_keys.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "storage/localstorage.h"
 #include "boxes/confirm_box.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "lang/lang_instance.h"
-#include "lang/lang_cloud_manager.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 
 class LanguageBox::Inner : public TWidget, private base::Subscriber {
 public:
-	Inner(QWidget *parent, not_null<Languages*> languages);
+	Inner(QWidget *parent, not_null<Languages *> languages);
 
 	void setSelected(int index);
 	void refresh();
@@ -41,14 +41,14 @@ private:
 	void activateCurrent();
 	void languageChanged(int languageIndex);
 
-	not_null<Languages*> _languages;
+	not_null<Languages *> _languages;
 	std::shared_ptr<Ui::RadiobuttonGroup> _group;
 	std::vector<object_ptr<Ui::Radiobutton>> _buttons;
-
 };
 
-LanguageBox::Inner::Inner(QWidget *parent, not_null<Languages*> languages) : TWidget(parent)
-, _languages(languages) {
+LanguageBox::Inner::Inner(QWidget *parent, not_null<Languages *> languages)
+    : TWidget(parent)
+    , _languages(languages) {
 	_group = std::make_shared<Ui::RadiobuttonGroup>(0);
 	_group->setChangedCallback([this](int value) { languageChanged(value); });
 	subscribe(Lang::Current().updated(), [this] {
@@ -107,16 +107,12 @@ void LanguageBox::Inner::activateCurrent() {
 
 void LanguageBox::prepare() {
 	refreshLang();
-	subscribe(Lang::Current().updated(), [this] {
-		refreshLang();
-	});
+	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	_inner = setInnerWidget(object_ptr<Inner>(this, &_languages), st::boxLayerScroll);
 
 	refresh();
-	subscribe(Lang::CurrentCloudManager().languageListChanged(), [this] {
-		refresh();
-	});
+	subscribe(Lang::CurrentCloudManager().languageListChanged(), [this] { refresh(); });
 }
 
 void LanguageBox::refreshLang() {
@@ -141,9 +137,10 @@ void LanguageBox::refreshLanguages() {
 	_languages.reserve(list.size() + 1);
 	auto currentId = Lang::Current().id();
 	auto currentIndex = -1;
-	_languages.push_back({ qsl("en"), qsl("English"), qsl("English") });
+	_languages.push_back({qsl("en"), qsl("English"), qsl("English")});
 	for (auto &language : list) {
-		auto isCurrent = (language.id == currentId) || (language.id == Lang::DefaultLanguageId() && currentId.isEmpty());
+		auto isCurrent =
+		    (language.id == currentId) || (language.id == Lang::DefaultLanguageId() && currentId.isEmpty());
 		if (language.id != qstr("en")) {
 			if (isCurrent) {
 				currentIndex = _languages.size();
@@ -154,11 +151,11 @@ void LanguageBox::refreshLanguages() {
 		}
 	}
 	if (currentId == qstr("custom")) {
-		_languages.insert(_languages.begin(), { currentId, qsl("Custom LangPack"), qsl("Custom LangPack") });
+		_languages.insert(_languages.begin(), {currentId, qsl("Custom LangPack"), qsl("Custom LangPack")});
 		currentIndex = 0;
 	} else if (currentIndex < 0) {
 		currentIndex = _languages.size();
-		_languages.push_back({ currentId, lang(lng_language_name), lang(lng_language_name) });
+		_languages.push_back({currentId, lang(lng_language_name), lang(lng_language_name)});
 	}
 	_inner->setSelected(currentIndex);
 }
diff --git a/Telegram/SourceFiles/boxes/language_box.h b/Telegram/SourceFiles/boxes/language_box.h
index a34505ebd..f174fc14e 100644
--- a/Telegram/SourceFiles/boxes/language_box.h
+++ b/Telegram/SourceFiles/boxes/language_box.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "lang/lang_cloud_manager.h"
 #include "boxes/abstract_box.h"
+#include "lang/lang_cloud_manager.h"
 #include "mtproto/sender.h"
 
 namespace Ui {
@@ -29,10 +29,9 @@ class RadiobuttonGroup;
 class Radiobutton;
 } // namespace Ui
 
-class LanguageBox : public BoxContent, private MTP::Sender  {
+class LanguageBox : public BoxContent, private MTP::Sender {
 public:
-	LanguageBox(QWidget*) {
-	}
+	LanguageBox(QWidget*) {}
 
 protected:
 	void prepare() override;
@@ -48,5 +47,4 @@ private:
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
index 1b744616c..a1549e0b6 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp
@@ -20,19 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/local_storage_box.h"
 
-#include "styles/style_boxes.h"
-#include "ui/widgets/buttons.h"
-#include "storage/localstorage.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
+#include "app.h" // For App::wnd
 #include "auth_session.h"
 #include "facades.h"
-#include "app.h" // For App::wnd
+#include "lang/lang_keys.h"
 #include "layout.h" // For formatSizeText
+#include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "ui/widgets/buttons.h"
 
 LocalStorageBox::LocalStorageBox(QWidget *parent)
-: _clear(this, lang(lng_local_storage_clear), st::boxLinkButton) {
-}
+    : _clear(this, lang(lng_local_storage_clear), st::boxLinkButton) {}
 
 void LocalStorageBox::prepare() {
 	setTitle(langFactory(lng_local_storage_title));
@@ -87,12 +86,15 @@ void LocalStorageBox::paintEvent(QPaintEvent *e) {
 	checkLocalStoredCounts();
 	auto top = st::localStorageBoxSkip;
 	if (_imagesCount > 0) {
-		auto text = lng_settings_images_cached(lt_count, _imagesCount, lt_size, formatSizeText(Local::storageImagesSize() + Local::storageStickersSize() + Local::storageWebFilesSize()));
+		auto text = lng_settings_images_cached(
+		    lt_count, _imagesCount, lt_size,
+		    formatSizeText(Local::storageImagesSize() + Local::storageStickersSize() + Local::storageWebFilesSize()));
 		p.drawTextLeft(st::boxPadding.left(), top, width(), text);
 		top += st::boxTextFont->height + st::localStorageBoxSkip;
 	}
 	if (_audiosCount > 0) {
-		auto text = lng_settings_audios_cached(lt_count, _audiosCount, lt_size, formatSizeText(Local::storageAudiosSize()));
+		auto text =
+		    lng_settings_audios_cached(lt_count, _audiosCount, lt_size, formatSizeText(Local::storageAudiosSize()));
 		p.drawTextLeft(st::boxPadding.left(), top, width(), text);
 		top += st::boxTextFont->height + st::localStorageBoxSkip;
 	} else if (_imagesCount <= 0) {
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.h b/Telegram/SourceFiles/boxes/local_storage_box.h
index 0b194d78d..f04771e29 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.h
+++ b/Telegram/SourceFiles/boxes/local_storage_box.h
@@ -30,7 +30,7 @@ class LocalStorageBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	LocalStorageBox(QWidget*);
+	LocalStorageBox(QWidget *);
 
 private slots:
 	void onTempDirCleared(int task);
@@ -58,5 +58,4 @@ private:
 
 	int _imagesCount = -1;
 	int _audiosCount = -1;
-
 };
diff --git a/Telegram/SourceFiles/boxes/mute_settings_box.cpp b/Telegram/SourceFiles/boxes/mute_settings_box.cpp
index 0a1827142..9f330f5ca 100644
--- a/Telegram/SourceFiles/boxes/mute_settings_box.cpp
+++ b/Telegram/SourceFiles/boxes/mute_settings_box.cpp
@@ -29,15 +29,14 @@ void MuteSettingsBox::prepare() {
 
 	object_ptr<Ui::FlatLabel> title(this, st::muteChatTitle);
 	title->setText(App::peerName(_peer, true));
-	title->moveToLeft(st::boxPadding.left(),
-		y + icon->height() / 2 - title->height() / 2);
+	title->moveToLeft(st::boxPadding.left(), y + icon->height() / 2 - title->height() / 2);
 	// the icon is always higher than this chat title
 	y += icon->height() + st::boxMediumSkip;
 
-	const int FOREVER = 8760;  // in fact, this is mute only for 1 year
+	const int FOREVER = 8760; // in fact, this is mute only for 1 year
 	auto group = std::make_shared<Ui::RadiobuttonGroup>(FOREVER);
 	y += st::boxOptionListPadding.top();
-	for (int value : { 1, 4, 18, 72, FOREVER }) {  // periods in hours
+	for (int value : {1, 4, 18, 72, FOREVER}) { // periods in hours
 		QString text;
 		if (value < 24) {
 			text = lng_mute_duration_hours(lt_count, value);
@@ -53,8 +52,7 @@ void MuteSettingsBox::prepare() {
 	y += st::boxOptionListPadding.bottom() - st::boxOptionListSkip + st::defaultCheckbox.margin.bottom();
 
 	addButton(langFactory(lng_box_ok), [this, group] {
-		App::main()->updateNotifySetting(_peer, NotifySettingSetMuted,
-			SilentNotifiesDontChange, group->value() * 3600);
+		App::main()->updateNotifySetting(_peer, NotifySettingSetMuted, SilentNotifiesDontChange, group->value() * 3600);
 		closeBox();
 	});
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
diff --git a/Telegram/SourceFiles/boxes/mute_settings_box.h b/Telegram/SourceFiles/boxes/mute_settings_box.h
index dc689b1fb..321bc7622 100644
--- a/Telegram/SourceFiles/boxes/mute_settings_box.h
+++ b/Telegram/SourceFiles/boxes/mute_settings_box.h
@@ -14,15 +14,14 @@
 class MuteSettingsBox : public BoxContent {
 	Q_OBJECT
 
-  public:
-	MuteSettingsBox(QWidget *parent, not_null<PeerData*> peer)
-	  : _peer(peer) {
-	}
+public:
+	MuteSettingsBox(QWidget *parent, not_null<PeerData *> peer)
+	    : _peer(peer) {}
 
-  protected:
+protected:
 	void prepare() override;
 
-  private:
-	not_null<PeerData*> _peer;
+private:
+	not_null<PeerData *> _peer;
 };
 // vi: ts=4 tw=80
diff --git a/Telegram/SourceFiles/boxes/notifications_box.cpp b/Telegram/SourceFiles/boxes/notifications_box.cpp
index b30f464f2..1470a4d60 100644
--- a/Telegram/SourceFiles/boxes/notifications_box.cpp
+++ b/Telegram/SourceFiles/boxes/notifications_box.cpp
@@ -20,19 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/notifications_box.h"
 
+#include "app.h" // For App::pixmapFromImageInPlace
+#include "auth_session.h"
 #include "config.h"
 #include "lang/lang_keys.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/discrete_sliders.h"
+#include "messenger.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_window.h"
-#include "messenger.h"
-#include "storage/localstorage.h"
-#include "auth_session.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
 #include "window/notifications_manager.h"
-#include "platform/platform_specific.h"
-#include "app.h" // For App::pixmapFromImageInPlace
 
 namespace {
 
@@ -44,12 +44,14 @@ using ChangeType = Window::Notifications::ChangeType;
 
 class NotificationsBox::SampleWidget : public QWidget {
 public:
-	SampleWidget(NotificationsBox *owner, const QPixmap &cache) : QWidget(nullptr)
-	, _owner(owner)
-	, _cache(cache) {
+	SampleWidget(NotificationsBox *owner, const QPixmap &cache)
+	    : QWidget(nullptr)
+	    , _owner(owner)
+	    , _cache(cache) {
 		resize(cache.width() / cache.devicePixelRatio(), cache.height() / cache.devicePixelRatio());
 
-		setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint | Qt::Tool);
+		setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint |
+		               Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint | Qt::Tool);
 		setAttribute(Qt::WA_MacAlwaysShowToolWindow);
 		setAttribute(Qt::WA_TransparentForMouseEvents);
 		setAttribute(Qt::WA_OpaquePaintEvent);
@@ -111,14 +113,12 @@ private:
 	Animation _opacity;
 	bool _hiding = false;
 	bool _deleted = false;
-
 };
 
 NotificationsBox::NotificationsBox(QWidget *parent)
-: _chosenCorner(Global::NotificationsCorner())
-, _oldCount(snap(Global::NotificationsCount(), 1, kMaxNotificationsCount))
-, _countSlider(this) {
-}
+    : _chosenCorner(Global::NotificationsCorner())
+    , _oldCount(snap(Global::NotificationsCount(), 1, kMaxNotificationsCount))
+    , _countSlider(this) {}
 
 void NotificationsBox::prepare() {
 	addButton(langFactory(lng_close), [this] { closeBox(); });
@@ -151,7 +151,8 @@ void NotificationsBox::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(contentLeft, st::boxTitlePosition.y(), width(), lang(lng_settings_notifications_position));
 
 	auto screenRect = getScreenRect();
-	p.fillRect(screenRect.x(), screenRect.y(), st::notificationsBoxScreenSize.width(), st::notificationsBoxScreenSize.height(), st::notificationsBoxScreenBg);
+	p.fillRect(screenRect.x(), screenRect.y(), st::notificationsBoxScreenSize.width(),
+	           st::notificationsBoxScreenSize.height(), st::notificationsBoxScreenBg);
 
 	auto monitorTop = st::notificationsBoxMonitorTop;
 	st::notificationsBoxMonitor.paint(p, contentLeft, monitorTop, width());
@@ -160,8 +161,12 @@ void NotificationsBox::paintEvent(QPaintEvent *e) {
 		auto screenCorner = static_cast<Notify::ScreenCorner>(corner);
 		auto isLeft = Notify::IsLeftCorner(screenCorner);
 		auto isTop = Notify::IsTopCorner(screenCorner);
-		auto sampleLeft = isLeft ? (screenRect.x() + st::notificationsSampleSkip) : (screenRect.x() + screenRect.width() - st::notificationsSampleSkip - st::notificationSampleSize.width());
-		auto sampleTop = isTop ? (screenRect.y() + st::notificationsSampleTopSkip) : (screenRect.y() + screenRect.height() - st::notificationsSampleBottomSkip - st::notificationSampleSize.height());
+		auto sampleLeft = isLeft ? (screenRect.x() + st::notificationsSampleSkip) :
+		                           (screenRect.x() + screenRect.width() - st::notificationsSampleSkip -
+		                            st::notificationSampleSize.width());
+		auto sampleTop = isTop ? (screenRect.y() + st::notificationsSampleTopSkip) :
+		                         (screenRect.y() + screenRect.height() - st::notificationsSampleBottomSkip -
+		                          st::notificationSampleSize.height());
 		if (corner == static_cast<int>(_chosenCorner)) {
 			auto count = currentCount();
 			for (int i = 0; i != kMaxNotificationsCount; ++i) {
@@ -209,14 +214,16 @@ int NotificationsBox::getContentLeft() const {
 QRect NotificationsBox::getScreenRect() const {
 	auto screenLeft = (width() - st::notificationsBoxScreenSize.width()) / 2;
 	auto screenTop = st::notificationsBoxMonitorTop + st::notificationsBoxScreenTop;
-	return QRect(screenLeft, screenTop, st::notificationsBoxScreenSize.width(), st::notificationsBoxScreenSize.height());
+	return QRect(screenLeft, screenTop, st::notificationsBoxScreenSize.width(),
+	             st::notificationsBoxScreenSize.height());
 }
 
 void NotificationsBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
 	auto screenRect = getScreenRect();
-	auto sliderTop = screenRect.y() + screenRect.height() + st::notificationsBoxCountLabelTop + st::notificationsBoxCountTop;
+	auto sliderTop =
+	    screenRect.y() + screenRect.height() + st::notificationsBoxCountLabelTop + st::notificationsBoxCountTop;
 	auto contentLeft = getContentLeft();
 	_countSlider->resizeToWidth(width() - 2 * contentLeft);
 	_countSlider->move(contentLeft, sliderTop);
@@ -225,7 +232,8 @@ void NotificationsBox::resizeEvent(QResizeEvent *e) {
 void NotificationsBox::prepareNotificationSampleSmall() {
 	auto width = st::notificationSampleSize.width();
 	auto height = st::notificationSampleSize.height();
-	auto sampleImage = QImage(width * cIntRetinaFactor(), height * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto sampleImage =
+	    QImage(width * cIntRetinaFactor(), height * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	sampleImage.setDevicePixelRatio(cRetinaFactor());
 	sampleImage.fill(st::notificationBg->c);
 	{
@@ -262,7 +270,9 @@ void NotificationsBox::prepareNotificationSampleSmall() {
 
 void NotificationsBox::prepareNotificationSampleUserpic() {
 	if (_notificationSampleUserpic.isNull()) {
-		_notificationSampleUserpic = App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaled(st::notifyPhotoSize * cIntRetinaFactor(), st::notifyPhotoSize * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+		_notificationSampleUserpic = App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaled(
+		    st::notifyPhotoSize * cIntRetinaFactor(), st::notifyPhotoSize * cIntRetinaFactor(), Qt::IgnoreAspectRatio,
+		    Qt::SmoothTransformation));
 		_notificationSampleUserpic.setDevicePixelRatio(cRetinaFactor());
 	}
 }
@@ -276,20 +286,24 @@ void NotificationsBox::prepareNotificationSampleLarge() {
 		Painter p(&sampleImage);
 		p.fillRect(0, 0, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder->b);
 		p.fillRect(w - st::notifyBorderWidth, 0, st::notifyBorderWidth, h - st::notifyBorderWidth, st::notifyBorder->b);
-		p.fillRect(st::notifyBorderWidth, h - st::notifyBorderWidth, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder->b);
+		p.fillRect(st::notifyBorderWidth, h - st::notifyBorderWidth, w - st::notifyBorderWidth, st::notifyBorderWidth,
+		           st::notifyBorder->b);
 		p.fillRect(0, st::notifyBorderWidth, st::notifyBorderWidth, h - st::notifyBorderWidth, st::notifyBorder->b);
 
 		prepareNotificationSampleUserpic();
 		p.drawPixmap(st::notifyPhotoPos.x(), st::notifyPhotoPos.y(), _notificationSampleUserpic);
 
-		int itemWidth = w - st::notifyPhotoPos.x() - st::notifyPhotoSize - st::notifyTextLeft - st::notifyClosePos.x() - st::notifyClose.width;
+		int itemWidth = w - st::notifyPhotoPos.x() - st::notifyPhotoSize - st::notifyTextLeft - st::notifyClosePos.x() -
+		                st::notifyClose.width;
 
-		auto rectForName = rtlrect(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyTextTop, itemWidth, st::msgNameFont->height, w);
+		auto rectForName = rtlrect(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyTextTop,
+		                           itemWidth, st::msgNameFont->height, w);
 
 		auto notifyText = st::dialogsTextFont->elided(lang(lng_notification_sample), itemWidth);
 		p.setFont(st::dialogsTextFont);
 		p.setPen(st::dialogsTextFgService);
-		p.drawText(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyItemTop + st::msgNameFont->height + st::dialogsTextFont->ascent, notifyText);
+		p.drawText(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft,
+		           st::notifyItemTop + st::msgNameFont->height + st::dialogsTextFont->ascent, notifyText);
 
 		p.setPen(st::dialogsNameFg);
 		p.setFont(st::msgNameFont);
@@ -297,7 +311,9 @@ void NotificationsBox::prepareNotificationSampleLarge() {
 		auto notifyTitle = st::msgNameFont->elided(str_const_toString(AppName), rectForName.width());
 		p.drawText(rectForName.left(), rectForName.top() + st::msgNameFont->ascent, notifyTitle);
 
-		st::notifyClose.icon.paint(p, w - st::notifyClosePos.x() - st::notifyClose.width + st::notifyClose.iconPosition.x(), st::notifyClosePos.y() + st::notifyClose.iconPosition.y(), w);
+		st::notifyClose.icon.paint(
+		    p, w - st::notifyClosePos.x() - st::notifyClose.width + st::notifyClose.iconPosition.x(),
+		    st::notifyClosePos.y() + st::notifyClose.iconPosition.y(), w);
 	}
 
 	_notificationSampleLarge = App::pixmapFromImageInPlace(std::move(sampleImage));
@@ -322,9 +338,12 @@ void NotificationsBox::mouseMoveEvent(QMouseEvent *e) {
 	auto cornerWidth = screenRect.width() / 3;
 	auto cornerHeight = screenRect.height() / 3;
 	auto topLeft = rtlrect(screenRect.x(), screenRect.y(), cornerWidth, cornerHeight, width());
-	auto topRight = rtlrect(screenRect.x() + screenRect.width() - cornerWidth, screenRect.y(), cornerWidth, cornerHeight, width());
-	auto bottomRight = rtlrect(screenRect.x() + screenRect.width() - cornerWidth, screenRect.y() + screenRect.height() - cornerHeight, cornerWidth, cornerHeight, width());
-	auto bottomLeft = rtlrect(screenRect.x(), screenRect.y() + screenRect.height() - cornerHeight, cornerWidth, cornerHeight, width());
+	auto topRight =
+	    rtlrect(screenRect.x() + screenRect.width() - cornerWidth, screenRect.y(), cornerWidth, cornerHeight, width());
+	auto bottomRight = rtlrect(screenRect.x() + screenRect.width() - cornerWidth,
+	                           screenRect.y() + screenRect.height() - cornerHeight, cornerWidth, cornerHeight, width());
+	auto bottomLeft = rtlrect(screenRect.x(), screenRect.y() + screenRect.height() - cornerHeight, cornerWidth,
+	                          cornerHeight, width());
 	if (topLeft.contains(e->pos())) {
 		setOverCorner(Notify::ScreenCorner::TopLeft);
 	} else if (topRight.contains(e->pos())) {
@@ -347,9 +366,7 @@ void NotificationsBox::setOverCorner(Notify::ScreenCorner corner) {
 		if (corner == _overCorner) {
 			return;
 		}
-		for_const (auto widget, _cornerSamples[static_cast<int>(_overCorner)]) {
-			widget->hideFast();
-		}
+		for_const (auto widget, _cornerSamples[static_cast<int>(_overCorner)]) { widget->hideFast(); }
 	} else {
 		_isOverCorner = true;
 		setCursor(style::cur_pointer);
@@ -369,8 +386,10 @@ void NotificationsBox::setOverCorner(Notify::ScreenCorner corner) {
 		auto r = psDesktopRect();
 		auto isLeft = Notify::IsLeftCorner(_overCorner);
 		auto isTop = Notify::IsTopCorner(_overCorner);
-		auto sampleLeft = (isLeft == rtl()) ? (r.x() + r.width() - st::notifyWidth - st::notifyDeltaX) : (r.x() + st::notifyDeltaX);
-		auto sampleTop = isTop ? (r.y() + st::notifyDeltaY) : (r.y() + r.height() - st::notifyDeltaY - st::notifyMinHeight);
+		auto sampleLeft =
+		    (isLeft == rtl()) ? (r.x() + r.width() - st::notifyWidth - st::notifyDeltaX) : (r.x() + st::notifyDeltaX);
+		auto sampleTop =
+		    isTop ? (r.y() + st::notifyDeltaY) : (r.y() + r.height() - st::notifyDeltaY - st::notifyMinHeight);
 		for (int i = samplesLeave; i != samplesNeeded; ++i) {
 			auto widget = std::make_unique<SampleWidget>(this, _notificationSampleLarge);
 			widget->move(sampleLeft, sampleTop + (isTop ? 1 : -1) * i * (st::notifyMinHeight + st::notifyDeltaY));
@@ -392,9 +411,7 @@ void NotificationsBox::clearOverCorner() {
 		Auth().notifications().settingsChanged().notify(ChangeType::DemoIsShown);
 
 		for_const (auto &samples, _cornerSamples) {
-			for_const (auto widget, samples) {
-				widget->hideFast();
-			}
+			for_const (auto widget, samples) { widget->hideFast(); }
 		}
 	}
 }
@@ -424,9 +441,7 @@ void NotificationsBox::mouseReleaseEvent(QMouseEvent *e) {
 
 NotificationsBox::~NotificationsBox() {
 	for_const (auto &samples, _cornerSamples) {
-		for_const (auto widget, samples) {
-			widget->detach();
-		}
+		for_const (auto widget, samples) { widget->detach(); }
 	}
 	clearOverCorner();
 }
diff --git a/Telegram/SourceFiles/boxes/notifications_box.h b/Telegram/SourceFiles/boxes/notifications_box.h
index 1149ce481..52cc3d57f 100644
--- a/Telegram/SourceFiles/boxes/notifications_box.h
+++ b/Telegram/SourceFiles/boxes/notifications_box.h
@@ -30,7 +30,7 @@ class SettingsSlider;
 
 class NotificationsBox : public BoxContent {
 public:
-	NotificationsBox(QWidget*);
+	NotificationsBox(QWidget *);
 	~NotificationsBox();
 
 protected:
@@ -74,6 +74,5 @@ private:
 	int _oldCount;
 	object_ptr<Ui::SettingsSlider> _countSlider;
 
-	QVector<SampleWidget*> _cornerSamples[4];
-
+	QVector<SampleWidget *> _cornerSamples[4];
 };
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index 91494147e..963aba772 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -20,39 +20,42 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/passcode_box.h"
 
-#include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "facades.h"
 
-PasscodeBox::PasscodeBox(QWidget*, bool turningOff)
-: _turningOff(turningOff)
-, _about(st::boxWidth - st::boxPadding.left() * 1.5)
-, _oldPasscode(this, st::defaultInputField, langFactory(lng_passcode_enter_old))
-, _newPasscode(this, st::defaultInputField, langFactory(Global::LocalPasscode() ? lng_passcode_enter_new : lng_passcode_enter_first))
-, _reenterPasscode(this, st::defaultInputField, langFactory(lng_passcode_confirm_new))
-, _passwordHint(this, st::defaultInputField, langFactory(lng_cloud_password_hint))
-, _recoverEmail(this, st::defaultInputField, langFactory(lng_cloud_password_email))
-, _recover(this, lang(lng_signin_recover)) {
-}
+PasscodeBox::PasscodeBox(QWidget *, bool turningOff)
+    : _turningOff(turningOff)
+    , _about(st::boxWidth - st::boxPadding.left() * 1.5)
+    , _oldPasscode(this, st::defaultInputField, langFactory(lng_passcode_enter_old))
+    , _newPasscode(this, st::defaultInputField,
+                   langFactory(Global::LocalPasscode() ? lng_passcode_enter_new : lng_passcode_enter_first))
+    , _reenterPasscode(this, st::defaultInputField, langFactory(lng_passcode_confirm_new))
+    , _passwordHint(this, st::defaultInputField, langFactory(lng_cloud_password_hint))
+    , _recoverEmail(this, st::defaultInputField, langFactory(lng_cloud_password_email))
+    , _recover(this, lang(lng_signin_recover)) {}
 
-PasscodeBox::PasscodeBox(QWidget*, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint, bool turningOff)
-: _turningOff(turningOff)
-, _cloudPwd(true)
-, _newSalt(newSalt)
-, _curSalt(curSalt)
-, _hasRecovery(hasRecovery)
-, _about(st::boxWidth - st::boxPadding.left() * 1.5)
-, _oldPasscode(this, st::defaultInputField, langFactory(lng_cloud_password_enter_old))
-, _newPasscode(this, st::defaultInputField, langFactory(curSalt.isEmpty() ? lng_cloud_password_enter_first : lng_cloud_password_enter_new))
-, _reenterPasscode(this, st::defaultInputField, langFactory(lng_cloud_password_confirm_new))
-, _passwordHint(this, st::defaultInputField, langFactory(curSalt.isEmpty() ? lng_cloud_password_hint : lng_cloud_password_change_hint))
-, _recoverEmail(this, st::defaultInputField, langFactory(lng_cloud_password_email))
-, _recover(this, lang(lng_signin_recover)) {
+PasscodeBox::PasscodeBox(QWidget *, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery,
+                         const QString &hint, bool turningOff)
+    : _turningOff(turningOff)
+    , _cloudPwd(true)
+    , _newSalt(newSalt)
+    , _curSalt(curSalt)
+    , _hasRecovery(hasRecovery)
+    , _about(st::boxWidth - st::boxPadding.left() * 1.5)
+    , _oldPasscode(this, st::defaultInputField, langFactory(lng_cloud_password_enter_old))
+    , _newPasscode(this, st::defaultInputField,
+                   langFactory(curSalt.isEmpty() ? lng_cloud_password_enter_first : lng_cloud_password_enter_new))
+    , _reenterPasscode(this, st::defaultInputField, langFactory(lng_cloud_password_confirm_new))
+    , _passwordHint(this, st::defaultInputField,
+                    langFactory(curSalt.isEmpty() ? lng_cloud_password_hint : lng_cloud_password_change_hint))
+    , _recoverEmail(this, st::defaultInputField, langFactory(lng_cloud_password_email))
+    , _recover(this, lang(lng_signin_recover)) {
 	if (!hint.isEmpty()) _hintText.setText(st::passcodeTextStyle, lng_signin_hint(lt_password_hint, hint));
 }
 
@@ -65,17 +68,30 @@ void PasscodeBox::prepare() {
 	if (_turningOff) {
 		_oldPasscode->show();
 		setTitle(langFactory(_cloudPwd ? lng_cloud_password_remove : lng_passcode_remove));
-		setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
+		setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine +
+		                                ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) +
+		                                st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
 	} else {
 		auto has = _cloudPwd ? (!_curSalt.isEmpty()) : Global::LocalPasscode();
 		if (has) {
 			_oldPasscode->show();
 			setTitle(langFactory(_cloudPwd ? lng_cloud_password_change : lng_passcode_change));
-			setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + _newPasscode->height() + st::passcodeLittleSkip + _reenterPasscode->height() + st::passcodeSkip + (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
+			setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine +
+			                                ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) +
+			                                _newPasscode->height() + st::passcodeLittleSkip +
+			                                _reenterPasscode->height() + st::passcodeSkip +
+			                                (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) +
+			                                st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
 		} else {
 			_oldPasscode->hide();
 			setTitle(langFactory(_cloudPwd ? lng_cloud_password_create : lng_passcode_create));
-			setDimensions(st::boxWidth, st::passcodePadding.top() + _newPasscode->height() + st::passcodeLittleSkip + _reenterPasscode->height() + st::passcodeSkip + (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) + st::passcodeAboutSkip + _aboutHeight + (_cloudPwd ? (st::passcodeLittleSkip + _recoverEmail->height() + st::passcodeSkip) : st::passcodePadding.bottom()));
+			setDimensions(st::boxWidth,
+			              st::passcodePadding.top() + _newPasscode->height() + st::passcodeLittleSkip +
+			                  _reenterPasscode->height() + st::passcodeSkip +
+			                  (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) +
+			                  st::passcodeAboutSkip + _aboutHeight +
+			                  (_cloudPwd ? (st::passcodeLittleSkip + _recoverEmail->height() + st::passcodeSkip) :
+			                               st::passcodePadding.bottom()));
 		}
 	}
 
@@ -143,27 +159,40 @@ void PasscodeBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	qint32 w = st::boxWidth - st::boxPadding.left() * 1.5;
-	qint32 abouty = (_passwordHint->isHidden() ? ((_reenterPasscode->isHidden() ? (_oldPasscode->y() + (_hasRecovery && !_hintText.isEmpty() ? st::passcodeTextLine : 0)) : _reenterPasscode->y()) + st::passcodeSkip) : _passwordHint->y()) + _oldPasscode->height() + st::passcodeLittleSkip + st::passcodeAboutSkip;
+	qint32 abouty = (_passwordHint->isHidden() ?
+	                     ((_reenterPasscode->isHidden() ?
+	                           (_oldPasscode->y() + (_hasRecovery && !_hintText.isEmpty() ? st::passcodeTextLine : 0)) :
+	                           _reenterPasscode->y()) +
+	                      st::passcodeSkip) :
+	                     _passwordHint->y()) +
+	                _oldPasscode->height() + st::passcodeLittleSkip + st::passcodeAboutSkip;
 	p.setPen(st::boxTextFg);
 	_about.drawLeft(p, st::boxPadding.left(), abouty, w, width());
 
 	if (!_hintText.isEmpty() && _oldError.isEmpty()) {
-		_hintText.drawLeftElided(p, st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height() + ((st::passcodeTextLine - st::normalFont->height) / 2), w, width(), 1, style::al_topleft);
+		_hintText.drawLeftElided(p, st::boxPadding.left(),
+		                         _oldPasscode->y() + _oldPasscode->height() +
+		                             ((st::passcodeTextLine - st::normalFont->height) / 2),
+		                         w, width(), 1, style::al_topleft);
 	}
 
 	if (!_oldError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height(), w, st::passcodeTextLine), _oldError, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height(), w, st::passcodeTextLine),
+		           _oldError, style::al_left);
 	}
 
 	if (!_newError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _reenterPasscode->y() + _reenterPasscode->height(), w, st::passcodeTextLine), _newError, style::al_left);
+		p.drawText(
+		    QRect(st::boxPadding.left(), _reenterPasscode->y() + _reenterPasscode->height(), w, st::passcodeTextLine),
+		    _newError, style::al_left);
 	}
 
 	if (!_emailError.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _recoverEmail->y() + _recoverEmail->height(), w, st::passcodeTextLine), _emailError, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _recoverEmail->y() + _recoverEmail->height(), w, st::passcodeTextLine),
+		           _emailError, style::al_left);
 	}
 }
 
@@ -175,16 +204,28 @@ void PasscodeBox::resizeEvent(QResizeEvent *e) {
 	_oldPasscode->resize(w, _oldPasscode->height());
 	_oldPasscode->moveToLeft(st::boxPadding.left(), st::passcodePadding.top());
 	_newPasscode->resize(w, _newPasscode->height());
-	_newPasscode->moveToLeft(st::boxPadding.left(), _oldPasscode->y() + ((_turningOff || has) ? (_oldPasscode->height() + st::passcodeTextLine + ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0)) : 0));
+	_newPasscode->moveToLeft(st::boxPadding.left(),
+	                         _oldPasscode->y() +
+	                             ((_turningOff || has) ?
+	                                  (_oldPasscode->height() + st::passcodeTextLine +
+	                                   ((_hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0)) :
+	                                  0));
 	_reenterPasscode->resize(w, _reenterPasscode->height());
-	_reenterPasscode->moveToLeft(st::boxPadding.left(), _newPasscode->y() + _newPasscode->height() + st::passcodeLittleSkip);
+	_reenterPasscode->moveToLeft(st::boxPadding.left(),
+	                             _newPasscode->y() + _newPasscode->height() + st::passcodeLittleSkip);
 	_passwordHint->resize(w, _passwordHint->height());
-	_passwordHint->moveToLeft(st::boxPadding.left(), _reenterPasscode->y() + _reenterPasscode->height() + st::passcodeSkip);
+	_passwordHint->moveToLeft(st::boxPadding.left(),
+	                          _reenterPasscode->y() + _reenterPasscode->height() + st::passcodeSkip);
 	_recoverEmail->resize(w, _passwordHint->height());
-	_recoverEmail->moveToLeft(st::boxPadding.left(), _passwordHint->y() + _passwordHint->height() + st::passcodeLittleSkip + _aboutHeight + st::passcodeLittleSkip);
+	_recoverEmail->moveToLeft(st::boxPadding.left(), _passwordHint->y() + _passwordHint->height() +
+	                                                     st::passcodeLittleSkip + _aboutHeight +
+	                                                     st::passcodeLittleSkip);
 
 	if (!_recover->isHidden()) {
-		_recover->moveToLeft(st::boxPadding.left(), _oldPasscode->y() + _oldPasscode->height() + (_hintText.isEmpty() ? ((st::passcodeTextLine - _recover->height()) / 2) : st::passcodeTextLine));
+		_recover->moveToLeft(
+		    st::boxPadding.left(),
+		    _oldPasscode->y() + _oldPasscode->height() +
+		        (_hintText.isEmpty() ? ((st::passcodeTextLine - _recover->height()) / 2) : st::passcodeTextLine));
 	}
 }
 
@@ -201,7 +242,9 @@ void PasscodeBox::setInnerFocus() {
 void PasscodeBox::setPasswordDone(const MTPBool &result) {
 	_setRequest = 0;
 	emit reloadPassword();
-	auto text = lang(_reenterPasscode->isHidden() ? lng_cloud_password_removed : (_oldPasscode->isHidden() ? lng_cloud_password_was_set : lng_cloud_password_updated));
+	auto text = lang(_reenterPasscode->isHidden() ?
+	                     lng_cloud_password_removed :
+	                     (_oldPasscode->isHidden() ? lng_cloud_password_was_set : lng_cloud_password_updated));
 	Ui::show(Box<InformBox>(text));
 }
 
@@ -319,9 +362,10 @@ void PasscodeBox::onSave(bool force) {
 		}
 		if (!_recoverEmail->isHidden() && email.isEmpty() && !force) {
 			_skipEmailWarning = true;
-			_replacedBy = Ui::show(Box<ConfirmBox>(lang(lng_cloud_password_about_recover), lang(lng_cloud_password_skip_email), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-				onSave(true);
-			})), KeepOtherLayers);
+			_replacedBy =
+			    Ui::show(Box<ConfirmBox>(lang(lng_cloud_password_about_recover), lang(lng_cloud_password_skip_email),
+			                             st::attentionBoxButton, base::lambda_guarded(this, [this] { onSave(true); })),
+			             KeepOtherLayers);
 		} else {
 			QByteArray newPasswordData = pwd.isEmpty() ? QByteArray() : (_newSalt + pwd.toUtf8() + _newSalt);
 			QByteArray newPasswordHash = pwd.isEmpty() ? QByteArray() : QByteArray(32, Qt::Uninitialized);
@@ -336,12 +380,17 @@ void PasscodeBox::onSave(bool force) {
 			if (!_oldPasscode->isHidden()) {
 				hashSha256(oldPasswordData.constData(), oldPasswordData.size(), oldPasswordHash.data());
 			}
-			auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt | MTPDaccount_passwordInputSettings::Flag::f_new_password_hash | MTPDaccount_passwordInputSettings::Flag::f_hint;
+			auto flags = MTPDaccount_passwordInputSettings::Flag::f_new_salt |
+			             MTPDaccount_passwordInputSettings::Flag::f_new_password_hash |
+			             MTPDaccount_passwordInputSettings::Flag::f_hint;
 			if (_oldPasscode->isHidden() || _newPasscode->isHidden()) {
 				flags |= MTPDaccount_passwordInputSettings::Flag::f_email;
 			}
-			MTPaccount_PasswordInputSettings settings(MTP_account_passwordInputSettings(MTP_flags(flags), MTP_bytes(_newSalt), MTP_bytes(newPasswordHash), MTP_string(hint), MTP_string(email)));
-			_setRequest = MTP::send(MTPaccount_UpdatePasswordSettings(MTP_bytes(oldPasswordHash), settings), rpcDone(&PasscodeBox::setPasswordDone), rpcFail(&PasscodeBox::setPasswordFail));
+			MTPaccount_PasswordInputSettings settings(
+			    MTP_account_passwordInputSettings(MTP_flags(flags), MTP_bytes(_newSalt), MTP_bytes(newPasswordHash),
+			                                      MTP_string(hint), MTP_string(email)));
+			_setRequest = MTP::send(MTPaccount_UpdatePasswordSettings(MTP_bytes(oldPasswordHash), settings),
+			                        rpcDone(&PasscodeBox::setPasswordDone), rpcFail(&PasscodeBox::setPasswordFail));
 		}
 	} else {
 		cSetPasscodeBadTries(0);
@@ -389,7 +438,8 @@ void PasscodeBox::onEmailChanged() {
 void PasscodeBox::onRecoverByEmail() {
 	if (_pattern.isEmpty()) {
 		_pattern = "-";
-		MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PasscodeBox::recoverStarted), rpcFail(&PasscodeBox::recoverStartFail));
+		MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PasscodeBox::recoverStarted),
+		          rpcFail(&PasscodeBox::recoverStartFail));
 	} else {
 		recover();
 	}
@@ -420,10 +470,10 @@ bool PasscodeBox::recoverStartFail(const RPCError &error) {
 	return true;
 }
 
-RecoverBox::RecoverBox(QWidget*, const QString &pattern)
-: _pattern(st::normalFont->elided(lng_signin_recover_hint(lt_recover_email, pattern), st::boxWidth - st::boxPadding.left() * 1.5))
-, _recoverCode(this, st::defaultInputField, langFactory(lng_signin_code)) {
-}
+RecoverBox::RecoverBox(QWidget *, const QString &pattern)
+    : _pattern(st::normalFont->elided(lng_signin_recover_hint(lt_recover_email, pattern),
+                                      st::boxWidth - st::boxPadding.left() * 1.5))
+    , _recoverCode(this, st::defaultInputField, langFactory(lng_signin_code)) {}
 
 void RecoverBox::prepare() {
 	setTitle(langFactory(lng_signin_recover_title));
@@ -431,7 +481,8 @@ void RecoverBox::prepare() {
 	addButton(langFactory(lng_passcode_submit), [this] { onSubmit(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	setDimensions(st::boxWidth, st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine + _recoverCode->height() + st::passcodeTextLine);
+	setDimensions(st::boxWidth, st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine +
+	                                _recoverCode->height() + st::passcodeTextLine);
 
 	connect(_recoverCode, SIGNAL(changed()), this, SLOT(onCodeChanged()));
 	connect(_recoverCode, SIGNAL(submitted(bool)), this, SLOT(onSubmit()));
@@ -445,11 +496,14 @@ void RecoverBox::paintEvent(QPaintEvent *e) {
 	p.setFont(st::normalFont);
 	p.setPen(st::boxTextFg);
 	qint32 w = st::boxWidth - st::boxPadding.left() * 1.5;
-	p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() - st::passcodeTextLine - st::passcodePadding.top(), w, st::passcodePadding.top() + st::passcodeTextLine), _pattern, style::al_left);
+	p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() - st::passcodeTextLine - st::passcodePadding.top(), w,
+	                 st::passcodePadding.top() + st::passcodeTextLine),
+	           _pattern, style::al_left);
 
 	if (!_error.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() + _recoverCode->height(), w, st::passcodeTextLine), _error, style::al_left);
+		p.drawText(QRect(st::boxPadding.left(), _recoverCode->y() + _recoverCode->height(), w, st::passcodeTextLine),
+		           _error, style::al_left);
 	}
 }
 
@@ -457,7 +511,8 @@ void RecoverBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
 	_recoverCode->resize(st::boxWidth - st::boxPadding.left() - st::boxPadding.right(), _recoverCode->height());
-	_recoverCode->moveToLeft(st::boxPadding.left(), st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine);
+	_recoverCode->moveToLeft(st::boxPadding.left(),
+	                         st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine);
 }
 
 void RecoverBox::setInnerFocus() {
@@ -474,7 +529,8 @@ void RecoverBox::onSubmit() {
 		return;
 	}
 
-	_submitRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&RecoverBox::codeSubmitDone, true), rpcFail(&RecoverBox::codeSubmitFail));
+	_submitRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&RecoverBox::codeSubmitDone, true),
+	                           rpcFail(&RecoverBox::codeSubmitFail));
 }
 
 void RecoverBox::onCodeChanged() {
@@ -522,7 +578,7 @@ bool RecoverBox::codeSubmitFail(const RPCError &error) {
 		return true;
 	}
 	if (cDebug()) { // internal server error
-		_error =  err + ": " + error.description();
+		_error = err + ": " + error.description();
 	} else {
 		_error = lang(lng_server_error);
 	}
diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h
index bb09b75c0..374852e93 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -32,8 +32,9 @@ class PasscodeBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	PasscodeBox(QWidget*, bool turningOff);
-	PasscodeBox(QWidget*, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint, bool turningOff = false);
+	PasscodeBox(QWidget *, bool turningOff);
+	PasscodeBox(QWidget *, const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint,
+	            bool turningOff = false);
 
 private slots:
 	void onSave(bool force = false);
@@ -88,14 +89,13 @@ private:
 	object_ptr<Ui::LinkButton> _recover;
 
 	QString _oldError, _newError, _emailError;
-
 };
 
 class RecoverBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	RecoverBox(QWidget*, const QString &pattern);
+	RecoverBox(QWidget *, const QString &pattern);
 
 public slots:
 	void onSubmit();
@@ -123,5 +123,4 @@ private:
 	object_ptr<Ui::InputField> _recoverCode;
 
 	QString _error;
-
 };
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 60dbd798d..4b371b75e 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -18,29 +18,27 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "base/algorithm.h"
 #include "boxes/peer_list_box.h"
+#include "base/algorithm.h"
 
-#include "styles/style_boxes.h"
-#include "styles/style_dialogs.h"
 #include "auth_session.h"
-#include "mainwidget.h"
-#include "ui/widgets/multi_select.h"
-#include "ui/widgets/labels.h"
-#include "ui/effects/round_checkbox.h"
-#include "ui/effects/ripple_animation.h"
-#include "ui/effects/widget_slide_wrap.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
 #include "observer_peer.h"
 #include "storage/file_download.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/round_checkbox.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/multi_select.h"
 #include "window/themes/window_theme.h"
 
-PeerListBox::PeerListBox(QWidget*
-		, std::unique_ptr<PeerListController> controller
-		, base::lambda<void(not_null<PeerListBox*>)> init)
-	: _controller(std::move(controller))
-	, _init(std::move(init))
-{
+PeerListBox::PeerListBox(QWidget *, std::unique_ptr<PeerListController> controller,
+                         base::lambda<void(not_null<PeerListBox *>)> init)
+    : _controller(std::move(controller))
+    , _init(std::move(init)) {
 	Expects(_controller != nullptr);
 }
 
@@ -159,7 +157,7 @@ void PeerListBox::peerListAppendSearchRow(std::unique_ptr<PeerListRow> row) {
 	_inner->appendSearchRow(std::move(row));
 }
 
-void PeerListBox::peerListAppendFoundRow(not_null<PeerListRow*> row) {
+void PeerListBox::peerListAppendFoundRow(not_null<PeerListRow *> row) {
 	_inner->appendFoundRow(row);
 }
 
@@ -167,7 +165,7 @@ void PeerListBox::peerListPrependRow(std::unique_ptr<PeerListRow> row) {
 	_inner->prependRow(std::move(row));
 }
 
-void PeerListBox::peerListPrependRowFromSearchResult(not_null<PeerListRow*> row) {
+void PeerListBox::peerListPrependRowFromSearchResult(not_null<PeerListRow *> row) {
 	_inner->prependRowFromSearchResult(row);
 }
 
@@ -175,19 +173,19 @@ PeerListRow *PeerListBox::peerListFindRow(PeerListRowId id) {
 	return _inner->findRow(id);
 }
 
-void PeerListBox::peerListUpdateRow(not_null<PeerListRow*> row) {
+void PeerListBox::peerListUpdateRow(not_null<PeerListRow *> row) {
 	_inner->updateRow(row);
 }
 
-void PeerListBox::peerListRemoveRow(not_null<PeerListRow*> row) {
+void PeerListBox::peerListRemoveRow(not_null<PeerListRow *> row) {
 	_inner->removeRow(row);
 }
 
-void PeerListBox::peerListConvertRowToSearchResult(not_null<PeerListRow*> row) {
+void PeerListBox::peerListConvertRowToSearchResult(not_null<PeerListRow *> row) {
 	_inner->convertRowToSearchResult(row);
 }
 
-void PeerListBox::peerListSetRowChecked(not_null<PeerListRow*> row, bool checked) {
+void PeerListBox::peerListSetRowChecked(not_null<PeerListRow *> row, bool checked) {
 	auto peer = row->peer();
 	if (checked) {
 		addSelectItem(peer, PeerListRow::SetStyle::Animated);
@@ -207,7 +205,7 @@ int PeerListBox::peerListFullRowsCount() {
 	return _inner->fullRowsCount();
 }
 
-not_null<PeerListRow*> PeerListBox::peerListRowAt(int index) {
+not_null<PeerListRow *> PeerListBox::peerListRowAt(int index) {
 	return _inner->rowAt(index);
 }
 
@@ -251,21 +249,18 @@ void PeerListBox::peerListSetSearchMode(PeerListSearchMode mode) {
 
 void PeerListBox::peerListSortRows(base::lambda<bool(PeerListRow &a, PeerListRow &b)> compare) {
 	_inner->reorderRows([compare = std::move(compare)](auto &&begin, auto &&end) {
-		std::sort(begin, end, [compare](auto &&a, auto &&b) {
-			return compare(*a, *b);
-		});
+		std::sort(begin, end, [compare](auto &&a, auto &&b) { return compare(*a, *b); });
 	});
 }
 
 void PeerListBox::peerListPartitionRows(base::lambda<bool(PeerListRow &a)> border) {
 	_inner->reorderRows([border = std::move(border)](auto &&begin, auto &&end) {
-		std::stable_partition(begin, end, [border](auto &&current) {
-			return border(*current);
-		});
+		std::stable_partition(begin, end, [border](auto &&current) { return border(*current); });
 	});
 }
 
-PeerListController::PeerListController(std::unique_ptr<PeerListSearchController> searchController) : _searchController(std::move(searchController)) {
+PeerListController::PeerListController(std::unique_ptr<PeerListSearchController> searchController)
+    : _searchController(std::move(searchController)) {
 	if (_searchController) {
 		_searchController->setDelegate(this);
 	}
@@ -280,7 +275,7 @@ void PeerListController::search(const QString &query) {
 	_searchController->searchQuery(query);
 }
 
-void PeerListController::peerListSearchAddRow(not_null<PeerData*> peer) {
+void PeerListController::peerListSearchAddRow(not_null<PeerData *> peer) {
 	if (auto row = delegate()->peerListFindRow(peer->id)) {
 		Assert(row->id() == row->peer()->id);
 		delegate()->peerListAppendFoundRow(row);
@@ -318,7 +313,7 @@ void PeerListController::setSearchNoResultsText(const QString &text) {
 	}
 }
 
-void PeerListBox::addSelectItem(not_null<PeerData*> peer, PeerListRow::SetStyle style) {
+void PeerListBox::addSelectItem(not_null<PeerData *> peer, PeerListRow::SetStyle style) {
 	if (!_select) {
 		createMultiSelect();
 		_select->toggleFast(false);
@@ -326,7 +321,8 @@ void PeerListBox::addSelectItem(not_null<PeerData*> peer, PeerListRow::SetStyle
 	if (style == PeerListRow::SetStyle::Fast) {
 		_select->entity()->addItemInBunch(peer->id, peer->shortName(), st::activeButtonBg, PaintUserpicCallback(peer));
 	} else {
-		_select->entity()->addItem(peer->id, peer->shortName(), st::activeButtonBg, PaintUserpicCallback(peer), Ui::MultiSelect::AddItemWay::Default);
+		_select->entity()->addItem(peer->id, peer->shortName(), st::activeButtonBg, PaintUserpicCallback(peer),
+		                           Ui::MultiSelect::AddItemWay::Default);
 	}
 }
 
@@ -335,7 +331,7 @@ void PeerListBox::peerListFinishSelectedRowsBunch() {
 	_select->entity()->finishItemsBunch();
 }
 
-bool PeerListBox::peerListIsRowSelected(not_null<PeerData*> peer) {
+bool PeerListBox::peerListIsRowSelected(not_null<PeerData *> peer) {
 	return _select ? _select->entity()->hasItem(peer->id) : false;
 }
 
@@ -343,27 +339,24 @@ int PeerListBox::peerListSelectedRowsCount() {
 	return _select ? _select->entity()->getItemsCount() : 0;
 }
 
-std::vector<not_null<PeerData*>> PeerListBox::peerListCollectSelectedRows() {
-	auto result = std::vector<not_null<PeerData*>> {};
-	auto items = _select ? _select->entity()->getItems() : QVector<quint64> {};
+std::vector<not_null<PeerData *>> PeerListBox::peerListCollectSelectedRows() {
+	auto result = std::vector<not_null<PeerData *>>{};
+	auto items = _select ? _select->entity()->getItems() : QVector<quint64>{};
 	if (!items.empty()) {
 		result.reserve(items.size());
-		for_const (auto itemId, items) {
-			result.push_back(App::peer(itemId));
-		}
+		for_const (auto itemId, items) { result.push_back(App::peer(itemId)); }
 	}
 	return result;
 }
 
-PeerListRow::PeerListRow(not_null<PeerData*> peer) : PeerListRow(peer, peer->id) {
-}
+PeerListRow::PeerListRow(not_null<PeerData *> peer)
+    : PeerListRow(peer, peer->id) {}
 
-PeerListRow::PeerListRow(not_null<PeerData*> peer, PeerListRowId id)
-: _id(id)
-, _peer(peer)
-, _initialized(false)
-, _isSearchResult(false) {
-}
+PeerListRow::PeerListRow(not_null<PeerData *> peer, PeerListRowId id)
+    : _id(id)
+    , _peer(peer)
+    , _initialized(false)
+    , _isSearchResult(false) {}
 
 bool PeerListRow::checked() const {
 	return _checkbox && _checkbox->checked();
@@ -423,7 +416,8 @@ void PeerListRow::invalidatePixmapsCache() {
 void PeerListRow::paintStatusText(Painter &p, int x, int y, int availableWidth, int outerWidth, bool selected) {
 	auto statusHasOnlineColor = (_statusType == PeerListRow::StatusType::Online);
 	p.setFont(st::contactsStatusFont);
-	p.setPen(statusHasOnlineColor ? st::contactsStatusFgOnline : (selected ? st::contactsStatusFgOver : st::contactsStatusFg));
+	p.setPen(statusHasOnlineColor ? st::contactsStatusFgOnline :
+	                                (selected ? st::contactsStatusFgOver : st::contactsStatusFg));
 	_status.drawLeftElided(p, x, y, availableWidth, outerWidth);
 }
 
@@ -514,7 +508,8 @@ void PeerListRow::lazyInitialize() {
 }
 
 void PeerListRow::createCheckbox(base::lambda<void()> updateCallback) {
-	_checkbox = std::make_unique<Ui::RoundImageCheckbox>(st::contactsPhotoCheckbox, std::move(updateCallback), PaintUserpicCallback(_peer));
+	_checkbox = std::make_unique<Ui::RoundImageCheckbox>(st::contactsPhotoCheckbox, std::move(updateCallback),
+	                                                     PaintUserpicCallback(_peer));
 }
 
 void PeerListRow::setCheckedInternal(bool checked, SetStyle style) {
@@ -524,20 +519,21 @@ void PeerListRow::setCheckedInternal(bool checked, SetStyle style) {
 	_checkbox->setChecked(checked, speed);
 }
 
-PeerListBox::Inner::Inner(QWidget *parent, not_null<PeerListController*> controller) : TWidget(parent)
-, _controller(controller)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) {
+PeerListBox::Inner::Inner(QWidget *parent, not_null<PeerListController *> controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) {
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 
 	using UpdateFlag = Notify::PeerUpdate::Flag;
 	auto changes = UpdateFlag::NameChanged | UpdateFlag::PhotoChanged;
 	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(changes, [this](const Notify::PeerUpdate &update) {
-		if (update.flags & UpdateFlag::PhotoChanged) {
-			this->update();
-		} else if (update.flags & UpdateFlag::NameChanged) {
-			handleNameChanged(update);
-		}
-	}));
+		          if (update.flags & UpdateFlag::PhotoChanged) {
+			          this->update();
+		          } else if (update.flags & UpdateFlag::NameChanged) {
+			          handleNameChanged(update);
+		          }
+	          }));
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
 		if (update.paletteChanged()) {
 			invalidatePixmapsCache();
@@ -566,7 +562,7 @@ void PeerListBox::Inner::appendSearchRow(std::unique_ptr<PeerListRow> row) {
 	}
 }
 
-void PeerListBox::Inner::appendFoundRow(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::appendFoundRow(not_null<PeerListRow *> row) {
 	Expects(showingSearch());
 	auto index = findRowIndex(row);
 	if (index.value < 0) {
@@ -574,13 +570,11 @@ void PeerListBox::Inner::appendFoundRow(not_null<PeerListRow*> row) {
 	}
 }
 
-void PeerListBox::Inner::changeCheckState(not_null<PeerListRow*> row, bool checked, PeerListRow::SetStyle style) {
-	row->setChecked(checked, style, [this, row] {
-		updateRow(row);
-	});
+void PeerListBox::Inner::changeCheckState(not_null<PeerListRow *> row, bool checked, PeerListRow::SetStyle style) {
+	row->setChecked(checked, style, [this, row] { updateRow(row); });
 }
 
-void PeerListBox::Inner::addRowEntry(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::addRowEntry(not_null<PeerListRow *> row) {
 	_rowsById.emplace(row->id(), row);
 	_rowsByPeer[row->peer()].push_back(row);
 	if (addingToSearchIndex()) {
@@ -603,19 +597,17 @@ bool PeerListBox::Inner::addingToSearchIndex() const {
 	return (_searchMode != PeerListSearchMode::Disabled) || !_searchIndex.empty();
 }
 
-void PeerListBox::Inner::addToSearchIndex(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::addToSearchIndex(not_null<PeerListRow *> row) {
 	if (row->isSearchResult()) {
 		return;
 	}
 
 	removeFromSearchIndex(row);
 	row->setNameFirstChars(row->peer()->chars);
-	for_const (auto ch, row->nameFirstChars()) {
-		_searchIndex[ch].push_back(row);
-	}
+	for_const (auto ch, row->nameFirstChars()) { _searchIndex[ch].push_back(row); }
 }
 
-void PeerListBox::Inner::removeFromSearchIndex(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::removeFromSearchIndex(not_null<PeerListRow *> row) {
 	auto &nameFirstChars = row->nameFirstChars();
 	if (!nameFirstChars.empty()) {
 		for_const (auto ch, row->nameFirstChars()) {
@@ -641,7 +633,7 @@ void PeerListBox::Inner::prependRow(std::unique_ptr<PeerListRow> row) {
 	}
 }
 
-void PeerListBox::Inner::prependRowFromSearchResult(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::prependRowFromSearchResult(not_null<PeerListRow *> row) {
 	if (!row->isSearchResult()) {
 		return;
 	}
@@ -679,7 +671,7 @@ PeerListRow *PeerListBox::Inner::findRow(PeerListRowId id) {
 	return (it == _rowsById.cend()) ? nullptr : it->second.get();
 }
 
-void PeerListBox::Inner::removeRow(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::removeRow(not_null<PeerListRow *> row) {
 	auto index = row->absoluteIndex();
 	auto isSearchResult = row->isSearchResult();
 	auto &eraseFrom = isSearchResult ? _searchRows : _rows;
@@ -700,7 +692,7 @@ void PeerListBox::Inner::removeRow(not_null<PeerListRow*> row) {
 	restoreSelection();
 }
 
-void PeerListBox::Inner::convertRowToSearchResult(not_null<PeerListRow*> row) {
+void PeerListBox::Inner::convertRowToSearchResult(not_null<PeerListRow *> row) {
 	if (row->isSearchResult()) {
 		return;
 	} else if (!showingSearch() || !_controller->hasComplexSearch()) {
@@ -721,7 +713,7 @@ int PeerListBox::Inner::fullRowsCount() const {
 	return _rows.size();
 }
 
-not_null<PeerListRow*> PeerListBox::Inner::rowAt(int index) const {
+not_null<PeerListRow *> PeerListBox::Inner::rowAt(int index) const {
 	Expects(index >= 0 && index < _rows.size());
 	return _rows[index].get();
 }
@@ -785,14 +777,13 @@ void PeerListBox::Inner::refreshRows() {
 void PeerListBox::Inner::setSearchMode(PeerListSearchMode mode) {
 	if (_searchMode != mode) {
 		if (!addingToSearchIndex()) {
-			for_const (auto &row, _rows) {
-				addToSearchIndex(row.get());
-			}
+			for_const (auto &row, _rows) { addToSearchIndex(row.get()); }
 		}
 		_searchMode = mode;
 		if (_controller->hasComplexSearch()) {
 			if (!_searchLoading) {
-				setSearchLoading(object_ptr<Ui::FlatLabel>(this, lang(lng_contacts_loading), Ui::FlatLabel::InitType::Simple, st::membersAbout));
+				setSearchLoading(object_ptr<Ui::FlatLabel>(this, lang(lng_contacts_loading),
+				                                           Ui::FlatLabel::InitType::Simple, st::membersAbout));
 			}
 		} else {
 			clearSearchRows();
@@ -847,7 +838,8 @@ int PeerListBox::Inner::resizeGetHeight(int newWidth) {
 		_description->setVisible(!showingSearch());
 	}
 	if (_searchNoResults) {
-		_searchNoResults->moveToLeft(st::contactsPadding.left(), labelTop + st::membersAboutLimitPadding.top(), newWidth);
+		_searchNoResults->moveToLeft(st::contactsPadding.left(), labelTop + st::membersAboutLimitPadding.top(),
+		                             newWidth);
 		_searchNoResults->setVisible(showingSearch() && _filterResults.empty() && !_controller->isSearchLoading());
 	}
 	if (_searchLoading) {
@@ -883,9 +875,7 @@ void PeerListBox::Inner::mousePressEvent(QMouseEvent *e) {
 
 	setPressed(_selected);
 	if (auto row = getRow(_selected.index)) {
-		auto updateCallback = [this, row, hint = _selected.index] {
-			updateRow(row, hint);
-		};
+		auto updateCallback = [this, row, hint = _selected.index] { updateRow(row, hint); };
 		if (_selected.action) {
 			auto actionRect = getActionRect(row, _selected.index);
 			if (!actionRect.isEmpty()) {
@@ -954,7 +944,8 @@ void PeerListBox::Inner::paintRow(Painter &p, TimeMs ms, RowIndex index) {
 	if (row->needsVerifiedIcon()) {
 		auto icon = &st::dialogsVerifiedIcon;
 		namew -= icon->width();
-		icon->paint(p, namex + std::min(name.maxWidth(), namew), st::contactsPadding.top() + st::contactsNameTop, width());
+		icon->paint(p, namex + std::min(name.maxWidth(), namew), st::contactsPadding.top() + st::contactsNameTop,
+		            width());
 	}
 	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
 	p.setPen(anim::pen(st::contactsNameFg, st::contactsNameCheckedFg, nameCheckedRatio));
@@ -967,7 +958,8 @@ void PeerListBox::Inner::paintRow(Painter &p, TimeMs ms, RowIndex index) {
 	}
 
 	p.setFont(st::contactsStatusFont);
-	if (row->isSearchResult() && !_mentionHighlight.isEmpty() && peer->userName().startsWith(_mentionHighlight, Qt::CaseInsensitive)) {
+	if (row->isSearchResult() && !_mentionHighlight.isEmpty() &&
+	    peer->userName().startsWith(_mentionHighlight, Qt::CaseInsensitive)) {
 		auto username = peer->userName();
 		auto availableWidth = statusw;
 		auto highlightedPart = '@' + username.mid(0, _mentionHighlight.size());
@@ -985,7 +977,8 @@ void PeerListBox::Inner::paintRow(Painter &p, TimeMs ms, RowIndex index) {
 			p.setPen(st::contactsStatusFgOnline);
 			p.drawTextLeft(namex, st::contactsPadding.top() + st::contactsStatusTop, width(), highlightedPart);
 			p.setPen(selected ? st::contactsStatusFgOver : st::contactsStatusFg);
-			p.drawTextLeft(namex + highlightedWidth, st::contactsPadding.top() + st::contactsStatusTop, width(), grayedPart);
+			p.drawTextLeft(namex + highlightedWidth, st::contactsPadding.top() + st::contactsStatusTop, width(),
+			               grayedPart);
 		}
 	} else {
 		row->paintStatusText(p, namex, st::contactsPadding.top() + st::contactsStatusTop, statusw, width(), selected);
@@ -1003,7 +996,7 @@ void PeerListBox::Inner::selectSkip(int direction) {
 	auto rowsCount = shownRowsCount();
 	auto index = 0;
 	auto firstEnabled = -1, lastEnabled = -1;
-	enumerateShownRows([&firstEnabled, &lastEnabled, &index](not_null<PeerListRow*> row) {
+	enumerateShownRows([&firstEnabled, &lastEnabled, &index](not_null<PeerListRow *> row) {
 		if (!row->disabled()) {
 			if (firstEnabled < 0) {
 				firstEnabled = index;
@@ -1022,8 +1015,8 @@ void PeerListBox::Inner::selectSkip(int direction) {
 	Assert(firstEnabled - 1 <= lastEnabled);
 
 	// Always pass through the first enabled item when changing from / to none selected.
-	if ((_selected.index.value > firstEnabled && newSelectedIndex < firstEnabled)
-		|| (_selected.index.value < firstEnabled && newSelectedIndex > firstEnabled)) {
+	if ((_selected.index.value > firstEnabled && newSelectedIndex < firstEnabled) ||
+	    (_selected.index.value < firstEnabled && newSelectedIndex > firstEnabled)) {
 		newSelectedIndex = firstEnabled;
 	}
 
@@ -1037,7 +1030,7 @@ void PeerListBox::Inner::selectSkip(int direction) {
 		newSelectedIndex = lastEnabled;
 	} else if (getRow(RowIndex(newSelectedIndex))->disabled()) {
 		auto delta = (direction > 0) ? 1 : -1;
-		for (newSelectedIndex += delta; ; newSelectedIndex += delta) {
+		for (newSelectedIndex += delta;; newSelectedIndex += delta) {
 			// We must find an enabled row, firstEnabled <= us <= lastEnabled.
 			Assert(newSelectedIndex >= 0 && newSelectedIndex < rowsCount);
 			if (!getRow(RowIndex(newSelectedIndex))->disabled()) {
@@ -1100,7 +1093,7 @@ void PeerListBox::Inner::searchQueryChanged(QString query) {
 	if (_normalizedSearchQuery != normalizedQuery) {
 		setSearchQuery(query, normalizedQuery);
 		if (_controller->searchInLocal() && !searchWordsList.isEmpty()) {
-			auto minimalList = (const std::vector<not_null<PeerListRow*>>*)nullptr;
+			auto minimalList = (const std::vector<not_null<PeerListRow *>> *)nullptr;
 			for_const (auto &searchWord, searchWordsList) {
 				auto searchWordStart = searchWord[0].toLower();
 				auto it = _searchIndex.find(searchWordStart);
@@ -1190,7 +1183,8 @@ void PeerListBox::Inner::updateSelection() {
 	auto in = parentWidget()->rect().contains(parentWidget()->mapFromGlobal(_lastMousePosition));
 	auto selected = Selected();
 	auto rowsPointY = point.y() - rowsTop();
-	selected.index.value = (in && rowsPointY >= 0 && rowsPointY < shownRowsCount() * _rowHeight) ? (rowsPointY / _rowHeight) : -1;
+	selected.index.value =
+	    (in && rowsPointY >= 0 && rowsPointY < shownRowsCount() * _rowHeight) ? (rowsPointY / _rowHeight) : -1;
 	if (selected.index.value >= 0) {
 		auto row = getRow(selected.index);
 		if (row->disabled()) {
@@ -1204,7 +1198,7 @@ void PeerListBox::Inner::updateSelection() {
 	setSelected(selected);
 }
 
-QRect PeerListBox::Inner::getActionRect(not_null<PeerListRow*> row, RowIndex index) const {
+QRect PeerListBox::Inner::getActionRect(not_null<PeerListRow *> row, RowIndex index) const {
 	auto actionSize = row->actionSize();
 	if (actionSize.isEmpty()) {
 		return QRect();
@@ -1228,7 +1222,7 @@ int PeerListBox::Inner::getRowTop(RowIndex index) const {
 	return -1;
 }
 
-void PeerListBox::Inner::updateRow(not_null<PeerListRow*> row, RowIndex hint) {
+void PeerListBox::Inner::updateRow(not_null<PeerListRow *> row, RowIndex hint) {
 	updateRow(findRowIndex(row, hint));
 }
 
@@ -1248,13 +1242,11 @@ void PeerListBox::Inner::updateRow(RowIndex index) {
 	update(0, getRowTop(index), width(), _rowHeight);
 }
 
-template <typename Callback>
-bool PeerListBox::Inner::enumerateShownRows(Callback callback) {
+template <typename Callback> bool PeerListBox::Inner::enumerateShownRows(Callback callback) {
 	return enumerateShownRows(0, shownRowsCount(), std::move(callback));
 }
 
-template <typename Callback>
-bool PeerListBox::Inner::enumerateShownRows(int from, int to, Callback callback) {
+template <typename Callback> bool PeerListBox::Inner::enumerateShownRows(int from, int to, Callback callback) {
 	Assert(0 <= from);
 	Assert(from <= to);
 	if (showingSearch()) {
@@ -1288,7 +1280,7 @@ PeerListRow *PeerListBox::Inner::getRow(RowIndex index) {
 	return nullptr;
 }
 
-PeerListBox::Inner::RowIndex PeerListBox::Inner::findRowIndex(not_null<PeerListRow*> row, RowIndex hint) {
+PeerListBox::Inner::RowIndex PeerListBox::Inner::findRowIndex(not_null<PeerListRow *> row, RowIndex hint) {
 	if (!showingSearch()) {
 		Assert(!row->isSearchResult());
 		return RowIndex(row->absoluteIndex());
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 2a952feef..e2c60bc12 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -20,16 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/timer.h"
 #include "boxes/abstract_box.h"
 #include "mtproto/sender.h"
-#include "base/timer.h"
 
 namespace Ui {
 class RippleAnimation;
 class RoundImageCheckbox;
 class MultiSelect;
-template <typename Widget>
-class WidgetSlideWrap;
+template <typename Widget> class WidgetSlideWrap;
 class FlatLabel;
 } // namespace Ui
 
@@ -46,8 +45,8 @@ inline auto PaintUserpicCallback(PeerData *peer) {
 using PeerListRowId = quint64;
 class PeerListRow {
 public:
-	PeerListRow(not_null<PeerData*> peer);
-	PeerListRow(not_null<PeerData*> peer, PeerListRowId id);
+	PeerListRow(not_null<PeerData *> peer);
+	PeerListRow(not_null<PeerData *> peer, PeerListRowId id);
 
 	enum class State {
 		Active,
@@ -64,7 +63,7 @@ public:
 	// added to the box it is always false.
 	bool checked() const;
 
-	not_null<PeerData*> peer() const {
+	not_null<PeerData *> peer() const {
 		return _peer;
 	}
 	PeerListRowId id() const {
@@ -86,12 +85,9 @@ public:
 	virtual QMargins actionMargins() const {
 		return QMargins();
 	}
-	virtual void addActionRipple(QPoint point, base::lambda<void()> updateCallback) {
-	}
-	virtual void stopLastActionRipple() {
-	}
-	virtual void paintAction(Painter &p, TimeMs ms, int x, int y, int outerWidth, bool actionSelected) {
-	}
+	virtual void addActionRipple(QPoint point, base::lambda<void()> updateCallback) {}
+	virtual void stopLastActionRipple() {}
+	virtual void paintAction(Painter &p, TimeMs ms, int x, int y, int outerWidth, bool actionSelected) {}
 
 	void refreshName();
 	const Text &name() const {
@@ -125,8 +121,7 @@ public:
 		Animated,
 		Fast,
 	};
-	template <typename UpdateCallback>
-	void setChecked(bool checked, SetStyle style, UpdateCallback callback) {
+	template <typename UpdateCallback> void setChecked(bool checked, SetStyle style, UpdateCallback callback) {
 		if (checked && !_checkbox) {
 			createCheckbox(std::move(callback));
 		}
@@ -134,8 +129,7 @@ public:
 	}
 	void invalidatePixmapsCache();
 
-	template <typename UpdateCallback>
-	void addRipple(QSize size, QPoint point, UpdateCallback updateCallback);
+	template <typename UpdateCallback> void addRipple(QSize size, QPoint point, UpdateCallback updateCallback);
 	void stopLastRipple();
 	void paintRipple(Painter &p, TimeMs ms, int x, int y, int outerWidth);
 	void paintUserpic(Painter &p, TimeMs ms, int x, int y, int outerWidth);
@@ -163,7 +157,7 @@ private:
 	void setStatusText(const QString &text);
 
 	PeerListRowId _id = 0;
-	not_null<PeerData*> _peer;
+	not_null<PeerData *> _peer;
 	std::unique_ptr<Ui::RippleAnimation> _ripple;
 	std::unique_ptr<Ui::RoundImageCheckbox> _checkbox;
 	Text _name;
@@ -174,7 +168,6 @@ private:
 	State _disabledState = State::Active;
 	bool _initialized : 1;
 	bool _isSearchResult : 1;
-
 };
 
 enum class PeerListSearchMode {
@@ -193,15 +186,15 @@ public:
 	virtual void peerListSetSearchMode(PeerListSearchMode mode) = 0;
 	virtual void peerListAppendRow(std::unique_ptr<PeerListRow> row) = 0;
 	virtual void peerListAppendSearchRow(std::unique_ptr<PeerListRow> row) = 0;
-	virtual void peerListAppendFoundRow(not_null<PeerListRow*> row) = 0;
+	virtual void peerListAppendFoundRow(not_null<PeerListRow *> row) = 0;
 	virtual void peerListPrependRow(std::unique_ptr<PeerListRow> row) = 0;
-	virtual void peerListPrependRowFromSearchResult(not_null<PeerListRow*> row) = 0;
-	virtual void peerListUpdateRow(not_null<PeerListRow*> row) = 0;
-	virtual void peerListRemoveRow(not_null<PeerListRow*> row) = 0;
-	virtual void peerListConvertRowToSearchResult(not_null<PeerListRow*> row) = 0;
-	virtual bool peerListIsRowSelected(not_null<PeerData*> peer) = 0;
-	virtual void peerListSetRowChecked(not_null<PeerListRow*> row, bool checked) = 0;
-	virtual not_null<PeerListRow*> peerListRowAt(int index) = 0;
+	virtual void peerListPrependRowFromSearchResult(not_null<PeerListRow *> row) = 0;
+	virtual void peerListUpdateRow(not_null<PeerListRow *> row) = 0;
+	virtual void peerListRemoveRow(not_null<PeerListRow *> row) = 0;
+	virtual void peerListConvertRowToSearchResult(not_null<PeerListRow *> row) = 0;
+	virtual bool peerListIsRowSelected(not_null<PeerData *> peer) = 0;
+	virtual void peerListSetRowChecked(not_null<PeerListRow *> row, bool checked) = 0;
+	virtual not_null<PeerListRow *> peerListRowAt(int index) = 0;
 	virtual void peerListRefreshRows() = 0;
 	virtual void peerListScrollToTop() = 0;
 	virtual int peerListFullRowsCount() = 0;
@@ -209,8 +202,7 @@ public:
 	virtual void peerListSortRows(base::lambda<bool(PeerListRow &a, PeerListRow &b)> compare) = 0;
 	virtual void peerListPartitionRows(base::lambda<bool(PeerListRow &a)> border) = 0;
 
-	template <typename PeerDataRange>
-	void peerListAddSelectedRows(PeerDataRange &&range) {
+	template <typename PeerDataRange> void peerListAddSelectedRows(PeerDataRange &&range) {
 		for (auto peer : range) {
 			peerListAddSelectedRowInBunch(peer);
 		}
@@ -218,21 +210,19 @@ public:
 	}
 
 	virtual int peerListSelectedRowsCount() = 0;
-	virtual std::vector<not_null<PeerData*>> peerListCollectSelectedRows() = 0;
+	virtual std::vector<not_null<PeerData *>> peerListCollectSelectedRows() = 0;
 	virtual ~PeerListDelegate() = default;
 
 private:
-	virtual void peerListAddSelectedRowInBunch(not_null<PeerData*> peer) = 0;
+	virtual void peerListAddSelectedRowInBunch(not_null<PeerData *> peer) = 0;
 	virtual void peerListFinishSelectedRowsBunch() = 0;
-
 };
 
 class PeerListSearchDelegate {
 public:
-	virtual void peerListSearchAddRow(not_null<PeerData*> peer) = 0;
+	virtual void peerListSearchAddRow(not_null<PeerData *> peer) = 0;
 	virtual void peerListSearchRefreshRows() = 0;
 	virtual ~PeerListSearchDelegate() = default;
-
 };
 
 class PeerListSearchController {
@@ -242,18 +232,17 @@ public:
 	virtual bool loadMoreRows() = 0;
 	virtual ~PeerListSearchController() = default;
 
-	void setDelegate(not_null<PeerListSearchDelegate*> delegate) {
+	void setDelegate(not_null<PeerListSearchDelegate *> delegate) {
 		_delegate = delegate;
 	}
 
 protected:
-	not_null<PeerListSearchDelegate*> delegate() const {
+	not_null<PeerListSearchDelegate *> delegate() const {
 		return _delegate;
 	}
 
 private:
 	PeerListSearchDelegate *_delegate = nullptr;
-
 };
 
 class PeerListController : public PeerListSearchDelegate {
@@ -261,27 +250,24 @@ public:
 	// Search works only with RowId == peer->id.
 	PeerListController(std::unique_ptr<PeerListSearchController> searchController = nullptr);
 
-	void setDelegate(not_null<PeerListDelegate*> delegate) {
+	void setDelegate(not_null<PeerListDelegate *> delegate) {
 		_delegate = delegate;
 		prepare();
 	}
 
 	virtual void prepare() = 0;
-	virtual void rowClicked(not_null<PeerListRow*> row) = 0;
-	virtual void rowActionClicked(not_null<PeerListRow*> row) {
-	}
-	virtual void loadMoreRows() {
-	}
-	virtual void itemDeselectedHook(not_null<PeerData*> peer) {
-	}
+	virtual void rowClicked(not_null<PeerListRow *> row) = 0;
+	virtual void rowActionClicked(not_null<PeerListRow *> row) {}
+	virtual void loadMoreRows() {}
+	virtual void itemDeselectedHook(not_null<PeerData *> peer) {}
 	bool isSearchLoading() const {
 		return _searchController ? _searchController->isLoading() : false;
 	}
-	virtual std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) {
+	virtual std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData *> peer) {
 		return nullptr;
 	}
 
-	bool isRowSelected(not_null<PeerData*> peer) {
+	bool isRowSelected(not_null<PeerData *> peer) {
 		return delegate()->peerListIsRowSelected(peer);
 	}
 
@@ -291,13 +277,13 @@ public:
 	bool hasComplexSearch() const;
 	void search(const QString &query);
 
-	void peerListSearchAddRow(not_null<PeerData*> peer) override;
+	void peerListSearchAddRow(not_null<PeerData *> peer) override;
 	void peerListSearchRefreshRows() override;
 
 	virtual ~PeerListController() = default;
 
 protected:
-	not_null<PeerListDelegate*> delegate() const {
+	not_null<PeerListDelegate *> delegate() const {
 		return _delegate;
 	}
 	PeerListSearchController *searchController() const {
@@ -320,12 +306,12 @@ protected:
 private:
 	PeerListDelegate *_delegate = nullptr;
 	std::unique_ptr<PeerListSearchController> _searchController = nullptr;
-
 };
 
 class PeerListBox : public BoxContent, public PeerListDelegate {
 public:
-	PeerListBox(QWidget*, std::unique_ptr<PeerListController> controller, base::lambda<void(not_null<PeerListBox*>)> init);
+	PeerListBox(QWidget *, std::unique_ptr<PeerListController> controller,
+	            base::lambda<void(not_null<PeerListBox *>)> init);
 
 	void peerListSetTitle(base::lambda<QString()> title) override {
 		setTitle(std::move(title));
@@ -340,17 +326,17 @@ public:
 	void peerListSetSearchMode(PeerListSearchMode mode) override;
 	void peerListAppendRow(std::unique_ptr<PeerListRow> row) override;
 	void peerListAppendSearchRow(std::unique_ptr<PeerListRow> row) override;
-	void peerListAppendFoundRow(not_null<PeerListRow*> row) override;
+	void peerListAppendFoundRow(not_null<PeerListRow *> row) override;
 	void peerListPrependRow(std::unique_ptr<PeerListRow> row) override;
-	void peerListPrependRowFromSearchResult(not_null<PeerListRow*> row) override;
-	void peerListUpdateRow(not_null<PeerListRow*> row) override;
-	void peerListRemoveRow(not_null<PeerListRow*> row) override;
-	void peerListConvertRowToSearchResult(not_null<PeerListRow*> row) override;
-	void peerListSetRowChecked(not_null<PeerListRow*> row, bool checked) override;
-	not_null<PeerListRow*> peerListRowAt(int index) override;
-	bool peerListIsRowSelected(not_null<PeerData*> peer) override;
+	void peerListPrependRowFromSearchResult(not_null<PeerListRow *> row) override;
+	void peerListUpdateRow(not_null<PeerListRow *> row) override;
+	void peerListRemoveRow(not_null<PeerListRow *> row) override;
+	void peerListConvertRowToSearchResult(not_null<PeerListRow *> row) override;
+	void peerListSetRowChecked(not_null<PeerListRow *> row, bool checked) override;
+	not_null<PeerListRow *> peerListRowAt(int index) override;
+	bool peerListIsRowSelected(not_null<PeerData *> peer) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
+	std::vector<not_null<PeerData *>> peerListCollectSelectedRows() override;
 	void peerListRefreshRows() override;
 	void peerListScrollToTop() override;
 	int peerListFullRowsCount() override;
@@ -367,26 +353,25 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
-	void peerListAddSelectedRowInBunch(not_null<PeerData*> peer) override {
+	void peerListAddSelectedRowInBunch(not_null<PeerData *> peer) override {
 		addSelectItem(peer, PeerListRow::SetStyle::Fast);
 	}
 	void peerListFinishSelectedRowsBunch() override;
 
-	void addSelectItem(not_null<PeerData*> peer, PeerListRow::SetStyle style);
+	void addSelectItem(not_null<PeerData *> peer, PeerListRow::SetStyle style);
 	void createMultiSelect();
 	int getTopScrollSkip() const;
 	void updateScrollSkips();
 	void searchQueryChanged(const QString &query);
 
-	object_ptr<Ui::WidgetSlideWrap<Ui::MultiSelect>> _select = { nullptr };
+	object_ptr<Ui::WidgetSlideWrap<Ui::MultiSelect>> _select = {nullptr};
 
 	class Inner;
 	QPointer<Inner> _inner;
 
 	std::unique_ptr<PeerListController> _controller;
-	base::lambda<void(PeerListBox*)> _init;
+	base::lambda<void(PeerListBox *)> _init;
 	bool _scrollBottomFixed = true;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -394,7 +379,7 @@ class PeerListBox::Inner : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	Inner(QWidget *parent, not_null<PeerListController*> controller);
+	Inner(QWidget *parent, not_null<PeerListController *> controller);
 
 	void selectSkip(int direction);
 	void selectSkipPage(int height, int direction);
@@ -409,17 +394,17 @@ public:
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
 	void appendSearchRow(std::unique_ptr<PeerListRow> row);
-	void appendFoundRow(not_null<PeerListRow*> row);
+	void appendFoundRow(not_null<PeerListRow *> row);
 	void prependRow(std::unique_ptr<PeerListRow> row);
-	void prependRowFromSearchResult(not_null<PeerListRow*> row);
+	void prependRowFromSearchResult(not_null<PeerListRow *> row);
 	PeerListRow *findRow(PeerListRowId id);
-	void updateRow(not_null<PeerListRow*> row) {
+	void updateRow(not_null<PeerListRow *> row) {
 		updateRow(row, RowIndex());
 	}
-	void removeRow(not_null<PeerListRow*> row);
-	void convertRowToSearchResult(not_null<PeerListRow*> row);
+	void removeRow(not_null<PeerListRow *> row);
+	void convertRowToSearchResult(not_null<PeerListRow *> row);
 	int fullRowsCount() const;
-	not_null<PeerListRow*> rowAt(int index) const;
+	not_null<PeerListRow *> rowAt(int index) const;
 	void setDescription(object_ptr<Ui::FlatLabel> description);
 	void setSearchLoading(object_ptr<Ui::FlatLabel> loading);
 	void setSearchNoResults(object_ptr<Ui::FlatLabel> noResults);
@@ -427,10 +412,9 @@ public:
 	void refreshRows();
 
 	void setSearchMode(PeerListSearchMode mode);
-	void changeCheckState(not_null<PeerListRow*> row, bool checked, PeerListRow::SetStyle style);
+	void changeCheckState(not_null<PeerListRow *> row, bool checked, PeerListRow::SetStyle style);
 
-	template <typename ReorderCallback>
-	void reorderRows(ReorderCallback &&callback) {
+	template <typename ReorderCallback> void reorderRows(ReorderCallback &&callback) {
 		callback(_rows.begin(), _rows.end());
 		for (auto &searchEntity : _searchIndex) {
 			callback(searchEntity.second.begin(), searchEntity.second.end());
@@ -461,10 +445,9 @@ private:
 	void invalidatePixmapsCache();
 
 	struct RowIndex {
-		RowIndex() {
-		}
-		explicit RowIndex(int value) : value(value) {
-		}
+		RowIndex() {}
+		explicit RowIndex(int value)
+		    : value(value) {}
 		int value = -1;
 	};
 	friend inline bool operator==(RowIndex a, RowIndex b) {
@@ -475,12 +458,13 @@ private:
 	}
 
 	struct Selected {
-		Selected() {
-		}
-		Selected(RowIndex index, bool action) : index(index), action(action) {
-		}
-		Selected(int index, bool action) : index(index), action(action) {
-		}
+		Selected() {}
+		Selected(RowIndex index, bool action)
+		    : index(index)
+		    , action(action) {}
+		Selected(int index, bool action)
+		    : index(index)
+		    , action(action) {}
 		RowIndex index;
 		bool action = false;
 	};
@@ -499,19 +483,19 @@ private:
 	void loadProfilePhotos();
 	void checkScrollForPreload();
 
-	void updateRow(not_null<PeerListRow*> row, RowIndex hint);
+	void updateRow(not_null<PeerListRow *> row, RowIndex hint);
 	void updateRow(RowIndex row);
 	int getRowTop(RowIndex row) const;
 	PeerListRow *getRow(RowIndex element);
-	RowIndex findRowIndex(not_null<PeerListRow*> row, RowIndex hint = RowIndex());
-	QRect getActionRect(not_null<PeerListRow*> row, RowIndex index) const;
+	RowIndex findRowIndex(not_null<PeerListRow *> row, RowIndex hint = RowIndex());
+	QRect getActionRect(not_null<PeerListRow *> row, RowIndex index) const;
 
 	void paintRow(Painter &p, TimeMs ms, RowIndex index);
 
-	void addRowEntry(not_null<PeerListRow*> row);
-	void addToSearchIndex(not_null<PeerListRow*> row);
+	void addRowEntry(not_null<PeerListRow *> row);
+	void addToSearchIndex(not_null<PeerListRow *> row);
 	bool addingToSearchIndex() const;
-	void removeFromSearchIndex(not_null<PeerListRow*> row);
+	void removeFromSearchIndex(not_null<PeerListRow *> row);
 	void setSearchQuery(const QString &query, const QString &normalizedQuery);
 	bool showingSearch() const {
 		return !_searchQuery.isEmpty();
@@ -519,17 +503,15 @@ private:
 	int shownRowsCount() const {
 		return showingSearch() ? _filterResults.size() : _rows.size();
 	}
-	template <typename Callback>
-	bool enumerateShownRows(Callback callback);
-	template <typename Callback>
-	bool enumerateShownRows(int from, int to, Callback callback);
+	template <typename Callback> bool enumerateShownRows(Callback callback);
+	template <typename Callback> bool enumerateShownRows(int from, int to, Callback callback);
 
 	int rowsTop() const;
 	int labelHeight() const;
 
 	void clearSearchRows();
 
-	not_null<PeerListController*> _controller;
+	not_null<PeerListController *> _controller;
 	PeerListSearchMode _searchMode = PeerListSearchMode::Disabled;
 
 	int _rowHeight = 0;
@@ -541,23 +523,22 @@ private:
 	bool _mouseSelection = false;
 
 	std::vector<std::unique_ptr<PeerListRow>> _rows;
-	std::map<PeerListRowId, not_null<PeerListRow*>> _rowsById;
-	std::map<PeerData*, std::vector<not_null<PeerListRow*>>> _rowsByPeer;
+	std::map<PeerListRowId, not_null<PeerListRow *>> _rowsById;
+	std::map<PeerData *, std::vector<not_null<PeerListRow *>>> _rowsByPeer;
 
-	std::map<QChar, std::vector<not_null<PeerListRow*>>> _searchIndex;
+	std::map<QChar, std::vector<not_null<PeerListRow *>>> _searchIndex;
 	QString _searchQuery;
 	QString _normalizedSearchQuery;
 	QString _mentionHighlight;
-	std::vector<not_null<PeerListRow*>> _filterResults;
+	std::vector<not_null<PeerListRow *>> _filterResults;
 
 	int _aboveHeight = 0;
-	object_ptr<TWidget> _aboveWidget = { nullptr };
-	object_ptr<Ui::FlatLabel> _description = { nullptr };
-	object_ptr<Ui::FlatLabel> _searchNoResults = { nullptr };
-	object_ptr<Ui::FlatLabel> _searchLoading = { nullptr };
+	object_ptr<TWidget> _aboveWidget = {nullptr};
+	object_ptr<Ui::FlatLabel> _description = {nullptr};
+	object_ptr<Ui::FlatLabel> _searchNoResults = {nullptr};
+	object_ptr<Ui::FlatLabel> _searchLoading = {nullptr};
 
 	QPoint _lastMousePosition;
 
 	std::vector<std::unique_ptr<PeerListRow>> _searchRows;
-
 };
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 2e30ff4d8..426b14e64 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -18,32 +18,32 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "base/algorithm.h"
 #include "boxes/peer_list_controllers.h"
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "base/algorithm.h"
+#include "boxes/confirm_box.h"
+#include "dialogs/dialogs_indexed_list.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
-#include "boxes/confirm_box.h"
-#include "observer_peer.h"
 #include "ui/widgets/checkbox.h"
-#include "auth_session.h"
-#include "apiwrap.h"
-#include "mainwidget.h"
-#include "lang/lang_keys.h"
-#include "dialogs/dialogs_indexed_list.h"
 
 namespace {
 
-base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
+base::flat_set<not_null<UserData *>> GetAlreadyInFromPeer(PeerData *peer) {
 	if (!peer) {
 		return {};
 	}
 	if (auto chat = peer->asChat()) {
 		auto participants = chat->participants.keys();
-		return { participants.cbegin(), participants.cend() };
+		return {participants.cbegin(), participants.cend()};
 	} else if (auto channel = peer->asChannel()) {
 		if (channel->isMegagroup()) {
 			auto &participants = channel->mgInfo->lastParticipants;
-			return { participants.cbegin(), participants.cend() };
+			return {participants.cbegin(), participants.cend()};
 		}
 	}
 	return {};
@@ -53,13 +53,13 @@ base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
 
 // Not used for now.
 //
-//MembersAddButton::MembersAddButton(QWidget *parent, const style::TwoIconButton &st) : RippleButton(parent, st.ripple)
+// MembersAddButton::MembersAddButton(QWidget *parent, const style::TwoIconButton &st) : RippleButton(parent, st.ripple)
 //, _st(st) {
 //	resize(_st.width, _st.height);
 //	setCursor(style::cur_pointer);
 //}
 //
-//void MembersAddButton::paintEvent(QPaintEvent *e) {
+// void MembersAddButton::paintEvent(QPaintEvent *e) {
 //	Painter p(this);
 //
 //	auto ms = getms();
@@ -71,17 +71,18 @@ base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
 //	((over || down) ? _st.iconAboveOver : _st.iconAbove).paint(p, _st.iconPosition, width());
 //}
 //
-//QImage MembersAddButton::prepareRippleMask() const {
+// QImage MembersAddButton::prepareRippleMask() const {
 //	return Ui::RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
 //}
 //
-//QPoint MembersAddButton::prepareRippleStartPosition() const {
+// QPoint MembersAddButton::prepareRippleStartPosition() const {
 //	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
 //}
 
 class EditChatAdminsBoxController::LabeledCheckbox : public TWidget, private base::Subscriber {
 public:
-	LabeledCheckbox(QWidget *parent, const QString &text, bool checked = false, const style::Checkbox &st = st::defaultCheckbox, const style::Check &checkSt = st::defaultCheck);
+	LabeledCheckbox(QWidget *parent, const QString &text, bool checked = false,
+	                const style::Checkbox &st = st::defaultCheckbox, const style::Check &checkSt = st::defaultCheck);
 
 	base::Observable<bool> checkedChanged;
 
@@ -89,12 +90,8 @@ public:
 		return _checkbox->checked();
 	}
 
-	void setLabelText(
-		bool checked,
-		const style::TextStyle &st,
-		const QString &text,
-		const TextParseOptions &options = _defaultOptions,
-		int minResizeWidth = QFIXED_MAX);
+	void setLabelText(bool checked, const style::TextStyle &st, const QString &text,
+	                  const TextParseOptions &options = _defaultOptions, int minResizeWidth = QFIXED_MAX);
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -105,7 +102,6 @@ private:
 	Text _labelUnchecked;
 	Text _labelChecked;
 	int _labelWidth = 0;
-
 };
 
 void PeerListRowWithLink::setActionLink(const QString &action) {
@@ -128,7 +124,10 @@ QSize PeerListRowWithLink::actionSize() const {
 }
 
 QMargins PeerListRowWithLink::actionMargins() const {
-	return QMargins(st::contactsCheckPosition.x(), (st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom() - st::normalFont->height) / 2, st::contactsCheckPosition.x(), 0);
+	return QMargins(
+	    st::contactsCheckPosition.x(),
+	    (st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom() - st::normalFont->height) / 2,
+	    st::contactsCheckPosition.x(), 0);
 }
 
 void PeerListRowWithLink::paintAction(Painter &p, TimeMs ms, int x, int y, int outerWidth, bool actionSelected) {
@@ -164,14 +163,16 @@ bool PeerListGlobalSearchController::searchInCache() {
 }
 
 void PeerListGlobalSearchController::searchOnServer() {
-	_requestId = request(MTPcontacts_Search(MTP_string(_query), MTP_int(SearchPeopleLimit))).done([this](const MTPcontacts_Found &result, mtpRequestId requestId) {
-		searchDone(result, requestId);
-	}).fail([this](const RPCError &error, mtpRequestId requestId) {
-		if (_requestId == requestId) {
-			_requestId = 0;
-			delegate()->peerListSearchRefreshRows();
-		}
-	}).send();
+	_requestId =
+	    request(MTPcontacts_Search(MTP_string(_query), MTP_int(SearchPeopleLimit)))
+	        .done([this](const MTPcontacts_Found &result, mtpRequestId requestId) { searchDone(result, requestId); })
+	        .fail([this](const RPCError &error, mtpRequestId requestId) {
+		        if (_requestId == requestId) {
+			        _requestId = 0;
+			        delegate()->peerListSearchRefreshRows();
+		        }
+	        })
+	        .send();
 	_queries.emplace(_requestId, _query);
 }
 
@@ -205,8 +206,8 @@ bool PeerListGlobalSearchController::isLoading() {
 	return _timer.isActive() || _requestId;
 }
 
-ChatsListBoxController::ChatsListBoxController(std::unique_ptr<PeerListSearchController> searchController) : PeerListController(std::move(searchController)) {
-}
+ChatsListBoxController::ChatsListBoxController(std::unique_ptr<PeerListSearchController> searchController)
+    : PeerListController(std::move(searchController)) {}
 
 void ChatsListBoxController::prepare() {
 	setSearchNoResultsText(lang(lng_blocked_list_not_found));
@@ -217,15 +218,9 @@ void ChatsListBoxController::prepare() {
 	rebuildRows();
 
 	auto &sessionData = Auth().data();
-	subscribe(sessionData.contactsLoaded(), [this](bool loaded) {
-		rebuildRows();
-	});
-	subscribe(sessionData.moreChatsLoaded(), [this] {
-		rebuildRows();
-	});
-	subscribe(sessionData.allChatsLoaded(), [this](bool loaded) {
-		checkForEmptyRows();
-	});
+	subscribe(sessionData.contactsLoaded(), [this](bool loaded) { rebuildRows(); });
+	subscribe(sessionData.moreChatsLoaded(), [this] { rebuildRows(); });
+	subscribe(sessionData.allChatsLoaded(), [this](bool loaded) { checkForEmptyRows(); });
 }
 
 void ChatsListBoxController::rebuildRows() {
@@ -244,7 +239,7 @@ void ChatsListBoxController::rebuildRows() {
 	if (!wasEmpty && added > 0) {
 		// Place dialogs list before contactsNoDialogs list.
 		delegate()->peerListPartitionRows([](PeerListRow &a) {
-			auto history = static_cast<Row&>(a).history();
+			auto history = static_cast<Row &>(a).history();
 			return history->inChatList(Dialogs::Mode::All);
 		});
 	}
@@ -266,13 +261,13 @@ QString ChatsListBoxController::emptyBoxText() const {
 	return lang(lng_contacts_not_found);
 }
 
-std::unique_ptr<PeerListRow> ChatsListBoxController::createSearchRow(not_null<PeerData*> peer) {
+std::unique_ptr<PeerListRow> ChatsListBoxController::createSearchRow(not_null<PeerData *> peer) {
 	return createRow(App::history(peer));
 }
 
-bool ChatsListBoxController::appendRow(not_null<History*> history) {
+bool ChatsListBoxController::appendRow(not_null<History *> history) {
 	if (auto row = delegate()->peerListFindRow(history->peer->id)) {
-		updateRowHook(static_cast<Row*>(row));
+		updateRowHook(static_cast<Row *>(row));
 		return false;
 	}
 	if (auto row = createRow(history)) {
@@ -282,8 +277,8 @@ bool ChatsListBoxController::appendRow(not_null<History*> history) {
 	return false;
 }
 
-ContactsBoxController::ContactsBoxController(std::unique_ptr<PeerListSearchController> searchController) : PeerListController(std::move(searchController)) {
-}
+ContactsBoxController::ContactsBoxController(std::unique_ptr<PeerListSearchController> searchController)
+    : PeerListController(std::move(searchController)) {}
 
 void ContactsBoxController::prepare() {
 	setSearchNoResultsText(lang(lng_blocked_list_not_found));
@@ -295,9 +290,7 @@ void ContactsBoxController::prepare() {
 	rebuildRows();
 
 	auto &sessionData = Auth().data();
-	subscribe(sessionData.contactsLoaded(), [this](bool loaded) {
-		rebuildRows();
-	});
+	subscribe(sessionData.contactsLoaded(), [this](bool loaded) { rebuildRows(); });
 }
 
 void ContactsBoxController::rebuildRows() {
@@ -328,18 +321,18 @@ void ContactsBoxController::checkForEmptyRows() {
 	}
 }
 
-std::unique_ptr<PeerListRow> ContactsBoxController::createSearchRow(not_null<PeerData*> peer) {
+std::unique_ptr<PeerListRow> ContactsBoxController::createSearchRow(not_null<PeerData *> peer) {
 	if (auto user = peer->asUser()) {
 		return createRow(user);
 	}
 	return nullptr;
 }
 
-void ContactsBoxController::rowClicked(not_null<PeerListRow*> row) {
+void ContactsBoxController::rowClicked(not_null<PeerListRow *> row) {
 	Ui::showPeerHistory(row->peer(), ShowAtUnreadMsgId);
 }
 
-bool ContactsBoxController::appendRow(not_null<UserData*> user) {
+bool ContactsBoxController::appendRow(not_null<UserData *> user) {
 	if (auto row = delegate()->peerListFindRow(user->id)) {
 		updateRowHook(row);
 		return false;
@@ -351,25 +344,22 @@ bool ContactsBoxController::appendRow(not_null<UserData*> user) {
 	return false;
 }
 
-std::unique_ptr<PeerListRow> ContactsBoxController::createRow(not_null<UserData*> user) {
+std::unique_ptr<PeerListRow> ContactsBoxController::createRow(not_null<UserData *> user) {
 	return std::make_unique<PeerListRow>(user);
 }
 
 AddParticipantsBoxController::AddParticipantsBoxController(PeerData *peer)
-: ContactsBoxController(std::make_unique<PeerListGlobalSearchController>())
-, _peer(peer)
-, _alreadyIn(GetAlreadyInFromPeer(peer)) {
-}
+    : ContactsBoxController(std::make_unique<PeerListGlobalSearchController>())
+    , _peer(peer)
+    , _alreadyIn(GetAlreadyInFromPeer(peer)) {}
 
-AddParticipantsBoxController::AddParticipantsBoxController(
-	not_null<ChannelData*> channel,
-	base::flat_set<not_null<UserData*>> &&alreadyIn)
-: ContactsBoxController(std::make_unique<PeerListGlobalSearchController>())
-, _peer(channel)
-, _alreadyIn(std::move(alreadyIn)) {
-}
+AddParticipantsBoxController::AddParticipantsBoxController(not_null<ChannelData *> channel,
+                                                           base::flat_set<not_null<UserData *>> &&alreadyIn)
+    : ContactsBoxController(std::make_unique<PeerListGlobalSearchController>())
+    , _peer(channel)
+    , _alreadyIn(std::move(alreadyIn)) {}
 
-void AddParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
+void AddParticipantsBoxController::rowClicked(not_null<PeerListRow *> row) {
 	auto count = fullCount();
 	auto limit = (_peer && _peer->isMegagroup()) ? Global::MegagroupSizeMax() : Global::ChatSizeMax();
 	if (count < limit || row->checked()) {
@@ -380,11 +370,12 @@ void AddParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 			Ui::show(Box<MaxInviteBox>(_peer->asChannel()), KeepOtherLayers);
 		}
 	} else if (count >= Global::ChatSizeMax() && count < Global::MegagroupSizeMax()) {
-		Ui::show(Box<InformBox>(lng_profile_add_more_after_upgrade(lt_count, Global::MegagroupSizeMax())), KeepOtherLayers);
+		Ui::show(Box<InformBox>(lng_profile_add_more_after_upgrade(lt_count, Global::MegagroupSizeMax())),
+		         KeepOtherLayers);
 	}
 }
 
-void AddParticipantsBoxController::itemDeselectedHook(not_null<PeerData*> peer) {
+void AddParticipantsBoxController::itemDeselectedHook(not_null<PeerData *> peer) {
 	updateTitle();
 }
 
@@ -404,15 +395,15 @@ int AddParticipantsBoxController::alreadyInCount() const {
 	Unexpected("User in AddParticipantsBoxController::alreadyInCount");
 }
 
-bool AddParticipantsBoxController::isAlreadyIn(not_null<UserData*> user) const {
+bool AddParticipantsBoxController::isAlreadyIn(not_null<UserData *> user) const {
 	if (!_peer) {
 		return false;
 	}
 	if (auto chat = _peer->asChat()) {
 		return chat->participants.contains(user);
 	} else if (auto channel = _peer->asChannel()) {
-		return _alreadyIn.contains(user)
-			|| (channel->isMegagroup() && channel->mgInfo->lastParticipants.contains(user));
+		return _alreadyIn.contains(user) ||
+		       (channel->isMegagroup() && channel->mgInfo->lastParticipants.contains(user));
 	}
 	Unexpected("User in AddParticipantsBoxController::isAlreadyIn");
 }
@@ -421,7 +412,7 @@ int AddParticipantsBoxController::fullCount() const {
 	return alreadyInCount() + delegate()->peerListSelectedRowsCount();
 }
 
-std::unique_ptr<PeerListRow> AddParticipantsBoxController::createRow(not_null<UserData*> user) {
+std::unique_ptr<PeerListRow> AddParticipantsBoxController::createRow(not_null<UserData *> user) {
 	if (user->isSelf()) {
 		return nullptr;
 	}
@@ -433,19 +424,19 @@ std::unique_ptr<PeerListRow> AddParticipantsBoxController::createRow(not_null<Us
 }
 
 void AddParticipantsBoxController::updateTitle() {
-	auto additional = (_peer && _peer->isChannel() && !_peer->isMegagroup())
-		? QString() :
-		QString("%1 / %2").arg(fullCount()).arg(Global::MegagroupSizeMax());
+	auto additional = (_peer && _peer->isChannel() && !_peer->isMegagroup()) ?
+	                      QString() :
+	                      QString("%1 / %2").arg(fullCount()).arg(Global::MegagroupSizeMax());
 	delegate()->peerListSetTitle(langFactory(lng_profile_add_participant));
 	delegate()->peerListSetAdditionalTitle([additional] { return additional; });
 }
 
-void AddParticipantsBoxController::Start(not_null<ChatData*> chat) {
-	auto initBox = [chat](not_null<PeerListBox*> box) {
+void AddParticipantsBoxController::Start(not_null<ChatData *> chat) {
+	auto initBox = [chat](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_participant_invite), [box, chat] {
 			auto rows = box->peerListCollectSelectedRows();
 			if (!rows.empty()) {
-				auto users = std::vector<not_null<UserData*>>();
+				auto users = std::vector<not_null<UserData *>>();
 				for (auto peer : rows) {
 					auto user = peer->asUser();
 					Assert(user != nullptr);
@@ -461,16 +452,14 @@ void AddParticipantsBoxController::Start(not_null<ChatData*> chat) {
 	Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(chat), std::move(initBox)));
 }
 
-void AddParticipantsBoxController::Start(
-		not_null<ChannelData*> channel,
-		base::flat_set<not_null<UserData*>> &&alreadyIn,
-		bool justCreated) {
-	auto initBox = [channel, justCreated](not_null<PeerListBox*> box) {
+void AddParticipantsBoxController::Start(not_null<ChannelData *> channel,
+                                         base::flat_set<not_null<UserData *>> &&alreadyIn, bool justCreated) {
+	auto initBox = [channel, justCreated](not_null<PeerListBox *> box) {
 		auto subscription = std::make_shared<base::Subscription>();
 		box->addButton(langFactory(lng_participant_invite), [box, channel, subscription] {
 			auto rows = box->peerListCollectSelectedRows();
 			if (!rows.empty()) {
-				auto users = std::vector<not_null<UserData*>>();
+				auto users = std::vector<not_null<UserData *>>();
 				for (auto peer : rows) {
 					auto user = peer->asUser();
 					Assert(user != nullptr);
@@ -487,41 +476,33 @@ void AddParticipantsBoxController::Start(
 		});
 		box->addButton(langFactory(justCreated ? lng_create_group_skip : lng_cancel), [box] { box->closeBox(); });
 		if (justCreated) {
-			*subscription = box->boxClosing.add_subscription([channel] {
-				Ui::showPeerHistory(channel, ShowAtTheEndMsgId);
-			});
+			*subscription =
+			    box->boxClosing.add_subscription([channel] { Ui::showPeerHistory(channel, ShowAtTheEndMsgId); });
 		}
 	};
-	Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(channel, std::move(alreadyIn)), std::move(initBox)));
+	Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantsBoxController>(channel, std::move(alreadyIn)),
+	                          std::move(initBox)));
 }
 
-void AddParticipantsBoxController::Start(
-		not_null<ChannelData*> channel,
-		base::flat_set<not_null<UserData*>> &&alreadyIn) {
+void AddParticipantsBoxController::Start(not_null<ChannelData *> channel,
+                                         base::flat_set<not_null<UserData *>> &&alreadyIn) {
 	Start(channel, std::move(alreadyIn), false);
 }
 
-void AddParticipantsBoxController::Start(not_null<ChannelData*> channel) {
+void AddParticipantsBoxController::Start(not_null<ChannelData *> channel) {
 	Start(channel, {}, true);
 }
 
-EditChatAdminsBoxController::LabeledCheckbox::LabeledCheckbox(
-	QWidget *parent,
-	const QString &text,
-	bool checked,
-	const style::Checkbox &st,
-	const style::Check &checkSt)
-: TWidget(parent)
-, _checkbox(this, text, checked, st, checkSt) {
+EditChatAdminsBoxController::LabeledCheckbox::LabeledCheckbox(QWidget *parent, const QString &text, bool checked,
+                                                              const style::Checkbox &st, const style::Check &checkSt)
+    : TWidget(parent)
+    , _checkbox(this, text, checked, st, checkSt) {
 	subscribe(_checkbox->checkedChanged, [this](bool value) { checkedChanged.notify(value, true); });
 }
 
-void EditChatAdminsBoxController::LabeledCheckbox::setLabelText(
-		bool checked,
-		const style::TextStyle &st,
-		const QString &text,
-		const TextParseOptions &options,
-		int minResizeWidth) {
+void EditChatAdminsBoxController::LabeledCheckbox::setLabelText(bool checked, const style::TextStyle &st,
+                                                                const QString &text, const TextParseOptions &options,
+                                                                int minResizeWidth) {
 	auto &label = (checked ? _labelChecked : _labelUnchecked);
 	label = Text(st, text, options, minResizeWidth);
 }
@@ -530,9 +511,7 @@ int EditChatAdminsBoxController::LabeledCheckbox::resizeGetHeight(int newWidth)
 	_labelWidth = newWidth - st::contactsPadding.left() - st::contactsPadding.right();
 	_checkbox->resizeToNaturalWidth(_labelWidth);
 	_checkbox->moveToLeft(st::contactsPadding.left(), st::contactsAllAdminsTop);
-	auto labelHeight = std::max(
-		_labelChecked.countHeight(_labelWidth),
-		_labelUnchecked.countHeight(_labelWidth));
+	auto labelHeight = std::max(_labelChecked.countHeight(_labelWidth), _labelUnchecked.countHeight(_labelWidth));
 	return st::contactsAboutTop + labelHeight + st::contactsAboutBottom;
 }
 
@@ -544,17 +523,18 @@ void EditChatAdminsBoxController::LabeledCheckbox::paintEvent(QPaintEvent *e) {
 	p.fillRect(infoRect, st::contactsAboutBg);
 	auto dividerFillTop = rtlrect(0, infoRect.y(), width(), st::profileDividerTop.height(), width());
 	st::profileDividerTop.fill(p, dividerFillTop);
-	auto dividerFillBottom = rtlrect(0, infoRect.y() + infoRect.height() - st::profileDividerBottom.height(), width(), st::profileDividerBottom.height(), width());
+	auto dividerFillBottom = rtlrect(0, infoRect.y() + infoRect.height() - st::profileDividerBottom.height(), width(),
+	                                 st::profileDividerBottom.height(), width());
 	st::profileDividerBottom.fill(p, dividerFillBottom);
 
 	p.setPen(st::contactsAboutFg);
-	(checked() ? _labelChecked : _labelUnchecked).draw(p, st::contactsPadding.left(), st::contactsAboutTop, _labelWidth);
+	(checked() ? _labelChecked : _labelUnchecked)
+	    .draw(p, st::contactsPadding.left(), st::contactsAboutTop, _labelWidth);
 }
 
-EditChatAdminsBoxController::EditChatAdminsBoxController(not_null<ChatData*> chat)
-: PeerListController()
-, _chat(chat) {
-}
+EditChatAdminsBoxController::EditChatAdminsBoxController(not_null<ChatData *> chat)
+    : PeerListController()
+    , _chat(chat) {}
 
 bool EditChatAdminsBoxController::allAreAdmins() const {
 	return _allAdmins->checked();
@@ -570,16 +550,16 @@ void EditChatAdminsBoxController::prepare() {
 	rebuildRows();
 	if (!delegate()->peerListFullRowsCount()) {
 		Auth().api().requestFullPeer(_chat);
-		_adminsUpdatedSubscription = subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(
-				Notify::PeerUpdate::Flag::AdminsChanged, [this](
-					const Notify::PeerUpdate &update) {
-			if (update.peer == _chat) {
-				rebuildRows();
-				if (delegate()->peerListFullRowsCount()) {
-					unsubscribe(_adminsUpdatedSubscription);
-				}
-			}
-		}));
+		_adminsUpdatedSubscription = subscribe(
+		    Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::AdminsChanged,
+		                                                      [this](const Notify::PeerUpdate &update) {
+			                                                      if (update.peer == _chat) {
+				                                                      rebuildRows();
+				                                                      if (delegate()->peerListFullRowsCount()) {
+					                                                      unsubscribe(_adminsUpdatedSubscription);
+				                                                      }
+			                                                      }
+		                                                      }));
 	}
 
 	subscribe(_allAdmins->checkedChanged, [this](bool checked) {
@@ -598,7 +578,8 @@ void EditChatAdminsBoxController::prepare() {
 
 void EditChatAdminsBoxController::createAllAdminsCheckbox() {
 	auto labelWidth = st::boxWideWidth - st::contactsPadding.left() - st::contactsPadding.right();
-	auto checkbox = object_ptr<LabeledCheckbox>(nullptr, lang(lng_chat_all_members_admins), !_chat->adminsEnabled(), st::defaultBoxCheckbox);
+	auto checkbox = object_ptr<LabeledCheckbox>(nullptr, lang(lng_chat_all_members_admins), !_chat->adminsEnabled(),
+	                                            st::defaultBoxCheckbox);
 	checkbox->setLabelText(true, st::defaultTextStyle, lang(lng_chat_about_all_admins), _defaultOptions, labelWidth);
 	checkbox->setLabelText(false, st::defaultTextStyle, lang(lng_chat_about_admins), _defaultOptions, labelWidth);
 	_allAdmins = checkbox;
@@ -612,7 +593,7 @@ void EditChatAdminsBoxController::rebuildRows() {
 
 	auto allAdmins = allAreAdmins();
 
-	auto admins = std::vector<not_null<UserData*>>();
+	auto admins = std::vector<not_null<UserData *>>();
 	auto others = admins;
 	admins.reserve(allAdmins ? _chat->participants.size() : _chat->admins.size());
 	others.reserve(_chat->participants.size());
@@ -633,13 +614,11 @@ void EditChatAdminsBoxController::rebuildRows() {
 		admins.insert(admins.end(), others.begin(), others.end());
 		others.clear();
 	}
-	auto sortByName = [](auto a, auto b) {
-		return (a->name.compare(b->name, Qt::CaseInsensitive) < 0);
-	};
+	auto sortByName = [](auto a, auto b) { return (a->name.compare(b->name, Qt::CaseInsensitive) < 0); };
 	std::sort(admins.begin(), admins.end(), sortByName);
 	std::sort(others.begin(), others.end(), sortByName);
 
-	auto addOne = [this](not_null<UserData*> user) {
+	auto addOne = [this](not_null<UserData *> user) {
 		if (auto row = createRow(user)) {
 			delegate()->peerListAppendRow(std::move(row));
 		}
@@ -655,7 +634,7 @@ void EditChatAdminsBoxController::rebuildRows() {
 	delegate()->peerListRefreshRows();
 }
 
-std::unique_ptr<PeerListRow> EditChatAdminsBoxController::createRow(not_null<UserData*> user) {
+std::unique_ptr<PeerListRow> EditChatAdminsBoxController::createRow(not_null<UserData *> user) {
 	auto result = std::make_unique<PeerListRow>(user);
 	if (allAreAdmins() || user->id == peerFromUser(_chat->creator)) {
 		result->setDisabledState(PeerListRow::State::DisabledChecked);
@@ -663,23 +642,23 @@ std::unique_ptr<PeerListRow> EditChatAdminsBoxController::createRow(not_null<Use
 	return result;
 }
 
-void EditChatAdminsBoxController::rowClicked(not_null<PeerListRow*> row) {
+void EditChatAdminsBoxController::rowClicked(not_null<PeerListRow *> row) {
 	delegate()->peerListSetRowChecked(row, !row->checked());
 }
 
-void EditChatAdminsBoxController::Start(not_null<ChatData*> chat) {
+void EditChatAdminsBoxController::Start(not_null<ChatData *> chat) {
 	auto controller = std::make_unique<EditChatAdminsBoxController>(chat);
-	auto initBox = [chat, controller = controller.get()](not_null<PeerListBox*> box) {
+	auto initBox = [chat, controller = controller.get()](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_settings_save), [box, chat, controller] {
 			auto rows = box->peerListCollectSelectedRows();
-			auto users = std::vector<not_null<UserData*>>();
+			auto users = std::vector<not_null<UserData *>>();
 			for (auto peer : rows) {
 				auto user = peer->asUser();
 				Assert(user != nullptr);
 				Assert(!user->isSelf());
 				users.push_back(peer->asUser());
 			}
-			Auth().api().editChatAdmins(chat, !controller->allAreAdmins(), { users.cbegin(), users.cend() });
+			Auth().api().editChatAdmins(chat, !controller->allAreAdmins(), {users.cbegin(), users.cend()});
 			box->closeBox();
 		});
 		box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
@@ -687,21 +666,18 @@ void EditChatAdminsBoxController::Start(not_null<ChatData*> chat) {
 	Ui::show(Box<PeerListBox>(std::move(controller), std::move(initBox)));
 }
 
-void AddBotToGroupBoxController::Start(not_null<UserData*> bot) {
-	auto initBox = [bot](not_null<PeerListBox*> box) {
+void AddBotToGroupBoxController::Start(not_null<UserData *> bot) {
+	auto initBox = [bot](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
 	};
 	Ui::show(Box<PeerListBox>(std::make_unique<AddBotToGroupBoxController>(bot), std::move(initBox)));
 }
 
-AddBotToGroupBoxController::AddBotToGroupBoxController(not_null<UserData*> bot)
-: ChatsListBoxController(SharingBotGame(bot)
-	? std::make_unique<PeerListGlobalSearchController>()
-	: nullptr)
-, _bot(bot) {
-}
+AddBotToGroupBoxController::AddBotToGroupBoxController(not_null<UserData *> bot)
+    : ChatsListBoxController(SharingBotGame(bot) ? std::make_unique<PeerListGlobalSearchController>() : nullptr)
+    , _bot(bot) {}
 
-void AddBotToGroupBoxController::rowClicked(not_null<PeerListRow*> row) {
+void AddBotToGroupBoxController::rowClicked(not_null<PeerListRow *> row) {
 	if (sharingBotGame()) {
 		shareBotGame(row->peer());
 	} else {
@@ -709,7 +685,7 @@ void AddBotToGroupBoxController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-void AddBotToGroupBoxController::shareBotGame(not_null<PeerData*> chat) {
+void AddBotToGroupBoxController::shareBotGame(not_null<PeerData *> chat) {
 	auto weak = base::make_weak_unique(this);
 	auto send = [weak, bot = _bot, chat] {
 		if (!weak) {
@@ -719,16 +695,9 @@ void AddBotToGroupBoxController::shareBotGame(not_null<PeerData*> chat) {
 		auto afterRequestId = history ? history->sendRequestId : 0;
 		auto randomId = rand_value<quint64>();
 		auto gameShortName = bot->botInfo->shareGameShortName;
-		auto inputGame = MTP_inputGameShortName(
-			bot->inputUser,
-			MTP_string(gameShortName));
-		auto request = MTPmessages_SendMedia(
-			MTP_flags(0),
-			chat->input,
-			MTP_int(0),
-			MTP_inputMediaGame(inputGame),
-			MTP_long(randomId),
-			MTPnullMarkup);
+		auto inputGame = MTP_inputGameShortName(bot->inputUser, MTP_string(gameShortName));
+		auto request = MTPmessages_SendMedia(MTP_flags(0), chat->input, MTP_int(0), MTP_inputMediaGame(inputGame),
+		                                     MTP_long(randomId), MTPnullMarkup);
 		auto done = App::main()->rpcDone(&MainWidget::sentUpdatesReceived);
 		auto fail = App::main()->rpcFail(&MainWidget::sendMessageFail);
 		auto requestId = MTP::send(request, done, fail, 0, 0, afterRequestId);
@@ -747,7 +716,7 @@ void AddBotToGroupBoxController::shareBotGame(not_null<PeerData*> chat) {
 	Ui::show(Box<ConfirmBox>(confirmText(), send), KeepOtherLayers);
 }
 
-void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
+void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData *> chat) {
 	if (auto megagroup = chat->asMegagroup()) {
 		if (!megagroup->canAddMembers()) {
 			Ui::show(Box<InformBox>(lang(lng_error_cant_add_member)), KeepOtherLayers);
@@ -761,26 +730,16 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 		}
 		if (auto &info = bot->botInfo) {
 			if (!info->startGroupToken.isEmpty()) {
-				auto request = MTPmessages_StartBot(
-					bot->inputUser,
-					chat->input,
-					MTP_long(rand_value<quint64>()),
-					MTP_string(info->startGroupToken));
-				auto done = App::main()->rpcDone(
-					&MainWidget::sentUpdatesReceived);
-				auto fail = App::main()->rpcFail(
-					&MainWidget::addParticipantFail,
-					{ bot, chat });
+				auto request = MTPmessages_StartBot(bot->inputUser, chat->input, MTP_long(rand_value<quint64>()),
+				                                    MTP_string(info->startGroupToken));
+				auto done = App::main()->rpcDone(&MainWidget::sentUpdatesReceived);
+				auto fail = App::main()->rpcFail(&MainWidget::addParticipantFail, {bot, chat});
 				MTP::send(request, done, fail);
 			} else {
-				App::main()->addParticipants(
-					chat,
-					{ 1, bot });
+				App::main()->addParticipants(chat, {1, bot});
 			}
 		} else {
-			App::main()->addParticipants(
-				chat,
-				{ 1, bot });
+			App::main()->addParticipants(chat, {1, bot});
 		}
 		Ui::hideLayer();
 		Ui::showPeerHistory(chat, ShowAtUnreadMsgId);
@@ -789,14 +748,14 @@ void AddBotToGroupBoxController::addBotToGroup(not_null<PeerData*> chat) {
 	Ui::show(Box<ConfirmBox>(confirmText, send), KeepOtherLayers);
 }
 
-std::unique_ptr<ChatsListBoxController::Row> AddBotToGroupBoxController::createRow(not_null<History*> history) {
+std::unique_ptr<ChatsListBoxController::Row> AddBotToGroupBoxController::createRow(not_null<History *> history) {
 	if (!needToCreateRow(history->peer)) {
 		return nullptr;
 	}
 	return std::make_unique<Row>(history);
 }
 
-bool AddBotToGroupBoxController::needToCreateRow(not_null<PeerData*> peer) const {
+bool AddBotToGroupBoxController::needToCreateRow(not_null<PeerData *> peer) const {
 	if (sharingBotGame()) {
 		if (!peer->canWrite()) {
 			return false;
@@ -818,7 +777,7 @@ bool AddBotToGroupBoxController::needToCreateRow(not_null<PeerData*> peer) const
 	return false;
 }
 
-bool AddBotToGroupBoxController::SharingBotGame(not_null<UserData*> bot) {
+bool AddBotToGroupBoxController::SharingBotGame(not_null<UserData *> bot) {
 	auto &info = bot->botInfo;
 	return (info && !info->shareGameShortName.isEmpty());
 }
@@ -828,15 +787,14 @@ bool AddBotToGroupBoxController::sharingBotGame() const {
 }
 
 QString AddBotToGroupBoxController::emptyBoxText() const {
-	return lang(Auth().data().allChatsLoaded().value()
-		? (sharingBotGame() ? lng_bot_no_chats : lng_bot_no_groups)
-		: lng_contacts_loading);
+	return lang(Auth().data().allChatsLoaded().value() ? (sharingBotGame() ? lng_bot_no_chats : lng_bot_no_groups) :
+	                                                     lng_contacts_loading);
 }
 
 QString AddBotToGroupBoxController::noResultsText() const {
-	return lang(Auth().data().allChatsLoaded().value()
-		? (sharingBotGame() ? lng_bot_chats_not_found : lng_bot_groups_not_found)
-		: lng_contacts_loading);
+	return lang(Auth().data().allChatsLoaded().value() ?
+	                (sharingBotGame() ? lng_bot_chats_not_found : lng_bot_groups_not_found) :
+	                lng_contacts_loading);
 }
 
 void AddBotToGroupBoxController::updateLabels() {
@@ -844,9 +802,7 @@ void AddBotToGroupBoxController::updateLabels() {
 }
 
 void AddBotToGroupBoxController::prepareViewHook() {
-	delegate()->peerListSetTitle(langFactory(sharingBotGame()
-		? lng_bot_choose_chat
-		: lng_bot_choose_group));
+	delegate()->peerListSetTitle(langFactory(sharingBotGame() ? lng_bot_choose_chat : lng_bot_choose_group));
 	updateLabels();
 	subscribe(Auth().data().allChatsLoaded(), [this](bool) { updateLabels(); });
 }
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 14d2fbcd3..a5fc86a4b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -20,24 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "boxes/peer_list_box.h"
 #include "base/flat_set.h"
 #include "base/weak_unique_ptr.h"
+#include "boxes/peer_list_box.h"
 #include "history/history.h"
 
 // Not used for now.
 //
-//class MembersAddButton : public Ui::RippleButton {
-//public:
+// class MembersAddButton : public Ui::RippleButton {
+// public:
 //	MembersAddButton(QWidget *parent, const style::TwoIconButton &st);
 //
-//protected:
+// protected:
 //	void paintEvent(QPaintEvent *e) override;
 //
 //	QImage prepareRippleMask() const override;
 //	QPoint prepareRippleStartPosition() const override;
 //
-//private:
+// private:
 //	const style::TwoIconButton &_st;
 //
 //};
@@ -58,7 +58,6 @@ private:
 
 	QString _action;
 	int _actionWidth = 0;
-
 };
 
 class PeerListGlobalSearchController : public PeerListSearchController, private MTP::Sender {
@@ -81,151 +80,138 @@ private:
 	mtpRequestId _requestId = 0;
 	std::map<QString, MTPcontacts_Found> _cache;
 	std::map<mtpRequestId, QString> _queries;
-
 };
 
 class ChatsListBoxController : public PeerListController, protected base::Subscriber {
 public:
-	ChatsListBoxController(std::unique_ptr<PeerListSearchController> searchController = std::make_unique<PeerListGlobalSearchController>());
+	ChatsListBoxController(std::unique_ptr<PeerListSearchController> searchController =
+	                           std::make_unique<PeerListGlobalSearchController>());
 
 	void prepare() override final;
-	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override final;
+	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData *> peer) override final;
 
 protected:
 	class Row : public PeerListRow {
 	public:
-		Row(not_null<History*> history) : PeerListRow(history->peer), _history(history) {
-		}
-		not_null<History*> history() const {
+		Row(not_null<History *> history)
+		    : PeerListRow(history->peer)
+		    , _history(history) {}
+		not_null<History *> history() const {
 			return _history;
 		}
 
 	private:
-		not_null<History*> _history;
-
+		not_null<History *> _history;
 	};
-	virtual std::unique_ptr<Row> createRow(not_null<History*> history) = 0;
+	virtual std::unique_ptr<Row> createRow(not_null<History *> history) = 0;
 	virtual void prepareViewHook() = 0;
-	virtual void updateRowHook(not_null<Row*> row) {
-	}
+	virtual void updateRowHook(not_null<Row *> row) {}
 	virtual QString emptyBoxText() const;
 
 private:
 	void rebuildRows();
 	void checkForEmptyRows();
-	bool appendRow(not_null<History*> history);
-
+	bool appendRow(not_null<History *> history);
 };
 
 class ContactsBoxController : public PeerListController, protected base::Subscriber {
 public:
-	ContactsBoxController(std::unique_ptr<PeerListSearchController> searchController = std::make_unique<PeerListGlobalSearchController>());
+	ContactsBoxController(std::unique_ptr<PeerListSearchController> searchController =
+	                          std::make_unique<PeerListGlobalSearchController>());
 
 	void prepare() override final;
-	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override final;
-	void rowClicked(not_null<PeerListRow*> row) override;
+	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData *> peer) override final;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
 protected:
-	virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user);
-	virtual void prepareViewHook() {
-	}
-	virtual void updateRowHook(not_null<PeerListRow*> row) {
-	}
+	virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user);
+	virtual void prepareViewHook() {}
+	virtual void updateRowHook(not_null<PeerListRow *> row) {}
 
 private:
 	void rebuildRows();
 	void checkForEmptyRows();
-	bool appendRow(not_null<UserData*> user);
-
+	bool appendRow(not_null<UserData *> user);
 };
 
 class EditChatAdminsBoxController : public PeerListController, private base::Subscriber {
 public:
-	static void Start(not_null<ChatData*> chat);
+	static void Start(not_null<ChatData *> chat);
 
-	EditChatAdminsBoxController(not_null<ChatData*> chat);
+	EditChatAdminsBoxController(not_null<ChatData *> chat);
 
 	bool allAreAdmins() const;
 
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
 private:
 	void createAllAdminsCheckbox();
 	void rebuildRows();
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user);
+	std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user);
 
-	not_null<ChatData*> _chat;
+	not_null<ChatData *> _chat;
 	int _adminsUpdatedSubscription = 0;
 
 	class LabeledCheckbox;
 	QPointer<LabeledCheckbox> _allAdmins;
-
 };
 
 class AddParticipantsBoxController : public ContactsBoxController {
 public:
-	static void Start(not_null<ChatData*> chat);
-	static void Start(not_null<ChannelData*> channel);
-	static void Start(
-		not_null<ChannelData*> channel,
-		base::flat_set<not_null<UserData*>> &&alreadyIn);
+	static void Start(not_null<ChatData *> chat);
+	static void Start(not_null<ChannelData *> channel);
+	static void Start(not_null<ChannelData *> channel, base::flat_set<not_null<UserData *>> &&alreadyIn);
 
 	AddParticipantsBoxController(PeerData *peer);
-	AddParticipantsBoxController(
-		not_null<ChannelData*> channel,
-		base::flat_set<not_null<UserData*>> &&alreadyIn);
+	AddParticipantsBoxController(not_null<ChannelData *> channel, base::flat_set<not_null<UserData *>> &&alreadyIn);
 
 	using ContactsBoxController::ContactsBoxController;
 
-	void rowClicked(not_null<PeerListRow*> row) override;
-	void itemDeselectedHook(not_null<PeerData*> peer) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
+	void itemDeselectedHook(not_null<PeerData *> peer) override;
 
 protected:
 	void prepareViewHook() override;
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) override;
+	std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user) override;
 
 private:
-	static void Start(
-		not_null<ChannelData*> channel,
-		base::flat_set<not_null<UserData*>> &&alreadyIn,
-		bool justCreated);
+	static void Start(not_null<ChannelData *> channel, base::flat_set<not_null<UserData *>> &&alreadyIn,
+	                  bool justCreated);
 
 	int alreadyInCount() const;
-	bool isAlreadyIn(not_null<UserData*> user) const;
+	bool isAlreadyIn(not_null<UserData *> user) const;
 	int fullCount() const;
 	void updateTitle();
 
 	PeerData *_peer = nullptr;
-	base::flat_set<not_null<UserData*>> _alreadyIn;
-
+	base::flat_set<not_null<UserData *>> _alreadyIn;
 };
 
 class AddBotToGroupBoxController : public ChatsListBoxController, public base::enable_weak_from_this {
 public:
-	static void Start(not_null<UserData*> bot);
+	static void Start(not_null<UserData *> bot);
 
-	AddBotToGroupBoxController(not_null<UserData*> bot);
+	AddBotToGroupBoxController(not_null<UserData *> bot);
 
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
 protected:
-	std::unique_ptr<Row> createRow(not_null<History*> history) override;
+	std::unique_ptr<Row> createRow(not_null<History *> history) override;
 	void prepareViewHook() override;
 	QString emptyBoxText() const override;
 
 private:
-	static bool SharingBotGame(not_null<UserData*> bot);
+	static bool SharingBotGame(not_null<UserData *> bot);
 
-	bool needToCreateRow(not_null<PeerData*> peer) const;
+	bool needToCreateRow(not_null<PeerData *> peer) const;
 	bool sharingBotGame() const;
 	QString noResultsText() const;
 	QString descriptionText() const;
 	void updateLabels();
 
-	void shareBotGame(not_null<PeerData*> chat);
-	void addBotToGroup(not_null<PeerData*> chat);
-
-	not_null<UserData*> _bot;
+	void shareBotGame(not_null<PeerData *> chat);
+	void addBotToGroup(not_null<PeerData *> chat);
 
+	not_null<UserData *> _bot;
 };
diff --git a/Telegram/SourceFiles/boxes/photo_crop_box.cpp b/Telegram/SourceFiles/boxes/photo_crop_box.cpp
index b38985ce2..e1882ed7f 100644
--- a/Telegram/SourceFiles/boxes/photo_crop_box.cpp
+++ b/Telegram/SourceFiles/boxes/photo_crop_box.cpp
@@ -21,21 +21,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/photo_crop_box.h"
 
 #include "lang/lang_keys.h"
-#include "messenger.h"
 #include "mainwidget.h"
+#include "messenger.h"
 #include "storage/file_upload.h"
-#include "ui/widgets/buttons.h"
 #include "styles/style_boxes.h"
+#include "ui/widgets/buttons.h"
 
-PhotoCropBox::PhotoCropBox(QWidget*, const QImage &img, const PeerId &peer)
-: _img(img)
-, _peerId(peer) {
+PhotoCropBox::PhotoCropBox(QWidget *, const QImage &img, const PeerId &peer)
+    : _img(img)
+    , _peerId(peer) {
 	init(img, nullptr);
 }
 
-PhotoCropBox::PhotoCropBox(QWidget*, const QImage &img, PeerData *peer)
-: _img(img)
-, _peerId(peer->id) {
+PhotoCropBox::PhotoCropBox(QWidget *, const QImage &img, PeerData *peer)
+    : _img(img)
+    , _peerId(peer->id) {
 	init(img, peer);
 }
 
@@ -53,11 +53,12 @@ void PhotoCropBox::prepare() {
 	addButton(langFactory(lng_settings_save), [this] { sendPhoto(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 	if (peerToBareInt(_peerId)) {
-		connect(this, SIGNAL(ready(const QImage&)), this, SLOT(onReady(const QImage&)));
+		connect(this, SIGNAL(ready(const QImage &)), this, SLOT(onReady(const QImage &)));
 	}
 
 	qint32 s = st::boxWideWidth - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-	_thumb = App::pixmapFromImageInPlace(_img.scaled(s * cIntRetinaFactor(), s * cIntRetinaFactor(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+	_thumb = App::pixmapFromImageInPlace(
+	    _img.scaled(s * cIntRetinaFactor(), s * cIntRetinaFactor(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
 	_thumb.setDevicePixelRatio(cRetinaFactor());
 	_mask = QImage(_thumb.size(), QImage::Format_ARGB32_Premultiplied);
 	_mask.setDevicePixelRatio(cRetinaFactor());
@@ -77,7 +78,8 @@ void PhotoCropBox::prepare() {
 	_thumby = st::boxPhotoPadding.top();
 	setMouseTracking(true);
 
-	setDimensions(st::boxWideWidth, st::boxPhotoPadding.top() + _thumbh + st::boxPhotoPadding.bottom() + st::boxTextFont->height + st::cropSkip);
+	setDimensions(st::boxWideWidth, st::boxPhotoPadding.top() + _thumbh + st::boxPhotoPadding.bottom() +
+	                                    st::boxTextFont->height + st::cropSkip);
 }
 
 void PhotoCropBox::mousePressEvent(QMouseEvent *e) {
@@ -231,7 +233,9 @@ void PhotoCropBox::paintEvent(QPaintEvent *e) {
 
 	p.setFont(st::boxTextFont);
 	p.setPen(st::boxPhotoTextFg);
-	p.drawText(QRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top() + _thumbh + st::boxPhotoPadding.bottom(), width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(), st::boxTextFont->height), _title, style::al_top);
+	p.drawText(QRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top() + _thumbh + st::boxPhotoPadding.bottom(),
+	                 width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(), st::boxTextFont->height),
+	           _title, style::al_top);
 
 	p.translate(_thumbx, _thumby);
 	p.drawPixmap(0, 0, _thumb);
diff --git a/Telegram/SourceFiles/boxes/photo_crop_box.h b/Telegram/SourceFiles/boxes/photo_crop_box.h
index 6f798860f..6d946443f 100644
--- a/Telegram/SourceFiles/boxes/photo_crop_box.h
+++ b/Telegram/SourceFiles/boxes/photo_crop_box.h
@@ -26,8 +26,8 @@ class PhotoCropBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	PhotoCropBox(QWidget*, const QImage &img, const PeerId &peer);
-	PhotoCropBox(QWidget*, const QImage &img, PeerData *peer);
+	PhotoCropBox(QWidget *, const QImage &img, const PeerId &peer);
+	PhotoCropBox(QWidget *, const QImage &img, PeerData *peer);
 
 	qint32 mouseState(QPoint p);
 
@@ -59,5 +59,4 @@ private:
 	QPixmap _thumb;
 	QImage _mask, _fade;
 	PeerId _peerId;
-
 };
diff --git a/Telegram/SourceFiles/boxes/rate_call_box.cpp b/Telegram/SourceFiles/boxes/rate_call_box.cpp
index f7c428274..131656766 100644
--- a/Telegram/SourceFiles/boxes/rate_call_box.cpp
+++ b/Telegram/SourceFiles/boxes/rate_call_box.cpp
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/rate_call_box.h"
 
+#include "boxes/confirm_box.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "styles/style_boxes.h"
 #include "styles/style_calls.h"
-#include "boxes/confirm_box.h"
-#include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
+#include "ui/widgets/labels.h"
 
 namespace {
 
@@ -36,10 +36,9 @@ constexpr auto kMaxRating = 5;
 
 } // namespace
 
-RateCallBox::RateCallBox(QWidget*, quint64 callId, quint64 callAccessHash)
-: _callId(callId)
-, _callAccessHash(callAccessHash) {
-}
+RateCallBox::RateCallBox(QWidget *, quint64 callId, quint64 callAccessHash)
+    : _callId(callId)
+    , _callAccessHash(callAccessHash) {}
 
 void RateCallBox::prepare() {
 	setTitle(langFactory(lng_call_rate_label));
@@ -88,7 +87,8 @@ void RateCallBox::ratingChanged(int value) {
 			_comment->show();
 			_comment->setCtrlEnterSubmit(Ui::CtrlEnterSubmit::Both);
 			_comment->setMaxLength(MaxPhotoCaption);
-			_comment->resize(width() - (st::callRatingPadding.left() + st::callRatingPadding.right()), _comment->height());
+			_comment->resize(width() - (st::callRatingPadding.left() + st::callRatingPadding.right()),
+			                 _comment->height());
 
 			updateMaxHeight();
 			connect(_comment, SIGNAL(resized()), this, SLOT(onCommentResized()));
@@ -121,14 +121,19 @@ void RateCallBox::onSend() {
 		return;
 	}
 	auto comment = _comment ? _comment->getLastText().trimmed() : QString();
-	_requestId = request(MTPphone_SetCallRating(MTP_inputPhoneCall(MTP_long(_callId), MTP_long(_callAccessHash)), MTP_int(_rating), MTP_string(comment))).done([this](const MTPUpdates &updates) {
-		App::main()->sentUpdatesReceived(updates);
-		closeBox();
-	}).fail([this](const RPCError &error) { closeBox(); }).send();
+	_requestId = request(MTPphone_SetCallRating(MTP_inputPhoneCall(MTP_long(_callId), MTP_long(_callAccessHash)),
+	                                            MTP_int(_rating), MTP_string(comment)))
+	                 .done([this](const MTPUpdates &updates) {
+		                 App::main()->sentUpdatesReceived(updates);
+		                 closeBox();
+	                 })
+	                 .fail([this](const RPCError &error) { closeBox(); })
+	                 .send();
 }
 
 void RateCallBox::updateMaxHeight() {
-	auto newHeight = st::callRatingPadding.top() + st::callRatingStarTop + _stars.back()->heightNoMargins() + st::callRatingPadding.bottom();
+	auto newHeight = st::callRatingPadding.top() + st::callRatingStarTop + _stars.back()->heightNoMargins() +
+	                 st::callRatingPadding.bottom();
 	if (_comment) {
 		newHeight += st::callRatingCommentTop + _comment->height();
 	}
diff --git a/Telegram/SourceFiles/boxes/rate_call_box.h b/Telegram/SourceFiles/boxes/rate_call_box.h
index b28603c34..e0c661d4c 100644
--- a/Telegram/SourceFiles/boxes/rate_call_box.h
+++ b/Telegram/SourceFiles/boxes/rate_call_box.h
@@ -33,7 +33,7 @@ class RateCallBox : public BoxContent, private MTP::Sender {
 	Q_OBJECT
 
 public:
-	RateCallBox(QWidget*, quint64 callId, quint64 callAccessHash);
+	RateCallBox(QWidget *, quint64 callId, quint64 callAccessHash);
 
 private slots:
 	void onSend();
@@ -57,8 +57,7 @@ private:
 	int _rating = 0;
 
 	std::vector<object_ptr<Ui::IconButton>> _stars;
-	object_ptr<Ui::InputArea> _comment = { nullptr };
+	object_ptr<Ui::InputArea> _comment = {nullptr};
 
 	mtpRequestId _requestId = 0;
-
 };
diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp
index 7f599ceef..3475388dd 100644
--- a/Telegram/SourceFiles/boxes/report_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_box.cpp
@@ -20,26 +20,28 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/report_box.h"
 
+#include "boxes/confirm_box.h"
+#include "facades.h"
 #include "lang/lang_keys.h"
+#include "mainwindow.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
-#include "boxes/confirm_box.h"
-#include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/widgets/input_fields.h"
-#include "mainwindow.h"
-#include "facades.h"
 
-ReportBox::ReportBox(QWidget*, PeerData *peer) : _peer(peer)
-, _reasonGroup(std::make_shared<Ui::RadioenumGroup<Reason>>(Reason::Spam))
-, _reasonSpam(this, _reasonGroup, Reason::Spam, lang(lng_report_reason_spam), st::defaultBoxCheckbox)
-, _reasonViolence(this, _reasonGroup, Reason::Violence, lang(lng_report_reason_violence), st::defaultBoxCheckbox)
-, _reasonPornography(this, _reasonGroup, Reason::Pornography, lang(lng_report_reason_pornography), st::defaultBoxCheckbox)
-, _reasonOther(this, _reasonGroup, Reason::Other, lang(lng_report_reason_other), st::defaultBoxCheckbox) {
-}
+ReportBox::ReportBox(QWidget *, PeerData *peer)
+    : _peer(peer)
+    , _reasonGroup(std::make_shared<Ui::RadioenumGroup<Reason>>(Reason::Spam))
+    , _reasonSpam(this, _reasonGroup, Reason::Spam, lang(lng_report_reason_spam), st::defaultBoxCheckbox)
+    , _reasonViolence(this, _reasonGroup, Reason::Violence, lang(lng_report_reason_violence), st::defaultBoxCheckbox)
+    , _reasonPornography(this, _reasonGroup, Reason::Pornography, lang(lng_report_reason_pornography),
+                         st::defaultBoxCheckbox)
+    , _reasonOther(this, _reasonGroup, Reason::Other, lang(lng_report_reason_other), st::defaultBoxCheckbox) {}
 
 void ReportBox::prepare() {
-	setTitle(langFactory(_peer->isUser() ? lng_report_bot_title : (_peer->isMegagroup() ? lng_report_group_title : lng_report_title)));
+	setTitle(langFactory(_peer->isUser() ? lng_report_bot_title :
+	                                       (_peer->isMegagroup() ? lng_report_group_title : lng_report_title)));
 
 	addButton(langFactory(lng_report_button), [this] { onReport(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
@@ -52,13 +54,19 @@ void ReportBox::prepare() {
 void ReportBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 
-	_reasonSpam->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top() + _reasonSpam->getMargins().top());
-	_reasonViolence->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonSpam->bottomNoMargins() + st::boxOptionListSkip);
-	_reasonPornography->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonViolence->bottomNoMargins() + st::boxOptionListSkip);
-	_reasonOther->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonPornography->bottomNoMargins() + st::boxOptionListSkip);
+	_reasonSpam->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                        st::boxOptionListPadding.top() + _reasonSpam->getMargins().top());
+	_reasonViolence->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                            _reasonSpam->bottomNoMargins() + st::boxOptionListSkip);
+	_reasonPornography->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                               _reasonViolence->bottomNoMargins() + st::boxOptionListSkip);
+	_reasonOther->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(),
+	                         _reasonPornography->bottomNoMargins() + st::boxOptionListSkip);
 
 	if (_reasonOtherText) {
-		_reasonOtherText->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() - st::defaultInputField.textMargins.left(), _reasonOther->bottomNoMargins() + st::newGroupDescriptionPadding.top());
+		_reasonOtherText->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left() -
+		                                 st::defaultInputField.textMargins.left(),
+		                             _reasonOther->bottomNoMargins() + st::newGroupDescriptionPadding.top());
 	}
 }
 
@@ -69,7 +77,9 @@ void ReportBox::reasonChanged(Reason reason) {
 			_reasonOtherText->show();
 			_reasonOtherText->setCtrlEnterSubmit(Ui::CtrlEnterSubmit::Both);
 			_reasonOtherText->setMaxLength(MaxPhotoCaption);
-			_reasonOtherText->resize(width() - (st::boxPadding.left() + st::boxOptionListPadding.left() + st::boxPadding.right()), _reasonOtherText->height());
+			_reasonOtherText->resize(
+			    width() - (st::boxPadding.left() + st::boxOptionListPadding.left() + st::boxPadding.right()),
+			    _reasonOtherText->height());
 
 			updateMaxHeight();
 			connect(_reasonOtherText, SIGNAL(resized()), this, SLOT(onReasonResized()));
@@ -113,7 +123,8 @@ void ReportBox::onReport() {
 		}
 		Unexpected("Bad reason group value.");
 	};
-	_requestId = MTP::send(MTPaccount_ReportPeer(_peer->input, getReason()), rpcDone(&ReportBox::reportDone), rpcFail(&ReportBox::reportFail));
+	_requestId = MTP::send(MTPaccount_ReportPeer(_peer->input, getReason()), rpcDone(&ReportBox::reportDone),
+	                       rpcFail(&ReportBox::reportFail));
 }
 
 void ReportBox::reportDone(const MTPBool &result) {
@@ -132,9 +143,12 @@ bool ReportBox::reportFail(const RPCError &error) {
 }
 
 void ReportBox::updateMaxHeight() {
-	auto newHeight = st::boxOptionListPadding.top() + _reasonSpam->getMargins().top() + 4 * _reasonSpam->heightNoMargins() + 3 * st::boxOptionListSkip + _reasonSpam->getMargins().bottom() + st::boxOptionListPadding.bottom();
+	auto newHeight = st::boxOptionListPadding.top() + _reasonSpam->getMargins().top() +
+	                 4 * _reasonSpam->heightNoMargins() + 3 * st::boxOptionListSkip +
+	                 _reasonSpam->getMargins().bottom() + st::boxOptionListPadding.bottom();
 	if (_reasonOtherText) {
-		newHeight += st::newGroupDescriptionPadding.top() + _reasonOtherText->height() + st::newGroupDescriptionPadding.bottom();
+		newHeight +=
+		    st::newGroupDescriptionPadding.top() + _reasonOtherText->height() + st::newGroupDescriptionPadding.bottom();
 	}
 	setDimensions(st::boxWidth, newHeight);
 }
diff --git a/Telegram/SourceFiles/boxes/report_box.h b/Telegram/SourceFiles/boxes/report_box.h
index 9d588179a..cfbb33d83 100644
--- a/Telegram/SourceFiles/boxes/report_box.h
+++ b/Telegram/SourceFiles/boxes/report_box.h
@@ -23,10 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/abstract_box.h"
 
 namespace Ui {
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
 class InputArea;
 } // namespace Ui
 
@@ -34,7 +32,7 @@ class ReportBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	ReportBox(QWidget*, PeerData *peer);
+	ReportBox(QWidget *, PeerData *peer);
 
 private slots:
 	void onReport();
@@ -69,8 +67,7 @@ private:
 	object_ptr<Ui::Radioenum<Reason>> _reasonViolence;
 	object_ptr<Ui::Radioenum<Reason>> _reasonPornography;
 	object_ptr<Ui::Radioenum<Reason>> _reasonOther;
-	object_ptr<Ui::InputArea> _reasonOtherText = { nullptr };
+	object_ptr<Ui::InputArea> _reasonOtherText = {nullptr};
 
 	mtpRequestId _requestId = 0;
-
 };
diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.cpp b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
index 747e270a9..8b7873daf 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.cpp
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
@@ -21,61 +21,68 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/self_destruction_box.h"
 
 #include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
-#include "styles/style_boxes.h"
 
 void SelfDestructionBox::prepare() {
 	setTitle(langFactory(lng_self_destruct_title));
 
-	_ttlValues = { 30, 90, 180, 365 };
+	_ttlValues = {30, 90, 180, 365};
 
-	auto fake = object_ptr<Ui::FlatLabel>(this, lang(lng_self_destruct_description), Ui::FlatLabel::InitType::Simple, st::boxLabel);
-	auto boxHeight = st::boxOptionListPadding.top()
-		+ fake->height() + st::boxMediumSkip
-		+ _ttlValues.size() * (st::defaultRadio.diameter + st::boxOptionListSkip) - st::boxOptionListSkip
-		+ st::boxOptionListPadding.bottom() + st::boxPadding.bottom();
+	auto fake = object_ptr<Ui::FlatLabel>(this, lang(lng_self_destruct_description), Ui::FlatLabel::InitType::Simple,
+	                                      st::boxLabel);
+	auto boxHeight = st::boxOptionListPadding.top() + fake->height() + st::boxMediumSkip +
+	                 _ttlValues.size() * (st::defaultRadio.diameter + st::boxOptionListSkip) - st::boxOptionListSkip +
+	                 st::boxOptionListPadding.bottom() + st::boxPadding.bottom();
 	fake.destroy();
 
 	setDimensions(st::boxWidth, boxHeight);
 
-	auto loading = object_ptr<Ui::FlatLabel>(this, lang(lng_contacts_loading), Ui::FlatLabel::InitType::Simple, st::membersAbout);
+	auto loading =
+	    object_ptr<Ui::FlatLabel>(this, lang(lng_contacts_loading), Ui::FlatLabel::InitType::Simple, st::membersAbout);
 	loading->moveToLeft((st::boxWidth - loading->width()) / 2, boxHeight / 3);
 
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	request(MTPaccount_GetAccountTTL()).done([this, loading = std::move(loading)](const MTPAccountDaysTTL &result) mutable {
-		Expects(result.type() == mtpc_accountDaysTTL);
-		Expects(!_ttlValues.empty());
+	request(MTPaccount_GetAccountTTL())
+	    .done([this, loading = std::move(loading)](const MTPAccountDaysTTL &result) mutable {
+		    Expects(result.type() == mtpc_accountDaysTTL);
+		    Expects(!_ttlValues.empty());
 
-		loading.destroy();
-		auto y = st::boxOptionListPadding.top();
-		_description.create(this, lang(lng_self_destruct_description), Ui::FlatLabel::InitType::Simple, st::boxLabel);
-		_description->moveToLeft(st::boxPadding.left(), y);
-		y += _description->height() + st::boxMediumSkip;
+		    loading.destroy();
+		    auto y = st::boxOptionListPadding.top();
+		    _description.create(this, lang(lng_self_destruct_description), Ui::FlatLabel::InitType::Simple,
+		                        st::boxLabel);
+		    _description->moveToLeft(st::boxPadding.left(), y);
+		    y += _description->height() + st::boxMediumSkip;
 
-		auto current = result.c_accountDaysTTL().vdays.v;
-		auto currentAdjusted = _ttlValues[0];
-		for (auto days : _ttlValues) {
-			if (qAbs(current - days) < qAbs(current - currentAdjusted)) {
-				currentAdjusted = days;
-			}
-		}
-		auto group = std::make_shared<Ui::RadiobuttonGroup>(currentAdjusted);
-		auto count = int(_ttlValues.size());
-		_options.reserve(count);
-		for (auto days : _ttlValues) {
-			_options.emplace_back(this, group, days, (days > 364) ? lng_self_destruct_years(lt_count, days / 365) : lng_self_destruct_months(lt_count, std::max(days / 30, 1)), st::langsButton);
-			_options.back()->moveToLeft(st::boxPadding.left(), y);
-			y += _options.back()->heightNoMargins() + st::boxOptionListSkip;
-		}
-		showChildren();
+		    auto current = result.c_accountDaysTTL().vdays.v;
+		    auto currentAdjusted = _ttlValues[0];
+		    for (auto days : _ttlValues) {
+			    if (qAbs(current - days) < qAbs(current - currentAdjusted)) {
+				    currentAdjusted = days;
+			    }
+		    }
+		    auto group = std::make_shared<Ui::RadiobuttonGroup>(currentAdjusted);
+		    auto count = int(_ttlValues.size());
+		    _options.reserve(count);
+		    for (auto days : _ttlValues) {
+			    _options.emplace_back(this, group, days,
+			                          (days > 364) ? lng_self_destruct_years(lt_count, days / 365) :
+			                                         lng_self_destruct_months(lt_count, std::max(days / 30, 1)),
+			                          st::langsButton);
+			    _options.back()->moveToLeft(st::boxPadding.left(), y);
+			    y += _options.back()->heightNoMargins() + st::boxOptionListSkip;
+		    }
+		    showChildren();
 
-		clearButtons();
-		addButton(langFactory(lng_settings_save), [this, group] {
-			MTP::send(MTPaccount_SetAccountTTL(MTP_accountDaysTTL(MTP_int(group->value()))));
-			closeBox();
-		});
-		addButton(langFactory(lng_cancel), [this] { closeBox(); });
-	}).send();
+		    clearButtons();
+		    addButton(langFactory(lng_settings_save), [this, group] {
+			    MTP::send(MTPaccount_SetAccountTTL(MTP_accountDaysTTL(MTP_int(group->value()))));
+			    closeBox();
+		    });
+		    addButton(langFactory(lng_cancel), [this] { closeBox(); });
+	    })
+	    .send();
 }
diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.h b/Telegram/SourceFiles/boxes/self_destruction_box.h
index 8b4740164..d8cedc0df 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.h
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.h
@@ -33,16 +33,14 @@ class SelfDestructionBox : public BoxContent, private MTP::Sender {
 	Q_OBJECT
 
 public:
-	SelfDestructionBox(QWidget*) {
-	}
+	SelfDestructionBox(QWidget*) {}
 
 protected:
 	void prepare() override;
 
 private:
 	std::vector<int> _ttlValues;
-	object_ptr<Ui::FlatLabel> _description = { nullptr };
+	object_ptr<Ui::FlatLabel> _description = {nullptr};
 	std::shared_ptr<Ui::RadiobuttonGroup> _ttlGroup;
 	std::vector<object_ptr<Ui::Radiobutton>> _options;
-
 };
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 79e7b2463..923701fb5 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/send_files_box.h"
 
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "mainwidget.h"
-#include "history/history_media_types.h"
 #include "core/file_utilities.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
-#include "styles/style_history.h"
-#include "styles/style_boxes.h"
+#include "history/history_media_types.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
 #include "media/media_clip_reader.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_history.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/input_fields.h"
 #include "window/window_controller.h"
 
 namespace {
@@ -43,18 +43,18 @@ bool ValidatePhotoDimensions(int width, int height) {
 
 } // namespace
 
-SendFilesBox::SendFilesBox(QWidget*, QImage image, CompressConfirm compressed)
-: _image(image)
-, _compressConfirm(compressed)
-, _caption(this, st::confirmCaptionArea, langFactory(lng_photo_caption)) {
+SendFilesBox::SendFilesBox(QWidget *, QImage image, CompressConfirm compressed)
+    : _image(image)
+    , _compressConfirm(compressed)
+    , _caption(this, st::confirmCaptionArea, langFactory(lng_photo_caption)) {
 	_files.push_back(QString());
 	prepareSingleFileLayout();
 }
 
-SendFilesBox::SendFilesBox(QWidget*, const QStringList &files, CompressConfirm compressed)
-: _files(files)
-, _compressConfirm(compressed)
-, _caption(this, st::confirmCaptionArea, langFactory(_files.size() > 1 ? lng_photos_comment : lng_photo_caption)) {
+SendFilesBox::SendFilesBox(QWidget *, const QStringList &files, CompressConfirm compressed)
+    : _files(files)
+    , _compressConfirm(compressed)
+    , _caption(this, st::confirmCaptionArea, langFactory(_files.size() > 1 ? lng_photos_comment : lng_photo_caption)) {
 	if (_files.size() == 1) {
 		prepareSingleFileLayout();
 	}
@@ -79,8 +79,11 @@ void SendFilesBox::prepareSingleFileLayout() {
 			if (originalWidth > originalHeight) {
 				thumbWidth = (originalWidth * st::msgFileThumbSize) / originalHeight;
 			}
-			auto options = Images::Option::Smooth | Images::Option::RoundedSmall | Images::Option::RoundedTopLeft | Images::Option::RoundedTopRight | Images::Option::RoundedBottomLeft | Images::Option::RoundedBottomRight;
-			_fileThumb = Images::pixmap(image, thumbWidth * cIntRetinaFactor(), 0, options, st::msgFileThumbSize, st::msgFileThumbSize);
+			auto options = Images::Option::Smooth | Images::Option::RoundedSmall | Images::Option::RoundedTopLeft |
+			               Images::Option::RoundedTopRight | Images::Option::RoundedBottomLeft |
+			               Images::Option::RoundedBottomRight;
+			_fileThumb = Images::pixmap(image, thumbWidth * cIntRetinaFactor(), 0, options, st::msgFileThumbSize,
+			                            st::msgFileThumbSize);
 		} else {
 			auto maxW = 0;
 			auto maxH = 0;
@@ -100,7 +103,8 @@ void SendFilesBox::prepareSingleFileLayout() {
 						maxH = limitH;
 					}
 				}
-				image = Images::prepare(image, maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(), Images::Option::Smooth | Images::Option::Blurred, maxW, maxH);
+				image = Images::prepare(image, maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(),
+				                        Images::Option::Smooth | Images::Option::Blurred, maxW, maxH);
 			}
 			auto originalWidth = image.width();
 			auto originalHeight = image.height();
@@ -120,7 +124,8 @@ void SendFilesBox::prepareSingleFileLayout() {
 			}
 			_previewLeft = (st::boxWideWidth - _previewWidth) / 2;
 
-			image = std::move(image).scaled(_previewWidth * cIntRetinaFactor(), _previewHeight * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+			image = std::move(image).scaled(_previewWidth * cIntRetinaFactor(), _previewHeight * cIntRetinaFactor(),
+			                                Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 			image = Images::prepareOpaque(std::move(image));
 			_preview = App::pixmapFromImageInPlace(std::move(image));
 			_preview.setDevicePixelRatio(cRetinaFactor());
@@ -145,9 +150,8 @@ void SendFilesBox::prepareGifPreview() {
 		return _animated;
 	};
 	if (createGifPreview()) {
-		_gifPreview = Media::Clip::MakeReader(_files.front(), [this](Media::Clip::Notification notification) {
-			clipCallback(notification);
-		});
+		_gifPreview = Media::Clip::MakeReader(
+		    _files.front(), [this](Media::Clip::Notification notification) { clipCallback(notification); });
 		if (_gifPreview) _gifPreview->setAutoplay();
 	}
 }
@@ -162,7 +166,8 @@ void SendFilesBox::clipCallback(Media::Clip::Notification notification) {
 
 		if (_gifPreview && _gifPreview->ready() && !_gifPreview->started()) {
 			auto s = QSize(_previewWidth, _previewHeight);
-			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, ImageRoundCorner::None);
+			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None,
+			                   ImageRoundCorner::None);
 		}
 
 		update();
@@ -219,10 +224,10 @@ void SendFilesBox::tryToReadSingleFile() {
 	}
 }
 
-SendFilesBox::SendFilesBox(QWidget*, const QString &phone, const QString &firstname, const QString &lastname)
-: _contactPhone(phone)
-, _contactFirstName(firstname)
-, _contactLastName(lastname) {
+SendFilesBox::SendFilesBox(QWidget *, const QString &phone, const QString &firstname, const QString &lastname)
+    : _contactPhone(phone)
+    , _contactFirstName(firstname)
+    , _contactLastName(lastname) {
 	auto name = lng_full_name(lt_first_name, _contactFirstName, lt_last_name, _contactLastName);
 	_nameText.setText(st::semiboldTextStyle, name, _textNameOptions);
 	_statusText = _contactPhone;
@@ -241,7 +246,8 @@ void SendFilesBox::prepare() {
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
 	if (_compressConfirm != CompressConfirm::None) {
-		auto compressed = (_compressConfirm == CompressConfirm::Auto) ? cCompressPastedImage() : (_compressConfirm == CompressConfirm::Yes);
+		auto compressed = (_compressConfirm == CompressConfirm::Auto) ? cCompressPastedImage() :
+		                                                                (_compressConfirm == CompressConfirm::Yes);
 		auto text = lng_send_images_compress(lt_count, _files.size());
 		_compressed.create(this, text, compressed, st::defaultBoxCheckbox);
 		subscribe(_compressed->checkedChanged, [this](bool checked) { onCompressedChange(); });
@@ -286,7 +292,8 @@ void SendFilesBox::onCaptionResized() {
 }
 
 void SendFilesBox::updateTitleText() {
-	_titleText = (_compressConfirm == CompressConfirm::None) ? lng_send_files_selected(lt_count, _files.size()) : lng_send_images_selected(lt_count, _files.size());
+	_titleText = (_compressConfirm == CompressConfirm::None) ? lng_send_files_selected(lt_count, _files.size()) :
+	                                                           lng_send_images_selected(lt_count, _files.size());
 	update();
 }
 
@@ -295,11 +302,13 @@ void SendFilesBox::updateBoxSize() {
 	if (!_preview.isNull()) {
 		newHeight += st::boxPhotoPadding.top() + _previewHeight;
 	} else if (!_fileThumb.isNull()) {
-		newHeight += st::boxPhotoPadding.top() + st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom();
+		newHeight += st::boxPhotoPadding.top() + st::msgFileThumbPadding.top() + st::msgFileThumbSize +
+		             st::msgFileThumbPadding.bottom();
 	} else if (_files.size() > 1) {
 		newHeight += 0;
 	} else {
-		newHeight += st::boxPhotoPadding.top() + st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
+		newHeight +=
+		    st::boxPhotoPadding.top() + st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
 	}
 	if (_compressed) {
 		newHeight += st::boxPhotoCompressedSkip + _compressed->heightNoMargins();
@@ -312,7 +321,8 @@ void SendFilesBox::updateBoxSize() {
 
 void SendFilesBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-		onSend((e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier)) && e->modifiers().testFlag(Qt::ShiftModifier));
+		onSend((e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier)) &&
+		       e->modifiers().testFlag(Qt::ShiftModifier));
 	} else {
 		BoxContent::keyPressEvent(e);
 	}
@@ -331,21 +341,27 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 
 	if (!_preview.isNull()) {
 		if (_previewLeft > st::boxPhotoPadding.left()) {
-			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
+			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(),
+			           _previewHeight, st::confirmBg);
 		}
 		if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) {
-			p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
+			p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(),
+			           width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight,
+			           st::confirmBg);
 		}
 		if (_gifPreview && _gifPreview->started()) {
 			auto s = QSize(_previewWidth, _previewHeight);
 			auto paused = controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
-			auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, ImageRoundCorner::None, paused ? 0 : getms());
+			auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None,
+			                                  ImageRoundCorner::None, paused ? 0 : getms());
 			p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), frame);
 		} else {
 			p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), _preview);
 		}
 		if (_animated && !_gifPreview) {
-			auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+			auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2,
+			                   st::boxPhotoPadding.top() + (_previewHeight - st::msgFileSize) / 2, st::msgFileSize,
+			                   st::msgFileSize);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgDateImgBg);
 
@@ -359,7 +375,9 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 		}
 	} else if (_files.size() < 2) {
 		auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-		auto h = _fileThumb.isNull() ? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom()) : (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
+		auto h = _fileThumb.isNull() ?
+		             (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom()) :
+		             (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
 		auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
 		if (_fileThumb.isNull()) {
 			nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
@@ -373,14 +391,16 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 			statustop = st::msgFileThumbStatusTop;
 			linktop = st::msgFileThumbLinkTop;
 		}
-		auto namewidth = w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
+		auto namewidth =
+		    w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
 		qint32 x = (width() - w) / 2, y = st::boxPhotoPadding.top();
 
 		App::roundRect(p, x, y, w, h, st::msgOutBg, MessageOutCorners, &st::msgOutShadow);
 
 		if (_fileThumb.isNull()) {
 			if (_contactPhone.isNull()) {
-				QRect inner(rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, width()));
+				QRect inner(rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize,
+				                    st::msgFileSize, width()));
 				p.setPen(Qt::NoPen);
 				p.setBrush(st::msgFileOutBg);
 
@@ -389,13 +409,16 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 					p.drawEllipse(inner);
 				}
 
-				auto &icon = _fileIsAudio ? st::historyFileOutPlay : _fileIsImage ? st::historyFileOutImage : st::historyFileOutDocument;
+				auto &icon = _fileIsAudio ? st::historyFileOutPlay :
+				                            _fileIsImage ? st::historyFileOutImage : st::historyFileOutDocument;
 				icon.paintInCenter(p, inner);
 			} else {
-				_contactPhotoEmpty.paint(p, x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), width(), st::msgFileSize);
+				_contactPhotoEmpty.paint(p, x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), width(),
+				                         st::msgFileSize);
 			}
 		} else {
-			QRect rthumb(rtlrect(x + st::msgFileThumbPadding.left(), y + st::msgFileThumbPadding.top(), st::msgFileThumbSize, st::msgFileThumbSize, width()));
+			QRect rthumb(rtlrect(x + st::msgFileThumbPadding.left(), y + st::msgFileThumbPadding.top(),
+			                     st::msgFileThumbSize, st::msgFileThumbSize, width()));
 			p.drawPixmap(rthumb.topLeft(), _fileThumb);
 		}
 		p.setFont(st::semiboldFont);
@@ -417,7 +440,8 @@ void SendFilesBox::resizeEvent(QResizeEvent *e) {
 void SendFilesBox::updateControlsGeometry() {
 	auto bottom = height();
 	if (_caption) {
-		_caption->resize(st::boxWideWidth - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(), _caption->height());
+		_caption->resize(st::boxWideWidth - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(),
+		                 _caption->height());
 		_caption->moveToLeft(st::boxPhotoPadding.left(), bottom - _caption->height());
 		bottom -= st::boxPhotoCaptionSkip + _caption->height();
 	}
@@ -443,13 +467,17 @@ void SendFilesBox::onSend(bool ctrlShiftEnter) {
 	_confirmed = true;
 	if (_confirmedCallback) {
 		auto compressed = _compressed ? _compressed->checked() : false;
-		auto caption = _caption ? TextUtilities::PrepareForSending(_caption->getLastText(), TextUtilities::PrepareTextOption::CheckLinks) : QString();
-		_confirmedCallback(_files, _animated ? QImage() : _image, std::move(_information), compressed, caption, ctrlShiftEnter);
+		auto caption = _caption ? TextUtilities::PrepareForSending(_caption->getLastText(),
+		                                                           TextUtilities::PrepareTextOption::CheckLinks) :
+		                          QString();
+		_confirmedCallback(_files, _animated ? QImage() : _image, std::move(_information), compressed, caption,
+		                   ctrlShiftEnter);
 	}
 	closeBox();
 }
 
-EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) : _msgId(msgId) {
+EditCaptionBox::EditCaptionBox(QWidget *, HistoryMedia *media, FullMsgId msgId)
+    : _msgId(msgId) {
 	Expects(media->canEditCaption());
 
 	QSize dimensions;
@@ -460,21 +488,21 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 	switch (media->type()) {
 	case MediaTypeGif: {
 		_animated = true;
-		doc = static_cast<HistoryGif*>(media)->getDocument();
+		doc = static_cast<HistoryGif *>(media)->getDocument();
 		dimensions = doc->dimensions;
 		image = doc->thumb;
 	} break;
 
 	case MediaTypePhoto: {
 		_photo = true;
-		auto photo = static_cast<HistoryPhoto*>(media)->photo();
+		auto photo = static_cast<HistoryPhoto *>(media)->photo();
 		dimensions = QSize(photo->full->width(), photo->full->height());
 		image = photo->full;
 	} break;
 
 	case MediaTypeVideo: {
 		_animated = true;
-		doc = static_cast<HistoryVideo*>(media)->getDocument();
+		doc = static_cast<HistoryVideo *>(media)->getDocument();
 		dimensions = doc->dimensions;
 		image = doc->thumb;
 	} break;
@@ -483,7 +511,7 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 	case MediaTypeMusicFile:
 	case MediaTypeVoiceFile: {
 		_doc = true;
-		doc = static_cast<HistoryDocument*>(media)->getDocument();
+		doc = static_cast<HistoryDocument *>(media)->getDocument();
 		image = doc->thumb;
 	} break;
 	}
@@ -499,8 +527,11 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 			} else {
 				_thumbw = st::msgFileThumbSize;
 			}
-			auto options = Images::Option::Smooth | Images::Option::RoundedSmall | Images::Option::RoundedTopLeft | Images::Option::RoundedTopRight | Images::Option::RoundedBottomLeft | Images::Option::RoundedBottomRight;
-			_thumb = Images::pixmap(image->pix().toImage(), _thumbw * cIntRetinaFactor(), 0, options, st::msgFileThumbSize, st::msgFileThumbSize);
+			auto options = Images::Option::Smooth | Images::Option::RoundedSmall | Images::Option::RoundedTopLeft |
+			               Images::Option::RoundedTopRight | Images::Option::RoundedBottomLeft |
+			               Images::Option::RoundedBottomRight;
+			_thumb = Images::pixmap(image->pix().toImage(), _thumbw * cIntRetinaFactor(), 0, options,
+			                        st::msgFileThumbSize, st::msgFileThumbSize);
 		}
 
 		if (doc) {
@@ -532,12 +563,14 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 					maxH = limitH;
 				}
 			}
-			_thumb = image->pixNoCache(maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(), Images::Option::Smooth | Images::Option::Blurred, maxW, maxH);
+			_thumb = image->pixNoCache(maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(),
+			                           Images::Option::Smooth | Images::Option::Blurred, maxW, maxH);
 			prepareGifPreview(doc);
 		} else {
 			maxW = dimensions.width();
 			maxH = dimensions.height();
-			_thumb = image->pixNoCache(maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(), Images::Option::Smooth, maxW, maxH);
+			_thumb = image->pixNoCache(maxW * cIntRetinaFactor(), maxH * cIntRetinaFactor(), Images::Option::Smooth,
+			                           maxW, maxH);
 		}
 		qint32 tw = _thumb.width(), th = _thumb.height();
 		if (!tw || !th) {
@@ -558,7 +591,9 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 		}
 		_thumbx = (st::boxWideWidth - _thumbw) / 2;
 
-		_thumb = App::pixmapFromImageInPlace(_thumb.toImage().scaled(_thumbw * cIntRetinaFactor(), _thumbh * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+		_thumb = App::pixmapFromImageInPlace(_thumb.toImage().scaled(_thumbw * cIntRetinaFactor(),
+		                                                             _thumbh * cIntRetinaFactor(),
+		                                                             Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 		_thumb.setDevicePixelRatio(cRetinaFactor());
 	}
 	Assert(_animated || _photo || _doc);
@@ -569,14 +604,11 @@ EditCaptionBox::EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId) :
 }
 
 void EditCaptionBox::prepareGifPreview(DocumentData *document) {
-	auto createGifPreview = [document] {
-		return (document && document->isAnimation());
-	};
+	auto createGifPreview = [document] { return (document && document->isAnimation()); };
 	auto createGifPreviewResult = createGifPreview(); // Clang freeze workaround.
 	if (createGifPreviewResult) {
-		_gifPreview = Media::Clip::MakeReader(document, _msgId, [this](Media::Clip::Notification notification) {
-			clipCallback(notification);
-		});
+		_gifPreview = Media::Clip::MakeReader(
+		    document, _msgId, [this](Media::Clip::Notification notification) { clipCallback(notification); });
 		if (_gifPreview) _gifPreview->setAutoplay();
 	}
 }
@@ -591,7 +623,8 @@ void EditCaptionBox::clipCallback(Media::Clip::Notification notification) {
 
 		if (_gifPreview && _gifPreview->ready() && !_gifPreview->started()) {
 			auto s = QSize(_thumbw, _thumbh);
-			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, ImageRoundCorner::None);
+			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None,
+			                   ImageRoundCorner::None);
 		}
 
 		update();
@@ -626,7 +659,8 @@ void EditCaptionBox::onCaptionResized() {
 }
 
 void EditCaptionBox::updateBoxSize() {
-	auto newHeight = st::boxPhotoPadding.top() + st::boxPhotoCaptionSkip + _field->height() + errorTopSkip() + st::normalFont->height;
+	auto newHeight = st::boxPhotoPadding.top() + st::boxPhotoCaptionSkip + _field->height() + errorTopSkip() +
+	                 st::normalFont->height;
 	if (_photo || _animated) {
 		newHeight += _thumbh;
 	} else if (_thumbw) {
@@ -650,21 +684,25 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 
 	if (_photo || _animated) {
 		if (_thumbx > st::boxPhotoPadding.left()) {
-			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _thumbx - st::boxPhotoPadding.left(), _thumbh, st::confirmBg);
+			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _thumbx - st::boxPhotoPadding.left(),
+			           _thumbh, st::confirmBg);
 		}
 		if (_thumbx + _thumbw < width() - st::boxPhotoPadding.right()) {
-			p.fillRect(_thumbx + _thumbw, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _thumbx - _thumbw, _thumbh, st::confirmBg);
+			p.fillRect(_thumbx + _thumbw, st::boxPhotoPadding.top(),
+			           width() - st::boxPhotoPadding.right() - _thumbx - _thumbw, _thumbh, st::confirmBg);
 		}
 		if (_gifPreview && _gifPreview->started()) {
 			auto s = QSize(_thumbw, _thumbh);
 			auto paused = controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
-			auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, ImageRoundCorner::None, paused ? 0 : getms());
+			auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None,
+			                                  ImageRoundCorner::None, paused ? 0 : getms());
 			p.drawPixmap(_thumbx, st::boxPhotoPadding.top(), frame);
 		} else {
 			p.drawPixmap(_thumbx, st::boxPhotoPadding.top(), _thumb);
 		}
 		if (_animated && !_gifPreview) {
-			QRect inner(_thumbx + (_thumbw - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (_thumbh - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+			QRect inner(_thumbx + (_thumbw - st::msgFileSize) / 2,
+			            st::boxPhotoPadding.top() + (_thumbh - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgDateImgBg);
 
@@ -693,12 +731,12 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 		}
 		qint32 namewidth = w - nameleft - 0;
 		if (namewidth > _statusw) {
-			//w -= (namewidth - _statusw);
-			//namewidth = _statusw;
+			// w -= (namewidth - _statusw);
+			// namewidth = _statusw;
 		}
 		qint32 x = (width() - w) / 2, y = st::boxPhotoPadding.top();
 
-//		App::roundRect(p, x, y, w, h, st::msgInBg, MessageInCorners, &st::msgInShadow);
+		//		App::roundRect(p, x, y, w, h, st::msgInBg, MessageInCorners, &st::msgInShadow);
 
 		if (_thumbw) {
 			QRect rthumb(rtlrect(x + 0, y + 0, st::msgFileThumbSize, st::msgFileThumbSize, width()));
@@ -713,7 +751,8 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 				p.drawEllipse(inner);
 			}
 
-			auto icon = &(_isAudio ? st::historyFileInPlay : _isImage ? st::historyFileInImage : st::historyFileInDocument);
+			auto icon =
+			    &(_isAudio ? st::historyFileInPlay : _isImage ? st::historyFileInImage : st::historyFileInDocument);
 			icon->paintInCenter(p, inner);
 		}
 		p.setFont(st::semiboldFont);
@@ -740,7 +779,8 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 void EditCaptionBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 	_field->resize(st::boxWideWidth - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(), _field->height());
-	_field->moveToLeft(st::boxPhotoPadding.left(), height() - st::normalFont->height - errorTopSkip() - _field->height());
+	_field->moveToLeft(st::boxPhotoPadding.left(),
+	                   height() - st::normalFont->height - errorTopSkip() - _field->height());
 }
 
 void EditCaptionBox::setInnerFocus() {
@@ -766,7 +806,10 @@ void EditCaptionBox::onSave(bool ctrlShiftEnter) {
 		flags |= MTPmessages_EditMessage::Flag::f_entities;
 	}
 	auto text = TextUtilities::PrepareForSending(_field->getLastText(), TextUtilities::PrepareTextOption::CheckLinks);
-	_saveRequestId = MTP::send(MTPmessages_EditMessage(MTP_flags(flags), item->history()->peer->input, MTP_int(item->id), MTP_string(text), MTPnullMarkup, sentEntities), rpcDone(&EditCaptionBox::saveDone), rpcFail(&EditCaptionBox::saveFail));
+	_saveRequestId =
+	    MTP::send(MTPmessages_EditMessage(MTP_flags(flags), item->history()->peer->input, MTP_int(item->id),
+	                                      MTP_string(text), MTPnullMarkup, sentEntities),
+	              rpcDone(&EditCaptionBox::saveDone), rpcFail(&EditCaptionBox::saveFail));
 }
 
 void EditCaptionBox::saveDone(const MTPUpdates &updates) {
@@ -782,7 +825,8 @@ bool EditCaptionBox::saveFail(const RPCError &error) {
 
 	_saveRequestId = 0;
 	QString err = error.type();
-	if (err == qstr("MESSAGE_ID_INVALID") || err == qstr("CHAT_ADMIN_REQUIRED") || err == qstr("MESSAGE_EDIT_TIME_EXPIRED")) {
+	if (err == qstr("MESSAGE_ID_INVALID") || err == qstr("CHAT_ADMIN_REQUIRED") ||
+	    err == qstr("MESSAGE_EDIT_TIME_EXPIRED")) {
 		_error = lang(lng_edit_error);
 	} else if (err == qstr("MESSAGE_NOT_MODIFIED")) {
 		closeBox();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 172d858a5..9905764d3 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "boxes/abstract_box.h"
-#include "storage/localimageloader.h"
 #include "history/history_media.h"
+#include "storage/localimageloader.h"
 
 namespace Ui {
 class Checkbox;
@@ -34,11 +34,14 @@ class SendFilesBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	SendFilesBox(QWidget*, QImage image, CompressConfirm compressed);
-	SendFilesBox(QWidget*, const QStringList &files, CompressConfirm compressed);
-	SendFilesBox(QWidget*, const QString &phone, const QString &firstname, const QString &lastname);
+	SendFilesBox(QWidget *, QImage image, CompressConfirm compressed);
+	SendFilesBox(QWidget *, const QStringList &files, CompressConfirm compressed);
+	SendFilesBox(QWidget *, const QString &phone, const QString &firstname, const QString &lastname);
 
-	void setConfirmedCallback(base::lambda<void(const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, bool ctrlShiftEnter)> callback) {
+	void setConfirmedCallback(base::lambda<void(const QStringList &files, const QImage &image,
+	                                            std::unique_ptr<FileLoadTask::MediaInformation> information,
+	                                            bool compressed, const QString &caption, bool ctrlShiftEnter)>
+	                              callback) {
 		_confirmedCallback = std::move(callback);
 	}
 	void setCancelledCallback(base::lambda<void()> callback) {
@@ -99,22 +102,24 @@ private:
 	QString _contactLastName;
 	EmptyUserpic _contactPhotoEmpty;
 
-	base::lambda<void(const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, bool ctrlShiftEnter)> _confirmedCallback;
+	base::lambda<void(const QStringList &files, const QImage &image,
+	                  std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed,
+	                  const QString &caption, bool ctrlShiftEnter)>
+	    _confirmedCallback;
 	base::lambda<void()> _cancelledCallback;
 	bool _confirmed = false;
 
-	object_ptr<Ui::InputArea> _caption = { nullptr };
-	object_ptr<Ui::Checkbox> _compressed = { nullptr };
+	object_ptr<Ui::InputArea> _caption = {nullptr};
+	object_ptr<Ui::Checkbox> _compressed = {nullptr};
 
 	QPointer<Ui::RoundButton> _send;
-
 };
 
 class EditCaptionBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	EditCaptionBox(QWidget*, HistoryMedia *media, FullMsgId msgId);
+	EditCaptionBox(QWidget *, HistoryMedia *media, FullMsgId msgId);
 
 public slots:
 	void onCaptionResized();
@@ -148,7 +153,7 @@ private:
 	QPixmap _thumb;
 	Media::Clip::ReaderPointer _gifPreview;
 
-	object_ptr<Ui::InputArea> _field = { nullptr };
+	object_ptr<Ui::InputArea> _field = {nullptr};
 
 	int _thumbx = 0;
 	int _thumby = 0;
@@ -164,5 +169,4 @@ private:
 	mtpRequestId _saveRequestId = 0;
 
 	QString _error;
-
 };
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index 55caef6f8..35414a70c 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -20,19 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/sessions_box.h"
 
+#include "boxes/confirm_box.h"
+#include "countries.h"
 #include "lang/lang_keys.h"
-#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "countries.h"
-#include "boxes/confirm_box.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
-#include "styles/style_boxes.h"
 
-SessionsBox::SessionsBox(QWidget*)
-: _shortPollTimer(this) {
-}
+SessionsBox::SessionsBox(QWidget *)
+    : _shortPollTimer(this) {}
 
 void SessionsBox::prepare() {
 	setTitle(langFactory(lng_sessions_other_header));
@@ -85,7 +84,8 @@ void SessionsBox::gotAuthorizations(const MTPaccount_Authorizations &result) {
 	setLoading(false);
 
 	auto availCurrent = st::boxWideWidth - st::sessionPadding.left() - st::sessionTerminateSkip;
-	auto availOther = availCurrent - st::sessionTerminate.iconPosition.x();// -st::sessionTerminate.width - st::sessionTerminateSkip;
+	auto availOther =
+	    availCurrent - st::sessionTerminate.iconPosition.x(); // -st::sessionTerminate.width - st::sessionTerminateSkip;
 
 	_list.clear();
 	if (result.type() != mtpc_account_authorizations) {
@@ -104,24 +104,26 @@ void SessionsBox::gotAuthorizations(const MTPaccount_Authorizations &result) {
 		Data data;
 		data.hash = d.vhash.v;
 
-		QString appName, appVer = qs(d.vapp_version), systemVer = qs(d.vsystem_version), deviceModel = qs(d.vdevice_model);
+		QString appName, appVer = qs(d.vapp_version), systemVer = qs(d.vsystem_version),
+		                 deviceModel = qs(d.vdevice_model);
 		if (d.vapi_id.v == 2040 || d.vapi_id.v == 17349) {
 			appName = str_const_toString(AppName);
-		//	if (systemVer == qstr("windows")) {
-		//		deviceModel = qsl("Windows");
-		//	} else if (systemVer == qstr("os x")) {
-		//		deviceModel = qsl("OS X");
-		//	} else if (systemVer == qstr("linux")) {
-		//		deviceModel = qsl("Linux");
-		//	}
+			//	if (systemVer == qstr("windows")) {
+			//		deviceModel = qsl("Windows");
+			//	} else if (systemVer == qstr("os x")) {
+			//		deviceModel = qsl("OS X");
+			//	} else if (systemVer == qstr("linux")) {
+			//		deviceModel = qsl("Linux");
+			//	}
 			if (appVer == QString::number(appVer.toInt())) {
 				qint32 ver = appVer.toInt();
-				appVer = QString("%1.%2").arg(ver / 1000000).arg((ver % 1000000) / 1000) + ((ver % 1000) ? ('.' + QString::number(ver % 1000)) : QString());
-			//} else {
-			//	appVer = QString();
+				appVer = QString("%1.%2").arg(ver / 1000000).arg((ver % 1000000) / 1000) +
+				         ((ver % 1000) ? ('.' + QString::number(ver % 1000)) : QString());
+				//} else {
+				//	appVer = QString();
 			}
 		} else {
-			appName = qs(d.vapp_name);// +qsl(" for ") + qs(d.vplatform);
+			appName = qs(d.vapp_name); // +qsl(" for ") + qs(d.vplatform);
 			if (appVer.indexOf('(') >= 0) appVer = appVer.mid(appVer.indexOf('('));
 		}
 		data.name = appName;
@@ -129,13 +131,14 @@ void SessionsBox::gotAuthorizations(const MTPaccount_Authorizations &result) {
 		data.nameWidth = st::sessionNameFont->width(data.name);
 
 		QString country = qs(d.vcountry), platform = qs(d.vplatform);
-		//CountriesByISO2::const_iterator j = countries.constFind(country);
-		//if (j != countries.cend()) country = QString::fromUtf8(j.value()->name);
+		// CountriesByISO2::const_iterator j = countries.constFind(country);
+		// if (j != countries.cend()) country = QString::fromUtf8(j.value()->name);
 
 		MTPint active = d.vdate_active.v ? d.vdate_active : d.vdate_created;
 		data.activeTime = active.v;
 
-		data.info = qs(d.vdevice_model) + qstr(", ") + (platform.isEmpty() ? QString() : platform + ' ') + qs(d.vsystem_version);
+		data.info = qs(d.vdevice_model) + qstr(", ") + (platform.isEmpty() ? QString() : platform + ' ') +
+		            qs(d.vsystem_version);
 		data.ip = qs(d.vip) + (country.isEmpty() ? QString() : QString::fromUtf8(" \xe2\x80\x93 ") + country);
 		if (!data.hash || (d.vflags.v & 1)) {
 			data.active = lang(lng_sessions_header);
@@ -213,7 +216,7 @@ void SessionsBox::onShortPollAuthorizations() {
 
 void SessionsBox::onCheckNewAuthorization() {
 	onShortPollAuthorizations();
-//	_shortPollTimer.start(1000);
+	//	_shortPollTimer.start(1000);
 }
 
 void SessionsBox::onAllTerminated() {
@@ -228,10 +231,11 @@ void SessionsBox::onTerminateAll() {
 	setLoading(true);
 }
 
-SessionsBox::Inner::Inner(QWidget *parent, SessionsBox::List *list, SessionsBox::Data *current) : TWidget(parent)
-, _list(list)
-, _current(current)
-, _terminateAll(this, lang(lng_sessions_terminate_all), st::sessionTerminateAllButton) {
+SessionsBox::Inner::Inner(QWidget *parent, SessionsBox::List *list, SessionsBox::Data *current)
+    : TWidget(parent)
+    , _list(list)
+    , _current(current)
+    , _terminateAll(this, lang(lng_sessions_terminate_all), st::sessionTerminateAllButton) {
 	connect(_terminateAll, SIGNAL(clicked()), this, SLOT(onTerminateAll()));
 	_terminateAll->hide();
 	setAttribute(Qt::WA_OpaquePaintEvent);
@@ -242,7 +246,10 @@ void SessionsBox::Inner::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	p.fillRect(r, st::boxBg);
-	qint32 x = st::sessionPadding.left(), xact = st::sessionTerminateSkip + st::sessionTerminate.iconPosition.x();// st::sessionTerminateSkip + st::sessionTerminate.width + st::sessionTerminateSkip;
+	qint32 x = st::sessionPadding.left(),
+	       xact = st::sessionTerminateSkip +
+	              st::sessionTerminate.iconPosition
+	                  .x(); // st::sessionTerminateSkip + st::sessionTerminate.width + st::sessionTerminateSkip;
 	qint32 w = width();
 
 	if (_current->active.isEmpty() && _list->isEmpty()) {
@@ -264,15 +271,19 @@ void SessionsBox::Inner::paintEvent(QPaintEvent *e) {
 
 		p.setFont(st::sessionInfoFont);
 		p.setPen(st::boxTextFg);
-		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height, w, _current->info, _current->infoWidth);
+		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height, w, _current->info,
+		               _current->infoWidth);
 		p.setPen(st::sessionInfoFg);
-		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height + st::sessionInfoFont->height, w, _current->ip, _current->ipWidth);
+		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height + st::sessionInfoFont->height, w,
+		               _current->ip, _current->ipWidth);
 	}
 	p.translate(0, st::sessionCurrentHeight - st::sessionCurrentPadding.top());
 	if (_list->isEmpty()) {
 		p.setFont(st::sessionInfoFont);
 		p.setPen(st::sessionInfoFg);
-		p.drawText(QRect(st::sessionPadding.left(), 0, width() - st::sessionPadding.left() - st::sessionPadding.right(), st::noContactsHeight), lang(lng_sessions_other_desc), style::al_topleft);
+		p.drawText(QRect(st::sessionPadding.left(), 0, width() - st::sessionPadding.left() - st::sessionPadding.right(),
+		                 st::noContactsHeight),
+		           lang(lng_sessions_other_desc), style::al_topleft);
 		return;
 	}
 
@@ -296,7 +307,8 @@ void SessionsBox::Inner::paintEvent(QPaintEvent *e) {
 		p.setPen(st::boxTextFg);
 		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height, w, auth.info, auth.infoWidth);
 		p.setPen(st::sessionInfoFg);
-		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height + st::sessionInfoFont->height, w, auth.ip, auth.ipWidth);
+		p.drawTextLeft(x, st::sessionPadding.top() + st::sessionNameFont->height + st::sessionInfoFont->height, w,
+		               auth.ip, auth.ipWidth);
 
 		p.translate(0, st::sessionHeight);
 	}
@@ -306,32 +318,45 @@ void SessionsBox::Inner::onTerminate() {
 	for (auto i = _terminateButtons.begin(), e = _terminateButtons.end(); i != e; ++i) {
 		if (i.value()->isOver()) {
 			if (_terminateBox) _terminateBox->deleteLater();
-			_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_one_sure), lang(lng_settings_reset_button), st::attentionBoxButton, base::lambda_guarded(this, [this, terminating = i.key()] {
-				if (_terminateBox) {
-					_terminateBox->closeBox();
-					_terminateBox = nullptr;
-				}
-				MTP::send(MTPaccount_ResetAuthorization(MTP_long(terminating)), rpcDone(&Inner::terminateDone, terminating), rpcFail(&Inner::terminateFail, terminating));
-				auto i = _terminateButtons.find(terminating);
-				if (i != _terminateButtons.cend()) {
-					i.value()->clearState();
-					i.value()->hide();
-				}
-			})), KeepOtherLayers);
+			_terminateBox =
+			    Ui::show(Box<ConfirmBox>(
+			                 lang(lng_settings_reset_one_sure), lang(lng_settings_reset_button), st::attentionBoxButton,
+			                 base::lambda_guarded(this,
+			                                      [this, terminating = i.key()] {
+				                                      if (_terminateBox) {
+					                                      _terminateBox->closeBox();
+					                                      _terminateBox = nullptr;
+				                                      }
+				                                      MTP::send(MTPaccount_ResetAuthorization(MTP_long(terminating)),
+				                                                rpcDone(&Inner::terminateDone, terminating),
+				                                                rpcFail(&Inner::terminateFail, terminating));
+				                                      auto i = _terminateButtons.find(terminating);
+				                                      if (i != _terminateButtons.cend()) {
+					                                      i.value()->clearState();
+					                                      i.value()->hide();
+				                                      }
+			                                      })),
+			             KeepOtherLayers);
 		}
 	}
 }
 
 void SessionsBox::Inner::onTerminateAll() {
 	if (_terminateBox) _terminateBox->deleteLater();
-	_terminateBox = Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_sure), lang(lng_settings_reset_button), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-		if (_terminateBox) {
-			_terminateBox->closeBox();
-			_terminateBox = nullptr;
-		}
-		MTP::send(MTPauth_ResetAuthorizations(), rpcDone(&Inner::terminateAllDone), rpcFail(&Inner::terminateAllFail));
-		emit terminateAll();
-	})), KeepOtherLayers);
+	_terminateBox =
+	    Ui::show(Box<ConfirmBox>(lang(lng_settings_reset_sure), lang(lng_settings_reset_button), st::attentionBoxButton,
+	                             base::lambda_guarded(this,
+	                                                  [this] {
+		                                                  if (_terminateBox) {
+			                                                  _terminateBox->closeBox();
+			                                                  _terminateBox = nullptr;
+		                                                  }
+		                                                  MTP::send(MTPauth_ResetAuthorizations(),
+		                                                            rpcDone(&Inner::terminateAllDone),
+		                                                            rpcFail(&Inner::terminateAllFail));
+		                                                  emit terminateAll();
+	                                                  })),
+	             KeepOtherLayers);
 }
 
 void SessionsBox::Inner::terminateDone(quint64 hash, const MTPBool &result) {
@@ -367,7 +392,8 @@ bool SessionsBox::Inner::terminateAllFail(const RPCError &error) {
 }
 
 void SessionsBox::Inner::resizeEvent(QResizeEvent *e) {
-	_terminateAll->moveToLeft(st::sessionPadding.left(), st::sessionCurrentPadding.top() + st::sessionHeight + st::sessionCurrentPadding.bottom());
+	_terminateAll->moveToLeft(st::sessionPadding.left(),
+	                          st::sessionCurrentPadding.top() + st::sessionHeight + st::sessionCurrentPadding.bottom());
 }
 
 void SessionsBox::Inner::listUpdated() {
@@ -385,7 +411,8 @@ void SessionsBox::Inner::listUpdated() {
 			j = _terminateButtons.insert(_list->at(i).hash, new Ui::IconButton(this, st::sessionTerminate));
 			connect(j.value(), SIGNAL(clicked()), this, SLOT(onTerminate()));
 		}
-		j.value()->moveToRight(st::sessionTerminateSkip, st::sessionCurrentHeight + i * st::sessionHeight + st::sessionTerminateTop, width());
+		j.value()->moveToRight(st::sessionTerminateSkip,
+		                       st::sessionCurrentHeight + i * st::sessionHeight + st::sessionTerminateTop, width());
 		j.value()->show();
 	}
 	for (TerminateButtons::iterator i = _terminateButtons.begin(); i != _terminateButtons.cend();) {
@@ -396,6 +423,7 @@ void SessionsBox::Inner::listUpdated() {
 			i = _terminateButtons.erase(i);
 		}
 	}
-	resize(width(), _list->isEmpty() ? (st::sessionCurrentHeight + st::noContactsHeight) : (st::sessionCurrentHeight + _list->size() * st::sessionHeight));
+	resize(width(), _list->isEmpty() ? (st::sessionCurrentHeight + st::noContactsHeight) :
+	                                   (st::sessionCurrentHeight + _list->size() * st::sessionHeight));
 	update();
 }
diff --git a/Telegram/SourceFiles/boxes/sessions_box.h b/Telegram/SourceFiles/boxes/sessions_box.h
index 3a15ba5c1..1a06c340c 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.h
+++ b/Telegram/SourceFiles/boxes/sessions_box.h
@@ -34,7 +34,7 @@ class SessionsBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	SessionsBox(QWidget*);
+	SessionsBox(QWidget *);
 
 protected:
 	void prepare() override;
@@ -72,7 +72,6 @@ private:
 
 	object_ptr<SingleTimer> _shortPollTimer;
 	mtpRequestId _shortPollRequest = 0;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -107,10 +106,9 @@ private:
 	SessionsBox::List *_list;
 	SessionsBox::Data *_current;
 
-	typedef QMap<quint64, Ui::IconButton*> TerminateButtons;
+	typedef QMap<quint64, Ui::IconButton *> TerminateButtons;
 	TerminateButtons _terminateButtons;
 
 	object_ptr<Ui::LinkButton> _terminateAll;
 	QPointer<ConfirmBox> _terminateBox;
-
 };
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index a969f483f..d7be573f7 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -20,35 +20,35 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/share_box.h"
 
-#include "dialogs/dialogs_indexed_list.h"
-#include "styles/style_boxes.h"
-#include "styles/style_history.h"
-#include "observer_peer.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "base/qthelp_url.h"
-#include "storage/localstorage.h"
-#include "boxes/confirm_box.h"
 #include "apiwrap.h"
-#include "ui/toast/toast.h"
-#include "ui/widgets/multi_select.h"
+#include "auth_session.h"
+#include "base/qthelp_url.h"
+#include "boxes/confirm_box.h"
+#include "boxes/peer_list_box.h"
+#include "dialogs/dialogs_indexed_list.h"
 #include "history/history_media_types.h"
 #include "history/history_message.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_history.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/multi_select.h"
 #include "ui/widgets/scroll_area.h"
 #include "window/themes/window_theme.h"
-#include "boxes/peer_list_box.h"
-#include "auth_session.h"
-#include "messenger.h"
 
-ShareBox::ShareBox(QWidget*, CopyCallback &&copyCallback, SubmitCallback &&submitCallback, FilterCallback &&filterCallback)
-: _copyCallback(std::move(copyCallback))
-, _submitCallback(std::move(submitCallback))
-, _filterCallback(std::move(filterCallback))
-, _select(this, st::contactsMultiSelect, langFactory(lng_participant_filter))
-, _searchTimer(this) {
-}
+ShareBox::ShareBox(QWidget *, CopyCallback &&copyCallback, SubmitCallback &&submitCallback,
+                   FilterCallback &&filterCallback)
+    : _copyCallback(std::move(copyCallback))
+    , _submitCallback(std::move(submitCallback))
+    , _filterCallback(std::move(filterCallback))
+    , _select(this, st::contactsMultiSelect, langFactory(lng_participant_filter))
+    , _searchTimer(this) {}
 
 void ShareBox::prepare() {
 	_select->resizeToWidth(st::boxWideWidth);
@@ -57,7 +57,7 @@ void ShareBox::prepare() {
 	setTitle(langFactory(lng_share_title));
 
 	_inner = setInnerWidget(object_ptr<Inner>(this, std::move(_filterCallback)), getTopScrollSkip());
-	connect(_inner, SIGNAL(mustScrollTo(int,int)), this, SLOT(onMustScrollTo(int,int)));
+	connect(_inner, SIGNAL(mustScrollTo(int, int)), this, SLOT(onMustScrollTo(int, int)));
 
 	createButtons();
 
@@ -74,9 +74,8 @@ void ShareBox::prepare() {
 	_select->setResizedCallback([this] { updateScrollSkips(); });
 	_select->setSubmittedCallback([this](bool) { _inner->onSelectActive(); });
 	connect(_inner, SIGNAL(searchByUsername()), this, SLOT(onNeedSearchByUsername()));
-	_inner->setPeerSelectedChangedCallback([this](PeerData *peer, bool checked) {
-		onPeerSelectedChanged(peer, checked);
-	});
+	_inner->setPeerSelectedChangedCallback(
+	    [this](PeerData *peer, bool checked) { onPeerSelectedChanged(peer, checked); });
 
 	_searchTimer->setSingleShot(true);
 	connect(_searchTimer, SIGNAL(timeout()), this, SLOT(onSearchByUsername()));
@@ -116,7 +115,8 @@ bool ShareBox::onSearchByUsername(bool searchCache) {
 		} else if (_peopleQuery != query) {
 			_peopleQuery = query;
 			_peopleFull = false;
-			_peopleRequest = MTP::send(MTPcontacts_Search(MTP_string(_peopleQuery), MTP_int(SearchPeopleLimit)), rpcDone(&ShareBox::peopleReceived), rpcFail(&ShareBox::peopleFailed));
+			_peopleRequest = MTP::send(MTPcontacts_Search(MTP_string(_peopleQuery), MTP_int(SearchPeopleLimit)),
+			                           rpcDone(&ShareBox::peopleReceived), rpcFail(&ShareBox::peopleFailed));
 			_peopleQueries.insert(_peopleRequest, _peopleQuery);
 		}
 	}
@@ -274,9 +274,10 @@ void ShareBox::scrollAnimationCallback() {
 	// scrollArea()->scrollToY(scrollTop);
 }
 
-ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback) : TWidget(parent)
-, _filterCallback(std::move(filterCallback))
-, _chatsIndexed(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Add)) {
+ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback)
+    : TWidget(parent)
+    , _filterCallback(std::move(filterCallback))
+    , _chatsIndexed(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Add)) {
 	_rowsTop = st::shareRowsTop;
 	_rowHeight = st::shareRowHeight;
 	setAttribute(Qt::WA_OpaquePaintEvent);
@@ -294,9 +295,9 @@ ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallbac
 
 	using UpdateFlag = Notify::PeerUpdate::Flag;
 	auto observeEvents = UpdateFlag::NameChanged | UpdateFlag::PhotoChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
@@ -307,9 +308,7 @@ ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallbac
 }
 
 void ShareBox::Inner::invalidateCache() {
-	for_const (auto data, _dataMap) {
-		data->checkbox.invalidateCache();
-	}
+	for_const (auto data, _dataMap) { data->checkbox.invalidateCache(); }
 }
 
 void ShareBox::Inner::setVisibleTopBottom(int visibleTop, int visibleBottom) {
@@ -376,12 +375,12 @@ void ShareBox::Inner::repaintChatAtIndex(int index) {
 
 ShareBox::Inner::Chat *ShareBox::Inner::getChatAtIndex(int index) {
 	if (index < 0) return nullptr;
-	auto row = ([this, index]() -> Dialogs::Row* {
+	auto row = ([this, index]() -> Dialogs::Row * {
 		if (_filter.isEmpty()) return _chatsIndexed->rowAtY(index, 1);
 		return (index < _filtered.size()) ? _filtered[index] : nullptr;
 	})();
 	if (row) {
-		return static_cast<Chat*>(row->attached);
+		return static_cast<Chat *>(row->attached);
 	}
 
 	if (!_filter.isEmpty()) {
@@ -464,7 +463,7 @@ void ShareBox::Inner::loadProfilePhotos(int yFrom) {
 }
 
 ShareBox::Inner::Chat *ShareBox::Inner::getChat(Dialogs::Row *row) {
-	auto data = static_cast<Chat*>(row->attached);
+	auto data = static_cast<Chat *>(row->attached);
 	if (!data) {
 		auto peer = row->history()->peer;
 		auto i = _dataMap.constFind(peer);
@@ -484,9 +483,8 @@ void ShareBox::Inner::setActive(int active) {
 	if (active != _active) {
 		auto changeNameFg = [this](int index, double from, double to) {
 			if (auto chat = getChatAtIndex(index)) {
-				chat->nameActive.start([this, peer = chat->peer] {
-					repaintChat(peer);
-				}, from, to, st::shareActivateDuration);
+				chat->nameActive.start([this, peer = chat->peer] { repaintChat(peer); }, from, to,
+				                       st::shareActivateDuration);
 			}
 		};
 		changeNameFg(_active, 1., 0.);
@@ -516,10 +514,9 @@ void ShareBox::Inner::paintChat(Painter &p, TimeMs ms, Chat *chat, int index) {
 }
 
 ShareBox::Inner::Chat::Chat(PeerData *peer, base::lambda<void()> updateCallback)
-: peer(peer)
-, checkbox(st::sharePhotoCheckbox, updateCallback, PaintUserpicCallback(peer))
-, name(st::sharePhotoCheckbox.imageRadius * 2) {
-}
+    : peer(peer)
+    , checkbox(st::sharePhotoCheckbox, updateCallback, PaintUserpicCallback(peer))
+    , name(st::sharePhotoCheckbox.imageRadius * 2) {}
 
 void ShareBox::Inner::paintEvent(QPaintEvent *e) {
 	Painter p(this);
@@ -601,7 +598,8 @@ void ShareBox::Inner::updateUpon(const QPoint &pos) {
 	auto left = _rowsLeft + std::floor(column * _rowWidthReal) + st::shareColumnSkip / 2;
 	auto top = _rowsTop + row * _rowHeight + st::sharePhotoTop;
 	auto xupon = (x >= left) && (x < left + (_rowWidth - st::shareColumnSkip));
-	auto yupon = (y >= top) && (y < top + st::sharePhotoCheckbox.imageRadius * 2 + st::shareNameTop + st::shareNameStyle.font->height * 2);
+	auto yupon = (y >= top) && (y < top + st::sharePhotoCheckbox.imageRadius * 2 + st::shareNameTop +
+	                                    st::shareNameStyle.font->height * 2);
 	auto upon = (xupon && yupon) ? (row * _columnCount + column) : -1;
 	if (upon >= displayedChatsCount()) {
 		upon = -1;
@@ -783,13 +781,11 @@ void ShareBox::Inner::refresh() {
 }
 
 ShareBox::Inner::~Inner() {
-	for_const (auto chat, _dataMap) {
-		delete chat;
-	}
+	for_const (auto chat, _dataMap) { delete chat; }
 }
 
-QVector<PeerData*> ShareBox::Inner::selected() const {
-	QVector<PeerData*> result;
+QVector<PeerData *> ShareBox::Inner::selected() const {
+	QVector<PeerData *> result;
 	result.reserve(_dataMap.size());
 	for_const (auto chat, _dataMap) {
 		if (chat->checkbox.checked()) {
@@ -801,10 +797,10 @@ QVector<PeerData*> ShareBox::Inner::selected() const {
 
 QString AppendShareGameScoreUrl(const QString &url, const FullMsgId &fullId) {
 	auto shareHashData = QByteArray(0x10, Qt::Uninitialized);
-	auto shareHashDataInts = reinterpret_cast<qint32*>(shareHashData.data());
-	auto channel = fullId.channel ? App::channelLoaded(fullId.channel) : static_cast<ChannelData*>(nullptr);
+	auto shareHashDataInts = reinterpret_cast<qint32 *>(shareHashData.data());
+	auto channel = fullId.channel ? App::channelLoaded(fullId.channel) : static_cast<ChannelData *>(nullptr);
 	auto channelAccessHash = channel ? channel->access : 0ULL;
-	auto channelAccessHashInts = reinterpret_cast<qint32*>(&channelAccessHash);
+	auto channelAccessHashInts = reinterpret_cast<qint32 *>(&channelAccessHash);
 	shareHashDataInts[0] = Auth().userId();
 	shareHashDataInts[1] = fullId.channel;
 	shareHashDataInts[2] = fullId.msg;
@@ -816,10 +812,11 @@ QString AppendShareGameScoreUrl(const QString &url, const FullMsgId &fullId) {
 	hashSha1(shareHashData.constData(), shareHashData.size(), shareHashEncrypted.data());
 
 	// Mix in channel access hash to the first 64 bits of SHA1 of data.
-	*reinterpret_cast<quint64*>(shareHashEncrypted.data()) ^= *reinterpret_cast<quint64*>(channelAccessHashInts);
+	*reinterpret_cast<quint64 *>(shareHashEncrypted.data()) ^= *reinterpret_cast<quint64 *>(channelAccessHashInts);
 
 	// Encrypt data.
-	if (!Local::encrypt(shareHashData.constData(), shareHashEncrypted.data() + key128Size, shareHashData.size(), shareHashEncrypted.constData())) {
+	if (!Local::encrypt(shareHashData.constData(), shareHashEncrypted.data() + key128Size, shareHashData.size(),
+	                    shareHashEncrypted.constData())) {
 		return url;
 	}
 
@@ -845,7 +842,8 @@ QString AppendShareGameScoreUrl(const QString &url, const FullMsgId &fullId) {
 void ShareGameScoreByHash(const QString &hash) {
 	auto key128Size = 0x10;
 
-	auto hashEncrypted = QByteArray::fromBase64(hash.toLatin1(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+	auto hashEncrypted =
+	    QByteArray::fromBase64(hash.toLatin1(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
 	if (hashEncrypted.size() <= key128Size || (hashEncrypted.size() % 0x10) != 0) {
 		Ui::show(Box<InformBox>(lang(lng_confirm_phone_link_invalid)));
 		return;
@@ -853,16 +851,18 @@ void ShareGameScoreByHash(const QString &hash) {
 
 	// Decrypt data.
 	auto hashData = QByteArray(hashEncrypted.size() - key128Size, Qt::Uninitialized);
-	if (!Local::decrypt(hashEncrypted.constData() + key128Size, hashData.data(), hashEncrypted.size() - key128Size, hashEncrypted.constData())) {
+	if (!Local::decrypt(hashEncrypted.constData() + key128Size, hashData.data(), hashEncrypted.size() - key128Size,
+	                    hashEncrypted.constData())) {
 		return;
 	}
 
 	// Count SHA1() of data.
-	char dataSha1[20] = { 0 };
+	char dataSha1[20] = {0};
 	hashSha1(hashData.constData(), hashData.size(), dataSha1);
 
 	// Mix out channel access hash from the first 64 bits of SHA1 of data.
-	auto channelAccessHash = *reinterpret_cast<quint64*>(hashEncrypted.data()) ^ *reinterpret_cast<quint64*>(dataSha1);
+	auto channelAccessHash =
+	    *reinterpret_cast<quint64 *>(hashEncrypted.data()) ^ *reinterpret_cast<quint64 *>(dataSha1);
 
 	// Check next 64 bits of SHA1() of data.
 	auto skipSha1Part = sizeof(channelAccessHash);
@@ -871,14 +871,14 @@ void ShareGameScoreByHash(const QString &hash) {
 		return;
 	}
 
-	auto hashDataInts = reinterpret_cast<qint32*>(hashData.data());
+	auto hashDataInts = reinterpret_cast<qint32 *>(hashData.data());
 	if (!AuthSession::Exists() || hashDataInts[0] != Auth().userId()) {
 		Ui::show(Box<InformBox>(lang(lng_share_wrong_user)));
 		return;
 	}
 
 	// Check first 32 bits of channel access hash.
-	auto channelAccessHashInts = reinterpret_cast<qint32*>(&channelAccessHash);
+	auto channelAccessHashInts = reinterpret_cast<qint32 *>(&channelAccessHash);
 	if (channelAccessHashInts[0] != hashDataInts[3]) {
 		Ui::show(Box<InformBox>(lang(lng_share_wrong_user)));
 		return;
@@ -909,16 +909,18 @@ void ShareGameScoreByHash(const QString &hash) {
 		if (channel || !channelId) {
 			resolveMessageAndShareScore(channel);
 		} else {
-			auto requestChannelIds = MTP_vector<MTPInputChannel>(1, MTP_inputChannel(MTP_int(channelId), MTP_long(channelAccessHash)));
+			auto requestChannelIds =
+			    MTP_vector<MTPInputChannel>(1, MTP_inputChannel(MTP_int(channelId), MTP_long(channelAccessHash)));
 			auto requestChannel = MTPchannels_GetChannels(requestChannelIds);
-			MTP::send(requestChannel, rpcDone([channelId, resolveMessageAndShareScore](const MTPmessages_Chats &result) {
-				if (auto chats = Api::getChatsFromMessagesChats(result)) {
-					App::feedChats(*chats);
-				}
-				if (auto channel = App::channelLoaded(channelId)) {
-					resolveMessageAndShareScore(channel);
-				}
-			}));
+			MTP::send(requestChannel,
+			          rpcDone([channelId, resolveMessageAndShareScore](const MTPmessages_Chats &result) {
+				          if (auto chats = Api::getChatsFromMessagesChats(result)) {
+					          App::feedChats(*chats);
+				          }
+				          if (auto channel = App::channelLoaded(channelId)) {
+					          resolveMessageAndShareScore(channel);
+				          }
+			          }));
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index 6caf6cb1d..b9d484cb7 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "boxes/abstract_box.h"
 #include "base/observer.h"
+#include "boxes/abstract_box.h"
 #include "ui/effects/round_checkbox.h"
 
 namespace Dialogs {
@@ -45,9 +45,9 @@ class ShareBox : public BoxContent, public RPCSender {
 
 public:
 	using CopyCallback = base::lambda<void()>;
-	using SubmitCallback = base::lambda<void(const QVector<PeerData*> &)>;
-	using FilterCallback = base::lambda<bool(PeerData*)>;
-	ShareBox(QWidget*, CopyCallback &&copyCallback, SubmitCallback &&submitCallback, FilterCallback &&filterCallback);
+	using SubmitCallback = base::lambda<void(const QVector<PeerData *> &)>;
+	using FilterCallback = base::lambda<bool(PeerData *)>;
+	ShareBox(QWidget *, CopyCallback &&copyCallback, SubmitCallback &&submitCallback, FilterCallback &&filterCallback);
 
 protected:
 	void prepare() override;
@@ -104,7 +104,6 @@ private:
 	PeopleQueries _peopleQueries;
 
 	Animation _scrollAnimation;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -117,7 +116,7 @@ public:
 	void setPeerSelectedChangedCallback(base::lambda<void(PeerData *peer, bool selected)> callback);
 	void peerUnselected(PeerData *peer);
 
-	QVector<PeerData*> selected() const;
+	QVector<PeerData *> selected() const;
 	bool hasSelected() const;
 
 	void peopleReceived(const QString &query, const QVector<MTPPeer> &people);
@@ -195,12 +194,12 @@ private:
 	ShareBox::FilterCallback _filterCallback;
 	std::unique_ptr<Dialogs::IndexedList> _chatsIndexed;
 	QString _filter;
-	using FilteredDialogs = QVector<Dialogs::Row*>;
+	using FilteredDialogs = QVector<Dialogs::Row *>;
 	FilteredDialogs _filtered;
 
-	using DataMap = QMap<PeerData*, Chat*>;
+	using DataMap = QMap<PeerData *, Chat *>;
 	DataMap _dataMap;
-	using SelectedChats = OrderedSet<PeerData*>;
+	using SelectedChats = OrderedSet<PeerData *>;
 	SelectedChats _selected;
 
 	base::lambda<void(PeerData *peer, bool selected)> _peerSelectedChangedCallback;
@@ -209,9 +208,8 @@ private:
 
 	bool _searching = false;
 	QString _lastQuery;
-	using ByUsernameRows = QVector<PeerData*>;
-	using ByUsernameDatas = QVector<Chat*>;
+	using ByUsernameRows = QVector<PeerData *>;
+	using ByUsernameDatas = QVector<Chat *>;
 	ByUsernameRows _byUsernameFiltered;
 	ByUsernameDatas d_byUsernameFiltered;
-
 };
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 5c1d25a3c..d7c4c035c 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -20,20 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/sticker_set_box.h"
 
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "chat_helpers/stickers.h"
+#include "dialogs/dialogs_layout.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "chat_helpers/stickers.h"
-#include "boxes/confirm_box.h"
-#include "apiwrap.h"
+#include "messenger.h"
 #include "storage/localstorage.h"
-#include "dialogs/dialogs_layout.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
-#include "auth_session.h"
-#include "messenger.h"
 #include <QApplication>
 #include <QClipboard>
 
@@ -43,9 +43,8 @@ constexpr auto kStickersPanelPerRow = Stickers::kPanelPerRow;
 
 } // namespace
 
-StickerSetBox::StickerSetBox(QWidget*, const MTPInputStickerSet &set)
-: _set(set) {
-}
+StickerSetBox::StickerSetBox(QWidget *, const MTPInputStickerSet &set)
+    : _set(set) {}
 
 void StickerSetBox::prepare() {
 	setTitle(langFactory(lng_contacts_loading));
@@ -104,10 +103,14 @@ void StickerSetBox::resizeEvent(QResizeEvent *e) {
 	_inner->resize(width(), _inner->height());
 }
 
-StickerSetBox::Inner::Inner(QWidget *parent, const MTPInputStickerSet &set) : TWidget(parent)
-, _input(set) {
+StickerSetBox::Inner::Inner(QWidget *parent, const MTPInputStickerSet &set)
+    : TWidget(parent)
+    , _input(set) {
 	switch (set.type()) {
-	case mtpc_inputStickerSetID: _setId = set.c_inputStickerSetID().vid.v; _setAccess = set.c_inputStickerSetID().vaccess_hash.v; break;
+	case mtpc_inputStickerSetID:
+		_setId = set.c_inputStickerSetID().vid.v;
+		_setAccess = set.c_inputStickerSetID().vaccess_hash.v;
+		break;
 	case mtpc_inputStickerSetShortName: _setShortName = qs(set.c_inputStickerSetShortName().vshort_name); break;
 	}
 	MTP::send(MTPmessages_GetStickerSet(_input), rpcDone(&Inner::gotSet), rpcFail(&Inner::failedSet));
@@ -170,7 +173,9 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			auto &sets = Global::RefStickerSets();
 			auto it = sets.find(_setId);
 			if (it != sets.cend()) {
-				auto clientFlags = it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_unread | MTPDstickerSet_ClientFlag::f_special);
+				auto clientFlags =
+				    it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_not_loaded |
+				                 MTPDstickerSet_ClientFlag::f_unread | MTPDstickerSet_ClientFlag::f_special);
 				_setFlags |= clientFlags;
 				it->flags = _setFlags;
 				it->stickers = _pack;
@@ -183,7 +188,8 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 		Ui::show(Box<InformBox>(lang(lng_stickers_not_found)));
 	} else {
 		qint32 rows = _pack.size() / kStickersPanelPerRow + ((_pack.size() % kStickersPanelPerRow) ? 1 : 0);
-		resize(st::stickersPadding.left() + kStickersPanelPerRow * st::stickersSize.width(), st::stickersPadding.top() + rows * st::stickersSize.height() + st::stickersPadding.bottom());
+		resize(st::stickersPadding.left() + kStickersPanelPerRow * st::stickersSize.width(),
+		       st::stickersPadding.top() + rows * st::stickersSize.height() + st::stickersPadding.bottom());
 	}
 	_loaded = true;
 
@@ -216,7 +222,8 @@ void StickerSetBox::Inner::installDone(const MTPmessages_StickerSetInstallResult
 	_setFlags |= MTPDstickerSet::Flag::f_installed;
 	auto it = sets.find(_setId);
 	if (it == sets.cend()) {
-		it = sets.insert(_setId, Stickers::Set(_setId, _setAccess, _setTitle, _setShortName, _setCount, _setHash, _setFlags));
+		it = sets.insert(_setId,
+		                 Stickers::Set(_setId, _setAccess, _setTitle, _setShortName, _setCount, _setHash, _setFlags));
 	} else {
 		it->flags = _setFlags;
 	}
@@ -319,13 +326,15 @@ void StickerSetBox::Inner::setSelected(int selected) {
 
 void StickerSetBox::Inner::startOverAnimation(int index, double from, double to) {
 	if (index >= 0 && index < _packOvers.size()) {
-		_packOvers[index].start([this, index] {
-			int row = index / kStickersPanelPerRow;
-			int column = index % kStickersPanelPerRow;
-			int left = st::stickersPadding.left() + column * st::stickersSize.width();
-			int top = st::stickersPadding.top() + row * st::stickersSize.height();
-			rtlupdate(left, top, st::stickersSize.width(), st::stickersSize.height());
-		}, from, to, st::emojiPanDuration);
+		_packOvers[index].start(
+		    [this, index] {
+			    int row = index / kStickersPanelPerRow;
+			    int column = index % kStickersPanelPerRow;
+			    int left = st::stickersPadding.left() + column * st::stickersSize.width();
+			    int top = st::stickersPadding.top() + row * st::stickersSize.height();
+			    rtlupdate(left, top, st::stickersSize.width(), st::stickersSize.height());
+		    },
+		    from, to, st::emojiPanDuration);
 	}
 }
 
@@ -340,8 +349,12 @@ void StickerSetBox::Inner::onPreview() {
 qint32 StickerSetBox::Inner::stickerFromGlobalPos(const QPoint &p) const {
 	QPoint l(mapFromGlobal(p));
 	if (rtl()) l.setX(width() - l.x());
-	qint32 row = (l.y() >= st::stickersPadding.top()) ? std::floor((l.y() - st::stickersPadding.top()) / st::stickersSize.height()) : -1;
-	qint32 col = (l.x() >= st::stickersPadding.left()) ? std::floor((l.x() - st::stickersPadding.left()) / st::stickersSize.width()) : -1;
+	qint32 row = (l.y() >= st::stickersPadding.top()) ?
+	                 std::floor((l.y() - st::stickersPadding.top()) / st::stickersSize.height()) :
+	                 -1;
+	qint32 col = (l.x() >= st::stickersPadding.left()) ?
+	                 std::floor((l.x() - st::stickersPadding.left()) / st::stickersSize.width()) :
+	                 -1;
 	if (row >= 0 && col >= 0 && col < kStickersPanelPerRow) {
 		qint32 result = row * kStickersPanelPerRow + col;
 		return (result < _pack.size()) ? result : -1;
@@ -357,7 +370,8 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 
 	auto ms = getms();
 	qint32 rows = _pack.size() / kStickersPanelPerRow + ((_pack.size() % kStickersPanelPerRow) ? 1 : 0);
-	qint32 from = std::floor(e->rect().top() / st::stickersSize.height()), to = std::floor(e->rect().bottom() / st::stickersSize.height()) + 1;
+	qint32 from = std::floor(e->rect().top() / st::stickersSize.height()),
+	       to = std::floor(e->rect().bottom() / st::stickersSize.height()) + 1;
 
 	for (qint32 i = from; i < to; ++i) {
 		for (qint32 j = 0; j < kStickersPanelPerRow; ++j) {
@@ -366,7 +380,8 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 			Assert(index < _packOvers.size());
 
 			DocumentData *doc = _pack.at(index);
-			QPoint pos(st::stickersPadding.left() + j * st::stickersSize.width(), st::stickersPadding.top() + i * st::stickersSize.height());
+			QPoint pos(st::stickersPadding.left() + j * st::stickersSize.width(),
+			           st::stickersPadding.top() + i * st::stickersSize.height());
 
 			if (auto over = _packOvers[index].current(ms, (index == _selected) ? 1. : 0.)) {
 				p.setOpacity(over);
@@ -374,7 +389,6 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 				if (rtl()) tl.setX(width() - tl.x() - st::stickersSize.width());
 				App::roundRect(p, QRect(tl, st::stickersSize), st::emojiPanHover, StickerHoverCorners);
 				p.setOpacity(1);
-
 			}
 			bool goodThumb = !doc->thumb->isNull() && ((doc->thumb->width() >= 128) || (doc->thumb->height() >= 128));
 			if (goodThumb) {
@@ -388,7 +402,9 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 				}
 			}
 
-			double coef = std::min((st::stickersSize.width() - st::buttonRadius * 2) / double(doc->dimensions.width()), (st::stickersSize.height() - st::buttonRadius * 2) / double(doc->dimensions.height()));
+			double coef =
+			    std::min((st::stickersSize.width() - st::buttonRadius * 2) / double(doc->dimensions.width()),
+			             (st::stickersSize.height() - st::buttonRadius * 2) / double(doc->dimensions.height()));
 			if (coef > 1) coef = 1;
 			qint32 w = std::round(coef * doc->dimensions.width()), h = std::round(coef * doc->dimensions.height());
 			if (w < 1) w = 1;
@@ -415,7 +431,9 @@ bool StickerSetBox::Inner::loaded() const {
 qint32 StickerSetBox::Inner::notInstalled() const {
 	if (!_loaded) return 0;
 	auto it = Global::StickerSets().constFind(_setId);
-	if (it == Global::StickerSets().cend() || !(it->flags & MTPDstickerSet::Flag::f_installed) || (it->flags & MTPDstickerSet::Flag::f_archived)) return _pack.size();
+	if (it == Global::StickerSets().cend() || !(it->flags & MTPDstickerSet::Flag::f_installed) ||
+	    (it->flags & MTPDstickerSet::Flag::f_archived))
+		return _pack.size();
 	return 0;
 }
 
@@ -424,15 +442,15 @@ bool StickerSetBox::Inner::official() const {
 }
 
 base::lambda<TextWithEntities()> StickerSetBox::Inner::title() const {
-	auto text = TextWithEntities { _setTitle };
+	auto text = TextWithEntities{_setTitle};
 	if (_loaded) {
 		if (_pack.isEmpty()) {
-			return [] { return TextWithEntities { lang(lng_attach_failed), EntitiesInText() }; };
+			return [] { return TextWithEntities{lang(lng_attach_failed), EntitiesInText()}; };
 		} else {
 			TextUtilities::ParseEntities(text, TextParseMentions);
 		}
 	} else {
-		return [] { return TextWithEntities { lang(lng_contacts_loading), EntitiesInText() }; };
+		return [] { return TextWithEntities{lang(lng_contacts_loading), EntitiesInText()}; };
 	}
 	return [text] { return text; };
 }
@@ -447,8 +465,8 @@ void StickerSetBox::Inner::install() {
 		return;
 	}
 	if (_installRequest) return;
-	_installRequest = MTP::send(MTPmessages_InstallStickerSet(_input, MTP_bool(false)), rpcDone(&Inner::installDone), rpcFail(&Inner::installFail));
+	_installRequest = MTP::send(MTPmessages_InstallStickerSet(_input, MTP_bool(false)), rpcDone(&Inner::installDone),
+	                            rpcFail(&Inner::installFail));
 }
 
-StickerSetBox::Inner::~Inner() {
-}
+StickerSetBox::Inner::~Inner() {}
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index 406a3f8af..f7675cc66 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -33,7 +33,7 @@ class StickerSetBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	StickerSetBox(QWidget*, const MTPInputStickerSet &set);
+	StickerSetBox(QWidget *, const MTPInputStickerSet &set);
 
 signals:
 	void installed(quint64 id);
@@ -57,7 +57,6 @@ private:
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -129,5 +128,4 @@ private:
 
 	QTimer _previewTimer;
 	int _previewShown = -1;
-
 };
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 422656e07..f3f04498f 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -20,25 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "stickers_box.h"
 
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
-#include "chat_helpers/stickers.h"
+#include "apiwrap.h"
+#include "auth_session.h"
 #include "boxes/confirm_box.h"
 #include "boxes/sticker_set_box.h"
-#include "apiwrap.h"
-#include "storage/localstorage.h"
+#include "chat_helpers/stickers.h"
 #include "dialogs/dialogs_layout.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "messenger.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/scroll_area.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/slide_animation.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/input_fields.h"
-#include "auth_session.h"
-#include "messenger.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
 
 namespace {
 
@@ -55,7 +55,8 @@ int stickerPacksCount(bool includeArchivedOfficial) {
 	for (auto i = 0, l = order.size(); i < l; ++i) {
 		auto it = sets.constFind(order.at(i));
 		if (it != sets.cend()) {
-			if (!(it->flags & MTPDstickerSet::Flag::f_archived) || ((it->flags & MTPDstickerSet::Flag::f_official) && includeArchivedOfficial)) {
+			if (!(it->flags & MTPDstickerSet::Flag::f_archived) ||
+			    ((it->flags & MTPDstickerSet::Flag::f_official) && includeArchivedOfficial)) {
 				++result;
 			}
 		}
@@ -77,10 +78,10 @@ private:
 
 	QString _text;
 	Dialogs::Layout::UnreadBadgeStyle _st;
-
 };
 
-StickersBox::CounterWidget::CounterWidget(QWidget *parent) : TWidget(parent) {
+StickersBox::CounterWidget::CounterWidget(QWidget *parent)
+    : TWidget(parent) {
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	_st.sizeId = Dialogs::Layout::UnreadBadgeInStickersBox;
@@ -119,12 +120,11 @@ void StickersBox::CounterWidget::updateCounter() {
 	update();
 }
 
-template <typename ...Args>
-StickersBox::Tab::Tab(int index, Args&&... args)
-: _index(index)
-, _widget(std::forward<Args>(args)...)
-, _weak(_widget) {
-}
+template <typename... Args>
+StickersBox::Tab::Tab(int index, Args &&... args)
+    : _index(index)
+    , _widget(std::forward<Args>(args)...)
+    , _weak(_widget) {}
 
 object_ptr<StickersBox::Inner> StickersBox::Tab::takeWidget() {
 	return std::move(_widget);
@@ -139,20 +139,20 @@ void StickersBox::Tab::saveScrollTop() {
 	_scrollTop = widget()->getVisibleTop();
 }
 
-StickersBox::StickersBox(QWidget*, Section section)
-: _tabs(this, st::stickersTabs)
-, _unreadBadge(this)
-, _section(section)
-, _installed(0, this, Section::Installed)
-, _featured(1, this, Section::Featured)
-, _archived(2, this, Section::Archived) {
+StickersBox::StickersBox(QWidget *, Section section)
+    : _tabs(this, st::stickersTabs)
+    , _unreadBadge(this)
+    , _section(section)
+    , _installed(0, this, Section::Installed)
+    , _featured(1, this, Section::Featured)
+    , _archived(2, this, Section::Archived) {
 	_tabs->setRippleTopRoundRadius(st::boxRadius);
 }
 
-StickersBox::StickersBox(QWidget*, not_null<ChannelData*> megagroup)
-: _section(Section::Installed)
-, _installed(0, this, megagroup)
-, _megagroupSet(megagroup) {
+StickersBox::StickersBox(QWidget *, not_null<ChannelData *> megagroup)
+    : _section(Section::Installed)
+    , _installed(0, this, megagroup)
+    , _megagroupSet(megagroup) {
 	subscribe(_installed.widget()->scrollToY, [this](int y) { onScrollToY(y); });
 }
 
@@ -243,9 +243,7 @@ void StickersBox::prepare() {
 			preloadArchivedSets();
 		}
 		setNoContentMargin(true);
-		_tabs->setSectionActivatedCallback([this] {
-			switchTab();
-		});
+		_tabs->setSectionActivatedCallback([this] { switchTab(); });
 		refreshTabs();
 	}
 	if (_installed.widget() && _section != Section::Installed) _installed.widget()->hide();
@@ -261,7 +259,10 @@ void StickersBox::prepare() {
 	}
 
 	if (_megagroupSet) {
-		addButton(langFactory(lng_settings_save), [this] { _installed.widget()->saveGroupSet(); closeBox(); });
+		addButton(langFactory(lng_settings_save), [this] {
+			_installed.widget()->saveGroupSet();
+			closeBox();
+		});
 		addButton(langFactory(lng_cancel), [this] { closeBox(); });
 	} else {
 		addButton(langFactory(lng_about_done), [this] { closeBox(); });
@@ -310,8 +311,8 @@ void StickersBox::refreshTabs() {
 		_tabIndices.push_back(Section::Archived);
 	}
 	_tabs->setSections(sections);
-	if ((_tab == &_archived && !_tabIndices.contains(Section::Archived))
-		|| (_tab == &_featured && !_tabIndices.contains(Section::Featured))) {
+	if ((_tab == &_archived && !_tabIndices.contains(Section::Archived)) ||
+	    (_tab == &_featured && !_tabIndices.contains(Section::Featured))) {
 		switchTab();
 	} else if (_tab == &_archived) {
 		_tabs->setActiveSectionFast(_tabIndices.indexOf(Section::Archived));
@@ -327,7 +328,8 @@ void StickersBox::loadMoreArchived() {
 	}
 
 	quint64 lastId = 0;
-	for (auto setIt = Global::ArchivedStickerSetsOrder().cend(), e = Global::ArchivedStickerSetsOrder().cbegin(); setIt != e;) {
+	for (auto setIt = Global::ArchivedStickerSetsOrder().cend(), e = Global::ArchivedStickerSetsOrder().cbegin();
+	     setIt != e;) {
 		--setIt;
 		auto it = Global::StickerSets().constFind(*setIt);
 		if (it != Global::StickerSets().cend()) {
@@ -337,7 +339,9 @@ void StickersBox::loadMoreArchived() {
 			}
 		}
 	}
-	_archivedRequestId = MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0), MTP_long(lastId), MTP_int(kArchivedLimitPerPage)), rpcDone(&StickersBox::getArchivedDone, lastId));
+	_archivedRequestId =
+	    MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0), MTP_long(lastId), MTP_int(kArchivedLimitPerPage)),
+	              rpcDone(&StickersBox::getArchivedDone, lastId));
 }
 
 void StickersBox::paintEvent(QPaintEvent *e) {
@@ -456,7 +460,8 @@ void StickersBox::installSet(quint64 setId) {
 		_archived.widget()->setRemovedSets(_localRemoved);
 	}
 	if (!(it->flags & MTPDstickerSet::Flag::f_installed) || (it->flags & MTPDstickerSet::Flag::f_archived)) {
-		MTP::send(MTPmessages_InstallStickerSet(Stickers::inputSetId(*it), MTP_boolFalse()), rpcDone(&StickersBox::installDone), rpcFail(&StickersBox::installFail, setId));
+		MTP::send(MTPmessages_InstallStickerSet(Stickers::inputSetId(*it), MTP_boolFalse()),
+		          rpcDone(&StickersBox::installDone), rpcFail(&StickersBox::installFail, setId));
 
 		Stickers::InstallLocally(setId);
 	}
@@ -486,10 +491,8 @@ void StickersBox::preloadArchivedSets() {
 	if (!_tabs) return;
 	if (!_archivedRequestId) {
 		_archivedRequestId =
-				MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0),
-														  MTP_long(0),
-														  MTP_int(kArchivedLimitFirstRequest)),
-						  rpcDone(&StickersBox::getArchivedDone, Q_UINT64_C(0)));
+		    MTP::send(MTPmessages_GetArchivedStickers(MTP_flags(0), MTP_long(0), MTP_int(kArchivedLimitFirstRequest)),
+		              rpcDone(&StickersBox::getArchivedDone, Q_UINT64_C(0)));
 	}
 }
 
@@ -572,49 +575,57 @@ void StickersBox::setInnerFocus() {
 
 StickersBox::~StickersBox() = default;
 
-StickersBox::Inner::Row::Row(quint64 id, DocumentData *sticker, qint32 count, const QString &title, int titleWidth, bool installed, bool official, bool unread, bool archived, bool removed, qint32 pixw, qint32 pixh) : id(id)
-, sticker(sticker)
-, count(count)
-, title(title)
-, titleWidth(titleWidth)
-, installed(installed)
-, official(official)
-, unread(unread)
-, archived(archived)
-, removed(removed)
-, pixw(pixw)
-, pixh(pixh) {
-}
+StickersBox::Inner::Row::Row(quint64 id, DocumentData *sticker, qint32 count, const QString &title, int titleWidth,
+                             bool installed, bool official, bool unread, bool archived, bool removed, qint32 pixw,
+                             qint32 pixh)
+    : id(id)
+    , sticker(sticker)
+    , count(count)
+    , title(title)
+    , titleWidth(titleWidth)
+    , installed(installed)
+    , official(official)
+    , unread(unread)
+    , archived(archived)
+    , removed(removed)
+    , pixw(pixw)
+    , pixh(pixh) {}
 
 StickersBox::Inner::Row::~Row() = default;
 
-StickersBox::Inner::Inner(QWidget *parent, StickersBox::Section section) : TWidget(parent)
-, _section(section)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
-, _a_shifting(animation(this, &Inner::step_shifting))
-, _itemsTop(st::membersMarginTop)
-, _addText(lang(lng_stickers_featured_add).toUpper())
-, _addWidth(st::stickersTrendingAdd.font->width(_addText))
-, _undoText(lang(lng_stickers_return).toUpper())
-, _undoWidth(st::stickersUndoRemove.font->width(_undoText)) {
+StickersBox::Inner::Inner(QWidget *parent, StickersBox::Section section)
+    : TWidget(parent)
+    , _section(section)
+    , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
+    , _a_shifting(animation(this, &Inner::step_shifting))
+    , _itemsTop(st::membersMarginTop)
+    , _addText(lang(lng_stickers_featured_add).toUpper())
+    , _addWidth(st::stickersTrendingAdd.font->width(_addText))
+    , _undoText(lang(lng_stickers_return).toUpper())
+    , _undoWidth(st::stickersUndoRemove.font->width(_undoText)) {
 	setup();
 }
 
-StickersBox::Inner::Inner(QWidget *parent, not_null<ChannelData*> megagroup) : TWidget(parent)
-, _section(StickersBox::Section::Installed)
-, _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
-, _a_shifting(animation(this, &Inner::step_shifting))
-, _itemsTop(st::membersMarginTop)
-, _megagroupSet(megagroup)
-, _megagroupSetInput(_megagroupSet->mgInfo->stickerSet)
-, _megagroupSetField(this, st::groupStickersField, [] { return qsl("stickerset"); }, QString(), true)
-, _megagroupDivider(this)
-, _megagroupSubTitle(this, lang(lng_stickers_group_from_your), Ui::FlatLabel::InitType::Simple, st::boxTitle) {
+StickersBox::Inner::Inner(QWidget *parent, not_null<ChannelData *> megagroup)
+    : TWidget(parent)
+    , _section(StickersBox::Section::Installed)
+    , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom())
+    , _a_shifting(animation(this, &Inner::step_shifting))
+    , _itemsTop(st::membersMarginTop)
+    , _megagroupSet(megagroup)
+    , _megagroupSetInput(_megagroupSet->mgInfo->stickerSet)
+    , _megagroupSetField(this, st::groupStickersField, [] { return qsl("stickerset"); }, QString(), true)
+    , _megagroupDivider(this)
+    , _megagroupSubTitle(this, lang(lng_stickers_group_from_your), Ui::FlatLabel::InitType::Simple, st::boxTitle) {
 	_megagroupSetField->setLinkPlaceholder(Messenger::Instance().createInternalLink(qsl("addstickers/")));
 	_megagroupSetField->setPlaceholderHidden(false);
 	_megagroupSetAddressChangedTimer.setCallback([this] { handleMegagroupSetAddressChange(); });
-	connect(_megagroupSetField, &Ui::MaskedInputField::changed, this, [this] { _megagroupSetAddressChangedTimer.callOnce(kHandleMegagroupSetAddressChangeTimeout); });
-	connect(_megagroupSetField, &Ui::MaskedInputField::submitted, this, [this] { _megagroupSetAddressChangedTimer.cancel(); handleMegagroupSetAddressChange(); });
+	connect(_megagroupSetField, &Ui::MaskedInputField::changed, this,
+	        [this] { _megagroupSetAddressChangedTimer.callOnce(kHandleMegagroupSetAddressChangeTimeout); });
+	connect(_megagroupSetField, &Ui::MaskedInputField::submitted, this, [this] {
+		_megagroupSetAddressChangedTimer.cancel();
+		handleMegagroupSetAddressChange();
+	});
 
 	setup();
 }
@@ -683,12 +694,14 @@ void StickersBox::Inner::updateControlsGeometry() {
 	if (_megagroupSet) {
 		auto top = st::groupStickersFieldPadding.top();
 		auto fieldLeft = st::boxLayerTitlePosition.x();
-		_megagroupSetField->setGeometryToLeft(fieldLeft, top, width() - fieldLeft - st::groupStickersFieldPadding.right(), _megagroupSetField->height());
+		_megagroupSetField->setGeometryToLeft(
+		    fieldLeft, top, width() - fieldLeft - st::groupStickersFieldPadding.right(), _megagroupSetField->height());
 		top += _megagroupSetField->height() + st::groupStickersFieldPadding.bottom();
 		if (_megagroupSelectedRemove) {
 			_megagroupSelectedShadow->setGeometryToLeft(0, top, width(), st::lineWidth);
 			top += st::lineWidth;
-			_megagroupSelectedRemove->moveToRight(st::groupStickersRemovePosition.x(), top + st::groupStickersRemovePosition.y());
+			_megagroupSelectedRemove->moveToRight(st::groupStickersRemovePosition.x(),
+			                                      top + st::groupStickersRemovePosition.y());
 			top += _rowHeight;
 		}
 		_megagroupDivider->setGeometryToLeft(0, top, width(), _megagroupDivider->height());
@@ -736,7 +749,10 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, TimeMs ms) {
 					current = reachedOpacity;
 				}
 			}
-			auto row = myrtlrect(st::contactsPadding.left() / 2, st::contactsPadding.top() / 2, width() - (st::contactsPadding.left() / 2) - _scrollbar - st::contactsPadding.left() / 2, _rowHeight - ((st::contactsPadding.top() + st::contactsPadding.bottom()) / 2));
+			auto row =
+			    myrtlrect(st::contactsPadding.left() / 2, st::contactsPadding.top() / 2,
+			              width() - (st::contactsPadding.left() / 2) - _scrollbar - st::contactsPadding.left() / 2,
+			              _rowHeight - ((st::contactsPadding.top() + st::contactsPadding.bottom()) / 2));
 			p.setOpacity(current);
 			Ui::Shadow::paint(p, row, width(), st::boxRoundShadow);
 			p.setOpacity(1);
@@ -762,14 +778,16 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, TimeMs ms) {
 	if (!_megagroupSet && _section == Section::Installed) {
 		stickerx += st::stickersReorderIcon.width() + st::stickersReorderSkip;
 		if (!set->isRecentSet()) {
-			st::stickersReorderIcon.paint(p, st::contactsPadding.left(), (_rowHeight - st::stickersReorderIcon.height()) / 2, width());
+			st::stickersReorderIcon.paint(p, st::contactsPadding.left(),
+			                              (_rowHeight - st::stickersReorderIcon.height()) / 2, width());
 		}
 	}
 
 	if (set->sticker) {
 		set->sticker->thumb->load();
 		auto pix = set->sticker->thumb->pix(set->pixw, set->pixh);
-		p.drawPixmapLeft(stickerx + (st::contactsPhotoSize - set->pixw) / 2, st::contactsPadding.top() + (st::contactsPhotoSize - set->pixh) / 2, width(), pix);
+		p.drawPixmapLeft(stickerx + (st::contactsPhotoSize - set->pixw) / 2,
+		                 st::contactsPadding.top() + (st::contactsPhotoSize - set->pixh) / 2, width(), pix);
 	}
 
 	int namex = stickerx + st::contactsPhotoSize + st::contactsPadding.left();
@@ -788,7 +806,9 @@ void StickersBox::Inner::paintRow(Painter &p, Row *set, int index, TimeMs ms) {
 
 		{
 			PainterHighQualityEnabler hq(p);
-			p.drawEllipse(rtlrect(namex + set->titleWidth + st::stickersFeaturedUnreadSkip, namey + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
+			p.drawEllipse(rtlrect(namex + set->titleWidth + st::stickersFeaturedUnreadSkip,
+			                      namey + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize,
+			                      st::stickersFeaturedUnreadSize, width()));
 		}
 	}
 
@@ -807,7 +827,8 @@ void StickersBox::Inner::paintFakeButton(Painter &p, Row *set, int index, TimeMs
 	auto rect = relativeButtonRect(removeButton);
 	if (_section != Section::Installed && set->installed && !set->archived && !set->removed) {
 		// Checkbox after installed from Trending or Archived.
-		int checkx = width() - (st::contactsPadding.right() + st::contactsCheckPosition.x() + (rect.width() + st::stickersFeaturedInstalled.width()) / 2);
+		int checkx = width() - (st::contactsPadding.right() + st::contactsCheckPosition.x() +
+		                        (rect.width() + st::stickersFeaturedInstalled.width()) / 2);
 		int checky = st::contactsPadding.top() + (st::contactsPhotoSize - st::stickersFeaturedInstalled.height()) / 2;
 		st::stickersFeaturedInstalled.paint(p, QPoint(checkx, checky), width());
 	} else {
@@ -896,7 +917,8 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 		}
 		if (set->ripple) {
 			auto rect = relativeButtonRect(removeButton);
-			set->ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(myrtlrect(rect).x(), _itemsTop + _actionDown * _rowHeight + rect.y()));
+			set->ripple->add(mapFromGlobal(QCursor::pos()) -
+			                 QPoint(myrtlrect(rect).x(), _itemsTop + _actionDown * _rowHeight + rect.y()));
 		}
 	}
 }
@@ -931,18 +953,19 @@ void StickersBox::Inner::setPressed(int pressed) {
 		auto &set = _rows[_pressed];
 		auto rippleMask = Ui::RippleAnimation::rectMask(QSize(width(), _rowHeight));
 		if (!_rows[_pressed]->ripple) {
-			_rows[_pressed]->ripple = std::make_unique<Ui::RippleAnimation>(st::contactsRipple, std::move(rippleMask), [this, index = _pressed] {
-				update(0, _itemsTop + index * _rowHeight, width(), _rowHeight);
-			});
+			_rows[_pressed]->ripple = std::make_unique<Ui::RippleAnimation>(
+			    st::contactsRipple, std::move(rippleMask),
+			    [this, index = _pressed] { update(0, _itemsTop + index * _rowHeight, width(), _rowHeight); });
 		}
 		_rows[_pressed]->ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(0, _itemsTop + _pressed * _rowHeight));
 	}
 }
 
 void StickersBox::Inner::ensureRipple(const style::RippleAnimation &st, QImage mask, bool removeButton) {
-	_rows[_actionDown]->ripple = std::make_unique<Ui::RippleAnimation>(st, std::move(mask), [this, index = _actionDown, removeButton] {
-		update(myrtlrect(relativeButtonRect(removeButton).translated(0, _itemsTop + index * _rowHeight)));
-	});
+	_rows[_actionDown]->ripple =
+	    std::make_unique<Ui::RippleAnimation>(st, std::move(mask), [this, index = _actionDown, removeButton] {
+		    update(myrtlrect(relativeButtonRect(removeButton).translated(0, _itemsTop + index * _rowHeight)));
+	    });
 }
 
 void StickersBox::Inner::mouseMoveEvent(QMouseEvent *e) {
@@ -960,14 +983,16 @@ void StickersBox::Inner::onUpdateSelected() {
 			++firstSetIndex;
 		}
 		if (_dragStart.y() > local.y() && _dragging > 0) {
-			shift = -floorclamp(_dragStart.y() - local.y() + (_rowHeight / 2), _rowHeight, 0, _dragging - firstSetIndex);
+			shift =
+			    -floorclamp(_dragStart.y() - local.y() + (_rowHeight / 2), _rowHeight, 0, _dragging - firstSetIndex);
 			for (qint32 from = _dragging, to = _dragging + shift; from > to; --from) {
 				qSwap(_rows[from], _rows[from - 1]);
 				_rows[from]->yadd = anim::value(_rows[from]->yadd.current() - _rowHeight, 0);
 				_animStartTimes[from] = ms;
 			}
 		} else if (_dragStart.y() < local.y() && _dragging + 1 < _rows.size()) {
-			shift = floorclamp(local.y() - _dragStart.y() + (_rowHeight / 2), _rowHeight, 0, _rows.size() - _dragging - 1);
+			shift =
+			    floorclamp(local.y() - _dragStart.y() + (_rowHeight / 2), _rowHeight, 0, _rows.size() - _dragging - 1);
 			for (qint32 from = _dragging, to = _dragging + shift; from < to; ++from) {
 				qSwap(_rows[from], _rows[from + 1]);
 				_rows[from]->yadd = anim::value(_rows[from]->yadd.current() + _rowHeight, 0);
@@ -1005,7 +1030,8 @@ void StickersBox::Inner::onUpdateSelected() {
 			selected = floorclamp(local.y() - _itemsTop, _rowHeight, 0, _rows.size() - 1);
 			local.setY(local.y() - _itemsTop - selected * _rowHeight);
 			auto &set = _rows[selected];
-			if (!_megagroupSet && (_section == Section::Installed || !set->installed || set->archived || set->removed)) {
+			if (!_megagroupSet &&
+			    (_section == Section::Installed || !set->installed || set->archived || set->removed)) {
 				auto removeButton = (_section == Section::Installed && !set->removed);
 				auto rect = myrtlrect(relativeButtonRect(removeButton));
 				actionSel = rect.contains(local) ? selected : -1;
@@ -1013,7 +1039,8 @@ void StickersBox::Inner::onUpdateSelected() {
 				actionSel = -1;
 			}
 			if (!_megagroupSet && _section == Section::Installed && !set->isRecentSet()) {
-				auto dragAreaWidth = st::contactsPadding.left() + st::stickersReorderIcon.width() + st::stickersReorderSkip;
+				auto dragAreaWidth =
+				    st::contactsPadding.left() + st::stickersReorderIcon.width() + st::stickersReorderSkip;
 				auto dragArea = myrtlrect(0, 0, dragAreaWidth, _rowHeight);
 				inDragArea = dragArea.contains(local);
 			}
@@ -1021,7 +1048,8 @@ void StickersBox::Inner::onUpdateSelected() {
 			selected = -1;
 		}
 		if (_selected != selected) {
-			if ((_megagroupSet || _section != Section::Installed) && ((_selected >= 0 || _pressed >= 0) != (selected >= 0 || _pressed >= 0))) {
+			if ((_megagroupSet || _section != Section::Installed) &&
+			    ((_selected >= 0 || _pressed >= 0) != (selected >= 0 || _pressed >= 0))) {
 				if (!inDragArea) {
 					setCursor((selected >= 0 || _pressed >= 0) ? style::cur_pointer : style::cur_default);
 				}
@@ -1030,7 +1058,8 @@ void StickersBox::Inner::onUpdateSelected() {
 		}
 		if (_inDragArea != inDragArea) {
 			_inDragArea = inDragArea;
-			setCursor(_inDragArea ? style::cur_sizeall : (_selected >= 0 || _pressed >= 0) ? style::cur_pointer : style::cur_default);
+			setCursor(_inDragArea ? style::cur_sizeall :
+			                        (_selected >= 0 || _pressed >= 0) ? style::cur_pointer : style::cur_default);
 		}
 		setActionSel(actionSel);
 		emit draggingScrollDelta(0);
@@ -1042,7 +1071,7 @@ double StickersBox::Inner::aboveShadowOpacity() const {
 
 	auto dx = 0;
 	auto dy = qAbs(_above * _rowHeight + std::round(_rows[_above]->yadd.current()) - _started * _rowHeight);
-	return std::min((dx + dy)  * 2. / _rowHeight, 1.);
+	return std::min((dx + dy) * 2. / _rowHeight, 1.);
 }
 
 void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
@@ -1092,8 +1121,11 @@ void StickersBox::Inner::mouseReleaseEvent(QMouseEvent *e) {
 
 void StickersBox::Inner::saveGroupSet() {
 	Expects(_megagroupSet != nullptr);
-	auto oldId = (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetID) ? _megagroupSet->mgInfo->stickerSet.c_inputStickerSetID().vid.v : 0;
-	auto newId = (_megagroupSetInput.type() == mtpc_inputStickerSetID) ? _megagroupSetInput.c_inputStickerSetID().vid.v : 0;
+	auto oldId = (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetID) ?
+	                 _megagroupSet->mgInfo->stickerSet.c_inputStickerSetID().vid.v :
+	                 0;
+	auto newId =
+	    (_megagroupSetInput.type() == mtpc_inputStickerSetID) ? _megagroupSetInput.c_inputStickerSetID().vid.v : 0;
 	if (newId != oldId) {
 		Auth().api().setGroupStickerSet(_megagroupSet, _megagroupSetInput);
 		App::main()->onStickersInstalled(Stickers::MegagroupSetId);
@@ -1142,7 +1174,8 @@ void StickersBox::Inner::step_shifting(TimeMs ms, bool timer) {
 		if (updateMin < 0 || updateMin > _above) updateMin = _above;
 		if (updateMax < _above) updateMin = _above;
 		if (_aboveShadowFadeStart + st::stickersRowDuration > ms && ms > _aboveShadowFadeStart) {
-			_aboveShadowFadeOpacity.update(double(ms - _aboveShadowFadeStart) / st::stickersRowDuration, anim::sineInOut);
+			_aboveShadowFadeOpacity.update(double(ms - _aboveShadowFadeStart) / st::stickersRowDuration,
+			                               anim::sineInOut);
 			animating = true;
 		} else {
 			_aboveShadowFadeOpacity.finish();
@@ -1189,7 +1222,8 @@ void StickersBox::Inner::setActionSel(qint32 actionSel) {
 		_actionSel = actionSel;
 		if (_actionSel >= 0) update(0, _itemsTop + _actionSel * _rowHeight, width(), _rowHeight);
 		if (_section == Section::Installed) {
-			setCursor((_actionSel >= 0 && (_actionDown < 0 || _actionDown == _actionSel)) ? style::cur_pointer : style::cur_default);
+			setCursor((_actionSel >= 0 && (_actionDown < 0 || _actionDown == _actionSel)) ? style::cur_pointer :
+			                                                                                style::cur_default);
 		}
 	}
 }
@@ -1204,14 +1238,18 @@ void StickersBox::Inner::handleMegagroupSetAddressChange() {
 			}
 		}
 	} else if (!_megagroupSetRequestId) {
-		_megagroupSetRequestId = request(MTPmessages_GetStickerSet(MTP_inputStickerSetShortName(MTP_string(text)))).done([this](const MTPmessages_StickerSet &result) {
-			_megagroupSetRequestId = 0;
-			auto set = Stickers::FeedSetFull(result);
-			setMegagroupSelectedSet(MTP_inputStickerSetID(MTP_long(set->id), MTP_long(set->access)));
-		}).fail([this](const RPCError &error) {
-			_megagroupSetRequestId = 0;
-			setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
-		}).send();
+		_megagroupSetRequestId =
+		    request(MTPmessages_GetStickerSet(MTP_inputStickerSetShortName(MTP_string(text))))
+		        .done([this](const MTPmessages_StickerSet &result) {
+			        _megagroupSetRequestId = 0;
+			        auto set = Stickers::FeedSetFull(result);
+			        setMegagroupSelectedSet(MTP_inputStickerSetID(MTP_long(set->id), MTP_long(set->access)));
+		        })
+		        .fail([this](const RPCError &error) {
+			        _megagroupSetRequestId = 0;
+			        setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
+		        })
+		        .send();
 	} else {
 		_megagroupSetAddressChangedTimer.callOnce(kHandleMegagroupSetAddressChangeTimeout);
 	}
@@ -1242,7 +1280,7 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 	auto titleWidth = 0;
 	auto title = fillSetTitle(*it, maxNameWidth, &titleWidth);
 	auto count = fillSetCount(*it);
-	auto sticker = (DocumentData*)nullptr;
+	auto sticker = (DocumentData *)nullptr;
 	auto pixw = 0, pixh = 0;
 	fillSetCover(*it, &sticker, &pixw, &pixh);
 	auto installed = true, official = false, unread = false, archived = false, removed = false;
@@ -1250,15 +1288,14 @@ void StickersBox::Inner::rebuildMegagroupSet() {
 		_megagroupSetField->setText(it->shortName);
 		_megagroupSetField->finishAnimations();
 	}
-	_megagroupSelectedSet = std::make_unique<Row>(it->id, sticker, count, title, titleWidth, installed, official, unread, archived, removed, pixw, pixh);
+	_megagroupSelectedSet = std::make_unique<Row>(it->id, sticker, count, title, titleWidth, installed, official,
+	                                              unread, archived, removed, pixw, pixh);
 	_itemsTop += st::lineWidth + _rowHeight;
 
 	if (!_megagroupSelectedRemove) {
 		_megagroupSelectedRemove.create(this, st::groupStickersRemove);
 		_megagroupSelectedRemove->showFast();
-		_megagroupSelectedRemove->setClickedCallback([this] {
-			setMegagroupSelectedSet(MTP_inputStickerSetEmpty());
-		});
+		_megagroupSelectedRemove->setClickedCallback([this] { setMegagroupSelectedSet(MTP_inputStickerSetEmpty()); });
 		_megagroupSelectedShadow.create(this);
 		updateControlsGeometry();
 	}
@@ -1268,7 +1305,8 @@ void StickersBox::Inner::rebuild() {
 	_itemsTop = st::membersMarginTop;
 
 	if (_megagroupSet) {
-		_itemsTop += st::groupStickersFieldPadding.top() + _megagroupSetField->height() + st::groupStickersFieldPadding.bottom();
+		_itemsTop +=
+		    st::groupStickersFieldPadding.top() + _megagroupSetField->height() + st::groupStickersFieldPadding.bottom();
 		_itemsTop += _megagroupDivider->height() + st::groupStickersSubTitleHeight;
 		rebuildMegagroupSet();
 	}
@@ -1336,7 +1374,7 @@ void StickersBox::Inner::updateRows() {
 		if (it != sets.cend()) {
 			auto &set = it.value();
 			if (!row->sticker) {
-				auto sticker = (DocumentData*)nullptr;
+				auto sticker = (DocumentData *)nullptr;
 				auto pixw = 0, pixh = 0;
 				fillSetCover(set, &sticker, &pixw, &pixh);
 				if (sticker) {
@@ -1404,11 +1442,13 @@ void StickersBox::Inner::rebuildAppendSet(const Stickers::Set &set, int maxNameW
 	QString title = fillSetTitle(set, maxNameWidth, &titleWidth);
 	int count = fillSetCount(set);
 
-	_rows.push_back(std::make_unique<Row>(set.id, sticker, count, title, titleWidth, installed, official, unread, archived, removed, pixw, pixh));
+	_rows.push_back(std::make_unique<Row>(set.id, sticker, count, title, titleWidth, installed, official, unread,
+	                                      archived, removed, pixw, pixh));
 	_animStartTimes.push_back(0);
 }
 
-void StickersBox::Inner::fillSetCover(const Stickers::Set &set, DocumentData **outSticker, int *outWidth, int *outHeight) const {
+void StickersBox::Inner::fillSetCover(const Stickers::Set &set, DocumentData **outSticker, int *outWidth,
+                                      int *outHeight) const {
 	if (set.stickers.isEmpty()) {
 		*outSticker = nullptr;
 		*outWidth = *outHeight = 0;
@@ -1465,7 +1505,8 @@ QString StickersBox::Inner::fillSetTitle(const Stickers::Set &set, int maxNameWi
 	return result;
 }
 
-void StickersBox::Inner::fillSetFlags(const Stickers::Set &set, bool *outInstalled, bool *outOfficial, bool *outUnread, bool *outArchived) {
+void StickersBox::Inner::fillSetFlags(const Stickers::Set &set, bool *outInstalled, bool *outOfficial, bool *outUnread,
+                                      bool *outArchived) {
 	*outInstalled = (set.flags & MTPDstickerSet::Flag::f_installed);
 	*outOfficial = (set.flags & MTPDstickerSet::Flag::f_official);
 	*outArchived = (set.flags & MTPDstickerSet::Flag::f_archived);
@@ -1476,8 +1517,7 @@ void StickersBox::Inner::fillSetFlags(const Stickers::Set &set, bool *outInstall
 	}
 }
 
-template <typename Check>
-Stickers::Order StickersBox::Inner::collectSets(Check check) const {
+template <typename Check> Stickers::Order StickersBox::Inner::collectSets(Check check) const {
 	Stickers::Order result;
 	result.reserve(_rows.size());
 	for_const (auto &row, _rows) {
@@ -1489,21 +1529,15 @@ Stickers::Order StickersBox::Inner::collectSets(Check check) const {
 }
 
 Stickers::Order StickersBox::Inner::getOrder() const {
-	return collectSets([](Row *row) {
-		return !row->archived && !row->removed && !row->isRecentSet();
-	});
+	return collectSets([](Row *row) { return !row->archived && !row->removed && !row->isRecentSet(); });
 }
 
 Stickers::Order StickersBox::Inner::getFullOrder() const {
-	return collectSets([](Row *row) {
-		return !row->isRecentSet();
-	});
+	return collectSets([](Row *row) { return !row->isRecentSet(); });
 }
 
 Stickers::Order StickersBox::Inner::getRemovedSets() const {
-	return collectSets([](Row *row) {
-		return row->removed;
-	});
+	return collectSets([](Row *row) { return row->removed; });
 }
 
 int StickersBox::Inner::getRowIndex(quint64 setId) const {
diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h
index 37736c630..695e62196 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.h
+++ b/Telegram/SourceFiles/boxes/stickers_box.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "boxes/abstract_box.h"
 #include "base/timer.h"
+#include "boxes/abstract_box.h"
 #include "mtproto/sender.h"
 
 class ConfirmBox;
@@ -46,8 +46,8 @@ public:
 		Featured,
 		Archived,
 	};
-	StickersBox(QWidget*, Section section);
-	StickersBox(QWidget*, not_null<ChannelData*> megagroup);
+	StickersBox(QWidget *, Section section);
+	StickersBox(QWidget *, not_null<ChannelData *> megagroup);
 
 	void setInnerFocus() override;
 
@@ -65,8 +65,7 @@ private:
 	public:
 		Tab() = default;
 
-		template <typename ...Args>
-		Tab(int index, Args&&... args);
+		template <typename... Args> Tab(int index, Args &&... args);
 
 		object_ptr<Inner> takeWidget();
 		void returnWidget(object_ptr<Inner> widget);
@@ -85,10 +84,9 @@ private:
 
 	private:
 		int _index = 0;
-		object_ptr<Inner> _widget = { nullptr };
+		object_ptr<Inner> _widget = {nullptr};
 		QPointer<Inner> _weak;
 		int _scrollTop = 0;
-
 	};
 
 	void handleStickersUpdated();
@@ -110,11 +108,11 @@ private:
 	void loadMoreArchived();
 	void getArchivedDone(quint64 offsetId, const MTPmessages_ArchivedStickers &result);
 
-	object_ptr<Ui::SettingsSlider> _tabs = { nullptr };
+	object_ptr<Ui::SettingsSlider> _tabs = {nullptr};
 	QList<Section> _tabIndices;
 
 	class CounterWidget;
-	object_ptr<CounterWidget> _unreadBadge = { nullptr };
+	object_ptr<CounterWidget> _unreadBadge = {nullptr};
 
 	Section _section;
 
@@ -126,7 +124,7 @@ private:
 	ChannelData *_megagroupSet = nullptr;
 
 	std::unique_ptr<Ui::SlideAnimation> _slideAnimation;
-	object_ptr<BoxLayerTitleShadow> _titleShadow = { nullptr };
+	object_ptr<BoxLayerTitleShadow> _titleShadow = {nullptr};
 
 	mtpRequestId _archivedRequestId = 0;
 	bool _archivedLoaded = false;
@@ -135,7 +133,6 @@ private:
 
 	Stickers::Order _localOrder;
 	Stickers::Order _localRemoved;
-
 };
 
 int stickerPacksCount(bool includeArchivedOfficial = false);
@@ -147,7 +144,7 @@ class StickersBox::Inner : public TWidget, private base::Subscriber, private MTP
 public:
 	using Section = StickersBox::Section;
 	Inner(QWidget *parent, Section section);
-	Inner(QWidget *parent, not_null<ChannelData*> megagroup);
+	Inner(QWidget *parent, not_null<ChannelData *> megagroup);
 
 	base::Observable<int> scrollToY;
 	void setInnerFocus();
@@ -199,7 +196,8 @@ public slots:
 
 private:
 	struct Row {
-		Row(quint64 id, DocumentData *sticker, qint32 count, const QString &title, int titleWidth, bool installed, bool official, bool unread, bool archived, bool removed, qint32 pixw, qint32 pixh);
+		Row(quint64 id, DocumentData *sticker, qint32 count, const QString &title, int titleWidth, bool installed,
+		    bool official, bool unread, bool archived, bool removed, qint32 pixw, qint32 pixh);
 		bool isRecentSet() const {
 			return (id == Stickers::CloudRecentSetId);
 		}
@@ -221,8 +219,7 @@ private:
 		std::unique_ptr<Ui::RippleAnimation> ripple;
 	};
 
-	template <typename Check>
-	Stickers::Order collectSets(Check check) const;
+	template <typename Check> Stickers::Order collectSets(Check check) const;
 
 	void checkLoadMore();
 	void updateScrollbarWidth();
@@ -250,7 +247,8 @@ private:
 	void fillSetCover(const Stickers::Set &set, DocumentData **outSticker, int *outWidth, int *outHeight) const;
 	int fillSetCount(const Stickers::Set &set) const;
 	QString fillSetTitle(const Stickers::Set &set, int maxNameWidth, int *outTitleWidth) const;
-	void fillSetFlags(const Stickers::Set &set, bool *outInstalled, bool *outOfficial, bool *outUnread, bool *outArchived);
+	void fillSetFlags(const Stickers::Set &set, bool *outInstalled, bool *outOfficial, bool *outUnread,
+	                  bool *outArchived);
 	void rebuildMegagroupSet();
 	void handleMegagroupSetAddressChange();
 	void setMegagroupSelectedSet(const MTPInputStickerSet &set);
@@ -299,12 +297,11 @@ private:
 	ChannelData *_megagroupSet = nullptr;
 	MTPInputStickerSet _megagroupSetInput = MTP_inputStickerSetEmpty();
 	std::unique_ptr<Row> _megagroupSelectedSet;
-	object_ptr<Ui::UsernameInput> _megagroupSetField = { nullptr };
-	object_ptr<BoxLayerTitleShadow> _megagroupSelectedShadow = { nullptr };
-	object_ptr<Ui::CrossButton> _megagroupSelectedRemove = { nullptr };
-	object_ptr<BoxContentDivider> _megagroupDivider = { nullptr };
-	object_ptr<Ui::FlatLabel> _megagroupSubTitle = { nullptr };
+	object_ptr<Ui::UsernameInput> _megagroupSetField = {nullptr};
+	object_ptr<BoxLayerTitleShadow> _megagroupSelectedShadow = {nullptr};
+	object_ptr<Ui::CrossButton> _megagroupSelectedRemove = {nullptr};
+	object_ptr<BoxContentDivider> _megagroupDivider = {nullptr};
+	object_ptr<Ui::FlatLabel> _megagroupSubTitle = {nullptr};
 	base::Timer _megagroupSetAddressChangedTimer;
 	mtpRequestId _megagroupSetRequestId = 0;
-
 };
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 32483679f..1fe79fc5b 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -20,24 +20,23 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "boxes/username_box.h"
 
-#include "lang/lang_keys.h"
 #include "application.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
+#include "messenger.h"
+#include "styles/style_boxes.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "ui/toast/toast.h"
-#include "styles/style_boxes.h"
-#include "messenger.h"
 #include <QApplication>
 #include <QClipboard>
 
-UsernameBox::UsernameBox(QWidget*)
-: _username(this, st::defaultInputField, [] { return qsl("@username"); }, App::self()->username, false)
-, _link(this, QString(), st::boxLinkButton)
-, _about(st::boxWidth - st::usernamePadding.left())
-, _checkTimer(this) {
-}
+UsernameBox::UsernameBox(QWidget *)
+    : _username(this, st::defaultInputField, [] { return qsl("@username"); }, App::self()->username, false)
+    , _link(this, QString(), st::boxLinkButton)
+    , _about(st::boxWidth - st::usernamePadding.left())
+    , _checkTimer(this) {}
 
 void UsernameBox::prepare() {
 	_goodText = App::self()->username.isEmpty() ? QString() : lang(lng_username_available);
@@ -52,7 +51,9 @@ void UsernameBox::prepare() {
 	connect(_link, SIGNAL(clicked()), this, SLOT(onLinkClick()));
 
 	_about.setRichText(st::usernameTextStyle, lang(lng_username_about));
-	setDimensions(st::boxWidth, st::usernamePadding.top() + _username->height() + st::usernameSkip + _about.countHeight(st::boxWidth - st::usernamePadding.left()) + 3 * st::usernameTextStyle.lineHeight + st::usernamePadding.bottom());
+	setDimensions(st::boxWidth, st::usernamePadding.top() + _username->height() + st::usernameSkip +
+	                                _about.countHeight(st::boxWidth - st::usernamePadding.left()) +
+	                                3 * st::usernameTextStyle.lineHeight + st::usernamePadding.bottom());
 
 	_checkTimer->setSingleShot(true);
 	connect(_checkTimer, SIGNAL(timeout()), this, SLOT(onCheck()));
@@ -72,23 +73,34 @@ void UsernameBox::paintEvent(QPaintEvent *e) {
 	p.setFont(st::boxTextFont);
 	if (!_errorText.isEmpty()) {
 		p.setPen(st::boxTextFgError);
-		p.drawTextLeft(st::usernamePadding.left(), _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2), width(), _errorText);
+		p.drawTextLeft(st::usernamePadding.left(),
+		               _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2),
+		               width(), _errorText);
 	} else if (!_goodText.isEmpty()) {
 		p.setPen(st::boxTextFgGood);
-		p.drawTextLeft(st::usernamePadding.left(), _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2), width(), _goodText);
+		p.drawTextLeft(st::usernamePadding.left(),
+		               _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2),
+		               width(), _goodText);
 	} else {
 		p.setPen(st::usernameDefaultFg);
-		p.drawTextLeft(st::usernamePadding.left(), _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2), width(), lang(lng_username_choose));
+		p.drawTextLeft(st::usernamePadding.left(),
+		               _username->y() + _username->height() + ((st::usernameSkip - st::boxTextFont->height) / 2),
+		               width(), lang(lng_username_choose));
 	}
 	p.setPen(st::boxTextFg);
 	qint32 availw = st::boxWidth - st::usernamePadding.left(), h = _about.countHeight(availw);
-	_about.drawLeft(p, st::usernamePadding.left(), _username->y() + _username->height() + st::usernameSkip, availw, width());
+	_about.drawLeft(p, st::usernamePadding.left(), _username->y() + _username->height() + st::usernameSkip, availw,
+	                width());
 
-	qint32 linky = _username->y() + _username->height() + st::usernameSkip + h + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2);
+	qint32 linky = _username->y() + _username->height() + st::usernameSkip + h + st::usernameTextStyle.lineHeight +
+	               ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2);
 	if (_link->isHidden()) {
 		p.drawTextLeft(st::usernamePadding.left(), linky, width(), lang(lng_username_link_willbe));
 		p.setPen(st::usernameDefaultFg);
-		p.drawTextLeft(st::usernamePadding.left(), linky + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2), width(), Messenger::Instance().createInternalLinkFull(qsl("username")));
+		p.drawTextLeft(st::usernamePadding.left(),
+		               linky + st::usernameTextStyle.lineHeight +
+		                   ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2),
+		               width(), Messenger::Instance().createInternalLinkFull(qsl("username")));
 	} else {
 		p.drawTextLeft(st::usernamePadding.left(), linky, width(), lang(lng_username_link));
 	}
@@ -101,15 +113,19 @@ void UsernameBox::resizeEvent(QResizeEvent *e) {
 	_username->moveToLeft(st::usernamePadding.left(), st::usernamePadding.top());
 
 	qint32 availw = st::boxWidth - st::usernamePadding.left(), h = _about.countHeight(availw);
-	qint32 linky = _username->y() + _username->height() + st::usernameSkip + h + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2);
-	_link->moveToLeft(st::usernamePadding.left(), linky + st::usernameTextStyle.lineHeight + ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2));
+	qint32 linky = _username->y() + _username->height() + st::usernameSkip + h + st::usernameTextStyle.lineHeight +
+	               ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2);
+	_link->moveToLeft(st::usernamePadding.left(),
+	                  linky + st::usernameTextStyle.lineHeight +
+	                      ((st::usernameTextStyle.lineHeight - st::boxTextFont->height) / 2));
 }
 
 void UsernameBox::onSave() {
 	if (_saveRequestId) return;
 
 	_sentUsername = getName();
-	_saveRequestId = MTP::send(MTPaccount_UpdateUsername(MTP_string(_sentUsername)), rpcDone(&UsernameBox::onUpdateDone), rpcFail(&UsernameBox::onUpdateFail));
+	_saveRequestId = MTP::send(MTPaccount_UpdateUsername(MTP_string(_sentUsername)),
+	                           rpcDone(&UsernameBox::onUpdateDone), rpcFail(&UsernameBox::onUpdateFail));
 }
 
 void UsernameBox::onCheck() {
@@ -119,7 +135,8 @@ void UsernameBox::onCheck() {
 	QString name = getName();
 	if (name.size() >= MinUsernameLength) {
 		_checkUsername = name;
-		_checkRequestId = MTP::send(MTPaccount_CheckUsername(MTP_string(name)), rpcDone(&UsernameBox::onCheckDone), rpcFail(&UsernameBox::onCheckFail));
+		_checkRequestId = MTP::send(MTPaccount_CheckUsername(MTP_string(name)), rpcDone(&UsernameBox::onCheckDone),
+		                            rpcFail(&UsernameBox::onCheckFail));
 	}
 }
 
@@ -136,7 +153,8 @@ void UsernameBox::onChanged() {
 		qint32 len = name.size();
 		for (qint32 i = 0; i < len; ++i) {
 			QChar ch = name.at(i);
-			if ((ch < 'A' || ch > 'Z') && (ch < 'a' || ch > 'z') && (ch < '0' || ch > '9') && ch != '_' && (ch != '@' || i > 0)) {
+			if ((ch < 'A' || ch > 'Z') && (ch < 'a' || ch > 'z') && (ch < '0' || ch > '9') && ch != '_' &&
+			    (ch != '@' || i > 0)) {
 				if (_errorText != lang(lng_username_bad_symbols)) {
 					_errorText = lang(lng_username_bad_symbols);
 					update();
@@ -177,7 +195,9 @@ bool UsernameBox::onUpdateFail(const RPCError &error) {
 	_saveRequestId = 0;
 	QString err(error.type());
 	if (err == qstr("USERNAME_NOT_MODIFIED") || _sentUsername == App::self()->username) {
-		App::self()->setName(TextUtilities::SingleLine(App::self()->firstName), TextUtilities::SingleLine(App::self()->lastName), TextUtilities::SingleLine(App::self()->nameOrPhone), TextUtilities::SingleLine(_sentUsername));
+		App::self()->setName(
+		    TextUtilities::SingleLine(App::self()->firstName), TextUtilities::SingleLine(App::self()->lastName),
+		    TextUtilities::SingleLine(App::self()->nameOrPhone), TextUtilities::SingleLine(_sentUsername));
 		closeBox();
 		return true;
 	} else if (err == qstr("USERNAME_INVALID")) {
@@ -199,7 +219,8 @@ bool UsernameBox::onUpdateFail(const RPCError &error) {
 
 void UsernameBox::onCheckDone(const MTPBool &result) {
 	_checkRequestId = 0;
-	QString newError = (mtpIsTrue(result) || _checkUsername == App::self()->username) ? QString() : lang(lng_username_occupied);
+	QString newError =
+	    (mtpIsTrue(result) || _checkUsername == App::self()->username) ? QString() : lang(lng_username_occupied);
 	QString newGood = newError.isEmpty() ? lang(lng_username_available) : QString();
 	if (_errorText != newError || _goodText != newGood) {
 		_errorText = newError;
@@ -233,7 +254,8 @@ QString UsernameBox::getName() const {
 
 void UsernameBox::updateLinkText() {
 	QString uname = getName();
-	_link->setText(st::boxTextFont->elided(Messenger::Instance().createInternalLinkFull(uname), st::boxWidth - st::usernamePadding.left() - st::usernamePadding.right()));
+	_link->setText(st::boxTextFont->elided(Messenger::Instance().createInternalLinkFull(uname),
+	                                       st::boxWidth - st::usernamePadding.left() - st::usernamePadding.right()));
 	if (uname.isEmpty()) {
 		if (!_link->isHidden()) {
 			_link->hide();
diff --git a/Telegram/SourceFiles/boxes/username_box.h b/Telegram/SourceFiles/boxes/username_box.h
index 7eab1bb2d..4239b2d98 100644
--- a/Telegram/SourceFiles/boxes/username_box.h
+++ b/Telegram/SourceFiles/boxes/username_box.h
@@ -31,7 +31,7 @@ class UsernameBox : public BoxContent, public RPCSender {
 	Q_OBJECT
 
 public:
-	UsernameBox(QWidget*);
+	UsernameBox(QWidget *);
 
 protected:
 	void prepare() override;
@@ -67,5 +67,4 @@ private:
 
 	Text _about;
 	object_ptr<QTimer> _checkTimer;
-
 };
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index e1d2c6174..34d272ad7 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "calls/calls_box_controller.h"
 
-#include "styles/style_calls.h"
-#include "styles/style_boxes.h"
-#include "lang/lang_keys.h"
-#include "observer_peer.h"
-#include "ui/effects/ripple_animation.h"
+#include "app.h"
 #include "calls/calls_instance.h"
 #include "history/history_media_types.h"
-#include "app.h"
+#include "lang/lang_keys.h"
+#include "observer_peer.h"
+#include "styles/style_boxes.h"
+#include "styles/style_calls.h"
+#include "ui/effects/ripple_animation.h"
 
 namespace Calls {
 namespace {
@@ -53,9 +53,7 @@ public:
 	void addItem(HistoryItem *item) {
 		Expects(canAddItem(item));
 		_items.push_back(item);
-		std::sort(_items.begin(), _items.end(), [](HistoryItem *a, HistoryItem *b) {
-			return (a->id > b->id);
-		});
+		std::sort(_items.begin(), _items.end(), [](HistoryItem *a, HistoryItem *b) { return (a->id > b->id); });
 		refreshStatus();
 	}
 	void itemRemoved(HistoryItem *item) {
@@ -97,18 +95,18 @@ private:
 	void refreshStatus();
 	static Type ComputeType(HistoryItem *item);
 
-	std::vector<HistoryItem*> _items;
+	std::vector<HistoryItem *> _items;
 	QDate _date;
 	Type _type;
 
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
-
 };
 
-BoxController::Row::Row(HistoryItem *item) : PeerListRow(item->history()->peer, item->id)
-, _items(1, item)
-, _date(item->date.date())
-, _type(ComputeType(item)) {
+BoxController::Row::Row(HistoryItem *item)
+    : PeerListRow(item->history()->peer, item->id)
+    , _items(1, item)
+    , _date(item->date.date())
+    , _type(ComputeType(item)) {
 	refreshStatus();
 }
 
@@ -132,7 +130,8 @@ void BoxController::Row::paintStatusText(Painter &p, int x, int y, int available
 void BoxController::Row::paintAction(Painter &p, TimeMs ms, int x, int y, int outerWidth, bool actionSelected) {
 	auto size = actionSize();
 	if (_actionRipple) {
-		_actionRipple->paint(p, x + st::callReDial.rippleAreaPosition.x(), y + st::callReDial.rippleAreaPosition.y(), outerWidth, ms);
+		_actionRipple->paint(p, x + st::callReDial.rippleAreaPosition.x(), y + st::callReDial.rippleAreaPosition.y(),
+		                     outerWidth, ms);
 		if (_actionRipple->empty()) {
 			_actionRipple.reset();
 		}
@@ -154,7 +153,9 @@ void BoxController::Row::refreshStatus() {
 		}
 		return lng_call_box_status_date(lt_date, langDayOfMonthFull(_date), lt_time, time);
 	};
-	setCustomStatus((_items.size() > 1) ? lng_call_box_status_group(lt_count, QString::number(_items.size()), lt_status, text()) : text());
+	setCustomStatus((_items.size() > 1) ?
+	                    lng_call_box_status_group(lt_count, QString::number(_items.size()), lt_status, text()) :
+	                    text());
 }
 
 BoxController::Row::Type BoxController::Row::ComputeType(HistoryItem *item) {
@@ -162,7 +163,7 @@ BoxController::Row::Type BoxController::Row::ComputeType(HistoryItem *item) {
 		return Type::Out;
 	} else if (auto media = item->getMedia()) {
 		if (media->type() == MediaTypeCall) {
-			auto reason = static_cast<HistoryCall*>(media)->reason();
+			auto reason = static_cast<HistoryCall *>(media)->reason();
 			if (reason == HistoryCall::FinishReason::Busy || reason == HistoryCall::FinishReason::Missed) {
 				return Type::Missed;
 			}
@@ -173,8 +174,10 @@ BoxController::Row::Type BoxController::Row::ComputeType(HistoryItem *item) {
 
 void BoxController::Row::addActionRipple(QPoint point, base::lambda<void()> updateCallback) {
 	if (!_actionRipple) {
-		auto mask = Ui::RippleAnimation::ellipseMask(QSize(st::callReDial.rippleAreaSize, st::callReDial.rippleAreaSize));
-		_actionRipple = std::make_unique<Ui::RippleAnimation>(st::callReDial.ripple, std::move(mask), std::move(updateCallback));
+		auto mask =
+		    Ui::RippleAnimation::ellipseMask(QSize(st::callReDial.rippleAreaSize, st::callReDial.rippleAreaSize));
+		_actionRipple =
+		    std::make_unique<Ui::RippleAnimation>(st::callReDial.ripple, std::move(mask), std::move(updateCallback));
 	}
 	_actionRipple->add(point - st::callReDial.rippleAreaPosition);
 }
@@ -216,41 +219,49 @@ void BoxController::loadMoreRows() {
 		return;
 	}
 
-	_loadRequestId = request(MTPmessages_Search(MTP_flags(0), MTP_inputPeerEmpty(), MTP_string(QString()), MTP_inputUserEmpty(), MTP_inputMessagesFilterPhoneCalls(MTP_flags(0)), MTP_int(0), MTP_int(0), MTP_int(_offsetId), MTP_int(0), MTP_int(_offsetId ? kFirstPageCount : kPerPageCount), MTP_int(0), MTP_int(0))).done([this](const MTPmessages_Messages &result) {
-		_loadRequestId = 0;
+	_loadRequestId =
+	    request(MTPmessages_Search(MTP_flags(0), MTP_inputPeerEmpty(), MTP_string(QString()), MTP_inputUserEmpty(),
+	                               MTP_inputMessagesFilterPhoneCalls(MTP_flags(0)), MTP_int(0), MTP_int(0),
+	                               MTP_int(_offsetId), MTP_int(0), MTP_int(_offsetId ? kFirstPageCount : kPerPageCount),
+	                               MTP_int(0), MTP_int(0)))
+	        .done([this](const MTPmessages_Messages &result) {
+		        _loadRequestId = 0;
 
-		auto handleResult = [this](auto &data) {
-			App::feedUsers(data.vusers);
-			App::feedChats(data.vchats);
-			receivedCalls(data.vmessages.v);
-		};
+		        auto handleResult = [this](auto &data) {
+			        App::feedUsers(data.vusers);
+			        App::feedChats(data.vchats);
+			        receivedCalls(data.vmessages.v);
+		        };
 
-		switch (result.type()) {
-		case mtpc_messages_messages: handleResult(result.c_messages_messages()); _allLoaded = true; break;
-		case mtpc_messages_messagesSlice: handleResult(result.c_messages_messagesSlice()); break;
-		case mtpc_messages_channelMessages: {
-			LOG(("API Error: received messages.channelMessages! (Calls::BoxController::preloadRows)"));
-			handleResult(result.c_messages_channelMessages());
-		} break;
+		        switch (result.type()) {
+		        case mtpc_messages_messages:
+			        handleResult(result.c_messages_messages());
+			        _allLoaded = true;
+			        break;
+		        case mtpc_messages_messagesSlice: handleResult(result.c_messages_messagesSlice()); break;
+		        case mtpc_messages_channelMessages: {
+			        LOG(("API Error: received messages.channelMessages! (Calls::BoxController::preloadRows)"));
+			        handleResult(result.c_messages_channelMessages());
+		        } break;
 
-		default: Unexpected("Type of messages.Messages (Calls::BoxController::preloadRows)");
-		}
-	}).fail([this](const RPCError &error) {
-		_loadRequestId = 0;
-	}).send();
+		        default: Unexpected("Type of messages.Messages (Calls::BoxController::preloadRows)");
+		        }
+	        })
+	        .fail([this](const RPCError &error) { _loadRequestId = 0; })
+	        .send();
 }
 
 void BoxController::refreshAbout() {
 	setDescriptionText(delegate()->peerListFullRowsCount() ? QString() : lang(lng_call_box_about));
 }
 
-void BoxController::rowClicked(not_null<PeerListRow*> row) {
-	auto itemsRow = static_cast<Row*>(row.get());
+void BoxController::rowClicked(not_null<PeerListRow *> row) {
+	auto itemsRow = static_cast<Row *>(row.get());
 	auto itemId = itemsRow->maxItemId();
 	Ui::showPeerHistoryAsync(row->peer()->id, itemId);
 }
 
-void BoxController::rowActionClicked(not_null<PeerListRow*> row) {
+void BoxController::rowActionClicked(not_null<PeerListRow *> row) {
 	auto user = row->peer()->asUser();
 	Assert(user != nullptr);
 
@@ -285,9 +296,10 @@ bool BoxController::insertRow(HistoryItem *item, InsertWay way) {
 			return false;
 		}
 	}
-	(way == InsertWay::Append) ? delegate()->peerListAppendRow(createRow(item)) : delegate()->peerListPrependRow(createRow(item));
+	(way == InsertWay::Append) ? delegate()->peerListAppendRow(createRow(item)) :
+	                             delegate()->peerListPrependRow(createRow(item));
 	delegate()->peerListSortRows([](PeerListRow &a, PeerListRow &b) {
-		return static_cast<Row&>(a).maxItemId() > static_cast<Row&>(b).maxItemId();
+		return static_cast<Row &>(a).maxItemId() > static_cast<Row &>(b).maxItemId();
 	});
 	return true;
 }
@@ -296,11 +308,11 @@ BoxController::Row *BoxController::rowForItem(HistoryItem *item) {
 	auto v = delegate();
 	if (auto fullRowsCount = v->peerListFullRowsCount()) {
 		auto itemId = item->id;
-		auto lastRow = static_cast<Row*>(v->peerListRowAt(fullRowsCount - 1).get());
+		auto lastRow = static_cast<Row *>(v->peerListRowAt(fullRowsCount - 1).get());
 		if (itemId < lastRow->minItemId()) {
 			return lastRow;
 		}
-		auto firstRow = static_cast<Row*>(v->peerListRowAt(0).get());
+		auto firstRow = static_cast<Row *>(v->peerListRowAt(0).get());
 		if (itemId > firstRow->maxItemId()) {
 			return firstRow;
 		}
@@ -312,18 +324,18 @@ BoxController::Row *BoxController::rowForItem(HistoryItem *item) {
 		auto right = fullRowsCount;
 		while (left + 1 < right) {
 			auto middle = (right + left) / 2;
-			auto middleRow = static_cast<Row*>(v->peerListRowAt(middle).get());
+			auto middleRow = static_cast<Row *>(v->peerListRowAt(middle).get());
 			if (middleRow->maxItemId() >= itemId) {
 				left = middle;
 			} else {
 				right = middle;
 			}
 		}
-		auto result = static_cast<Row*>(v->peerListRowAt(left).get());
+		auto result = static_cast<Row *>(v->peerListRowAt(left).get());
 		// Check for rowAt(left)->minItemId > itemId > rowAt(left + 1)->maxItemId.
 		// In that case we sometimes need to return rowAt(left + 1), not rowAt(left).
 		if (result->minItemId() > itemId && left + 1 < fullRowsCount) {
-			auto possibleResult = static_cast<Row*>(v->peerListRowAt(left + 1).get());
+			auto possibleResult = static_cast<Row *>(v->peerListRowAt(left + 1).get());
 			Assert(possibleResult->maxItemId() < itemId);
 			if (possibleResult->canAddItem(item)) {
 				return possibleResult;
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.h b/Telegram/SourceFiles/calls/calls_box_controller.h
index cbaf79d9d..5ab79b9d7 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.h
+++ b/Telegram/SourceFiles/calls/calls_box_controller.h
@@ -27,8 +27,8 @@ namespace Calls {
 class BoxController : public PeerListController, private base::Subscriber, private MTP::Sender {
 public:
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowActionClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
+	void rowActionClicked(not_null<PeerListRow *> row) override;
 	void loadMoreRows() override;
 
 private:
@@ -48,7 +48,6 @@ private:
 	MsgId _offsetId = 0;
 	mtpRequestId _loadRequestId = 0;
 	bool _allLoaded = false;
-
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 4738c3f3e..90a1cfb04 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -19,18 +19,18 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 
-#include "core/utils.h"
 #include "calls/calls_call.h"
 #include "auth_session.h"
-#include "mainwidget.h"
-#include "lang/lang_keys.h"
+#include "base/openssl_help.h"
 #include "boxes/confirm_box.h"
 #include "boxes/rate_call_box.h"
 #include "calls/calls_instance.h"
-#include "base/openssl_help.h"
-#include "mtproto/connection.h"
-#include "media/media_audio_track.h"
 #include "calls/calls_panel.h"
+#include "core/utils.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "media/media_audio_track.h"
+#include "mtproto/connection.h"
 
 #ifdef slots
 #undef slots
@@ -60,28 +60,25 @@ void ConvertEndpoint(std::vector<tgvoip::Endpoint> &ep, const MTPDphoneConnectio
 	}
 	auto ipv4 = tgvoip::IPv4Address(std::string(mtc.vip.v.constData(), mtc.vip.v.size()));
 	auto ipv6 = tgvoip::IPv6Address(std::string(mtc.vipv6.v.constData(), mtc.vipv6.v.size()));
-	ep.push_back(Endpoint((int64_t)mtc.vid.v, (uint16_t)mtc.vport.v, ipv4, ipv6, EP_TYPE_UDP_RELAY, (unsigned char*)mtc.vpeer_tag.v.data()));
+	ep.push_back(Endpoint((int64_t)mtc.vid.v, (uint16_t)mtc.vport.v, ipv4, ipv6, EP_TYPE_UDP_RELAY,
+	                      (unsigned char *)mtc.vpeer_tag.v.data()));
 }
 
 constexpr auto kFingerprintDataSize = 256;
 quint64 ComputeFingerprint(const std::array<gsl::byte, kFingerprintDataSize> &authKey) {
 	auto hash = openssl::Sha1(authKey);
-	return (gsl::to_integer<quint64>(hash[19]) << 56)
-		| (gsl::to_integer<quint64>(hash[18]) << 48)
-		| (gsl::to_integer<quint64>(hash[17]) << 40)
-		| (gsl::to_integer<quint64>(hash[16]) << 32)
-		| (gsl::to_integer<quint64>(hash[15]) << 24)
-		| (gsl::to_integer<quint64>(hash[14]) << 16)
-		| (gsl::to_integer<quint64>(hash[13]) << 8)
-		| (gsl::to_integer<quint64>(hash[12]));
+	return (gsl::to_integer<quint64>(hash[19]) << 56) | (gsl::to_integer<quint64>(hash[18]) << 48) |
+	       (gsl::to_integer<quint64>(hash[17]) << 40) | (gsl::to_integer<quint64>(hash[16]) << 32) |
+	       (gsl::to_integer<quint64>(hash[15]) << 24) | (gsl::to_integer<quint64>(hash[14]) << 16) |
+	       (gsl::to_integer<quint64>(hash[13]) << 8) | (gsl::to_integer<quint64>(hash[12]));
 }
 
 } // namespace
 
-Call::Call(not_null<Delegate*> delegate, not_null<UserData*> user, Type type)
-: _delegate(delegate)
-, _user(user)
-, _type(type) {
+Call::Call(not_null<Delegate *> delegate, not_null<UserData *> user, Type type)
+    : _delegate(delegate)
+    , _user(user)
+    , _type(type) {
 	_discardByTimeoutTimer.setCallback([this] { hangup(); });
 
 	if (_type == Type::Outgoing) {
@@ -138,50 +135,55 @@ void Call::startOutgoing() {
 	Expects(_type == Type::Outgoing);
 	Expects(_state == State::Requesting);
 
-	request(MTPphone_RequestCall(_user->inputUser, MTP_int(rand_value<qint32>()), MTP_bytes(_gaHash), MTP_phoneCallProtocol(MTP_flags(MTPDphoneCallProtocol::Flag::f_udp_p2p | MTPDphoneCallProtocol::Flag::f_udp_reflector), MTP_int(kMinLayer), MTP_int(kMaxLayer)))).done([this](const MTPphone_PhoneCall &result) {
-		Expects(result.type() == mtpc_phone_phoneCall);
+	request(MTPphone_RequestCall(_user->inputUser, MTP_int(rand_value<qint32>()), MTP_bytes(_gaHash),
+	                             MTP_phoneCallProtocol(MTP_flags(MTPDphoneCallProtocol::Flag::f_udp_p2p |
+	                                                             MTPDphoneCallProtocol::Flag::f_udp_reflector),
+	                                                   MTP_int(kMinLayer), MTP_int(kMaxLayer))))
+	    .done([this](const MTPphone_PhoneCall &result) {
+		    Expects(result.type() == mtpc_phone_phoneCall);
 
-		setState(State::Waiting);
+		    setState(State::Waiting);
 
-		auto &call = result.c_phone_phoneCall();
-		App::feedUsers(call.vusers);
-		if (call.vphone_call.type() != mtpc_phoneCallWaiting) {
-			LOG(("Call Error: Expected phoneCallWaiting in response to phone.requestCall()"));
-			finish(FinishType::Failed);
-			return;
-		}
+		    auto &call = result.c_phone_phoneCall();
+		    App::feedUsers(call.vusers);
+		    if (call.vphone_call.type() != mtpc_phoneCallWaiting) {
+			    LOG(("Call Error: Expected phoneCallWaiting in response to phone.requestCall()"));
+			    finish(FinishType::Failed);
+			    return;
+		    }
 
-		auto &phoneCall = call.vphone_call;
-		auto &waitingCall = phoneCall.c_phoneCallWaiting();
-		_id = waitingCall.vid.v;
-		_accessHash = waitingCall.vaccess_hash.v;
-		if (_finishAfterRequestingCall != FinishType::None) {
-			if (_finishAfterRequestingCall == FinishType::Failed) {
-				finish(_finishAfterRequestingCall);
-			} else {
-				hangup();
-			}
-			return;
-		}
+		    auto &phoneCall = call.vphone_call;
+		    auto &waitingCall = phoneCall.c_phoneCallWaiting();
+		    _id = waitingCall.vid.v;
+		    _accessHash = waitingCall.vaccess_hash.v;
+		    if (_finishAfterRequestingCall != FinishType::None) {
+			    if (_finishAfterRequestingCall == FinishType::Failed) {
+				    finish(_finishAfterRequestingCall);
+			    } else {
+				    hangup();
+			    }
+			    return;
+		    }
 
-		_discardByTimeoutTimer.callOnce(Global::CallReceiveTimeoutMs());
-		handleUpdate(phoneCall);
-	}).fail([this](const RPCError &error) {
-		handleRequestError(error);
-	}).send();
+		    _discardByTimeoutTimer.callOnce(Global::CallReceiveTimeoutMs());
+		    handleUpdate(phoneCall);
+	    })
+	    .fail([this](const RPCError &error) { handleRequestError(error); })
+	    .send();
 }
 
 void Call::startIncoming() {
 	Expects(_type == Type::Incoming);
 	Expects(_state == State::Starting);
 
-	request(MTPphone_ReceivedCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)))).done([this](const MTPBool &result) {
-		if (_state == State::Starting) {
-			setState(State::WaitingIncoming);
-		}
-	}).fail([this](const RPCError &error) {
-		handleRequestError(error);
-	}).send();
+	request(MTPphone_ReceivedCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash))))
+	    .done([this](const MTPBool &result) {
+		    if (_state == State::Starting) {
+			    setState(State::WaitingIncoming);
+		    }
+	    })
+	    .fail([this](const RPCError &error) { handleRequestError(error); })
+	    .send();
 }
 
 void Call::answer() {
@@ -199,20 +201,21 @@ void Call::answer() {
 	} else {
 		_answerAfterDhConfigReceived = false;
 	}
-	request(MTPphone_AcceptCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_gb), _protocol)).done([this](const MTPphone_PhoneCall &result) {
-		Expects(result.type() == mtpc_phone_phoneCall);
-		auto &call = result.c_phone_phoneCall();
-		App::feedUsers(call.vusers);
-		if (call.vphone_call.type() != mtpc_phoneCallWaiting) {
-			LOG(("Call Error: Expected phoneCallWaiting in response to phone.acceptCall()"));
-			finish(FinishType::Failed);
-			return;
-		}
+	request(MTPphone_AcceptCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_gb), _protocol))
+	    .done([this](const MTPphone_PhoneCall &result) {
+		    Expects(result.type() == mtpc_phone_phoneCall);
+		    auto &call = result.c_phone_phoneCall();
+		    App::feedUsers(call.vusers);
+		    if (call.vphone_call.type() != mtpc_phoneCallWaiting) {
+			    LOG(("Call Error: Expected phoneCallWaiting in response to phone.acceptCall()"));
+			    finish(FinishType::Failed);
+			    return;
+		    }
 
-		handleUpdate(call.vphone_call);
-	}).fail([this](const RPCError &error) {
-		handleRequestError(error);
-	}).send();
+		    handleUpdate(call.vphone_call);
+	    })
+	    .fail([this](const RPCError &error) { handleRequestError(error); })
+	    .send();
 }
 
 void Call::setMute(bool mute) {
@@ -234,7 +237,7 @@ void Call::hangup() {
 		auto missed = (_state == State::Ringing || (_state == State::Waiting && _type == Type::Outgoing));
 		auto declined = isIncomingWaiting();
 		auto reason = missed ? MTP_phoneCallDiscardReasonMissed() :
-			declined ? MTP_phoneCallDiscardReasonBusy() : MTP_phoneCallDiscardReasonHangup();
+		                       declined ? MTP_phoneCallDiscardReasonBusy() : MTP_phoneCallDiscardReasonHangup();
 		finish(FinishType::Ended, reason);
 	}
 }
@@ -253,16 +256,17 @@ void Call::redial() {
 
 QString Call::getDebugLog() const {
 	constexpr auto kDebugLimit = 4096;
-	auto bytes = base::byte_vector(kDebugLimit, gsl::byte {});
-	_controller->GetDebugString(reinterpret_cast<char*>(bytes.data()), bytes.size());
-	auto end = std::find(bytes.begin(), bytes.end(), gsl::byte {});
+	auto bytes = base::byte_vector(kDebugLimit, gsl::byte{});
+	_controller->GetDebugString(reinterpret_cast<char *>(bytes.data()), bytes.size());
+	auto end = std::find(bytes.begin(), bytes.end(), gsl::byte{});
 	auto size = (end - bytes.begin());
-	return QString::fromUtf8(reinterpret_cast<const char*>(bytes.data()), size);
+	return QString::fromUtf8(reinterpret_cast<const char *>(bytes.data()), size);
 }
 
 void Call::startWaitingTrack() {
 	_waitingTrack = Media::Audio::Current().createTrack();
-	auto trackFileName = Auth().data().getSoundPath((_type == Type::Outgoing) ? qsl("call_outgoing") : qsl("call_incoming"));
+	auto trackFileName =
+	    Auth().data().getSoundPath((_type == Type::Outgoing) ? qsl("call_outgoing") : qsl("call_incoming"));
 	_waitingTrack->samplePeakEach(kSoundSampleMs);
 	_waitingTrack->fillFromFile(trackFileName);
 	_waitingTrack->playInLoop();
@@ -283,7 +287,7 @@ bool Call::isKeyShaForFingerprintReady() const {
 base::byte_array<Call::kSha256Size> Call::getKeyShaForFingerprint() const {
 	Expects(isKeyShaForFingerprintReady());
 	Expects(!_ga.empty());
-	auto encryptedChatAuthKey = base::byte_vector(_authKey.size() + _ga.size(), gsl::byte {});
+	auto encryptedChatAuthKey = base::byte_vector(_authKey.size() + _ga.size(), gsl::byte{});
 	base::copy_bytes(gsl::make_span(encryptedChatAuthKey).subspan(0, _authKey.size()), _authKey);
 	base::copy_bytes(gsl::make_span(encryptedChatAuthKey).subspan(_authKey.size(), _ga.size()), _ga);
 	return openssl::Sha256(encryptedChatAuthKey);
@@ -293,13 +297,13 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 	switch (call.type()) {
 	case mtpc_phoneCallRequested: {
 		auto &data = call.c_phoneCallRequested();
-		if (_type != Type::Incoming
-			|| _id != 0
-			|| peerToUser(_user->id) != data.vadmin_id.v) {
+		if (_type != Type::Incoming || _id != 0 || peerToUser(_user->id) != data.vadmin_id.v) {
 			Unexpected("phoneCallRequested call inside an existing call handleUpdate()");
 		}
 		if (Auth().userId() != data.vparticipant_id.v) {
-			LOG(("Call Error: Wrong call participant_id %1, expected %2.").arg(data.vparticipant_id.v).arg(Auth().userId()));
+			LOG(("Call Error: Wrong call participant_id %1, expected %2.")
+			        .arg(data.vparticipant_id.v)
+			        .arg(Auth().userId()));
 			finish(FinishType::Failed);
 			return true;
 		}
@@ -313,7 +317,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			return true;
 		}
 		base::copy_bytes(gsl::make_span(_gaHash), gaHashBytes);
-	} return true;
+	}
+		return true;
 
 	case mtpc_phoneCallEmpty: {
 		auto &data = call.c_phoneCallEmpty();
@@ -322,7 +327,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		}
 		LOG(("Call Error: phoneCallEmpty received."));
 		finish(FinishType::Failed);
-	} return true;
+	}
+		return true;
 
 	case mtpc_phoneCallWaiting: {
 		auto &data = call.c_phoneCallWaiting();
@@ -334,7 +340,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 			setState(State::Ringing);
 			startWaitingTrack();
 		}
-	} return true;
+	}
+		return true;
 
 	case mtpc_phoneCall: {
 		auto &data = call.c_phoneCall();
@@ -344,7 +351,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		if (_type == Type::Incoming && _state == State::ExchangingKeys) {
 			startConfirmedCall(data);
 		}
-	} return true;
+	}
+		return true;
 
 	case mtpc_phoneCallDiscarded: {
 		auto &data = call.c_phoneCallDiscarded();
@@ -354,7 +362,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		if (data.is_need_debug()) {
 			auto debugLog = _controller ? _controller->GetDebugLog() : std::string();
 			if (!debugLog.empty()) {
-				MTP::send(MTPphone_SaveCallDebug(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_dataJSON(MTP_string(debugLog))));
+				MTP::send(MTPphone_SaveCallDebug(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)),
+				                                 MTP_dataJSON(MTP_string(debugLog))));
 			}
 		}
 		if (data.is_need_rating() && _id && _accessHash) {
@@ -370,7 +379,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		} else {
 			setState(State::EndedByOtherDevice);
 		}
-	} return true;
+	}
+		return true;
 
 	case mtpc_phoneCallAccepted: {
 		auto &data = call.c_phoneCallAccepted();
@@ -383,7 +393,8 @@ bool Call::handleUpdate(const MTPPhoneCall &call) {
 		} else if (checkCallFields(data)) {
 			confirmAcceptedCall(data);
 		}
-	} return true;
+	}
+		return true;
 	}
 
 	Unexpected("phoneCall type inside an existing call handleUpdate()");
@@ -404,20 +415,25 @@ void Call::confirmAcceptedCall(const MTPDphoneCallAccepted &call) {
 	_keyFingerprint = ComputeFingerprint(_authKey);
 
 	setState(State::ExchangingKeys);
-	request(MTPphone_ConfirmCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_ga), MTP_long(_keyFingerprint), MTP_phoneCallProtocol(MTP_flags(MTPDphoneCallProtocol::Flag::f_udp_p2p | MTPDphoneCallProtocol::Flag::f_udp_reflector), MTP_int(kMinLayer), MTP_int(kMaxLayer)))).done([this](const MTPphone_PhoneCall &result) {
-		Expects(result.type() == mtpc_phone_phoneCall);
-		auto &call = result.c_phone_phoneCall();
-		App::feedUsers(call.vusers);
-		if (call.vphone_call.type() != mtpc_phoneCall) {
-			LOG(("Call Error: Expected phoneCall in response to phone.confirmCall()"));
-			finish(FinishType::Failed);
-			return;
-		}
+	request(MTPphone_ConfirmCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_bytes(_ga),
+	                             MTP_long(_keyFingerprint),
+	                             MTP_phoneCallProtocol(MTP_flags(MTPDphoneCallProtocol::Flag::f_udp_p2p |
+	                                                             MTPDphoneCallProtocol::Flag::f_udp_reflector),
+	                                                   MTP_int(kMinLayer), MTP_int(kMaxLayer))))
+	    .done([this](const MTPphone_PhoneCall &result) {
+		    Expects(result.type() == mtpc_phone_phoneCall);
+		    auto &call = result.c_phone_phoneCall();
+		    App::feedUsers(call.vusers);
+		    if (call.vphone_call.type() != mtpc_phoneCall) {
+			    LOG(("Call Error: Expected phoneCall in response to phone.confirmCall()"));
+			    finish(FinishType::Failed);
+			    return;
+		    }
 
-		createAndStartController(call.vphone_call.c_phoneCall());
-	}).fail([this](const RPCError &error) {
-		handleRequestError(error);
-	}).send();
+		    createAndStartController(call.vphone_call.c_phoneCall());
+	    })
+	    .fail([this](const RPCError &error) { handleRequestError(error); })
+	    .send();
 }
 
 void Call::startConfirmedCall(const MTPDphoneCall &call) {
@@ -450,7 +466,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		return;
 	}
 
-	voip_config_t config = { 0 };
+	voip_config_t config = {0};
 	config.data_saving = DATA_SAVING_NEVER;
 	config.enableAEC = true;
 	config.enableNS = true;
@@ -480,12 +496,12 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 	if (_mute) {
 		_controller->SetMicMute(_mute);
 	}
-	_controller->implData = static_cast<void*>(this);
+	_controller->implData = static_cast<void *>(this);
 	_controller->SetRemoteEndpoints(endpoints, true);
 	_controller->SetConfig(&config);
-	_controller->SetEncryptionKey(reinterpret_cast<char*>(_authKey.data()), (_type == Type::Outgoing));
+	_controller->SetEncryptionKey(reinterpret_cast<char *>(_authKey.data()), (_type == Type::Outgoing));
 	_controller->SetStateCallback([](tgvoip::VoIPController *controller, int state) {
-		static_cast<Call*>(controller->implData)->handleControllerStateChange(controller, state);
+		static_cast<Call *>(controller->implData)->handleControllerStateChange(controller, state);
 	});
 	_controller->Start();
 	_controller->Connect();
@@ -494,7 +510,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 void Call::handleControllerStateChange(tgvoip::VoIPController *controller, int state) {
 	// NB! Can be called from an arbitrary thread!
 	// Expects(controller == _controller.get()); This can be called from ~VoIPController()!
-	Expects(controller->implData == static_cast<void*>(this));
+	Expects(controller->implData == static_cast<void *>(this));
 
 	switch (state) {
 	case STATE_WAIT_INIT: {
@@ -522,8 +538,7 @@ void Call::handleControllerStateChange(tgvoip::VoIPController *controller, int s
 	}
 }
 
-template <typename T>
-bool Call::checkCallCommonFields(const T &call) {
+template <typename T> bool Call::checkCallCommonFields(const T &call) {
 	auto checkFailed = [this] {
 		finish(FinishType::Failed);
 		return false;
@@ -572,43 +587,28 @@ void Call::setState(State state) {
 		_state = state;
 		_stateChanged.notify(state, true);
 
-		if (true
-			&& _state != State::Starting
-			&& _state != State::Requesting
-			&& _state != State::Waiting
-			&& _state != State::WaitingIncoming
-			&& _state != State::Ringing) {
+		if (true && _state != State::Starting && _state != State::Requesting && _state != State::Waiting &&
+		    _state != State::WaitingIncoming && _state != State::Ringing) {
 			_waitingTrack.reset();
 		}
-		if (false
-			|| _state == State::Ended
-			|| _state == State::EndedByOtherDevice
-			|| _state == State::Failed
-			|| _state == State::Busy) {
+		if (false || _state == State::Ended || _state == State::EndedByOtherDevice || _state == State::Failed ||
+		    _state == State::Busy) {
 			// Destroy controller before destroying Call Panel,
 			// so that the panel hide animation is smooth.
 			destroyController();
 		}
 		switch (_state) {
-		case State::Established:
-			_startTime = getms(true);
-			break;
-		case State::ExchangingKeys:
-			_delegate->playSound(Delegate::Sound::Connecting);
-			break;
+		case State::Established: _startTime = getms(true); break;
+		case State::ExchangingKeys: _delegate->playSound(Delegate::Sound::Connecting); break;
 		case State::Ended:
 			_delegate->playSound(Delegate::Sound::Ended);
 			// [[fallthrough]]
-		case State::EndedByOtherDevice:
-			_delegate->callFinished(this);
-			break;
+		case State::EndedByOtherDevice: _delegate->callFinished(this); break;
 		case State::Failed:
 			_delegate->playSound(Delegate::Sound::Ended);
 			_delegate->callFailed(this);
 			break;
-		case State::Busy:
-			_delegate->playSound(Delegate::Sound::Busy);
-			break;
+		case State::Busy: _delegate->playSound(Delegate::Sound::Busy); break;
 		}
 	}
 }
@@ -622,11 +622,8 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 		_finishAfterRequestingCall = type;
 		return;
 	}
-	if (_state == State::HangingUp
-		|| _state == State::FailedHangingUp
-		|| _state == State::EndedByOtherDevice
-		|| _state == State::Ended
-		|| _state == State::Failed) {
+	if (_state == State::HangingUp || _state == State::FailedHangingUp || _state == State::EndedByOtherDevice ||
+	    _state == State::Ended || _state == State::Failed) {
 		return;
 	}
 	if (!_id) {
@@ -638,14 +635,16 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 	auto duration = getDurationMs() / 1000;
 	auto connectionId = _controller ? _controller->GetPreferredRelayID() : 0;
 	_finishByTimeoutTimer.call(kHangupTimeoutMs, [this, finalState] { setState(finalState); });
-	request(MTPphone_DiscardCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_int(duration), reason, MTP_long(connectionId))).done([this, finalState](const MTPUpdates &result) {
-		// This could be destroyed by updates, so we set Ended after
-		// updates being handled, but in a guarded way.
-		InvokeQueued(this, [this, finalState] { setState(finalState); });
-		App::main()->sentUpdatesReceived(result);
-	}).fail([this, finalState](const RPCError &error) {
-		setState(finalState);
-	}).send();
+	request(MTPphone_DiscardCall(MTP_inputPhoneCall(MTP_long(_id), MTP_long(_accessHash)), MTP_int(duration), reason,
+	                             MTP_long(connectionId)))
+	    .done([this, finalState](const MTPUpdates &result) {
+		    // This could be destroyed by updates, so we set Ended after
+		    // updates being handled, but in a guarded way.
+		    InvokeQueued(this, [this, finalState] { setState(finalState); });
+		    App::main()->sentUpdatesReceived(result);
+	    })
+	    .fail([this, finalState](const RPCError &error) { setState(finalState); })
+	    .send();
 }
 
 void Call::setStateQueued(State state) {
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 8dc8f49f2..e05837884 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/weak_unique_ptr.h"
 #include "base/timer.h"
-#include "mtproto/sender.h"
+#include "base/weak_unique_ptr.h"
 #include "mtproto/auth_key.h"
+#include "mtproto/sender.h"
 
 namespace Media {
 namespace Audio {
@@ -48,9 +48,9 @@ public:
 	class Delegate {
 	public:
 		virtual DhConfig getDhConfig() const = 0;
-		virtual void callFinished(not_null<Call*> call) = 0;
-		virtual void callFailed(not_null<Call*> call) = 0;
-		virtual void callRedial(not_null<Call*> call) = 0;
+		virtual void callFinished(not_null<Call *> call) = 0;
+		virtual void callFailed(not_null<Call *> call) = 0;
+		virtual void callRedial(not_null<Call *> call) = 0;
 
 		enum class Sound {
 			Connecting,
@@ -58,7 +58,6 @@ public:
 			Ended,
 		};
 		virtual void playSound(Sound sound) = 0;
-
 	};
 
 	static constexpr auto kRandomPowerSize = 256;
@@ -69,12 +68,12 @@ public:
 		Incoming,
 		Outgoing,
 	};
-	Call(not_null<Delegate*> delegate, not_null<UserData*> user, Type type);
+	Call(not_null<Delegate *> delegate, not_null<UserData *> user, Type type);
 
 	Type type() const {
 		return _type;
 	}
-	not_null<UserData*> user() const {
+	not_null<UserData *> user() const {
 		return _user;
 	}
 	bool isIncomingWaiting() const;
@@ -145,8 +144,7 @@ private:
 	void handleControllerStateChange(tgvoip::VoIPController *controller, int state);
 	void createAndStartController(const MTPDphoneCall &call);
 
-	template <typename T>
-	bool checkCallCommonFields(const T &call);
+	template <typename T> bool checkCallCommonFields(const T &call);
 	bool checkCallFields(const MTPDphoneCall &call);
 	bool checkCallFields(const MTPDphoneCallAccepted &call);
 
@@ -157,8 +155,8 @@ private:
 	void setFailedQueued(int error);
 	void destroyController();
 
-	not_null<Delegate*> _delegate;
-	not_null<UserData*> _user;
+	not_null<Delegate *> _delegate;
+	not_null<UserData *> _user;
 	Type _type = Type::Outgoing;
 	State _state = State::Starting;
 	FinishType _finishAfterRequestingCall = FinishType::None;
@@ -186,7 +184,6 @@ private:
 	std::unique_ptr<tgvoip::VoIPController> _controller;
 
 	std::unique_ptr<Media::Audio::Track> _waitingTrack;
-
 };
 
 void UpdateConfig(const std::map<std::string, std::string> &data);
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index ac0871771..adecae91c 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -26,102 +26,77 @@ namespace Calls {
 namespace {
 
 ushort Data[] = {
-0xd83d, 0xde09, 0xd83d, 0xde0d, 0xd83d, 0xde1b, 0xd83d, 0xde2d, 0xd83d, 0xde31, 0xd83d, 0xde21,
-0xd83d, 0xde0e, 0xd83d, 0xde34, 0xd83d, 0xde35, 0xd83d, 0xde08, 0xd83d, 0xde2c, 0xd83d, 0xde07,
-0xd83d, 0xde0f, 0xd83d, 0xdc6e, 0xd83d, 0xdc77, 0xd83d, 0xdc82, 0xd83d, 0xdc76, 0xd83d, 0xdc68,
-0xd83d, 0xdc69, 0xd83d, 0xdc74, 0xd83d, 0xdc75, 0xd83d, 0xde3b, 0xd83d, 0xde3d, 0xd83d, 0xde40,
-0xd83d, 0xdc7a, 0xd83d, 0xde48, 0xd83d, 0xde49, 0xd83d, 0xde4a, 0xd83d, 0xdc80, 0xd83d, 0xdc7d,
-0xd83d, 0xdca9, 0xd83d, 0xdd25, 0xd83d, 0xdca5, 0xd83d, 0xdca4, 0xd83d, 0xdc42, 0xd83d, 0xdc40,
-0xd83d, 0xdc43, 0xd83d, 0xdc45, 0xd83d, 0xdc44, 0xd83d, 0xdc4d, 0xd83d, 0xdc4e, 0xd83d, 0xdc4c,
-0xd83d, 0xdc4a, 0x270c, 0x270b, 0xd83d, 0xdc50, 0xd83d, 0xdc46, 0xd83d, 0xdc47, 0xd83d, 0xdc49,
-0xd83d, 0xdc48, 0xd83d, 0xde4f, 0xd83d, 0xdc4f, 0xd83d, 0xdcaa, 0xd83d, 0xdeb6, 0xd83c, 0xdfc3,
-0xd83d, 0xdc83, 0xd83d, 0xdc6b, 0xd83d, 0xdc6a, 0xd83d, 0xdc6c, 0xd83d, 0xdc6d, 0xd83d, 0xdc85,
-0xd83c, 0xdfa9, 0xd83d, 0xdc51, 0xd83d, 0xdc52, 0xd83d, 0xdc5f, 0xd83d, 0xdc5e, 0xd83d, 0xdc60,
-0xd83d, 0xdc55, 0xd83d, 0xdc57, 0xd83d, 0xdc56, 0xd83d, 0xdc59, 0xd83d, 0xdc5c, 0xd83d, 0xdc53,
-0xd83c, 0xdf80, 0xd83d, 0xdc84, 0xd83d, 0xdc9b, 0xd83d, 0xdc99, 0xd83d, 0xdc9c, 0xd83d, 0xdc9a,
-0xd83d, 0xdc8d, 0xd83d, 0xdc8e, 0xd83d, 0xdc36, 0xd83d, 0xdc3a, 0xd83d, 0xdc31, 0xd83d, 0xdc2d,
-0xd83d, 0xdc39, 0xd83d, 0xdc30, 0xd83d, 0xdc38, 0xd83d, 0xdc2f, 0xd83d, 0xdc28, 0xd83d, 0xdc3b,
-0xd83d, 0xdc37, 0xd83d, 0xdc2e, 0xd83d, 0xdc17, 0xd83d, 0xdc34, 0xd83d, 0xdc11, 0xd83d, 0xdc18,
-0xd83d, 0xdc3c, 0xd83d, 0xdc27, 0xd83d, 0xdc25, 0xd83d, 0xdc14, 0xd83d, 0xdc0d, 0xd83d, 0xdc22,
-0xd83d, 0xdc1b, 0xd83d, 0xdc1d, 0xd83d, 0xdc1c, 0xd83d, 0xdc1e, 0xd83d, 0xdc0c, 0xd83d, 0xdc19,
-0xd83d, 0xdc1a, 0xd83d, 0xdc1f, 0xd83d, 0xdc2c, 0xd83d, 0xdc0b, 0xd83d, 0xdc10, 0xd83d, 0xdc0a,
-0xd83d, 0xdc2b, 0xd83c, 0xdf40, 0xd83c, 0xdf39, 0xd83c, 0xdf3b, 0xd83c, 0xdf41, 0xd83c, 0xdf3e,
-0xd83c, 0xdf44, 0xd83c, 0xdf35, 0xd83c, 0xdf34, 0xd83c, 0xdf33, 0xd83c, 0xdf1e, 0xd83c, 0xdf1a,
-0xd83c, 0xdf19, 0xd83c, 0xdf0e, 0xd83c, 0xdf0b, 0x26a1, 0x2614, 0x2744, 0x26c4, 0xd83c, 0xdf00,
-0xd83c, 0xdf08, 0xd83c, 0xdf0a, 0xd83c, 0xdf93, 0xd83c, 0xdf86, 0xd83c, 0xdf83, 0xd83d, 0xdc7b,
-0xd83c, 0xdf85, 0xd83c, 0xdf84, 0xd83c, 0xdf81, 0xd83c, 0xdf88, 0xd83d, 0xdd2e, 0xd83c, 0xdfa5,
-0xd83d, 0xdcf7, 0xd83d, 0xdcbf, 0xd83d, 0xdcbb, 0x260e, 0xd83d, 0xdce1, 0xd83d, 0xdcfa, 0xd83d,
-0xdcfb, 0xd83d, 0xdd09, 0xd83d, 0xdd14, 0x23f3, 0x23f0, 0x231a, 0xd83d, 0xdd12, 0xd83d, 0xdd11,
-0xd83d, 0xdd0e, 0xd83d, 0xdca1, 0xd83d, 0xdd26, 0xd83d, 0xdd0c, 0xd83d, 0xdd0b, 0xd83d, 0xdebf,
-0xd83d, 0xdebd, 0xd83d, 0xdd27, 0xd83d, 0xdd28, 0xd83d, 0xdeaa, 0xd83d, 0xdeac, 0xd83d, 0xdca3,
-0xd83d, 0xdd2b, 0xd83d, 0xdd2a, 0xd83d, 0xdc8a, 0xd83d, 0xdc89, 0xd83d, 0xdcb0, 0xd83d, 0xdcb5,
-0xd83d, 0xdcb3, 0x2709, 0xd83d, 0xdceb, 0xd83d, 0xdce6, 0xd83d, 0xdcc5, 0xd83d, 0xdcc1, 0x2702,
-0xd83d, 0xdccc, 0xd83d, 0xdcce, 0x2712, 0x270f, 0xd83d, 0xdcd0, 0xd83d, 0xdcda, 0xd83d, 0xdd2c,
-0xd83d, 0xdd2d, 0xd83c, 0xdfa8, 0xd83c, 0xdfac, 0xd83c, 0xdfa4, 0xd83c, 0xdfa7, 0xd83c, 0xdfb5,
-0xd83c, 0xdfb9, 0xd83c, 0xdfbb, 0xd83c, 0xdfba, 0xd83c, 0xdfb8, 0xd83d, 0xdc7e, 0xd83c, 0xdfae,
-0xd83c, 0xdccf, 0xd83c, 0xdfb2, 0xd83c, 0xdfaf, 0xd83c, 0xdfc8, 0xd83c, 0xdfc0, 0x26bd, 0x26be,
-0xd83c, 0xdfbe, 0xd83c, 0xdfb1, 0xd83c, 0xdfc9, 0xd83c, 0xdfb3, 0xd83c, 0xdfc1, 0xd83c, 0xdfc7,
-0xd83c, 0xdfc6, 0xd83c, 0xdfca, 0xd83c, 0xdfc4, 0x2615, 0xd83c, 0xdf7c, 0xd83c, 0xdf7a, 0xd83c,
-0xdf77, 0xd83c, 0xdf74, 0xd83c, 0xdf55, 0xd83c, 0xdf54, 0xd83c, 0xdf5f, 0xd83c, 0xdf57, 0xd83c,
-0xdf71, 0xd83c, 0xdf5a, 0xd83c, 0xdf5c, 0xd83c, 0xdf61, 0xd83c, 0xdf73, 0xd83c, 0xdf5e, 0xd83c,
-0xdf69, 0xd83c, 0xdf66, 0xd83c, 0xdf82, 0xd83c, 0xdf70, 0xd83c, 0xdf6a, 0xd83c, 0xdf6b, 0xd83c,
-0xdf6d, 0xd83c, 0xdf6f, 0xd83c, 0xdf4e, 0xd83c, 0xdf4f, 0xd83c, 0xdf4a, 0xd83c, 0xdf4b, 0xd83c,
-0xdf52, 0xd83c, 0xdf47, 0xd83c, 0xdf49, 0xd83c, 0xdf53, 0xd83c, 0xdf51, 0xd83c, 0xdf4c, 0xd83c,
-0xdf50, 0xd83c, 0xdf4d, 0xd83c, 0xdf46, 0xd83c, 0xdf45, 0xd83c, 0xdf3d, 0xd83c, 0xdfe1, 0xd83c,
-0xdfe5, 0xd83c, 0xdfe6, 0x26ea, 0xd83c, 0xdff0, 0x26fa, 0xd83c, 0xdfed, 0xd83d, 0xddfb, 0xd83d,
-0xddfd, 0xd83c, 0xdfa0, 0xd83c, 0xdfa1, 0x26f2, 0xd83c, 0xdfa2, 0xd83d, 0xdea2, 0xd83d, 0xdea4,
-0x2693, 0xd83d, 0xde80, 0x2708, 0xd83d, 0xde81, 0xd83d, 0xde82, 0xd83d, 0xde8b, 0xd83d, 0xde8e,
-0xd83d, 0xde8c, 0xd83d, 0xde99, 0xd83d, 0xde97, 0xd83d, 0xde95, 0xd83d, 0xde9b, 0xd83d, 0xdea8,
-0xd83d, 0xde94, 0xd83d, 0xde92, 0xd83d, 0xde91, 0xd83d, 0xdeb2, 0xd83d, 0xdea0, 0xd83d, 0xde9c,
-0xd83d, 0xdea6, 0x26a0, 0xd83d, 0xdea7, 0x26fd, 0xd83c, 0xdfb0, 0xd83d, 0xddff, 0xd83c, 0xdfaa,
-0xd83c, 0xdfad, 0xd83c, 0xddef, 0xd83c, 0xddf5, 0xd83c, 0xddf0, 0xd83c, 0xddf7, 0xd83c, 0xdde9,
-0xd83c, 0xddea, 0xd83c, 0xdde8, 0xd83c, 0xddf3, 0xd83c, 0xddfa, 0xd83c, 0xddf8, 0xd83c, 0xddeb,
-0xd83c, 0xddf7, 0xd83c, 0xddea, 0xd83c, 0xddf8, 0xd83c, 0xddee, 0xd83c, 0xddf9, 0xd83c, 0xddf7,
-0xd83c, 0xddfa, 0xd83c, 0xddec, 0xd83c, 0xdde7, 0x0031, 0x20e3, 0x0032, 0x20e3, 0x0033, 0x20e3,
-0x0034, 0x20e3, 0x0035, 0x20e3, 0x0036, 0x20e3, 0x0037, 0x20e3, 0x0038, 0x20e3, 0x0039, 0x20e3,
-0x0030, 0x20e3, 0xd83d, 0xdd1f, 0x2757, 0x2753, 0x2665, 0x2666, 0xd83d, 0xdcaf, 0xd83d, 0xdd17,
-0xd83d, 0xdd31, 0xd83d, 0xdd34, 0xd83d, 0xdd35, 0xd83d, 0xdd36, 0xd83d, 0xdd37 };
+    0xd83d, 0xde09, 0xd83d, 0xde0d, 0xd83d, 0xde1b, 0xd83d, 0xde2d, 0xd83d, 0xde31, 0xd83d, 0xde21, 0xd83d, 0xde0e,
+    0xd83d, 0xde34, 0xd83d, 0xde35, 0xd83d, 0xde08, 0xd83d, 0xde2c, 0xd83d, 0xde07, 0xd83d, 0xde0f, 0xd83d, 0xdc6e,
+    0xd83d, 0xdc77, 0xd83d, 0xdc82, 0xd83d, 0xdc76, 0xd83d, 0xdc68, 0xd83d, 0xdc69, 0xd83d, 0xdc74, 0xd83d, 0xdc75,
+    0xd83d, 0xde3b, 0xd83d, 0xde3d, 0xd83d, 0xde40, 0xd83d, 0xdc7a, 0xd83d, 0xde48, 0xd83d, 0xde49, 0xd83d, 0xde4a,
+    0xd83d, 0xdc80, 0xd83d, 0xdc7d, 0xd83d, 0xdca9, 0xd83d, 0xdd25, 0xd83d, 0xdca5, 0xd83d, 0xdca4, 0xd83d, 0xdc42,
+    0xd83d, 0xdc40, 0xd83d, 0xdc43, 0xd83d, 0xdc45, 0xd83d, 0xdc44, 0xd83d, 0xdc4d, 0xd83d, 0xdc4e, 0xd83d, 0xdc4c,
+    0xd83d, 0xdc4a, 0x270c, 0x270b, 0xd83d, 0xdc50, 0xd83d, 0xdc46, 0xd83d, 0xdc47, 0xd83d, 0xdc49, 0xd83d, 0xdc48,
+    0xd83d, 0xde4f, 0xd83d, 0xdc4f, 0xd83d, 0xdcaa, 0xd83d, 0xdeb6, 0xd83c, 0xdfc3, 0xd83d, 0xdc83, 0xd83d, 0xdc6b,
+    0xd83d, 0xdc6a, 0xd83d, 0xdc6c, 0xd83d, 0xdc6d, 0xd83d, 0xdc85, 0xd83c, 0xdfa9, 0xd83d, 0xdc51, 0xd83d, 0xdc52,
+    0xd83d, 0xdc5f, 0xd83d, 0xdc5e, 0xd83d, 0xdc60, 0xd83d, 0xdc55, 0xd83d, 0xdc57, 0xd83d, 0xdc56, 0xd83d, 0xdc59,
+    0xd83d, 0xdc5c, 0xd83d, 0xdc53, 0xd83c, 0xdf80, 0xd83d, 0xdc84, 0xd83d, 0xdc9b, 0xd83d, 0xdc99, 0xd83d, 0xdc9c,
+    0xd83d, 0xdc9a, 0xd83d, 0xdc8d, 0xd83d, 0xdc8e, 0xd83d, 0xdc36, 0xd83d, 0xdc3a, 0xd83d, 0xdc31, 0xd83d, 0xdc2d,
+    0xd83d, 0xdc39, 0xd83d, 0xdc30, 0xd83d, 0xdc38, 0xd83d, 0xdc2f, 0xd83d, 0xdc28, 0xd83d, 0xdc3b, 0xd83d, 0xdc37,
+    0xd83d, 0xdc2e, 0xd83d, 0xdc17, 0xd83d, 0xdc34, 0xd83d, 0xdc11, 0xd83d, 0xdc18, 0xd83d, 0xdc3c, 0xd83d, 0xdc27,
+    0xd83d, 0xdc25, 0xd83d, 0xdc14, 0xd83d, 0xdc0d, 0xd83d, 0xdc22, 0xd83d, 0xdc1b, 0xd83d, 0xdc1d, 0xd83d, 0xdc1c,
+    0xd83d, 0xdc1e, 0xd83d, 0xdc0c, 0xd83d, 0xdc19, 0xd83d, 0xdc1a, 0xd83d, 0xdc1f, 0xd83d, 0xdc2c, 0xd83d, 0xdc0b,
+    0xd83d, 0xdc10, 0xd83d, 0xdc0a, 0xd83d, 0xdc2b, 0xd83c, 0xdf40, 0xd83c, 0xdf39, 0xd83c, 0xdf3b, 0xd83c, 0xdf41,
+    0xd83c, 0xdf3e, 0xd83c, 0xdf44, 0xd83c, 0xdf35, 0xd83c, 0xdf34, 0xd83c, 0xdf33, 0xd83c, 0xdf1e, 0xd83c, 0xdf1a,
+    0xd83c, 0xdf19, 0xd83c, 0xdf0e, 0xd83c, 0xdf0b, 0x26a1, 0x2614, 0x2744, 0x26c4, 0xd83c, 0xdf00, 0xd83c, 0xdf08,
+    0xd83c, 0xdf0a, 0xd83c, 0xdf93, 0xd83c, 0xdf86, 0xd83c, 0xdf83, 0xd83d, 0xdc7b, 0xd83c, 0xdf85, 0xd83c, 0xdf84,
+    0xd83c, 0xdf81, 0xd83c, 0xdf88, 0xd83d, 0xdd2e, 0xd83c, 0xdfa5, 0xd83d, 0xdcf7, 0xd83d, 0xdcbf, 0xd83d, 0xdcbb,
+    0x260e, 0xd83d, 0xdce1, 0xd83d, 0xdcfa, 0xd83d, 0xdcfb, 0xd83d, 0xdd09, 0xd83d, 0xdd14, 0x23f3, 0x23f0, 0x231a,
+    0xd83d, 0xdd12, 0xd83d, 0xdd11, 0xd83d, 0xdd0e, 0xd83d, 0xdca1, 0xd83d, 0xdd26, 0xd83d, 0xdd0c, 0xd83d, 0xdd0b,
+    0xd83d, 0xdebf, 0xd83d, 0xdebd, 0xd83d, 0xdd27, 0xd83d, 0xdd28, 0xd83d, 0xdeaa, 0xd83d, 0xdeac, 0xd83d, 0xdca3,
+    0xd83d, 0xdd2b, 0xd83d, 0xdd2a, 0xd83d, 0xdc8a, 0xd83d, 0xdc89, 0xd83d, 0xdcb0, 0xd83d, 0xdcb5, 0xd83d, 0xdcb3,
+    0x2709, 0xd83d, 0xdceb, 0xd83d, 0xdce6, 0xd83d, 0xdcc5, 0xd83d, 0xdcc1, 0x2702, 0xd83d, 0xdccc, 0xd83d, 0xdcce,
+    0x2712, 0x270f, 0xd83d, 0xdcd0, 0xd83d, 0xdcda, 0xd83d, 0xdd2c, 0xd83d, 0xdd2d, 0xd83c, 0xdfa8, 0xd83c, 0xdfac,
+    0xd83c, 0xdfa4, 0xd83c, 0xdfa7, 0xd83c, 0xdfb5, 0xd83c, 0xdfb9, 0xd83c, 0xdfbb, 0xd83c, 0xdfba, 0xd83c, 0xdfb8,
+    0xd83d, 0xdc7e, 0xd83c, 0xdfae, 0xd83c, 0xdccf, 0xd83c, 0xdfb2, 0xd83c, 0xdfaf, 0xd83c, 0xdfc8, 0xd83c, 0xdfc0,
+    0x26bd, 0x26be, 0xd83c, 0xdfbe, 0xd83c, 0xdfb1, 0xd83c, 0xdfc9, 0xd83c, 0xdfb3, 0xd83c, 0xdfc1, 0xd83c, 0xdfc7,
+    0xd83c, 0xdfc6, 0xd83c, 0xdfca, 0xd83c, 0xdfc4, 0x2615, 0xd83c, 0xdf7c, 0xd83c, 0xdf7a, 0xd83c, 0xdf77, 0xd83c,
+    0xdf74, 0xd83c, 0xdf55, 0xd83c, 0xdf54, 0xd83c, 0xdf5f, 0xd83c, 0xdf57, 0xd83c, 0xdf71, 0xd83c, 0xdf5a, 0xd83c,
+    0xdf5c, 0xd83c, 0xdf61, 0xd83c, 0xdf73, 0xd83c, 0xdf5e, 0xd83c, 0xdf69, 0xd83c, 0xdf66, 0xd83c, 0xdf82, 0xd83c,
+    0xdf70, 0xd83c, 0xdf6a, 0xd83c, 0xdf6b, 0xd83c, 0xdf6d, 0xd83c, 0xdf6f, 0xd83c, 0xdf4e, 0xd83c, 0xdf4f, 0xd83c,
+    0xdf4a, 0xd83c, 0xdf4b, 0xd83c, 0xdf52, 0xd83c, 0xdf47, 0xd83c, 0xdf49, 0xd83c, 0xdf53, 0xd83c, 0xdf51, 0xd83c,
+    0xdf4c, 0xd83c, 0xdf50, 0xd83c, 0xdf4d, 0xd83c, 0xdf46, 0xd83c, 0xdf45, 0xd83c, 0xdf3d, 0xd83c, 0xdfe1, 0xd83c,
+    0xdfe5, 0xd83c, 0xdfe6, 0x26ea, 0xd83c, 0xdff0, 0x26fa, 0xd83c, 0xdfed, 0xd83d, 0xddfb, 0xd83d, 0xddfd, 0xd83c,
+    0xdfa0, 0xd83c, 0xdfa1, 0x26f2, 0xd83c, 0xdfa2, 0xd83d, 0xdea2, 0xd83d, 0xdea4, 0x2693, 0xd83d, 0xde80, 0x2708,
+    0xd83d, 0xde81, 0xd83d, 0xde82, 0xd83d, 0xde8b, 0xd83d, 0xde8e, 0xd83d, 0xde8c, 0xd83d, 0xde99, 0xd83d, 0xde97,
+    0xd83d, 0xde95, 0xd83d, 0xde9b, 0xd83d, 0xdea8, 0xd83d, 0xde94, 0xd83d, 0xde92, 0xd83d, 0xde91, 0xd83d, 0xdeb2,
+    0xd83d, 0xdea0, 0xd83d, 0xde9c, 0xd83d, 0xdea6, 0x26a0, 0xd83d, 0xdea7, 0x26fd, 0xd83c, 0xdfb0, 0xd83d, 0xddff,
+    0xd83c, 0xdfaa, 0xd83c, 0xdfad, 0xd83c, 0xddef, 0xd83c, 0xddf5, 0xd83c, 0xddf0, 0xd83c, 0xddf7, 0xd83c, 0xdde9,
+    0xd83c, 0xddea, 0xd83c, 0xdde8, 0xd83c, 0xddf3, 0xd83c, 0xddfa, 0xd83c, 0xddf8, 0xd83c, 0xddeb, 0xd83c, 0xddf7,
+    0xd83c, 0xddea, 0xd83c, 0xddf8, 0xd83c, 0xddee, 0xd83c, 0xddf9, 0xd83c, 0xddf7, 0xd83c, 0xddfa, 0xd83c, 0xddec,
+    0xd83c, 0xdde7, 0x0031, 0x20e3, 0x0032, 0x20e3, 0x0033, 0x20e3, 0x0034, 0x20e3, 0x0035, 0x20e3, 0x0036, 0x20e3,
+    0x0037, 0x20e3, 0x0038, 0x20e3, 0x0039, 0x20e3, 0x0030, 0x20e3, 0xd83d, 0xdd1f, 0x2757, 0x2753, 0x2665, 0x2666,
+    0xd83d, 0xdcaf, 0xd83d, 0xdd17, 0xd83d, 0xdd31, 0xd83d, 0xdd34, 0xd83d, 0xdd35, 0xd83d, 0xdd36, 0xd83d, 0xdd37};
 
 ushort Offsets[] = {
-0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22,
-24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46,
-48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70,
-72, 74, 76, 78, 80, 82, 84, 86, 87, 88, 90, 92,
-94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116,
-118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140,
-142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164,
-166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188,
-190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212,
-214, 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, 236,
-238, 240, 242, 244, 246, 248, 250, 252, 254, 256, 258, 259,
-260, 261, 262, 264, 266, 268, 270, 272, 274, 276, 278, 280,
-282, 284, 286, 288, 290, 292, 294, 295, 297, 299, 301, 303,
-305, 306, 307, 308, 310, 312, 314, 316, 318, 320, 322, 324,
-326, 328, 330, 332, 334, 336, 338, 340, 342, 344, 346, 348,
-350, 351, 353, 355, 357, 359, 360, 362, 364, 365, 366, 368,
-370, 372, 374, 376, 378, 380, 382, 384, 386, 388, 390, 392,
-394, 396, 398, 400, 402, 404, 406, 407, 408, 410, 412, 414,
-416, 418, 420, 422, 424, 426, 427, 429, 431, 433, 435, 437,
-439, 441, 443, 445, 447, 449, 451, 453, 455, 457, 459, 461,
-463, 465, 467, 469, 471, 473, 475, 477, 479, 481, 483, 485,
-487, 489, 491, 493, 495, 497, 499, 501, 503, 505, 507, 508,
-510, 511, 513, 515, 517, 519, 521, 522, 524, 526, 528, 529,
-531, 532, 534, 536, 538, 540, 542, 544, 546, 548, 550, 552,
-554, 556, 558, 560, 562, 564, 566, 567, 569, 570, 572, 574,
-576, 578, 582, 586, 590, 594, 598, 602, 606, 610, 614, 618,
-620, 622, 624, 626, 628, 630, 632, 634, 636, 638, 640, 641,
-642, 643, 644, 646, 648, 650, 652, 654, 656, 658 };
+    0,   2,   4,   6,   8,   10,  12,  14,  16,  18,  20,  22,  24,  26,  28,  30,  32,  34,  36,  38,  40,  42,  44,
+    46,  48,  50,  52,  54,  56,  58,  60,  62,  64,  66,  68,  70,  72,  74,  76,  78,  80,  82,  84,  86,  87,  88,
+    90,  92,  94,  96,  98,  100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134,
+    136, 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
+    182, 184, 186, 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, 224, 226,
+    228, 230, 232, 234, 236, 238, 240, 242, 244, 246, 248, 250, 252, 254, 256, 258, 259, 260, 261, 262, 264, 266, 268,
+    270, 272, 274, 276, 278, 280, 282, 284, 286, 288, 290, 292, 294, 295, 297, 299, 301, 303, 305, 306, 307, 308, 310,
+    312, 314, 316, 318, 320, 322, 324, 326, 328, 330, 332, 334, 336, 338, 340, 342, 344, 346, 348, 350, 351, 353, 355,
+    357, 359, 360, 362, 364, 365, 366, 368, 370, 372, 374, 376, 378, 380, 382, 384, 386, 388, 390, 392, 394, 396, 398,
+    400, 402, 404, 406, 407, 408, 410, 412, 414, 416, 418, 420, 422, 424, 426, 427, 429, 431, 433, 435, 437, 439, 441,
+    443, 445, 447, 449, 451, 453, 455, 457, 459, 461, 463, 465, 467, 469, 471, 473, 475, 477, 479, 481, 483, 485, 487,
+    489, 491, 493, 495, 497, 499, 501, 503, 505, 507, 508, 510, 511, 513, 515, 517, 519, 521, 522, 524, 526, 528, 529,
+    531, 532, 534, 536, 538, 540, 542, 544, 546, 548, 550, 552, 554, 556, 558, 560, 562, 564, 566, 567, 569, 570, 572,
+    574, 576, 578, 582, 586, 590, 594, 598, 602, 606, 610, 614, 618, 620, 622, 624, 626, 628, 630, 632, 634, 636, 638,
+    640, 641, 642, 643, 644, 646, 648, 650, 652, 654, 656, 658};
 
 quint64 ComputeEmojiIndex(base::const_byte_span bytes) {
 	Expects(bytes.size() == 8);
-	return ((gsl::to_integer<quint64>(bytes[0]) & 0x7F) << 56)
-		| (gsl::to_integer<quint64>(bytes[1]) << 48)
-		| (gsl::to_integer<quint64>(bytes[2]) << 40)
-		| (gsl::to_integer<quint64>(bytes[3]) << 32)
-		| (gsl::to_integer<quint64>(bytes[4]) << 24)
-		| (gsl::to_integer<quint64>(bytes[5]) << 16)
-		| (gsl::to_integer<quint64>(bytes[6]) << 8)
-		| (gsl::to_integer<quint64>(bytes[7]));
+	return ((gsl::to_integer<quint64>(bytes[0]) & 0x7F) << 56) | (gsl::to_integer<quint64>(bytes[1]) << 48) |
+	       (gsl::to_integer<quint64>(bytes[2]) << 40) | (gsl::to_integer<quint64>(bytes[3]) << 32) |
+	       (gsl::to_integer<quint64>(bytes[4]) << 24) | (gsl::to_integer<quint64>(bytes[5]) << 16) |
+	       (gsl::to_integer<quint64>(bytes[6]) << 8) | (gsl::to_integer<quint64>(bytes[7]));
 }
 
 } // namespace
@@ -151,7 +126,6 @@ std::vector<EmojiPtr> ComputeEmojiFingerprint(not_null<Call*> call) {
 		}
 	}
 	return result;
-
 }
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
index 4596ed109..72d840098 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <vector>
-#include <core/basic_types.h>
 #include "settings.h"
+#include <core/basic_types.h>
+#include <vector>
 
 namespace Calls {
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 194a3224a..6d6436689 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -19,24 +19,24 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 
-#include <QJsonDocument>
+#include "calls/calls_instance.h"
 #include <QJsonArray>
+#include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
-#include "calls/calls_instance.h"
 
-#include "mtproto/connection.h"
-#include "messenger.h"
-#include "auth_session.h"
 #include "apiwrap.h"
-#include "lang/lang_keys.h"
+#include "auth_session.h"
 #include "boxes/confirm_box.h"
 #include "calls/calls_call.h"
 #include "calls/calls_panel.h"
+#include "lang/lang_keys.h"
 #include "media/media_audio_track.h"
+#include "messenger.h"
+#include "mtproto/connection.h"
 
-#include "boxes/rate_call_box.h"
 #include "app.h"
+#include "boxes/rate_call_box.h"
 
 namespace Calls {
 namespace {
@@ -47,7 +47,7 @@ constexpr auto kServerConfigUpdateTimeoutMs = 24 * 3600 * TimeMs(1000);
 
 Instance::Instance() = default;
 
-void Instance::startOutgoingCall(not_null<UserData*> user) {
+void Instance::startOutgoingCall(not_null<UserData *> user) {
 	if (alreadyInCall()) { // Already in a call.
 		_currentCallPanel->showAndActivate();
 		return;
@@ -61,15 +61,15 @@ void Instance::startOutgoingCall(not_null<UserData*> user) {
 	createCall(user, Call::Type::Outgoing);
 }
 
-void Instance::callFinished(not_null<Call*> call) {
+void Instance::callFinished(not_null<Call *> call) {
 	destroyCall(call);
 }
 
-void Instance::callFailed(not_null<Call*> call) {
+void Instance::callFailed(not_null<Call *> call) {
 	destroyCall(call);
 }
 
-void Instance::callRedial(not_null<Call*> call) {
+void Instance::callRedial(not_null<Call *> call) {
 	if (_currentCall.get() == call) {
 		refreshDhConfig();
 	}
@@ -103,7 +103,7 @@ void Instance::playSound(Sound sound) {
 	}
 }
 
-void Instance::destroyCall(not_null<Call*> call) {
+void Instance::destroyCall(not_null<Call *> call) {
 	if (_currentCall.get() == call) {
 		destroyCurrentPanel();
 		_currentCall.reset();
@@ -117,15 +117,16 @@ void Instance::destroyCall(not_null<Call*> call) {
 }
 
 void Instance::destroyCurrentPanel() {
-	_pendingPanels.erase(std::remove_if(_pendingPanels.begin(), _pendingPanels.end(), [](auto &&panel) {
-		return !panel;
-	}), _pendingPanels.end());
+	_pendingPanels.erase(
+	    std::remove_if(_pendingPanels.begin(), _pendingPanels.end(), [](auto &&panel) { return !panel; }),
+	    _pendingPanels.end());
 	_pendingPanels.push_back(_currentCallPanel.release());
 	_pendingPanels.back()->hideAndDestroy(); // Always queues the destruction.
 }
 
-void Instance::createCall(not_null<UserData*> user, Call::Type type) {
-	auto call = std::make_unique<Call>(getCallDelegate(), user, type);;
+void Instance::createCall(not_null<UserData *> user, Call::Type type) {
+	auto call = std::make_unique<Call>(getCallDelegate(), user, type);
+	;
 	if (_currentCall) {
 		_currentCallPanel->replaceCall(call.get());
 		std::swap(_currentCall, call);
@@ -141,49 +142,52 @@ void Instance::createCall(not_null<UserData*> user, Call::Type type) {
 
 void Instance::refreshDhConfig() {
 	Expects(_currentCall != nullptr);
-	request(MTPmessages_GetDhConfig(MTP_int(_dhConfig.version), MTP_int(Call::kRandomPowerSize))).done([this, call = base::make_weak_unique(_currentCall)](const MTPmessages_DhConfig &result) {
-		auto random = base::const_byte_span();
-		switch (result.type()) {
-		case mtpc_messages_dhConfig: {
-			auto &config = result.c_messages_dhConfig();
-			if (!MTP::IsPrimeAndGood(bytesFromMTP(config.vp), config.vg.v)) {
-				LOG(("API Error: bad p/g received in dhConfig."));
-				callFailed(call.get());
-				return;
-			}
-			_dhConfig.g = config.vg.v;
-			_dhConfig.p = byteVectorFromMTP(config.vp);
-			random = bytesFromMTP(config.vrandom);
-		} break;
+	request(MTPmessages_GetDhConfig(MTP_int(_dhConfig.version), MTP_int(Call::kRandomPowerSize)))
+	    .done([this, call = base::make_weak_unique(_currentCall)](const MTPmessages_DhConfig &result) {
+		    auto random = base::const_byte_span();
+		    switch (result.type()) {
+		    case mtpc_messages_dhConfig: {
+			    auto &config = result.c_messages_dhConfig();
+			    if (!MTP::IsPrimeAndGood(bytesFromMTP(config.vp), config.vg.v)) {
+				    LOG(("API Error: bad p/g received in dhConfig."));
+				    callFailed(call.get());
+				    return;
+			    }
+			    _dhConfig.g = config.vg.v;
+			    _dhConfig.p = byteVectorFromMTP(config.vp);
+			    random = bytesFromMTP(config.vrandom);
+		    } break;
 
-		case mtpc_messages_dhConfigNotModified: {
-			auto &config = result.c_messages_dhConfigNotModified();
-			random = bytesFromMTP(config.vrandom);
-			if (!_dhConfig.g || _dhConfig.p.empty()) {
-				LOG(("API Error: dhConfigNotModified on zero version."));
-				callFailed(call.get());
-				return;
-			}
-		} break;
+		    case mtpc_messages_dhConfigNotModified: {
+			    auto &config = result.c_messages_dhConfigNotModified();
+			    random = bytesFromMTP(config.vrandom);
+			    if (!_dhConfig.g || _dhConfig.p.empty()) {
+				    LOG(("API Error: dhConfigNotModified on zero version."));
+				    callFailed(call.get());
+				    return;
+			    }
+		    } break;
 
-		default: Unexpected("Type in messages.getDhConfig");
-		}
+		    default: Unexpected("Type in messages.getDhConfig");
+		    }
 
-		if (random.size() != Call::kRandomPowerSize) {
-			LOG(("API Error: dhConfig random bytes wrong size: %1").arg(random.size()));
-			callFailed(call.get());
-			return;
-		}
-		if (call) {
-			call->start(random);
-		}
-	}).fail([this, call = base::make_weak_unique(_currentCall)](const RPCError &error) {
-		if (!call) {
-			DEBUG_LOG(("API Warning: call was destroyed before got dhConfig."));
-			return;
-		}
-		callFailed(call.get());
-	}).send();
+		    if (random.size() != Call::kRandomPowerSize) {
+			    LOG(("API Error: dhConfig random bytes wrong size: %1").arg(random.size()));
+			    callFailed(call.get());
+			    return;
+		    }
+		    if (call) {
+			    call->start(random);
+		    }
+	    })
+	    .fail([this, call = base::make_weak_unique(_currentCall)](const RPCError &error) {
+		    if (!call) {
+			    DEBUG_LOG(("API Warning: call was destroyed before got dhConfig."));
+			    return;
+		    }
+		    callFailed(call.get());
+	    })
+	    .send();
 }
 
 void Instance::refreshServerConfig() {
@@ -193,67 +197,72 @@ void Instance::refreshServerConfig() {
 	if (_lastServerConfigUpdateTime && (getms(true) - _lastServerConfigUpdateTime) < kServerConfigUpdateTimeoutMs) {
 		return;
 	}
-	_serverConfigRequestId = request(MTPphone_GetCallConfig()).done([this](const MTPDataJSON &result) {
-		_serverConfigRequestId = 0;
-		_lastServerConfigUpdateTime = getms(true);
+	_serverConfigRequestId =
+	    request(MTPphone_GetCallConfig())
+	        .done([this](const MTPDataJSON &result) {
+		        _serverConfigRequestId = 0;
+		        _lastServerConfigUpdateTime = getms(true);
 
-		auto configUpdate = std::map<std::string, std::string>();
-		auto bytes = bytesFromMTP(result.c_dataJSON().vdata);
-		auto error = QJsonParseError { 0, QJsonParseError::NoError };
-		auto document = QJsonDocument::fromJson(QByteArray::fromRawData(reinterpret_cast<const char*>(bytes.data()), bytes.size()), &error);
-		if (error.error != QJsonParseError::NoError) {
-			LOG(("API Error: Failed to parse call config JSON, error: %1").arg(error.errorString()));
-			return;
-		} else if (!document.isObject()) {
-			LOG(("API Error: Not an object received in call config JSON."));
-			return;
-		}
+		        auto configUpdate = std::map<std::string, std::string>();
+		        auto bytes = bytesFromMTP(result.c_dataJSON().vdata);
+		        auto error = QJsonParseError{0, QJsonParseError::NoError};
+		        auto document = QJsonDocument::fromJson(
+		            QByteArray::fromRawData(reinterpret_cast<const char *>(bytes.data()), bytes.size()), &error);
+		        if (error.error != QJsonParseError::NoError) {
+			        LOG(("API Error: Failed to parse call config JSON, error: %1").arg(error.errorString()));
+			        return;
+		        } else if (!document.isObject()) {
+			        LOG(("API Error: Not an object received in call config JSON."));
+			        return;
+		        }
 
-		auto parseValue = [](QJsonValueRef data) -> std::string {
-			switch (data.type()) {
-			case QJsonValue::String: return data.toString().toStdString();
-			case QJsonValue::Double: return QString::number(data.toDouble(), 'f').toStdString();
-			case QJsonValue::Bool: return data.toBool() ? "true" : "false";
-			case QJsonValue::Null: {
-				LOG(("API Warning: null field in call config JSON."));
-			} return "null";
-			case QJsonValue::Undefined: {
-				LOG(("API Warning: undefined field in call config JSON."));
-			} return "undefined";
-			case QJsonValue::Object:
-			case QJsonValue::Array: {
-				LOG(("API Warning: complex field in call config JSON."));
-				QJsonDocument serializer;
-				if (data.isArray()) {
-					serializer.setArray(data.toArray());
-				} else {
-					serializer.setObject(data.toObject());
-				}
-				auto byteArray = serializer.toJson(QJsonDocument::Compact);
-				return std::string(byteArray.constData(), byteArray.size());
-			} break;
-			}
-			Unexpected("Type in Json parse.");
-		};
+		        auto parseValue = [](QJsonValueRef data) -> std::string {
+			        switch (data.type()) {
+			        case QJsonValue::String: return data.toString().toStdString();
+			        case QJsonValue::Double: return QString::number(data.toDouble(), 'f').toStdString();
+			        case QJsonValue::Bool: return data.toBool() ? "true" : "false";
+			        case QJsonValue::Null: {
+				        LOG(("API Warning: null field in call config JSON."));
+			        }
+				        return "null";
+			        case QJsonValue::Undefined: {
+				        LOG(("API Warning: undefined field in call config JSON."));
+			        }
+				        return "undefined";
+			        case QJsonValue::Object:
+			        case QJsonValue::Array: {
+				        LOG(("API Warning: complex field in call config JSON."));
+				        QJsonDocument serializer;
+				        if (data.isArray()) {
+					        serializer.setArray(data.toArray());
+				        } else {
+					        serializer.setObject(data.toObject());
+				        }
+				        auto byteArray = serializer.toJson(QJsonDocument::Compact);
+				        return std::string(byteArray.constData(), byteArray.size());
+			        } break;
+			        }
+			        Unexpected("Type in Json parse.");
+		        };
 
-		auto object = document.object();
-		for (auto i = object.begin(), e = object.end(); i != e; ++i) {
-			auto key = i.key().toStdString();
-			auto value = parseValue(i.value());
-			configUpdate[key] = value;
-		}
+		        auto object = document.object();
+		        for (auto i = object.begin(), e = object.end(); i != e; ++i) {
+			        auto key = i.key().toStdString();
+			        auto value = parseValue(i.value());
+			        configUpdate[key] = value;
+		        }
 
-		UpdateConfig(configUpdate);
-	}).fail([this](const RPCError &error) {
-		_serverConfigRequestId = 0;
-	}).send();
+		        UpdateConfig(configUpdate);
+	        })
+	        .fail([this](const RPCError &error) { _serverConfigRequestId = 0; })
+	        .send();
 }
 
-void Instance::handleUpdate(const MTPDupdatePhoneCall& update) {
+void Instance::handleUpdate(const MTPDupdatePhoneCall &update) {
 	handleCallUpdate(update.vphone_call);
 }
 
-void Instance::showInfoPanel(not_null<Call*> call) {
+void Instance::showInfoPanel(not_null<Call *> call) {
 	if (_currentCall.get() == call) {
 		_currentCallPanel->showAndActivate();
 	}
@@ -281,7 +290,9 @@ void Instance::handleCallUpdate(const MTPPhoneCall &call) {
 			LOG(("API Error: Self found in phoneCallRequested."));
 		}
 		if (alreadyInCall() || !user || user->isSelf()) {
-			request(MTPphone_DiscardCall(MTP_inputPhoneCall(phoneCall.vid, phoneCall.vaccess_hash), MTP_int(0), MTP_phoneCallDiscardReasonBusy(), MTP_long(0))).send();
+			request(MTPphone_DiscardCall(MTP_inputPhoneCall(phoneCall.vid, phoneCall.vaccess_hash), MTP_int(0),
+			                             MTP_phoneCallDiscardReasonBusy(), MTP_long(0)))
+			    .send();
 		} else if (phoneCall.vdate.v + (Global::CallRingTimeoutMs() / 1000) < unixtime()) {
 			LOG(("Ignoring too old call."));
 		} else {
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 89c8c7163..939eae03f 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "mtproto/sender.h"
 #include "calls/calls_call.h"
+#include "mtproto/sender.h"
 
 namespace Media {
 namespace Audio {
@@ -37,11 +37,11 @@ class Instance : private MTP::Sender, private Call::Delegate, private base::Subs
 public:
 	Instance();
 
-	void startOutgoingCall(not_null<UserData*> user);
+	void startOutgoingCall(not_null<UserData *> user);
 	void handleUpdate(const MTPDupdatePhoneCall &update);
-	void showInfoPanel(not_null<Call*> call);
+	void showInfoPanel(not_null<Call *> call);
 
-	base::Observable<Call*> &currentCallChanged() {
+	base::Observable<Call *> &currentCallChanged() {
 		return _currentCallChanged;
 	}
 
@@ -54,19 +54,19 @@ public:
 	~Instance();
 
 private:
-	not_null<Call::Delegate*> getCallDelegate() {
-		return static_cast<Call::Delegate*>(this);
+	not_null<Call::Delegate *> getCallDelegate() {
+		return static_cast<Call::Delegate *>(this);
 	}
 	DhConfig getDhConfig() const override {
 		return _dhConfig;
 	}
-	void callFinished(not_null<Call*> call) override;
-	void callFailed(not_null<Call*> call) override;
-	void callRedial(not_null<Call*> call) override;
+	void callFinished(not_null<Call *> call) override;
+	void callFailed(not_null<Call *> call) override;
+	void callRedial(not_null<Call *> call) override;
 	using Sound = Call::Delegate::Sound;
 	void playSound(Sound sound) override;
-	void createCall(not_null<UserData*> user, Call::Type type);
-	void destroyCall(not_null<Call*> call);
+	void createCall(not_null<UserData *> user, Call::Type type);
+	void destroyCall(not_null<Call *> call);
 	void destroyCurrentPanel();
 
 	void refreshDhConfig();
@@ -82,14 +82,13 @@ private:
 
 	std::unique_ptr<Call> _currentCall;
 	std::unique_ptr<Panel> _currentCallPanel;
-	base::Observable<Call*> _currentCallChanged;
+	base::Observable<Call *> _currentCallChanged;
 	base::Observable<FullMsgId> _newServiceMessage;
 	std::vector<QPointer<Panel>> _pendingPanels;
 
 	std::unique_ptr<Media::Audio::Track> _callConnectingTrack;
 	std::unique_ptr<Media::Audio::Track> _callEndedTrack;
 	std::unique_ptr<Media::Audio::Track> _callBusyTrack;
-
 };
 
 Instance &Current();
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 1ade7e41e..d31203689 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -18,27 +18,27 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QDesktopWidget>
 #include "calls/calls_panel.h"
+#include <QDesktopWidget>
 
+#include "apiwrap.h"
+#include "app.h"
+#include "auth_session.h"
+#include "base/task_queue.h"
 #include "calls/calls_emoji_fingerprint.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "platform/platform_specific.h"
 #include "styles/style_calls.h"
 #include "styles/style_history.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/effects/widget_fade_wrap.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
-#include "ui/effects/ripple_animation.h"
-#include "ui/effects/widget_fade_wrap.h"
-#include "messenger.h"
-#include "mainwindow.h"
-#include "lang/lang_keys.h"
-#include "auth_session.h"
-#include "apiwrap.h"
-#include "observer_peer.h"
-#include "platform/platform_specific.h"
-#include "base/task_queue.h"
 #include "window/main_window.h"
-#include "app.h"
 #include <QApplication>
 
 namespace Calls {
@@ -64,10 +64,10 @@ protected:
 	QPoint prepareRippleStartPosition() const override;
 
 private:
-	QPoint iconPosition(not_null<const style::CallButton*> st) const;
+	QPoint iconPosition(not_null<const style::CallButton *> st) const;
 	void mixIconMasks();
 
-	not_null<const style::CallButton*> _stFrom;
+	not_null<const style::CallButton *> _stFrom;
 	const style::CallButton *_stTo = nullptr;
 	double _progress = 0.;
 
@@ -77,12 +77,12 @@ private:
 
 	double _outerValue = 0.;
 	Animation _outerAnimation;
-
 };
 
-Panel::Button::Button(QWidget *parent, const style::CallButton &stFrom, const style::CallButton *stTo) : Ui::RippleButton(parent, stFrom.button.ripple)
-, _stFrom(&stFrom)
-, _stTo(stTo) {
+Panel::Button::Button(QWidget *parent, const style::CallButton &stFrom, const style::CallButton *stTo)
+    : Ui::RippleButton(parent, stFrom.button.ripple)
+    , _stFrom(&stFrom)
+    , _stTo(stTo) {
 	resize(_stFrom->button.width, _stFrom->button.height);
 
 	_bgMask = prepareRippleMask();
@@ -103,14 +103,18 @@ Panel::Button::Button(QWidget *parent, const style::CallButton &stFrom, const st
 		_iconFrom.fill(Qt::black);
 		{
 			Painter p(&_iconFrom);
-			p.drawImage((_stFrom->button.rippleAreaSize - _stFrom->button.icon.width()) / 2, (_stFrom->button.rippleAreaSize - _stFrom->button.icon.height()) / 2, _stFrom->button.icon.instance(Qt::white));
+			p.drawImage((_stFrom->button.rippleAreaSize - _stFrom->button.icon.width()) / 2,
+			            (_stFrom->button.rippleAreaSize - _stFrom->button.icon.height()) / 2,
+			            _stFrom->button.icon.instance(Qt::white));
 		}
 		_iconTo = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
 		_iconTo.setDevicePixelRatio(cRetinaFactor());
 		_iconTo.fill(Qt::black);
 		{
 			Painter p(&_iconTo);
-			p.drawImage((_stTo->button.rippleAreaSize - _stTo->button.icon.width()) / 2, (_stTo->button.rippleAreaSize - _stTo->button.icon.height()) / 2, _stTo->button.icon.instance(Qt::white));
+			p.drawImage((_stTo->button.rippleAreaSize - _stTo->button.icon.width()) / 2,
+			            (_stTo->button.rippleAreaSize - _stTo->button.icon.height()) / 2,
+			            _stTo->button.icon.instance(Qt::white));
 		}
 		_iconMixed = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
 		_iconMixed.setDevicePixelRatio(cRetinaFactor());
@@ -119,11 +123,13 @@ Panel::Button::Button(QWidget *parent, const style::CallButton &stFrom, const st
 
 void Panel::Button::setOuterValue(double value) {
 	if (_outerValue != value) {
-		_outerAnimation.start([this] {
-			if (_progress == 0. || _progress == 1.) {
-				update();
-			}
-		}, _outerValue, value, Call::kSoundSampleMs);
+		_outerAnimation.start(
+		    [this] {
+			    if (_progress == 0. || _progress == 1.) {
+				    update();
+			    }
+		    },
+		    _outerValue, value, Call::kSoundSampleMs);
 		_outerValue = value;
 	}
 }
@@ -143,9 +149,13 @@ void Panel::Button::paintEvent(QPaintEvent *e) {
 
 	auto outerValue = _outerAnimation.current(ms, _outerValue);
 	if (outerValue > 0.) {
-		auto outerRadius = paintFrom ? _stFrom->outerRadius : paintTo ? _stTo->outerRadius : (_stFrom->outerRadius * (1. - _progress) + _stTo->outerRadius * _progress);
+		auto outerRadius = paintFrom ?
+		                       _stFrom->outerRadius :
+		                       paintTo ? _stTo->outerRadius :
+		                                 (_stFrom->outerRadius * (1. - _progress) + _stTo->outerRadius * _progress);
 		auto outerPixels = outerValue * outerRadius;
-		auto outerRect = QRectF(myrtlrect(bgPosition.x(), bgPosition.y(), _stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
+		auto outerRect = QRectF(
+		    myrtlrect(bgPosition.x(), bgPosition.y(), _stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
 		outerRect = outerRect.marginsAdded(QMarginsF(outerPixels, outerPixels, outerPixels, outerPixels));
 
 		PainterHighQualityEnabler hq(p);
@@ -178,7 +188,8 @@ void Panel::Button::paintEvent(QPaintEvent *e) {
 	} else {
 		rippleColorInterpolated = anim::color(_stFrom->button.ripple.color, _stTo->button.ripple.color, _progress);
 	}
-	paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), ms, rippleColorOverride);
+	paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), ms,
+	            rippleColorOverride);
 
 	auto positionFrom = iconPosition(_stFrom);
 	if (paintFrom) {
@@ -195,7 +206,7 @@ void Panel::Button::paintEvent(QPaintEvent *e) {
 	}
 }
 
-QPoint Panel::Button::iconPosition(not_null<const style::CallButton*> st) const {
+QPoint Panel::Button::iconPosition(not_null<const style::CallButton *> st) const {
 	auto result = st->button.iconPosition;
 	if (result.x() < 0) {
 		result.setX((width() - st->button.icon.width()) / 2);
@@ -243,15 +254,15 @@ QImage Panel::Button::prepareRippleMask() const {
 	return Ui::RippleAnimation::ellipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
 }
 
-Panel::Panel(not_null<Call*> call)
-: _call(call)
-, _user(call->user())
-, _answerHangupRedial(this, st::callAnswer, &st::callHangup)
-, _decline(this, object_ptr<Button>(this, st::callHangup), st::callPanelDuration)
-, _cancel(this, object_ptr<Button>(this, st::callCancel), st::callPanelDuration)
-, _mute(this, st::callMuteToggle)
-, _name(this, st::callName)
-, _status(this, st::callStatus) {
+Panel::Panel(not_null<Call *> call)
+    : _call(call)
+    , _user(call->user())
+    , _answerHangupRedial(this, st::callAnswer, &st::callHangup)
+    , _decline(this, object_ptr<Button>(this, st::callHangup), st::callPanelDuration)
+    , _cancel(this, object_ptr<Button>(this, st::callCancel), st::callPanelDuration)
+    , _mute(this, st::callMuteToggle)
+    , _name(this, st::callName)
+    , _status(this, st::callStatus) {
 	setMouseTracking(true);
 	setWindowIcon(Window::CreateIcon());
 	initControls();
@@ -267,7 +278,7 @@ void Panel::showAndActivate() {
 	setFocus();
 }
 
-void Panel::replaceCall(not_null<Call*> call) {
+void Panel::replaceCall(not_null<Call *> call) {
 	_call = call;
 	_user = call->user();
 	reinitControls();
@@ -294,16 +305,16 @@ void Panel::initControls() {
 			_call->setMute(!_call->isMute());
 		}
 	});
-	subscribe(_call->muteChanged(), [this](bool mute) {
-		_mute->setIconOverride(mute ? &st::callUnmuteIcon : nullptr);
-	});
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged, [this](const Notify::PeerUpdate &update) {
-		if (!_call || update.peer != _call->user()) {
-			return;
-		}
-		_name->setText(App::peerName(_call->user()));
-		updateControlsGeometry();
-	}));
+	subscribe(_call->muteChanged(),
+	          [this](bool mute) { _mute->setIconOverride(mute ? &st::callUnmuteIcon : nullptr); });
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (!_call || update.peer != _call->user()) {
+			                                                            return;
+		                                                            }
+		                                                            _name->setText(App::peerName(_call->user()));
+		                                                            updateControlsGeometry();
+	                                                            }));
 	_updateDurationTimer.setCallback([this] {
 		if (_call) {
 			updateStatusText(_call->state());
@@ -356,7 +367,8 @@ void Panel::reinitControls() {
 }
 
 void Panel::initLayout() {
-	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint | Qt::Dialog);
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint |
+	               Qt::NoDropShadowWindowHint | Qt::Dialog);
 	setAttribute(Qt::WA_MacAlwaysShowToolWindow);
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
@@ -369,9 +381,7 @@ void Panel::initLayout() {
 			processUserPhoto();
 		}
 	});
-	subscribe(Auth().downloaderTaskFinished(), [this] {
-		refreshUserPhoto();
-	});
+	subscribe(Auth().downloaderTaskFinished(), [this] { refreshUserPhoto(); });
 	createDefaultCacheImage();
 
 	Platform::InitOnTopPanel(this);
@@ -389,7 +399,8 @@ void Panel::toggleOpacityAnimation(bool visible) {
 			_animationCache = myGrab(this);
 			hideChildren();
 		}
-		_opacityAnimation.start([this] { update(); }, _visible ? 0. : 1., _visible ? 1. : 0., st::callPanelDuration, _visible ? anim::easeOutCirc : anim::easeInCirc);
+		_opacityAnimation.start([this] { update(); }, _visible ? 0. : 1., _visible ? 1. : 0., st::callPanelDuration,
+		                        _visible ? anim::easeOutCirc : anim::easeInCirc);
 	}
 	if (isHidden() && _visible) {
 		show();
@@ -461,7 +472,9 @@ void Panel::refreshUserPhoto() {
 
 void Panel::createUserpicCache(ImagePtr image) {
 	auto size = st::callWidth * cIntRetinaFactor();
-	auto options = _useTransparency ? (Images::Option::RoundedLarge | Images::Option::RoundedTopLeft | Images::Option::RoundedTopRight | Images::Option::Smooth) : Images::Option::None;
+	auto options = _useTransparency ? (Images::Option::RoundedLarge | Images::Option::RoundedTopLeft |
+	                                   Images::Option::RoundedTopRight | Images::Option::Smooth) :
+	                                  Images::Option::None;
 	if (image) {
 		auto width = image->width();
 		auto height = image->height();
@@ -475,7 +488,8 @@ void Panel::createUserpicCache(ImagePtr image) {
 		_userPhoto = image->pixNoCache(width, height, options, st::callWidth, st::callWidth);
 		if (cRetina()) _userPhoto.setDevicePixelRatio(cRetinaFactor());
 	} else {
-		auto filled = QImage(QSize(st::callWidth, st::callWidth) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+		auto filled =
+		    QImage(QSize(st::callWidth, st::callWidth) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 		filled.setDevicePixelRatio(cRetinaFactor());
 		{
 			Painter p(&filled);
@@ -493,9 +507,7 @@ bool Panel::isGoodUserPhoto(PhotoData *photo) {
 	if (!photo || !photo->date) {
 		return false;
 	}
-	auto badAspect = [](int a, int b) {
-		return a > 10 * b;
-	};
+	auto badAspect = [](int a, int b) { return a > 10 * b; };
 	auto width = photo->full->width();
 	auto height = photo->full->height();
 	return !badAspect(width, height) && !badAspect(height, width);
@@ -505,7 +517,8 @@ void Panel::initGeometry() {
 	auto center = Messenger::Instance().getPointForCallPanelCenter();
 	_useTransparency = Platform::TranslucentWindowsSupported(center);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
-	_padding = _useTransparency ? st::callShadow.extend : style::margins(st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth);
+	_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);
@@ -524,12 +537,15 @@ void Panel::createBottomImage() {
 	image.fill(Qt::transparent);
 	{
 		Painter p(&image);
-		Ui::Shadow::paint(p, QRect(_padding.left(), 0, st::callWidth, bottomHeight - _padding.bottom()), width(), st::callShadow, RectPart::Left | RectPart::Right | RectPart::Bottom);
+		Ui::Shadow::paint(p, QRect(_padding.left(), 0, st::callWidth, bottomHeight - _padding.bottom()), width(),
+		                  st::callShadow, RectPart::Left | RectPart::Right | RectPart::Bottom);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
 		p.setBrush(st::callBg);
 		p.setPen(Qt::NoPen);
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(myrtlrect(_padding.left(), -st::historyMessageRadius, st::callWidth, bottomHeight - _padding.bottom() + st::historyMessageRadius), st::historyMessageRadius, st::historyMessageRadius);
+		p.drawRoundedRect(myrtlrect(_padding.left(), -st::historyMessageRadius, st::callWidth,
+		                            bottomHeight - _padding.bottom() + st::historyMessageRadius),
+		                  st::historyMessageRadius, st::historyMessageRadius);
 	}
 	_bottomCache = App::pixmapFromImageInPlace(std::move(image));
 }
@@ -560,7 +576,8 @@ void Panel::refreshCacheImageUserPhoto() {
 	cache.fill(Qt::transparent);
 	{
 		Painter p(&cache);
-		Ui::Shadow::paint(p, QRect(_padding.left(), _padding.top(), st::callWidth, st::callWidth), width(), st::callShadow, RectPart::Top | RectPart::Left | RectPart::Right);
+		Ui::Shadow::paint(p, QRect(_padding.left(), _padding.top(), st::callWidth, st::callWidth), width(),
+		                  st::callShadow, RectPart::Top | RectPart::Left | RectPart::Right);
 		p.drawPixmapLeft(_padding.left(), _padding.top(), width(), _userPhoto);
 		p.drawPixmapLeft(0, _padding.top() + st::callWidth, width(), _bottomCache);
 	}
@@ -616,7 +633,8 @@ void Panel::paintEvent(QPaintEvent *e) {
 			auto marginRatio = (1. - opacity) / 5;
 			auto marginWidth = std::round(width() * marginRatio);
 			auto marginHeight = std::round(height() * marginRatio);
-			p.drawPixmap(rect().marginsRemoved(QMargins(marginWidth, marginHeight, marginWidth, marginHeight)), _animationCache, QRect(QPoint(0, 0), _animationCache.size()));
+			p.drawPixmap(rect().marginsRemoved(QMargins(marginWidth, marginHeight, marginWidth, marginHeight)),
+			             _animationCache, QRect(QPoint(0, 0), _animationCache.size()));
 			return;
 		}
 	}
@@ -631,7 +649,9 @@ void Panel::paintEvent(QPaintEvent *e) {
 		auto brush = QBrush(callBgOpaque);
 		p.fillRect(0, 0, width(), _padding.top(), brush);
 		p.fillRect(myrtlrect(0, _padding.top(), _padding.left(), _contentTop - _padding.top()), brush);
-		p.fillRect(myrtlrect(width() - _padding.right(), _padding.top(), _padding.right(), _contentTop - _padding.top()), brush);
+		p.fillRect(
+		    myrtlrect(width() - _padding.right(), _padding.top(), _padding.right(), _contentTop - _padding.top()),
+		    brush);
 		p.fillRect(0, _contentTop, width(), height() - _contentTop, brush);
 	}
 
@@ -643,7 +663,8 @@ void Panel::paintEvent(QPaintEvent *e) {
 		auto left = _fingerprintArea.left() + st::callFingerprintPadding.left();
 		auto top = _fingerprintArea.top() + st::callFingerprintPadding.top();
 		for (auto emoji : _fingerprint) {
-			p.drawPixmap(QPoint(left, top), App::emojiLarge(), QRect(emoji->x() * realSize, emoji->y() * realSize, realSize, realSize));
+			p.drawPixmap(QPoint(left, top), App::emojiLarge(),
+			             QRect(emoji->x() * realSize, emoji->y() * realSize, realSize, realSize));
 			left += st::callFingerprintSkip + size;
 		}
 	}
@@ -715,11 +736,8 @@ void Panel::stateChanged(State state) {
 	updateStatusText(state);
 
 	if (_call) {
-		if ((state != State::HangingUp)
-			&& (state != State::Ended)
-			&& (state != State::EndedByOtherDevice)
-			&& (state != State::FailedHangingUp)
-			&& (state != State::Failed)) {
+		if ((state != State::HangingUp) && (state != State::Ended) && (state != State::EndedByOtherDevice) &&
+		    (state != State::FailedHangingUp) && (state != State::Failed)) {
 			auto toggleButton = [this](auto &&button, bool visible) {
 				if (isHidden()) {
 					button->toggleFast(visible);
@@ -736,7 +754,8 @@ void Panel::stateChanged(State state) {
 			auto hangupShown = _decline->isHiddenOrHiding() && _cancel->isHiddenOrHiding();
 			if (_hangupShown != hangupShown) {
 				_hangupShown = hangupShown;
-				_hangupShownProgress.start([this] { updateHangupGeometry(); }, _hangupShown ? 0. : 1., _hangupShown ? 1. : 0., st::callPanelDuration, anim::sineInOut);
+				_hangupShownProgress.start([this] { updateHangupGeometry(); }, _hangupShown ? 0. : 1.,
+				                           _hangupShown ? 1. : 0., st::callPanelDuration, anim::sineInOut);
 			}
 			if (_fingerprint.empty() && _call->isKeyShaForFingerprintReady()) {
 				fillFingerprint();
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index c101ee38b..42fa8687d 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -20,26 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/weak_unique_ptr.h"
 #include "base/timer.h"
+#include "base/weak_unique_ptr.h"
 #include "calls/calls_call.h"
 #include "ui/widgets/tooltip.h"
 
 namespace Ui {
 class IconButton;
 class FlatLabel;
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 } // namespace Ui
 
 namespace Calls {
 
 class Panel : public TWidget, private base::Subscriber, private Ui::AbstractTooltipShower {
 public:
-	Panel(not_null<Call*> call);
+	Panel(not_null<Call *> call);
 
 	void showAndActivate();
-	void replaceCall(not_null<Call*> call);
+	void replaceCall(not_null<Call *> call);
 	void hideAndDestroy();
 
 protected:
@@ -89,7 +88,7 @@ private:
 	void destroyDelayed();
 
 	Call *_call = nullptr;
-	not_null<UserData*> _user;
+	not_null<UserData *> _user;
 
 	bool _useTransparency = true;
 	style::margins _padding;
@@ -125,7 +124,6 @@ private:
 	QPixmap _animationCache;
 	QPixmap _bottomCache;
 	QPixmap _cache;
-
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index ae1f7c330..9ffe65a01 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "calls/calls_top_bar.h"
 
+#include "app.h"
+#include "base/timer.h"
+#include "boxes/abstract_box.h"
+#include "calls/calls_call.h"
+#include "calls/calls_instance.h"
+#include "lang/lang_keys.h"
+#include "observer_peer.h"
+#include "styles/style_boxes.h"
 #include "styles/style_calls.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "lang/lang_keys.h"
-#include "calls/calls_call.h"
-#include "calls/calls_instance.h"
-#include "styles/style_boxes.h"
-#include "observer_peer.h"
-#include "boxes/abstract_box.h"
-#include "base/timer.h"
-#include "app.h"
 
 namespace Calls {
 namespace {
@@ -39,7 +39,7 @@ constexpr auto kUpdateDebugTimeoutMs = TimeMs(500);
 
 class DebugInfoBox : public BoxContent {
 public:
-	DebugInfoBox(QWidget*, base::weak_unique_ptr<Call> call);
+	DebugInfoBox(QWidget *, base::weak_unique_ptr<Call> call);
 
 protected:
 	void prepare() override;
@@ -50,11 +50,10 @@ private:
 	base::weak_unique_ptr<Call> _call;
 	QPointer<Ui::FlatLabel> _text;
 	base::Timer _updateTextTimer;
-
 };
 
-DebugInfoBox::DebugInfoBox(QWidget*, base::weak_unique_ptr<Call> call) : _call(call) {
-}
+DebugInfoBox::DebugInfoBox(QWidget *, base::weak_unique_ptr<Call> call)
+    : _call(call) {}
 
 void DebugInfoBox::prepare() {
 	setTitle([] { return QString("Call Debug"); });
@@ -76,15 +75,16 @@ void DebugInfoBox::updateText() {
 
 } // namespace
 
-TopBar::TopBar(QWidget *parent, const base::weak_unique_ptr<Call> &call) : TWidget(parent)
-, _call(call)
-, _durationLabel(this, st::callBarLabel)
-, _fullInfoLabel(this, st::callBarInfoLabel)
-, _shortInfoLabel(this, st::callBarInfoLabel)
-, _hangupLabel(this, st::callBarLabel, lang(lng_call_bar_hangup).toUpper())
-, _mute(this, st::callBarMuteToggle)
-, _info(this)
-, _hangup(this, st::callBarHangup) {
+TopBar::TopBar(QWidget *parent, const base::weak_unique_ptr<Call> &call)
+    : TWidget(parent)
+    , _call(call)
+    , _durationLabel(this, st::callBarLabel)
+    , _fullInfoLabel(this, st::callBarInfoLabel)
+    , _shortInfoLabel(this, st::callBarInfoLabel)
+    , _hangupLabel(this, st::callBarLabel, lang(lng_call_bar_hangup).toUpper())
+    , _mute(this, st::callBarMuteToggle)
+    , _info(this)
+    , _hangup(this, st::callBarHangup) {
 	initControls();
 	resize(width(), st::callBarHeight);
 }
@@ -100,13 +100,14 @@ void TopBar::initControls() {
 		setMuted(mute);
 		update();
 	});
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged, [this](const Notify::PeerUpdate &update) {
-		if (auto call = _call.get()) {
-			if (update.peer == call->user()) {
-				updateInfoLabels();
-			}
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NameChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (auto call = _call.get()) {
+			                                                            if (update.peer == call->user()) {
+				                                                            updateInfoLabels();
+			                                                            }
+		                                                            }
+	                                                            }));
 	setInfoLabels();
 	_info->setClickedCallback([this] {
 		if (auto call = _call.get()) {
@@ -173,11 +174,14 @@ void TopBar::resizeEvent(QResizeEvent *e) {
 
 void TopBar::updateControlsGeometry() {
 	auto left = 0;
-	_mute->moveToLeft(left, 0); left += _mute->width();
-	_durationLabel->moveToLeft(left, st::callBarLabelTop); left += _durationLabel->width() + st::callBarSkip;
+	_mute->moveToLeft(left, 0);
+	left += _mute->width();
+	_durationLabel->moveToLeft(left, st::callBarLabelTop);
+	left += _durationLabel->width() + st::callBarSkip;
 
 	auto right = st::callBarRightSkip;
-	_hangupLabel->moveToRight(right, st::callBarLabelTop); right += _hangupLabel->width();
+	_hangupLabel->moveToRight(right, st::callBarLabelTop);
+	right += _hangupLabel->width();
 	right += st::callBarHangup.width;
 	_hangup->setGeometryToRight(0, 0, right, height());
 	_info->setGeometryToLeft(_mute->width(), 0, width() - _mute->width() - _hangup->width(), height());
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index bcc930304..7f6052acc 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/weak_unique_ptr.h"
 #include "base/timer.h"
+#include "base/weak_unique_ptr.h"
 #include "ui/twidget.h"
 
 namespace Ui {
@@ -66,7 +66,6 @@ private:
 	object_ptr<Ui::IconButton> _hangup;
 
 	base::Timer _updateDurationTimer;
-
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index 3752e9abe..c7484f139 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -18,16 +18,17 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QPaintEvent>
 #include "chat_helpers/bot_keyboard.h"
+#include <QPaintEvent>
 
-#include "styles/style_widgets.h"
-#include "styles/style_history.h"
-#include "facades.h"
 #include "app.h"
+#include "facades.h"
+#include "styles/style_history.h"
+#include "styles/style_widgets.h"
 
-BotKeyboard::BotKeyboard(QWidget *parent) : TWidget(parent)
-, _st(&st::botKbButton) {
+BotKeyboard::BotKeyboard(QWidget *parent)
+    : TWidget(parent)
+    , _st(&st::botKbButton) {
 	setGeometry(0, 0, _st->margin, st::botKbScroll.deltat);
 	_height = st::botKbScroll.deltat;
 	setMouseTracking(true);
@@ -55,7 +56,7 @@ const style::TextStyle &BotKeyboard::Style::textStyle() const {
 	return st::botKbStyle;
 }
 
-void BotKeyboard::Style::repaint(not_null<const HistoryItem*> item) const {
+void BotKeyboard::Style::repaint(not_null<const HistoryItem *> item) const {
 	_parent->update();
 }
 
@@ -67,7 +68,8 @@ void BotKeyboard::Style::paintButtonBg(Painter &p, const QRect &rect, double how
 	App::roundRect(p, rect, st::botKbBg, BotKeyboardCorners);
 }
 
-void BotKeyboard::Style::paintButtonIcon(Painter &p, const QRect &rect, int outerWidth, HistoryMessageReplyMarkup::Button::Type type) const {
+void BotKeyboard::Style::paintButtonIcon(Painter &p, const QRect &rect, int outerWidth,
+                                         HistoryMessageReplyMarkup::Button::Type type) const {
 	// Buttons with icons should not appear here.
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
index 450779cff..d98779e05 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
@@ -21,9 +21,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "history/history_item.h"
+#include "structs.h"
 #include "ui/twidget.h"
 #include "ui/widgets/tooltip.h"
-#include "structs.h"
 
 class HistoryItem;
 
@@ -90,25 +90,25 @@ private:
 
 	class Style : public ReplyKeyboard::Style {
 	public:
-		Style(BotKeyboard *parent, const style::BotKeyboardButton &st) : ReplyKeyboard::Style(st), _parent(parent) {
-		}
+		Style(BotKeyboard *parent, const style::BotKeyboardButton &st)
+		    : ReplyKeyboard::Style(st)
+		    , _parent(parent) {}
 
 		int buttonRadius() const override;
 
 		void startPaint(Painter &p) const override;
 		const style::TextStyle &textStyle() const override;
-		void repaint(not_null<const HistoryItem*> item) const override;
+		void repaint(not_null<const HistoryItem *> item) const override;
 
 	protected:
 		void paintButtonBg(Painter &p, const QRect &rect, double howMuchOver) const override;
-		void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth, HistoryMessageReplyMarkup::Button::Type type) const override;
+		void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth,
+		                     HistoryMessageReplyMarkup::Button::Type type) const override;
 		void paintButtonLoading(Painter &p, const QRect &rect) const override;
 		int minButtonWidth(HistoryMessageReplyMarkup::Button::Type type) const override;
 
 	private:
 		BotKeyboard *_parent;
-
 	};
 	const style::BotKeyboardButton *_st = nullptr;
-
 };
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 6339b51a4..d71c41b30 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/emoji_list_widget.h"
 
-#include "ui/widgets/buttons.h"
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/shadow.h"
-#include "lang/lang_keys.h"
 #include "app.h"
+#include "lang/lang_keys.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/shadow.h"
 
 namespace ChatHelpers {
 namespace {
@@ -36,7 +36,7 @@ constexpr auto kEmojiPanelRowsPerPage = Ui::Emoji::kPanelRowsPerPage;
 
 class EmojiListWidget::Footer : public TabbedSelector::InnerFooter {
 public:
-	Footer(not_null<EmojiListWidget*> parent);
+	Footer(not_null<EmojiListWidget *> parent);
 
 	void setCurrentSectionIcon(Section section);
 
@@ -47,23 +47,23 @@ private:
 	void prepareSection(int &left, int top, int _width, Ui::IconButton *sectionIcon, Section section);
 	void setActiveSection(Section section);
 
-	not_null<EmojiListWidget*> _pan;
+	not_null<EmojiListWidget *> _pan;
 	std::array<object_ptr<Ui::IconButton>, kEmojiSectionCount> _sections;
-
 };
 
-EmojiListWidget::Footer::Footer(not_null<EmojiListWidget*> parent) : InnerFooter(parent)
-, _pan(parent)
-, _sections { {
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryRecent),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryPeople),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryNature),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryFood),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryActivity),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryTravel),
-	object_ptr<Ui::IconButton>(this, st::emojiCategoryObjects),
-	object_ptr<Ui::IconButton>(this, st::emojiCategorySymbols),
-} } {
+EmojiListWidget::Footer::Footer(not_null<EmojiListWidget *> parent)
+    : InnerFooter(parent)
+    , _pan(parent)
+    , _sections{{
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryRecent),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryPeople),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryNature),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryFood),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryActivity),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryTravel),
+          object_ptr<Ui::IconButton>(this, st::emojiCategoryObjects),
+          object_ptr<Ui::IconButton>(this, st::emojiCategorySymbols),
+      }} {
 	auto left = (st::emojiPanWidth - _sections.size() * st::emojiCategory.width) / 2;
 	for (auto i = 0; i != _sections.size(); ++i) {
 		auto &button = _sections[i];
@@ -76,20 +76,20 @@ EmojiListWidget::Footer::Footer(not_null<EmojiListWidget*> parent) : InnerFooter
 
 void EmojiListWidget::Footer::processPanelHideFinished() {
 	// Preserve panel state through visibility toggles.
-	//setCurrentSectionIcon(Section::Recent);
+	// setCurrentSectionIcon(Section::Recent);
 }
 
 void EmojiListWidget::Footer::setCurrentSectionIcon(Section section) {
-	std::array<const style::icon *, kEmojiSectionCount> overrides = { {
-		&st::emojiRecentActive,
-		&st::emojiPeopleActive,
-		&st::emojiNatureActive,
-		&st::emojiFoodActive,
-		&st::emojiActivityActive,
-		&st::emojiTravelActive,
-		&st::emojiObjectsActive,
-		&st::emojiSymbolsActive,
-	} };
+	std::array<const style::icon *, kEmojiSectionCount> overrides = {{
+	    &st::emojiRecentActive,
+	    &st::emojiPeopleActive,
+	    &st::emojiNatureActive,
+	    &st::emojiFoodActive,
+	    &st::emojiActivityActive,
+	    &st::emojiTravelActive,
+	    &st::emojiObjectsActive,
+	    &st::emojiSymbolsActive,
+	}};
 	for (auto i = 0; i != _sections.size(); ++i) {
 		_sections[i]->setIconOverride((section == static_cast<Section>(i)) ? overrides[i] : nullptr);
 	}
@@ -99,11 +99,13 @@ void EmojiListWidget::Footer::setActiveSection(Ui::Emoji::Section section) {
 	_pan->showEmojiSection(section);
 }
 
-EmojiColorPicker::EmojiColorPicker(QWidget *parent) : TWidget(parent) {
+EmojiColorPicker::EmojiColorPicker(QWidget *parent)
+    : TWidget(parent) {
 	setMouseTracking(true);
 
 	auto w = st::emojiPanMargins.left() + st::emojiPanSize.width() + st::emojiColorsSep + st::emojiPanMargins.right();
-	auto h = st::emojiPanMargins.top() + 2 * st::emojiColorsPadding + st::emojiPanSize.height() + st::emojiPanMargins.bottom();
+	auto h = st::emojiPanMargins.top() + 2 * st::emojiColorsPadding + st::emojiPanSize.height() +
+	         st::emojiPanMargins.bottom();
 	resize(w, h);
 
 	_hideTimer.setSingleShot(true);
@@ -121,8 +123,10 @@ void EmojiColorPicker::showEmoji(EmojiPtr emoji) {
 		_variants[i] = emoji->variant(i);
 	}
 
-	auto w = st::emojiPanMargins.left() + st::emojiPanSize.width() * _variants.size() + (_variants.size() - 2) * st::emojiColorsPadding + st::emojiColorsSep + st::emojiPanMargins.right();
-	auto h = st::emojiPanMargins.top() + 2 * st::emojiColorsPadding + st::emojiPanSize.height() + st::emojiPanMargins.bottom();
+	auto w = st::emojiPanMargins.left() + st::emojiPanSize.width() * _variants.size() +
+	         (_variants.size() - 2) * st::emojiColorsPadding + st::emojiColorsSep + st::emojiPanMargins.right();
+	auto h = st::emojiPanMargins.top() + 2 * st::emojiColorsPadding + st::emojiPanSize.height() +
+	         st::emojiPanMargins.bottom();
 	resize(w, h);
 
 	if (!_cache.isNull()) _cache = QPixmap();
@@ -154,7 +158,8 @@ void EmojiColorPicker::paintEvent(QPaintEvent *e) {
 
 	auto x = st::emojiPanMargins.left() + 2 * st::emojiColorsPadding + st::emojiPanSize.width();
 	if (rtl()) x = width() - x - st::emojiColorsSep;
-	p.fillRect(x, st::emojiPanMargins.top() + st::emojiColorsPadding, st::emojiColorsSep, inner.height() - st::emojiColorsPadding * 2, st::emojiColorsSepColor);
+	p.fillRect(x, st::emojiPanMargins.top() + st::emojiColorsPadding, st::emojiColorsSep,
+	           inner.height() - st::emojiColorsPadding * 2, st::emojiColorsSepColor);
 
 	if (_variants.isEmpty()) return;
 	for (auto i = 0, count = _variants.size(); i != count; ++i) {
@@ -284,7 +289,10 @@ void EmojiColorPicker::setSelected(int newSelected) {
 	}
 	auto updateSelectedRect = [this] {
 		if (_selected < 0) return;
-		rtlupdate(st::emojiPanMargins.left() + st::emojiColorsPadding + _selected * st::emojiPanSize.width() + (_selected ? 2 * st::emojiColorsPadding + st::emojiColorsSep : 0), st::emojiPanMargins.top() + st::emojiColorsPadding, st::emojiPanSize.width(), st::emojiPanSize.height());
+		rtlupdate(st::emojiPanMargins.left() + st::emojiColorsPadding + _selected * st::emojiPanSize.width() +
+		              (_selected ? 2 * st::emojiColorsPadding + st::emojiColorsSep : 0),
+		          st::emojiPanMargins.top() + st::emojiColorsPadding, st::emojiPanSize.width(),
+		          st::emojiPanSize.height());
 	};
 	updateSelectedRect();
 	_selected = newSelected;
@@ -293,18 +301,23 @@ void EmojiColorPicker::setSelected(int newSelected) {
 }
 
 void EmojiColorPicker::drawVariant(Painter &p, int variant) {
-	QPoint w(st::emojiPanMargins.left() + st::emojiColorsPadding + variant * st::emojiPanSize.width() + (variant ? 2 * st::emojiColorsPadding + st::emojiColorsSep : 0), st::emojiPanMargins.top() + st::emojiColorsPadding);
+	QPoint w(st::emojiPanMargins.left() + st::emojiColorsPadding + variant * st::emojiPanSize.width() +
+	             (variant ? 2 * st::emojiColorsPadding + st::emojiColorsSep : 0),
+	         st::emojiPanMargins.top() + st::emojiColorsPadding);
 	if (variant == _selected) {
 		QPoint tl(w);
 		if (rtl()) tl.setX(width() - tl.x() - st::emojiPanSize.width());
 		App::roundRect(p, QRect(tl, st::emojiPanSize), st::emojiPanHover, StickerHoverCorners);
 	}
 	auto esize = Ui::Emoji::Size(Ui::Emoji::Index() + 1);
-	p.drawPixmapLeft(w.x() + (st::emojiPanSize.width() - (esize / cIntRetinaFactor())) / 2, w.y() + (st::emojiPanSize.height() - (esize / cIntRetinaFactor())) / 2, width(), App::emojiLarge(), QRect(_variants[variant]->x() * esize, _variants[variant]->y() * esize, esize, esize));
+	p.drawPixmapLeft(w.x() + (st::emojiPanSize.width() - (esize / cIntRetinaFactor())) / 2,
+	                 w.y() + (st::emojiPanSize.height() - (esize / cIntRetinaFactor())) / 2, width(), App::emojiLarge(),
+	                 QRect(_variants[variant]->x() * esize, _variants[variant]->y() * esize, esize, esize));
 }
 
-EmojiListWidget::EmojiListWidget(QWidget *parent, not_null<Window::Controller*> controller) : Inner(parent, controller)
-, _picker(this) {
+EmojiListWidget::EmojiListWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : Inner(parent, controller)
+    , _picker(this) {
 	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, countHeight());
 
 	setMouseTracking(true);
@@ -338,8 +351,7 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
 	return std::move(result);
 }
 
-template <typename Callback>
-bool EmojiListWidget::enumerateSections(Callback callback) const {
+template <typename Callback> bool EmojiListWidget::enumerateSections(Callback callback) const {
 	auto info = SectionInfo();
 	for (auto i = 0; i != kEmojiSectionCount; ++i) {
 		info.section = i;
@@ -429,7 +441,8 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 		if (info.section > 0 && r.top() < info.rowsTop) {
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st::emojiPanHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), lang(LangKey(lng_emoji_category0 + info.section)));
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(),
+			               lang(LangKey(lng_emoji_category0 + info.section)));
 		}
 		if (r.top() + r.height() > info.rowsTop) {
 			ensureLoaded(info.section);
@@ -440,15 +453,18 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 					auto index = i * kEmojiPanelPerRow + j;
 					if (index >= info.count) break;
 
-					auto selected = (!_picker->isHidden() && info.section * MatrixRowShift + index == _pickerSel) || (info.section * MatrixRowShift + index == _selected);
+					auto selected = (!_picker->isHidden() && info.section * MatrixRowShift + index == _pickerSel) ||
+					                (info.section * MatrixRowShift + index == _selected);
 
-					auto w = QPoint(st::emojiPanPadding + j * st::emojiPanSize.width(), info.rowsTop + i * st::emojiPanSize.height());
+					auto w = QPoint(st::emojiPanPadding + j * st::emojiPanSize.width(),
+					                info.rowsTop + i * st::emojiPanSize.height());
 					if (selected) {
 						auto tl = w;
 						if (rtl()) tl.setX(width() - tl.x() - st::emojiPanSize.width());
 						App::roundRect(p, QRect(tl, st::emojiPanSize), st::emojiPanHover, StickerHoverCorners);
 					}
-					auto sourceRect = QRect(_emoji[info.section][index]->x() * _esize, _emoji[info.section][index]->y() * _esize, _esize, _esize);
+					auto sourceRect = QRect(_emoji[info.section][index]->x() * _esize,
+					                        _emoji[info.section][index]->y() * _esize, _esize, _esize);
 					auto imageLeft = w.x() + (st::emojiPanSize.width() - (_esize / cIntRetinaFactor())) / 2;
 					auto imageTop = w.y() + (st::emojiPanSize.height() - (_esize / cIntRetinaFactor())) / 2;
 					p.drawPixmapLeft(imageLeft, imageTop, width(), App::emojiLarge(), sourceRect);
@@ -673,7 +689,8 @@ void EmojiListWidget::updateSelected() {
 	if (p.y() >= info.rowsTop && p.y() < info.rowsBottom) {
 		auto sx = (rtl() ? width() - p.x() : p.x()) - st::emojiPanPadding;
 		if (sx >= 0 && sx < kEmojiPanelPerRow * st::emojiPanSize.width()) {
-			newSelected = std::floor((p.y() - info.rowsTop) / st::emojiPanSize.height()) * kEmojiPanelPerRow + std::floor(sx / st::emojiPanSize.width());
+			newSelected = std::floor((p.y() - info.rowsTop) / st::emojiPanSize.height()) * kEmojiPanelPerRow +
+			              std::floor(sx / st::emojiPanSize.width());
 			if (newSelected >= _emoji[info.section].size()) {
 				newSelected = -1;
 			} else {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 00bd245e9..e005a54f5 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -81,14 +81,13 @@ private:
 	Animation _a_opacity;
 
 	QTimer _hideTimer;
-
 };
 
 class EmojiListWidget : public TabbedSelector::Inner {
 	Q_OBJECT
 
 public:
-	EmojiListWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	EmojiListWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	using Section = Ui::Emoji::Section;
 
@@ -136,8 +135,7 @@ private:
 		int rowsTop = 0;
 		int rowsBottom = 0;
 	};
-	template <typename Callback>
-	bool enumerateSections(Callback callback) const;
+	template <typename Callback> bool enumerateSections(Callback callback) const;
 	SectionInfo sectionInfo(int section) const;
 	SectionInfo sectionInfoByOffset(int yOffset) const;
 
@@ -164,7 +162,6 @@ private:
 
 	object_ptr<EmojiColorPicker> _picker;
 	QTimer _showPickerTimer;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_helper.h b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_helper.h
index b9fadb8d6..69173fe6e 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_helper.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_helper.h
@@ -27,11 +27,11 @@ namespace Ui {
 namespace Emoji {
 
 inline utf16string QStringToUTF16(const QString &string) {
-	return utf16string(reinterpret_cast<const char16_t*>(string.constData()), string.size());
+	return utf16string(reinterpret_cast<const char16_t *>(string.constData()), string.size());
 }
 
 inline QString QStringFromUTF16(utf16string string) {
-	return QString::fromRawData(reinterpret_cast<const QChar*>(string.data()), string.size());
+	return QString::fromRawData(reinterpret_cast<const QChar *>(string.data()), string.size());
 }
 
 constexpr auto kSuggestionMaxLength = internal::kReplacementMaxLength;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index e2bfb3cad..45f9850be 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -18,17 +18,17 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QTextBlock>
 #include "chat_helpers/emoji_suggestions_widget.h"
+#include <QTextBlock>
 
+#include "app.h"
 #include "chat_helpers/emoji_suggestions_helper.h"
-#include "ui/effects/ripple_animation.h"
-#include "ui/widgets/shadow.h"
 #include "platform/platform_specific.h"
 #include "styles/style_chat_helpers.h"
-#include "ui/widgets/inner_dropdown.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/emoji_config.h"
-#include "app.h"
+#include "ui/widgets/inner_dropdown.h"
+#include "ui/widgets/shadow.h"
 
 namespace Ui {
 namespace Emoji {
@@ -71,20 +71,19 @@ private:
 	QString _label;
 	QString _replacement;
 	std::unique_ptr<RippleAnimation> _ripple;
-
 };
 
 SuggestionsWidget::Row::Row(not_null<EmojiPtr> emoji, const QString &label, const QString &replacement)
-: _emoji(emoji)
-, _label(label)
-, _replacement(replacement) {
-}
+    : _emoji(emoji)
+    , _label(label)
+    , _replacement(replacement) {}
 
 SuggestionsWidget::Row::~Row() = default;
 
-SuggestionsWidget::SuggestionsWidget(QWidget *parent, const style::Menu &st) : TWidget(parent)
-, _st(&st)
-, _rowHeight(_st->itemPadding.top() + _st->itemFont->height + _st->itemPadding.bottom()) {
+SuggestionsWidget::SuggestionsWidget(QWidget *parent, const style::Menu &st)
+    : TWidget(parent)
+    , _st(&st)
+    , _rowHeight(_st->itemPadding.top() + _st->itemFont->height + _st->itemPadding.bottom()) {
 	setMouseTracking(true);
 }
 
@@ -124,7 +123,7 @@ std::vector<SuggestionsWidget::Row> SuggestionsWidget::getRowsByQuery() const {
 		suggestionsEmoji[i] = Find(QStringFromUTF16(suggestions[i].emoji()));
 	}
 	auto recents = 0;
-    auto &recent = GetRecent();
+	auto &recent = GetRecent();
 	for (auto &item : recent) {
 		auto emoji = item.first->original();
 		if (!emoji) emoji = item.first;
@@ -209,7 +208,9 @@ void SuggestionsWidget::paintEvent(QPaintEvent *e) {
 		}
 		auto emoji = row.emoji();
 		auto esize = Ui::Emoji::Size(Ui::Emoji::Index() + 1);
-		p.drawPixmapLeft((_st->itemPadding.left() - (esize / cIntRetinaFactor())) / 2, (_rowHeight - (esize / cIntRetinaFactor())) / 2, width(), App::emojiLarge(), QRect(emoji->x() * esize, emoji->y() * esize, esize, esize));
+		p.drawPixmapLeft((_st->itemPadding.left() - (esize / cIntRetinaFactor())) / 2,
+		                 (_rowHeight - (esize / cIntRetinaFactor())) / 2, width(), App::emojiLarge(),
+		                 QRect(emoji->x() * esize, emoji->y() * esize, esize, esize));
 		p.setPen(selected ? _st->itemFgOver : _st->itemFg);
 		p.drawTextLeft(_st->itemPadding.left(), _st->itemPadding.top(), width(), row.label());
 		p.translate(0, _rowHeight);
@@ -318,9 +319,8 @@ void SuggestionsWidget::mousePressEvent(QMouseEvent *e) {
 		setPressed(_selected);
 		if (!_rows[_pressed].ripple()) {
 			auto mask = RippleAnimation::rectMask(QSize(width(), _rowHeight));
-			_rows[_pressed].setRipple(std::make_unique<RippleAnimation>(_st->ripple, std::move(mask), [this, selected = _pressed] {
-				updateItem(selected);
-			}));
+			_rows[_pressed].setRipple(std::make_unique<RippleAnimation>(
+			    _st->ripple, std::move(mask), [this, selected = _pressed] { updateItem(selected); }));
 		}
 		_rows[_pressed].ripple()->add(mapFromGlobal(QCursor::pos()) - QPoint(0, itemTop(_pressed)));
 	}
@@ -362,10 +362,12 @@ void SuggestionsWidget::leaveEventHook(QEvent *e) {
 	return TWidget::leaveEventHook(e);
 }
 
-SuggestionsController::SuggestionsController(QWidget *parent, not_null<QTextEdit*> field) : QObject(nullptr)
-, _field(field)
-, _container(parent, st::emojiSuggestionsDropdown)
-, _suggestions(_container->setOwnedWidget(object_ptr<Ui::Emoji::SuggestionsWidget>(parent, st::emojiSuggestionsMenu))) {
+SuggestionsController::SuggestionsController(QWidget *parent, not_null<QTextEdit *> field)
+    : QObject(nullptr)
+    , _field(field)
+    , _container(parent, st::emojiSuggestionsDropdown)
+    , _suggestions(
+          _container->setOwnedWidget(object_ptr<Ui::Emoji::SuggestionsWidget>(parent, st::emojiSuggestionsMenu))) {
 	_container->setAutoHiding(false);
 
 	_field->installEventFilter(this);
@@ -430,9 +432,7 @@ QString SuggestionsController::getEmojiQuery() {
 	auto isSuggestionChar = [](QChar ch) {
 		return (ch >= 'a' && ch <= 'z') || (ch >= '0' && ch <= '9') || (ch == '_') || (ch == '-') || (ch == '+');
 	};
-	auto isGoodCharBeforeSuggestion = [isSuggestionChar](QChar ch) {
-		return !isSuggestionChar(ch) || (ch == 0);
-	};
+	auto isGoodCharBeforeSuggestion = [isSuggestionChar](QChar ch) { return !isSuggestionChar(ch) || (ch == 0); };
 	Assert(position > 0 && position <= text.size());
 	for (auto i = position; i != 0;) {
 		auto ch = text[--i];
@@ -511,7 +511,8 @@ void SuggestionsController::updateGeometry() {
 	auto boundingRect = _container->parentWidget()->rect();
 	auto origin = rtl() ? PanelAnimation::Origin::BottomRight : PanelAnimation::Origin::BottomLeft;
 	auto point = rtl() ? (aroundRect.topLeft() + QPoint(aroundRect.width(), 0)) : aroundRect.topLeft();
-	point -= rtl() ? QPoint(_container->width() - st::emojiSuggestionsDropdown.padding.right(), _container->height()) : QPoint(st::emojiSuggestionsDropdown.padding.left(), _container->height());
+	point -= rtl() ? QPoint(_container->width() - st::emojiSuggestionsDropdown.padding.right(), _container->height()) :
+	                 QPoint(st::emojiSuggestionsDropdown.padding.left(), _container->height());
 	if (rtl()) {
 		if (point.x() < boundingRect.x()) {
 			point.setX(boundingRect.x());
@@ -529,7 +530,8 @@ void SuggestionsController::updateGeometry() {
 	}
 	if (point.y() < boundingRect.y()) {
 		point.setY(aroundRect.y() + aroundRect.height());
-		origin = (origin == PanelAnimation::Origin::BottomRight) ? PanelAnimation::Origin::TopRight : PanelAnimation::Origin::TopLeft;
+		origin = (origin == PanelAnimation::Origin::BottomRight) ? PanelAnimation::Origin::TopRight :
+		                                                           PanelAnimation::Origin::TopLeft;
 	}
 	_container->move(point);
 }
@@ -562,7 +564,7 @@ bool SuggestionsController::eventFilter(QObject *object, QEvent *event) {
 		} break;
 
 		case QEvent::KeyPress: {
-			auto key = static_cast<QKeyEvent*>(event)->key();
+			auto key = static_cast<QKeyEvent *>(event)->key();
 			switch (key) {
 			case Qt::Key_Enter:
 			case Qt::Key_Return:
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
index 3ba07972a..04ff4f28b 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QTextEdit>
 #include "base/observer.h"
-#include "ui/twidget.h"
 #include "ui/effects/panel_animation.h"
+#include "ui/twidget.h"
+#include <QTextEdit>
 
 namespace Ui {
 
@@ -68,7 +68,7 @@ private:
 	void triggerSelectedRow();
 	void triggerRow(const Row &row);
 
-	not_null<const style::Menu*> _st;
+	not_null<const style::Menu *> _st;
 
 	QString _query;
 	std::vector<Row> _rows;
@@ -77,12 +77,11 @@ private:
 	bool _mouseSelection = false;
 	int _selected = -1;
 	int _pressed = -1;
-
 };
 
 class SuggestionsController : public QObject, private base::Subscriber {
 public:
-	SuggestionsController(QWidget *parent, not_null<QTextEdit*> field);
+	SuggestionsController(QWidget *parent, not_null<QTextEdit *> field);
 
 	void raise();
 
@@ -106,7 +105,6 @@ private:
 	QPointer<QTextEdit> _field;
 	object_ptr<InnerDropdown> _container;
 	QPointer<SuggestionsWidget> _suggestions;
-
 };
 
 } // namespace Emoji
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index c385f7c50..ecf9eeaff 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -20,29 +20,35 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/field_autocomplete.h"
 
-#include "mainwindow.h"
 #include "apiwrap.h"
-#include "storage/localstorage.h"
-#include "ui/widgets/scroll_area.h"
-#include "styles/style_history.h"
-#include "styles/style_widgets.h"
-#include "styles/style_chat_helpers.h"
+#include "app.h"
 #include "auth_session.h"
 #include "chat_helpers/stickers.h"
-#include "app.h"
+#include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_history.h"
+#include "styles/style_widgets.h"
+#include "ui/widgets/scroll_area.h"
 #include <QApplication>
 
-FieldAutocomplete::FieldAutocomplete(QWidget *parent) : TWidget(parent)
-, _scroll(this, st::mentionScroll) {
+FieldAutocomplete::FieldAutocomplete(QWidget *parent)
+    : TWidget(parent)
+    , _scroll(this, st::mentionScroll) {
 	_scroll->setGeometry(rect());
 
-	_inner = _scroll->setOwnedWidget(object_ptr<internal::FieldAutocompleteInner>(this, &_mrows, &_hrows, &_brows, &_srows));
+	_inner =
+	    _scroll->setOwnedWidget(object_ptr<internal::FieldAutocompleteInner>(this, &_mrows, &_hrows, &_brows, &_srows));
 	_inner->setGeometry(rect());
 
-	connect(_inner, SIGNAL(mentionChosen(UserData*, FieldAutocomplete::ChooseMethod)), this, SIGNAL(mentionChosen(UserData*, FieldAutocomplete::ChooseMethod)));
-	connect(_inner, SIGNAL(hashtagChosen(QString, FieldAutocomplete::ChooseMethod)), this, SIGNAL(hashtagChosen(QString, FieldAutocomplete::ChooseMethod)));
-	connect(_inner, SIGNAL(botCommandChosen(QString, FieldAutocomplete::ChooseMethod)), this, SIGNAL(botCommandChosen(QString, FieldAutocomplete::ChooseMethod)));
-	connect(_inner, SIGNAL(stickerChosen(DocumentData*, FieldAutocomplete::ChooseMethod)), this, SIGNAL(stickerChosen(DocumentData*, FieldAutocomplete::ChooseMethod)));
+	connect(_inner, SIGNAL(mentionChosen(UserData *, FieldAutocomplete::ChooseMethod)), this,
+	        SIGNAL(mentionChosen(UserData *, FieldAutocomplete::ChooseMethod)));
+	connect(_inner, SIGNAL(hashtagChosen(QString, FieldAutocomplete::ChooseMethod)), this,
+	        SIGNAL(hashtagChosen(QString, FieldAutocomplete::ChooseMethod)));
+	connect(_inner, SIGNAL(botCommandChosen(QString, FieldAutocomplete::ChooseMethod)), this,
+	        SIGNAL(botCommandChosen(QString, FieldAutocomplete::ChooseMethod)));
+	connect(_inner, SIGNAL(stickerChosen(DocumentData *, FieldAutocomplete::ChooseMethod)), this,
+	        SIGNAL(stickerChosen(DocumentData *, FieldAutocomplete::ChooseMethod)));
 	connect(_inner, SIGNAL(mustScrollTo(int, int)), _scroll, SLOT(scrollToY(int, int)));
 
 	_scroll->show();
@@ -62,7 +68,6 @@ void FieldAutocomplete::paintEvent(QPaintEvent *e) {
 			p.setOpacity(opacity);
 			p.drawPixmap(0, 0, _cache);
 		} else if (_hiding) {
-
 		}
 		return;
 	}
@@ -132,8 +137,7 @@ bool FieldAutocomplete::clearFilteredBotCommands() {
 }
 
 namespace {
-template <typename T, typename U>
-inline int indexOfInFirstN(const T &v, const U &elem, int last) {
+template <typename T, typename U> inline int indexOfInFirstN(const T &v, const U &elem, int last) {
 	for (auto b = v.cbegin(), i = b, e = b + std::max(v.size(), last); i != e; ++i) {
 		if (*i == elem) {
 			return (i - b);
@@ -141,7 +145,7 @@ inline int indexOfInFirstN(const T &v, const U &elem, int last) {
 	}
 	return -1;
 }
-}
+} // namespace
 
 void FieldAutocomplete::updateFiltered(bool resetScroll) {
 	qint32 now = unixtime(), recentInlineBots = 0;
@@ -192,8 +196,9 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 			}
 		}
 		if (_chat) {
-			QMultiMap<qint32, UserData*> ordered;
-			mrows.reserve(mrows.size() + (_chat->participants.isEmpty() ? _chat->lastAuthors.size() : _chat->participants.size()));
+			QMultiMap<qint32, UserData *> ordered;
+			mrows.reserve(mrows.size() +
+			              (_chat->participants.isEmpty() ? _chat->lastAuthors.size() : _chat->participants.size()));
 			if (_chat->noParticipantInfo()) {
 				Auth().api().requestFullPeer(_chat);
 			} else if (!_chat->participants.isEmpty()) {
@@ -221,7 +226,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 				}
 			}
 		} else if (_channel && _channel->isMegagroup()) {
-			QMultiMap<qint32, UserData*> ordered;
+			QMultiMap<qint32, UserData *> ordered;
 			if (_channel->mgInfo->lastParticipants.isEmpty() || _channel->lastParticipantsCountOutdated()) {
 				Auth().api().requestLastParticipants(_channel);
 			} else {
@@ -239,7 +244,8 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		auto &recent(cRecentWriteHashtags());
 		hrows.reserve(recent.size());
 		for (auto i = recent.cbegin(), e = recent.cend(); i != e; ++i) {
-			if (!listAllSuggestions && (!i->first.startsWith(_filter, Qt::CaseInsensitive) || i->first.size() == _filter.size())) {
+			if (!listAllSuggestions &&
+			    (!i->first.startsWith(_filter, Qt::CaseInsensitive) || i->first.size() == _filter.size())) {
 				continue;
 			}
 			hrows.push_back(i->first);
@@ -247,7 +253,7 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 	} else if (_type == Type::BotCommands) {
 		bool listAllSuggestions = _filter.isEmpty();
 		bool hasUsername = _filter.indexOf('@') > 0;
-		QMap<UserData*, bool> bots;
+		QMap<UserData *, bool> bots;
 		qint32 cnt = 0;
 		if (_chat) {
 			if (_chat->noParticipantInfo()) {
@@ -289,7 +295,8 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 		}
 		if (cnt) {
 			brows.reserve(cnt);
-			qint32 botStatus = _chat ? _chat->botStatus : ((_channel && _channel->isMegagroup()) ? _channel->mgInfo->botStatus : -1);
+			qint32 botStatus =
+			    _chat ? _chat->botStatus : ((_channel && _channel->isMegagroup()) ? _channel->mgInfo->botStatus : -1);
 			if (_chat) {
 				for (auto i = _chat->lastAuthors.cbegin(), e = _chat->lastAuthors.cend(); i != e; ++i) {
 					auto user = *i;
@@ -302,10 +309,11 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 					bots.remove(user);
 					for (auto j = 0, l = user->botInfo->commands.size(); j != l; ++j) {
 						if (!listAllSuggestions) {
-							auto toFilter = (hasUsername || botStatus == 0 || botStatus == 2)
-								? user->botInfo->commands.at(j).command + '@' + user->username
-								: user->botInfo->commands.at(j).command;
-							if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) {
+							auto toFilter = (hasUsername || botStatus == 0 || botStatus == 2) ?
+							                    user->botInfo->commands.at(j).command + '@' + user->username :
+							                    user->botInfo->commands.at(j).command;
+							if (!toFilter.startsWith(_filter,
+							                         Qt::CaseInsensitive) /* || toFilter.size() == _filter.size()*/) {
 								continue;
 							}
 						}
@@ -314,12 +322,16 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 				}
 			}
 			if (!bots.isEmpty()) {
-				for (QMap<UserData*, bool>::const_iterator i = bots.cbegin(), e = bots.cend(); i != e; ++i) {
+				for (QMap<UserData *, bool>::const_iterator i = bots.cbegin(), e = bots.cend(); i != e; ++i) {
 					UserData *user = i.key();
 					for (qint32 j = 0, l = user->botInfo->commands.size(); j < l; ++j) {
 						if (!listAllSuggestions) {
-							QString toFilter = (hasUsername || botStatus == 0 || botStatus == 2) ? user->botInfo->commands.at(j).command + '@' + user->username : user->botInfo->commands.at(j).command;
-							if (!toFilter.startsWith(_filter, Qt::CaseInsensitive)/* || toFilter.size() == _filter.size()*/) continue;
+							QString toFilter = (hasUsername || botStatus == 0 || botStatus == 2) ?
+							                       user->botInfo->commands.at(j).command + '@' + user->username :
+							                       user->botInfo->commands.at(j).command;
+							if (!toFilter.startsWith(_filter,
+							                         Qt::CaseInsensitive) /* || toFilter.size() == _filter.size()*/)
+								continue;
 						}
 						brows.push_back(qMakePair(user, &user->botInfo->commands.at(j)));
 					}
@@ -331,7 +343,8 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 	_inner->setRecentInlineBotsInRows(recentInlineBots);
 }
 
-void FieldAutocomplete::rowsUpdated(const internal::MentionRows &mrows, const internal::HashtagRows &hrows, const internal::BotCommandRows &brows, const StickerPack &srows, bool resetScroll) {
+void FieldAutocomplete::rowsUpdated(const internal::MentionRows &mrows, const internal::HashtagRows &hrows,
+                                    const internal::BotCommandRows &brows, const StickerPack &srows, bool resetScroll) {
 	if (mrows.isEmpty() && hrows.isEmpty() && brows.isEmpty() && srows.isEmpty()) {
 		if (!isHidden()) {
 			hideAnimated();
@@ -368,7 +381,8 @@ void FieldAutocomplete::setBoundings(QRect boundings) {
 void FieldAutocomplete::recount(bool resetScroll) {
 	qint32 h = 0, oldst = _scroll->scrollTop(), st = oldst, maxh = 4.5 * st::mentionHeight;
 	if (!_srows.isEmpty()) {
-		qint32 stickersPerRow = std::max(1, qint32(_boundings.width() - 2 * st::stickerPanPadding) / qint32(st::stickerPanSize.width()));
+		qint32 stickersPerRow =
+		    std::max(1, qint32(_boundings.width() - 2 * st::stickerPanPadding) / qint32(st::stickerPanSize.width()));
 		qint32 rows = rowscount(_srows.size(), stickersPerRow);
 		h = st::stickerPanPadding + rows * st::stickerPanSize.height();
 	} else if (!_mrows.isEmpty()) {
@@ -485,10 +499,11 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 	if (hidden && !moderate) return QWidget::eventFilter(obj, e);
 
 	if (e->type() == QEvent::KeyPress) {
-		QKeyEvent *ev = static_cast<QKeyEvent*>(e);
+		QKeyEvent *ev = static_cast<QKeyEvent *>(e);
 		if (!(ev->modifiers() & (Qt::AltModifier | Qt::ControlModifier | Qt::ShiftModifier | Qt::MetaModifier))) {
 			if (!hidden) {
-				if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down || (!_srows.isEmpty() && (ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right))) {
+				if (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down ||
+				    (!_srows.isEmpty() && (ev->key() == Qt::Key_Left || ev->key() == Qt::Key_Right))) {
 					return _inner->moveSel(ev->key());
 				} else if (ev->key() == Qt::Key_Enter || ev->key() == Qt::Key_Return) {
 					return _inner->chooseSelected(ChooseMethod::ByEnter);
@@ -504,24 +519,24 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 	return QWidget::eventFilter(obj, e);
 }
 
-FieldAutocomplete::~FieldAutocomplete() {
-}
+FieldAutocomplete::~FieldAutocomplete() {}
 
 namespace internal {
 
-FieldAutocompleteInner::FieldAutocompleteInner(FieldAutocomplete *parent, MentionRows *mrows, HashtagRows *hrows, BotCommandRows *brows, StickerPack *srows)
-: _parent(parent)
-, _mrows(mrows)
-, _hrows(hrows)
-, _brows(brows)
-, _srows(srows)
-, _stickersPerRow(1)
-, _recentInlineBotsInRows(0)
-, _sel(-1)
-, _down(-1)
-, _mouseSel(false)
-, _overDelete(false)
-, _previewShown(false) {
+FieldAutocompleteInner::FieldAutocompleteInner(FieldAutocomplete *parent, MentionRows *mrows, HashtagRows *hrows,
+                                               BotCommandRows *brows, StickerPack *srows)
+    : _parent(parent)
+    , _mrows(mrows)
+    , _hrows(hrows)
+    , _brows(brows)
+    , _srows(srows)
+    , _stickersPerRow(1)
+    , _recentInlineBotsInRows(0)
+    , _sel(-1)
+    , _down(-1)
+    , _mouseSel(false)
+    , _overDelete(false)
+    , _previewShown(false) {
 	_previewTimer.setSingleShot(true);
 	connect(&_previewTimer, SIGNAL(timeout()), this, SLOT(onPreview()));
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
@@ -536,14 +551,16 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 	qint32 atwidth = st::mentionFont->width('@'), hashwidth = st::mentionFont->width('#');
 	qint32 mentionleft = 2 * st::mentionPadding.left() + st::mentionPhotoSize;
 	qint32 mentionwidth = width() - mentionleft - 2 * st::mentionPadding.right();
-	qint32 htagleft = st::historyAttach.width + st::historyComposeField.textMrg.left() - st::lineWidth, htagwidth = width() - st::mentionPadding.right() - htagleft - st::mentionScroll.width;
+	qint32 htagleft = st::historyAttach.width + st::historyComposeField.textMrg.left() - st::lineWidth,
+	       htagwidth = width() - st::mentionPadding.right() - htagleft - st::mentionScroll.width;
 
 	if (!_srows->isEmpty()) {
 		qint32 rows = rowscount(_srows->size(), _stickersPerRow);
 		qint32 fromrow = floorclamp(r.y() - st::stickerPanPadding, st::stickerPanSize.height(), 0, rows);
 		qint32 torow = ceilclamp(r.y() + r.height() - st::stickerPanPadding, st::stickerPanSize.height(), 0, rows);
 		qint32 fromcol = floorclamp(r.x() - st::stickerPanPadding, st::stickerPanSize.width(), 0, _stickersPerRow);
-		qint32 tocol = ceilclamp(r.x() + r.width() - st::stickerPanPadding, st::stickerPanSize.width(), 0, _stickersPerRow);
+		qint32 tocol =
+		    ceilclamp(r.x() + r.width() - st::stickerPanPadding, st::stickerPanSize.width(), 0, _stickersPerRow);
 		for (qint32 row = fromrow; row < torow; ++row) {
 			for (qint32 col = fromcol; col < tocol; ++col) {
 				qint32 index = row * _stickersPerRow + col;
@@ -552,23 +569,28 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 				DocumentData *sticker = _srows->at(index);
 				if (!sticker->sticker()) continue;
 
-				QPoint pos(st::stickerPanPadding + col * st::stickerPanSize.width(), st::stickerPanPadding + row * st::stickerPanSize.height());
+				QPoint pos(st::stickerPanPadding + col * st::stickerPanSize.width(),
+				           st::stickerPanPadding + row * st::stickerPanSize.height());
 				if (_sel == index) {
 					QPoint tl(pos);
 					if (rtl()) tl.setX(width() - tl.x() - st::stickerPanSize.width());
 					App::roundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
 				}
 
-				bool goodThumb = !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
+				bool goodThumb = !sticker->thumb->isNull() &&
+				                 ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
 				if (goodThumb) {
 					sticker->thumb->load();
 				} else {
 					sticker->checkSticker();
 				}
 
-				double coef = std::min((st::stickerPanSize.width() - st::buttonRadius * 2) / double(sticker->dimensions.width()), (st::stickerPanSize.height() - st::buttonRadius * 2) / double(sticker->dimensions.height()));
+				double coef = std::min(
+				    (st::stickerPanSize.width() - st::buttonRadius * 2) / double(sticker->dimensions.width()),
+				    (st::stickerPanSize.height() - st::buttonRadius * 2) / double(sticker->dimensions.height()));
 				if (coef > 1) coef = 1;
-				qint32 w = std::round(coef * sticker->dimensions.width()), h = std::round(coef * sticker->dimensions.height());
+				qint32 w = std::round(coef * sticker->dimensions.width()),
+				       h = std::round(coef * sticker->dimensions.height());
 				if (w < 1) w = 1;
 				if (h < 1) h = 1;
 				QPoint ppos = pos + QPoint((st::stickerPanSize.width() - w) / 2, (st::stickerPanSize.height() - h) / 2);
@@ -580,7 +602,8 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 			}
 		}
 	} else {
-		qint32 from = std::floor(e->rect().top() / st::mentionHeight), to = std::floor(e->rect().bottom() / st::mentionHeight) + 1;
+		qint32 from = std::floor(e->rect().top() / st::mentionHeight),
+		       to = std::floor(e->rect().bottom() / st::mentionHeight) + 1;
 		qint32 last = _mrows->isEmpty() ? (_hrows->isEmpty() ? _brows->size() : _hrows->size()) : _mrows->size();
 		auto filter = _parent->filter();
 		bool hasUsername = filter.indexOf('@') > 0;
@@ -594,14 +617,20 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 				p.fillRect(0, i * st::mentionHeight, width(), st::mentionHeight, st::mentionBgOver);
 				int skip = (st::mentionHeight - st::smallCloseIconOver.height()) / 2;
 				if (!_hrows->isEmpty() || (!_mrows->isEmpty() && i < _recentInlineBotsInRows)) {
-					st::smallCloseIconOver.paint(p, QPoint(width() - st::smallCloseIconOver.width() - skip, i * st::mentionHeight + skip), width());
+					st::smallCloseIconOver.paint(
+					    p, QPoint(width() - st::smallCloseIconOver.width() - skip, i * st::mentionHeight + skip),
+					    width());
 				}
 			}
 			if (!_mrows->isEmpty()) {
 				UserData *user = _mrows->at(i);
-				QString first = (!filterIsEmpty && user->username.startsWith(filter, Qt::CaseInsensitive)) ? ('@' + user->username.mid(0, filterSize)) : QString();
-				QString second = first.isEmpty() ? (user->username.isEmpty() ? QString() : ('@' + user->username)) : user->username.mid(filterSize);
-				qint32 firstwidth = st::mentionFont->width(first), secondwidth = st::mentionFont->width(second), unamewidth = firstwidth + secondwidth, namewidth = user->nameText.maxWidth();
+				QString first = (!filterIsEmpty && user->username.startsWith(filter, Qt::CaseInsensitive)) ?
+				                    ('@' + user->username.mid(0, filterSize)) :
+				                    QString();
+				QString second = first.isEmpty() ? (user->username.isEmpty() ? QString() : ('@' + user->username)) :
+				                                   user->username.mid(filterSize);
+				qint32 firstwidth = st::mentionFont->width(first), secondwidth = st::mentionFont->width(second),
+				       unamewidth = firstwidth + secondwidth, namewidth = user->nameText.maxWidth();
 				if (mentionwidth < unamewidth + namewidth) {
 					namewidth = (mentionwidth * namewidth) / (namewidth + unamewidth);
 					unamewidth = mentionwidth - namewidth;
@@ -617,17 +646,21 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 					}
 				}
 				user->loadUserpic();
-				user->paintUserpicLeft(p, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), width(), st::mentionPhotoSize);
+				user->paintUserpicLeft(p, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(),
+				                       width(), st::mentionPhotoSize);
 
 				p.setPen(selected ? st::mentionNameFgOver : st::mentionNameFg);
-				user->nameText.drawElided(p, 2 * st::mentionPadding.left() + st::mentionPhotoSize, i * st::mentionHeight + st::mentionTop, namewidth);
+				user->nameText.drawElided(p, 2 * st::mentionPadding.left() + st::mentionPhotoSize,
+				                          i * st::mentionHeight + st::mentionTop, namewidth);
 
 				p.setFont(st::mentionFont);
 				p.setPen(selected ? st::mentionFgOverActive : st::mentionFgActive);
-				p.drawText(mentionleft + namewidth + st::mentionPadding.right(), i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, first);
+				p.drawText(mentionleft + namewidth + st::mentionPadding.right(),
+				           i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, first);
 				if (!second.isEmpty()) {
 					p.setPen(selected ? st::mentionFgOver : st::mentionFg);
-					p.drawText(mentionleft + namewidth + st::mentionPadding.right() + firstwidth, i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, second);
+					p.drawText(mentionleft + namewidth + st::mentionPadding.right() + firstwidth,
+					           i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, second);
 				}
 			} else if (!_hrows->isEmpty()) {
 				QString hrow = _hrows->at(i);
@@ -650,25 +683,31 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 				}
 				if (!second.isEmpty()) {
 					p.setPen((selected ? st::mentionFgOver : st::mentionFg)->p);
-					p.drawText(htagleft + firstwidth, i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, second);
+					p.drawText(htagleft + firstwidth, i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent,
+					           second);
 				}
 			} else {
 				UserData *user = _brows->at(i).first;
 
 				const BotCommand *command = _brows->at(i).second;
 				QString toHighlight = command->command;
-				qint32 botStatus = _parent->chat() ? _parent->chat()->botStatus : ((_parent->channel() && _parent->channel()->isMegagroup()) ? _parent->channel()->mgInfo->botStatus : -1);
+				qint32 botStatus = _parent->chat() ? _parent->chat()->botStatus :
+				                                     ((_parent->channel() && _parent->channel()->isMegagroup()) ?
+				                                          _parent->channel()->mgInfo->botStatus :
+				                                          -1);
 				if (hasUsername || botStatus == 0 || botStatus == 2) {
 					toHighlight += '@' + user->username;
 				}
 				user->loadUserpic();
-				user->paintUserpicLeft(p, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(), width(), st::mentionPhotoSize);
+				user->paintUserpicLeft(p, st::mentionPadding.left(), i * st::mentionHeight + st::mentionPadding.top(),
+				                       width(), st::mentionPhotoSize);
 
 				auto commandText = '/' + toHighlight;
 
 				p.setPen(selected ? st::mentionNameFgOver : st::mentionNameFg);
 				p.setFont(st::semiboldFont);
-				p.drawText(2 * st::mentionPadding.left() + st::mentionPhotoSize, i * st::mentionHeight + st::mentionTop + st::semiboldFont->ascent, commandText);
+				p.drawText(2 * st::mentionPadding.left() + st::mentionPhotoSize,
+				           i * st::mentionHeight + st::mentionTop + st::semiboldFont->ascent, commandText);
 
 				auto commandTextWidth = st::semiboldFont->width(commandText);
 				auto addleft = commandTextWidth + st::mentionPadding.left();
@@ -676,13 +715,16 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 
 				if (widthleft > st::mentionFont->elidew && !command->descriptionText().isEmpty()) {
 					p.setPen((selected ? st::mentionFgOver : st::mentionFg)->p);
-					command->descriptionText().drawElided(p, mentionleft + addleft, i * st::mentionHeight + st::mentionTop, widthleft);
+					command->descriptionText().drawElided(p, mentionleft + addleft,
+					                                      i * st::mentionHeight + st::mentionTop, widthleft);
 				}
 			}
 		}
-		p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, _parent->innerBottom() - st::lineWidth, width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
+		p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, _parent->innerBottom() - st::lineWidth,
+		           width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
 	}
-	p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, _parent->innerTop(), width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
+	p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, _parent->innerTop(),
+	           width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
 }
 
 void FieldAutocompleteInner::resizeEvent(QResizeEvent *e) {
@@ -706,7 +748,9 @@ void FieldAutocompleteInner::clearSel(bool hidden) {
 
 bool FieldAutocompleteInner::moveSel(int key) {
 	_mouseSel = false;
-	qint32 maxSel = (_mrows->isEmpty() ? (_hrows->isEmpty() ? (_brows->isEmpty() ? _srows->size() : _brows->size()) : _hrows->size()) : _mrows->size());
+	qint32 maxSel = (_mrows->isEmpty() ?
+	                     (_hrows->isEmpty() ? (_brows->isEmpty() ? _srows->size() : _brows->size()) : _hrows->size()) :
+	                     _mrows->size());
 	qint32 direction = (key == Qt::Key_Up) ? -1 : (key == Qt::Key_Down ? 1 : 0);
 	if (!_srows->isEmpty()) {
 		if (key == Qt::Key_Left) {
@@ -751,7 +795,10 @@ bool FieldAutocompleteInner::chooseSelected(FieldAutocomplete::ChooseMethod meth
 		if (_sel >= 0 && _sel < _brows->size()) {
 			UserData *user = _brows->at(_sel).first;
 			const BotCommand *command(_brows->at(_sel).second);
-			qint32 botStatus = _parent->chat() ? _parent->chat()->botStatus : ((_parent->channel() && _parent->channel()->isMegagroup()) ? _parent->channel()->mgInfo->botStatus : -1);
+			qint32 botStatus = _parent->chat() ? _parent->chat()->botStatus :
+			                                     ((_parent->channel() && _parent->channel()->isMegagroup()) ?
+			                                          _parent->channel()->mgInfo->botStatus :
+			                                          -1);
 			if (botStatus == 0 || botStatus == 2 || _parent->filter().indexOf('@') > 0) {
 				emit botCommandChosen('/' + command->command + '@' + user->username, method);
 			} else {
@@ -850,7 +897,9 @@ void FieldAutocompleteInner::updateSelectedRow() {
 			update(0, _sel * st::mentionHeight, width(), st::mentionHeight);
 		} else {
 			qint32 row = _sel / _stickersPerRow, col = _sel % _stickersPerRow;
-			update(st::stickerPanPadding + col * st::stickerPanSize.width(), st::stickerPanPadding + row * st::stickerPanSize.height(), st::stickerPanSize.width(), st::stickerPanSize.height());
+			update(st::stickerPanPadding + col * st::stickerPanSize.width(),
+			       st::stickerPanPadding + row * st::stickerPanSize.height(), st::stickerPanSize.width(),
+			       st::stickerPanSize.height());
 		}
 	}
 }
@@ -865,7 +914,8 @@ void FieldAutocompleteInner::setSel(int sel, bool scroll) {
 			emit mustScrollTo(_sel * st::mentionHeight, (_sel + 1) * st::mentionHeight);
 		} else {
 			qint32 row = _sel / _stickersPerRow;
-			emit mustScrollTo(st::stickerPanPadding + row * st::stickerPanSize.height(), st::stickerPanPadding + (row + 1) * st::stickerPanSize.height());
+			emit mustScrollTo(st::stickerPanPadding + row * st::stickerPanSize.height(),
+			                  st::stickerPanPadding + (row + 1) * st::stickerPanSize.height());
 		}
 	}
 }
@@ -879,8 +929,12 @@ void FieldAutocompleteInner::onUpdateSelected(bool force) {
 	qint32 sel = -1, maxSel = 0;
 	if (!_srows->isEmpty()) {
 		qint32 rows = rowscount(_srows->size(), _stickersPerRow);
-		qint32 row = (mouse.y() >= st::stickerPanPadding) ? ((mouse.y() - st::stickerPanPadding) / st::stickerPanSize.height()) : -1;
-		qint32 col = (mouse.x() >= st::stickerPanPadding) ? ((mouse.x() - st::stickerPanPadding) / st::stickerPanSize.width()) : -1;
+		qint32 row = (mouse.y() >= st::stickerPanPadding) ?
+		                 ((mouse.y() - st::stickerPanPadding) / st::stickerPanSize.height()) :
+		                 -1;
+		qint32 col = (mouse.x() >= st::stickerPanPadding) ?
+		                 ((mouse.x() - st::stickerPanPadding) / st::stickerPanSize.width()) :
+		                 -1;
 		if (row >= 0 && col >= 0) {
 			sel = row * _stickersPerRow + col;
 		}
@@ -889,7 +943,9 @@ void FieldAutocompleteInner::onUpdateSelected(bool force) {
 	} else {
 		sel = mouse.y() / qint32(st::mentionHeight);
 		maxSel = _mrows->isEmpty() ? (_hrows->isEmpty() ? _brows->size() : _hrows->size()) : _mrows->size();
-		_overDelete = (!_hrows->isEmpty() || (!_mrows->isEmpty() && sel < _recentInlineBotsInRows)) ? (mouse.x() >= width() - st::mentionHeight) : false;
+		_overDelete = (!_hrows->isEmpty() || (!_mrows->isEmpty() && sel < _recentInlineBotsInRows)) ?
+		                  (mouse.x() >= width() - st::mentionHeight) :
+		                  false;
 	}
 	if (sel < 0 || sel >= maxSel) {
 		sel = -1;
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index 65bb88d90..5d45b3a51 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QTimer>
 #include "base/observer.h"
-#include "ui/twidget.h"
-#include "ui/animation.h"
 #include "structs.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
+#include <QTimer>
 
 namespace Ui {
 class ScrollArea;
@@ -32,9 +32,9 @@ class ScrollArea;
 
 namespace internal {
 
-using MentionRows = QList<UserData*>;
+using MentionRows = QList<UserData *>;
 using HashtagRows = QList<QString>;
-using BotCommandRows = QList<QPair<UserData*, const BotCommand*>>;
+using BotCommandRows = QList<QPair<UserData *, const BotCommand *>>;
 
 class FieldAutocompleteInner;
 
@@ -110,7 +110,8 @@ private:
 	internal::BotCommandRows _brows;
 	StickerPack _srows;
 
-	void rowsUpdated(const internal::MentionRows &mrows, const internal::HashtagRows &hrows, const internal::BotCommandRows &brows, const StickerPack &srows, bool resetScroll);
+	void rowsUpdated(const internal::MentionRows &mrows, const internal::HashtagRows &hrows,
+	                 const internal::BotCommandRows &brows, const StickerPack &srows, bool resetScroll);
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<internal::FieldAutocompleteInner> _inner;
@@ -136,7 +137,6 @@ private:
 	Animation _a_opacity;
 
 	friend class internal::FieldAutocompleteInner;
-
 };
 
 namespace internal {
@@ -145,7 +145,8 @@ class FieldAutocompleteInner final : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	FieldAutocompleteInner(FieldAutocomplete *parent, MentionRows *mrows, HashtagRows *hrows, BotCommandRows *brows, StickerPack *srows);
+	FieldAutocompleteInner(FieldAutocomplete *parent, MentionRows *mrows, HashtagRows *hrows, BotCommandRows *brows,
+	                       StickerPack *srows);
 
 	void clearSel(bool hidden = false);
 	bool moveSel(int key);
@@ -194,7 +195,6 @@ private:
 	bool _previewShown;
 
 	QTimer _previewTimer;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index aaa648121..5bf5edb81 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/gifs_list_widget.h"
 
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
-#include "ui/effects/ripple_animation.h"
+#include "app.h"
 #include "boxes/stickers_box.h"
-#include "inline_bots/inline_bot_result.h"
 #include "chat_helpers/stickers.h"
-#include "storage/localstorage.h"
+#include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/input_fields.h"
 #include "window/window_controller.h"
-#include "app.h"
 #include <QApplication>
 
 namespace ChatHelpers {
@@ -47,7 +47,7 @@ constexpr auto kSearchBotUsername = str_const("gif");
 
 class GifsListWidget::Footer : public TabbedSelector::InnerFooter {
 public:
-	Footer(not_null<GifsListWidget*> parent);
+	Footer(not_null<GifsListWidget *> parent);
 
 	void stealFocus();
 	void returnFocus();
@@ -61,24 +61,24 @@ protected:
 	void processPanelHideFinished() override;
 
 private:
-	not_null<GifsListWidget*> _pan;
+	not_null<GifsListWidget *> _pan;
 
 	object_ptr<Ui::InputField> _field;
 	object_ptr<Ui::CrossButton> _cancel;
 
 	QPointer<QWidget> _focusTakenFrom;
-
 };
 
-GifsListWidget::Footer::Footer(not_null<GifsListWidget*> parent) : InnerFooter(parent)
-, _pan(parent)
-, _field(this, st::gifsSearchField, langFactory(lng_gifs_search))
-, _cancel(this, st::gifsSearchCancel) {
-	_field->resize(width() - st::gifsSearchFieldPosition.x() - st::gifsSearchCancelPosition.x() - st::gifsSearchCancel.width, _field->height());
+GifsListWidget::Footer::Footer(not_null<GifsListWidget *> parent)
+    : InnerFooter(parent)
+    , _pan(parent)
+    , _field(this, st::gifsSearchField, langFactory(lng_gifs_search))
+    , _cancel(this, st::gifsSearchCancel) {
+	_field->resize(width() - st::gifsSearchFieldPosition.x() - st::gifsSearchCancelPosition.x() -
+	                   st::gifsSearchCancel.width,
+	               _field->height());
 	_field->moveToLeft(st::gifsSearchFieldPosition.x(), st::gifsSearchFieldPosition.y());
-	connect(_field, &Ui::InputField::submitted, this, [this](bool ctrlShiftEnter) {
-		_pan->sendInlineRequest();
-	});
+	connect(_field, &Ui::InputField::submitted, this, [this](bool ctrlShiftEnter) { _pan->sendInlineRequest(); });
 	connect(_field, &Ui::InputField::cancelled, this, [this] {
 		if (_field->getLastText().isEmpty()) {
 			emit _pan->cancelled();
@@ -91,9 +91,7 @@ GifsListWidget::Footer::Footer(not_null<GifsListWidget*> parent) : InnerFooter(p
 		_pan->searchForGifs(_field->getLastText());
 	});
 	_cancel->moveToRight(st::gifsSearchCancelPosition.x(), st::gifsSearchCancelPosition.y());
-	_cancel->setClickedCallback([this] {
-		_field->setText(QString());
-	});
+	_cancel->setClickedCallback([this] { _field->setText(QString()); });
 }
 
 void GifsListWidget::Footer::stealFocus() {
@@ -122,8 +120,9 @@ void GifsListWidget::Footer::processPanelHideFinished() {
 	//_field->setText(QString());
 }
 
-GifsListWidget::GifsListWidget(QWidget *parent, not_null<Window::Controller*> controller) : Inner(parent, controller)
-, _section(Section::Gifs) {
+GifsListWidget::GifsListWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : Inner(parent, controller)
+    , _section(Section::Gifs) {
 	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, countHeight());
 
 	setMouseTracking(true);
@@ -138,12 +137,8 @@ GifsListWidget::GifsListWidget(QWidget *parent, not_null<Window::Controller*> co
 	_inlineRequestTimer.setSingleShot(true);
 	connect(&_inlineRequestTimer, &QTimer::timeout, this, [this] { sendInlineRequest(); });
 
-	subscribe(Auth().data().savedGifsUpdated(), [this] {
-		refreshSavedGifs();
-	});
-	subscribe(Auth().downloaderTaskFinished(), [this] {
-		update();
-	});
+	subscribe(Auth().data().savedGifsUpdated(), [this] { refreshSavedGifs(); });
+	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 	subscribe(controller->gifPauseLevelChanged(), [this] {
 		if (!this->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::SavedGifs)) {
 			update();
@@ -325,7 +320,7 @@ void GifsListWidget::mouseReleaseEvent(QMouseEvent *e) {
 		return;
 	}
 
-	if (dynamic_cast<InlineBots::Layout::SendClickHandler*>(activated.data())) {
+	if (dynamic_cast<InlineBots::Layout::SendClickHandler *>(activated.data())) {
 		int row = _selected / MatrixRowShift, column = _selected % MatrixRowShift;
 		selectInlineResult(row, column);
 	} else {
@@ -411,13 +406,9 @@ void GifsListWidget::processPanelHideFinished() {
 		}
 	};
 	// Preserve panel state through visibility toggles.
-	//clearInlineRows(false);
-	for_const (auto &item, _gifLayouts) {
-		itemForget(item.second);
-	}
-	for_const (auto &item, _inlineLayouts) {
-		itemForget(item.second);
-	}
+	// clearInlineRows(false);
+	for_const (auto &item, _gifLayouts) { itemForget(item.second); }
+	for_const (auto &item, _inlineLayouts) { itemForget(item.second); }
 }
 
 bool GifsListWidget::inlineRowsAddItem(DocumentData *savedGif, InlineResult *result, Row &row, qint32 &sumWidth) {
@@ -468,9 +459,7 @@ void GifsListWidget::refreshSavedGifs() {
 			auto row = Row();
 			row.items.reserve(kInlineItemsMaxPerRow);
 			auto sumWidth = 0;
-			for_const (auto &gif, saved) {
-				inlineRowsAddItem(gif, 0, row, sumWidth);
-			}
+			for_const (auto &gif, saved) { inlineRowsAddItem(gif, 0, row, sumWidth); }
 			inlineRowFinalize(row, sumWidth, true);
 		}
 		deleteUnusedGifLayouts();
@@ -496,9 +485,7 @@ void GifsListWidget::clearInlineRows(bool resultsDeleted) {
 	} else {
 		clearSelection();
 		for_const (auto &row, _rows) {
-			for_const (auto &item, row.items) {
-				item->setPosition(-1);
-			}
+			for_const (auto &item, row.items) { item->setPosition(-1); }
 		}
 	}
 	_rows.clear();
@@ -574,9 +561,8 @@ GifsListWidget::Row &GifsListWidget::layoutInlineRow(Row &row, qint32 sumWidth)
 	for (auto i = 0; i != count; ++i) {
 		indices[i] = i;
 	}
-	std::sort(indices, indices + count, [&row](int a, int b) -> bool {
-		return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth();
-	});
+	std::sort(indices, indices + count,
+	          [&row](int a, int b) -> bool { return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth(); });
 
 	row.height = 0;
 	int availw = width() - (st::inlineResultsLeft - st::buttonRadius);
@@ -810,17 +796,19 @@ void GifsListWidget::searchForGifs(const QString &query) {
 
 	if (!_searchBot && !_searchBotRequestId) {
 		auto username = str_const_toString(kSearchBotUsername);
-		_searchBotRequestId = request(MTPcontacts_ResolveUsername(MTP_string(username))).done([this](const MTPcontacts_ResolvedPeer &result) {
-			Expects(result.type() == mtpc_contacts_resolvedPeer);
-			auto &data = result.c_contacts_resolvedPeer();
-			App::feedUsers(data.vusers);
-			App::feedChats(data.vchats);
-			if (auto peer = App::peerLoaded(peerFromMTP(data.vpeer))) {
-				if (auto user = peer->asUser()) {
-					_searchBot = user;
-				}
-			}
-		}).send();
+		_searchBotRequestId = request(MTPcontacts_ResolveUsername(MTP_string(username)))
+		                          .done([this](const MTPcontacts_ResolvedPeer &result) {
+			                          Expects(result.type() == mtpc_contacts_resolvedPeer);
+			                          auto &data = result.c_contacts_resolvedPeer();
+			                          App::feedUsers(data.vusers);
+			                          App::feedChats(data.vchats);
+			                          if (auto peer = App::peerLoaded(peerFromMTP(data.vpeer))) {
+				                          if (auto user = peer->asUser()) {
+					                          _searchBot = user;
+				                          }
+			                          }
+		                          })
+		                          .send();
 	}
 }
 
@@ -849,13 +837,17 @@ void GifsListWidget::sendInlineRequest() {
 	}
 
 	_footer->setLoading(true);
-	_inlineRequestId = request(MTPmessages_GetInlineBotResults(MTP_flags(0), _searchBot->inputUser, _inlineQueryPeer->input, MTPInputGeoPoint(), MTP_string(_inlineQuery), MTP_string(nextOffset))).done([this](const MTPmessages_BotResults &result, mtpRequestId requestId) {
-		inlineResultsDone(result);
-	}).fail([this](const RPCError &error) {
-		// show error?
-		_footer->setLoading(false);
-		_inlineRequestId = 0;
-	}).handleAllErrors().send();
+	_inlineRequestId =
+	    request(MTPmessages_GetInlineBotResults(MTP_flags(0), _searchBot->inputUser, _inlineQueryPeer->input,
+	                                            MTPInputGeoPoint(), MTP_string(_inlineQuery), MTP_string(nextOffset)))
+	        .done([this](const MTPmessages_BotResults &result, mtpRequestId requestId) { inlineResultsDone(result); })
+	        .fail([this](const RPCError &error) {
+		        // show error?
+		        _footer->setLoading(false);
+		        _inlineRequestId = 0;
+	        })
+	        .handleAllErrors()
+	        .send();
 }
 
 void GifsListWidget::refreshRecent() {
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
index c28cc359c..6c219df81 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@@ -40,11 +40,14 @@ class Controller;
 
 namespace ChatHelpers {
 
-class GifsListWidget : public TabbedSelector::Inner, public InlineBots::Layout::Context, private base::Subscriber, private MTP::Sender {
+class GifsListWidget : public TabbedSelector::Inner,
+                       public InlineBots::Layout::Context,
+                       private base::Subscriber,
+                       private MTP::Sender {
 	Q_OBJECT
 
 public:
-	GifsListWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	GifsListWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void refreshRecent() override;
 	void preloadImages() override;
@@ -131,15 +134,15 @@ private:
 
 	struct Row {
 		int height = 0;
-		QVector<LayoutItem*> items;
+		QVector<LayoutItem *> items;
 	};
 	QVector<Row> _rows;
 	void clearInlineRows(bool resultsDeleted);
 
-	std::map<DocumentData*, std::unique_ptr<LayoutItem>> _gifLayouts;
+	std::map<DocumentData *, std::unique_ptr<LayoutItem>> _gifLayouts;
 	LayoutItem *layoutPrepareSavedGif(DocumentData *doc, qint32 position);
 
-	std::map<InlineResult*, std::unique_ptr<LayoutItem>> _inlineLayouts;
+	std::map<InlineResult *, std::unique_ptr<LayoutItem>> _inlineLayouts;
 	LayoutItem *layoutPrepareInlineResult(InlineResult *result, qint32 position);
 
 	bool inlineRowsAddItem(DocumentData *savedGif, InlineResult *result, Row &row, qint32 &sumWidth);
@@ -170,7 +173,6 @@ private:
 	PeerData *_inlineQueryPeer = nullptr;
 	QString _inlineQuery, _inlineNextQuery, _inlineNextOffset;
 	mtpRequestId _inlineRequestId = 0;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index d5ae0eb7f..e94e25dc9 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -23,12 +23,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "chat_helpers/message_field.h"
 
-#include "history/history_widget.h"
+#include "auth_session.h"
 #include "base/qthelp_regex.h"
+#include "history/history_widget.h"
+#include "mainwindow.h"
 #include "styles/style_history.h"
 #include "window/window_controller.h"
-#include "mainwindow.h"
-#include "auth_session.h"
 
 namespace {
 
@@ -49,7 +49,6 @@ public:
 		}
 		return mimeTag;
 	}
-
 };
 
 } // namespace
@@ -90,7 +89,7 @@ TextWithTags::Tags ConvertEntitiesToTextTags(const EntitiesInText &entities) {
 		if (entity.type() == EntityInTextMentionName) {
 			auto match = QRegularExpression("^(\\d+\\.\\d+)$").match(entity.data());
 			if (match.hasMatch()) {
-				result.push_back({ entity.offset(), entity.length(), qstr("mention://user.") + entity.data() });
+				result.push_back({entity.offset(), entity.length(), qstr("mention://user.") + entity.data()});
 			}
 		}
 	}
@@ -114,8 +113,10 @@ std::unique_ptr<QMimeData> MimeDataFromTextWithEntities(const TextWithEntities &
 	return result;
 }
 
-MessageField::MessageField(QWidget *parent, not_null<Window::Controller*> controller, const style::FlatTextarea &st, base::lambda<QString()> placeholderFactory, const QString &val) : Ui::FlatTextarea(parent, st, std::move(placeholderFactory), val)
-, _controller(controller) {
+MessageField::MessageField(QWidget *parent, not_null<Window::Controller *> controller, const style::FlatTextarea &st,
+                           base::lambda<QString()> placeholderFactory, const QString &val)
+    : Ui::FlatTextarea(parent, st, std::move(placeholderFactory), val)
+    , _controller(controller) {
 	setMinHeight(st::historySendSize.height() - 2 * st::historySendPadding);
 	setMaxHeight(st::historyComposeFieldMaxHeight);
 
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.h b/Telegram/SourceFiles/chat_helpers/message_field.h
index 3b983a91c..593c12730 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.h
+++ b/Telegram/SourceFiles/chat_helpers/message_field.h
@@ -37,7 +37,9 @@ class MessageField final : public Ui::FlatTextarea {
 	Q_OBJECT
 
 public:
-	MessageField(QWidget *parent, not_null<Window::Controller*> controller, const style::FlatTextarea &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
+	MessageField(QWidget *parent, not_null<Window::Controller *> controller, const style::FlatTextarea &st,
+	             base::lambda<QString()> placeholderFactory = base::lambda<QString()>(),
+	             const QString &val = QString());
 
 	bool hasSendText() const;
 
@@ -58,7 +60,6 @@ protected:
 	void insertFromMimeData(const QMimeData *source) override;
 
 private:
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 	base::lambda<bool(const QMimeData *data)> _insertFromMimeDataHook;
-
 };
diff --git a/Telegram/SourceFiles/chat_helpers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp
index 6892044c7..16b005cb0 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers.cpp
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "stickers.h"
 
-#include "boxes/stickers_box.h"
-#include "boxes/confirm_box.h"
-#include "lang/lang_keys.h"
 #include "apiwrap.h"
-#include "storage/localstorage.h"
+#include "boxes/confirm_box.h"
+#include "boxes/stickers_box.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "ui/toast/toast.h"
+#include "storage/localstorage.h"
 #include "styles/style_chat_helpers.h"
+#include "ui/toast/toast.h"
 
 namespace Stickers {
 namespace {
@@ -86,7 +86,7 @@ void ApplyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d) {
 	toast.maxWidth = st::stickersToastMaxWidth;
 	toast.padding = st::stickersToastPadding;
 	Ui::Toast::Show(toast);
-//	Ui::show(Box<StickersBox>(archived), KeepOtherLayers);
+	//	Ui::show(Box<StickersBox>(archived), KeepOtherLayers);
 
 	Auth().data().stickersUpdated().notify(true);
 }
@@ -97,7 +97,9 @@ bool ApplyArchivedResultFake() {
 	for (auto &set : Global::RefStickerSets()) {
 		if ((set.flags & MTPDstickerSet::Flag::f_installed) && !(set.flags & MTPDstickerSet_ClientFlag::f_special)) {
 			if (rand_value<quint32>() % 128 < 64) {
-				auto data = MTP_stickerSet(MTP_flags(set.flags | MTPDstickerSet::Flag::f_archived), MTP_long(set.id), MTP_long(set.access), MTP_string(set.title), MTP_string(set.shortName), MTP_int(set.count), MTP_int(set.hash));
+				auto data = MTP_stickerSet(MTP_flags(set.flags | MTPDstickerSet::Flag::f_archived), MTP_long(set.id),
+				                           MTP_long(set.access), MTP_string(set.title), MTP_string(set.shortName),
+				                           MTP_int(set.count), MTP_int(set.hash));
 				sets.push_back(MTP_stickerSetCovered(data, MTP_documentEmpty(MTP_long(0))));
 			}
 		}
@@ -183,7 +185,7 @@ void MarkFeaturedAsRead(quint64 setId) {
 	FeaturedReaderInstance->scheduleRead(setId);
 }
 
-bool IsFaved(not_null<DocumentData*> document) {
+bool IsFaved(not_null<DocumentData *> document) {
 	auto it = Global::StickerSets().constFind(FavedSetId);
 	return (it != Global::StickerSets().cend()) && it->stickers.contains(document);
 }
@@ -207,10 +209,7 @@ void CheckFavedLimit(Set &set) {
 	}
 }
 
-void PushFavedToFront(
-		Set &set,
-		not_null<DocumentData*> document,
-		const std::vector<not_null<EmojiPtr>> &emojiList) {
+void PushFavedToFront(Set &set, not_null<DocumentData *> document, const std::vector<not_null<EmojiPtr>> &emojiList) {
 	set.stickers.push_front(document);
 	for (auto emoji : emojiList) {
 		set.emoji[emoji].push_front(document);
@@ -236,13 +235,15 @@ void MoveFavedToFront(Set &set, int index) {
 	}
 }
 
-void RequestSetToPushFaved(not_null<DocumentData*> document);
+void RequestSetToPushFaved(not_null<DocumentData *> document);
 
-void SetIsFaved(not_null<DocumentData*> document, base::optional<std::vector<not_null<EmojiPtr>>> emojiList = base::none) {
+void SetIsFaved(not_null<DocumentData *> document,
+                base::optional<std::vector<not_null<EmojiPtr>>> emojiList = base::none) {
 	auto &sets = Global::RefStickerSets();
 	auto it = sets.find(FavedSetId);
 	if (it == sets.end()) {
-		it = sets.insert(FavedSetId, Set(FavedSetId, 0, lang(lng_faved_stickers), QString(), 0, 0, MTPDstickerSet_ClientFlag::f_special | 0));
+		it = sets.insert(FavedSetId, Set(FavedSetId, 0, lang(lng_faved_stickers), QString(), 0, 0,
+		                                 MTPDstickerSet_ClientFlag::f_special | 0));
 	}
 	auto index = it->stickers.indexOf(document);
 	if (index == 0) {
@@ -263,7 +264,7 @@ void SetIsFaved(not_null<DocumentData*> document, base::optional<std::vector<not
 	App::main()->onStickersInstalled(FavedSetId);
 }
 
-void RequestSetToPushFaved(not_null<DocumentData*> document) {
+void RequestSetToPushFaved(not_null<DocumentData *> document) {
 	auto addAnyway = [document](std::vector<not_null<EmojiPtr>> list) {
 		if (list.empty()) {
 			if (auto sticker = document->sticker()) {
@@ -274,34 +275,36 @@ void RequestSetToPushFaved(not_null<DocumentData*> document) {
 		}
 		SetIsFaved(document, std::move(list));
 	};
-	MTP::send(MTPmessages_GetStickerSet(document->sticker()->set), rpcDone([document, addAnyway](const MTPmessages_StickerSet &result) {
-		Expects(result.type() == mtpc_messages_stickerSet);
-		auto list = std::vector<not_null<EmojiPtr>>();
-		auto &d = result.c_messages_stickerSet();
-		list.reserve(d.vpacks.v.size());
-		for_const (auto &mtpPack, d.vpacks.v) {
-			auto &pack = mtpPack.c_stickerPack();
-			for_const (auto &documentId, pack.vdocuments.v) {
-				if (documentId.v == document->id) {
-					if (auto emoji = Ui::Emoji::Find(qs(mtpPack.c_stickerPack().vemoticon))) {
-						list.push_back(emoji);
-					}
-					break;
-				}
-			}
-		}
-		addAnyway(std::move(list));
-	}), rpcFail([addAnyway](const RPCError &error) {
-		if (MTP::isDefaultHandledError(error)) {
-			return false;
-		}
-		// Perhaps this is a deleted sticker pack. Add anyway.
-		addAnyway({});
-		return true;
-	}));
+	MTP::send(MTPmessages_GetStickerSet(document->sticker()->set),
+	          rpcDone([document, addAnyway](const MTPmessages_StickerSet &result) {
+		          Expects(result.type() == mtpc_messages_stickerSet);
+		          auto list = std::vector<not_null<EmojiPtr>>();
+		          auto &d = result.c_messages_stickerSet();
+		          list.reserve(d.vpacks.v.size());
+		          for_const (auto &mtpPack, d.vpacks.v) {
+			          auto &pack = mtpPack.c_stickerPack();
+			          for_const (auto &documentId, pack.vdocuments.v) {
+				          if (documentId.v == document->id) {
+					          if (auto emoji = Ui::Emoji::Find(qs(mtpPack.c_stickerPack().vemoticon))) {
+						          list.push_back(emoji);
+					          }
+					          break;
+				          }
+			          }
+		          }
+		          addAnyway(std::move(list));
+	          }),
+	          rpcFail([addAnyway](const RPCError &error) {
+		          if (MTP::isDefaultHandledError(error)) {
+			          return false;
+		          }
+		          // Perhaps this is a deleted sticker pack. Add anyway.
+		          addAnyway({});
+		          return true;
+	          }));
 }
 
-void SetIsNotFaved(not_null<DocumentData*> document) {
+void SetIsNotFaved(not_null<DocumentData *> document) {
 	auto &sets = Global::RefStickerSets();
 	auto it = sets.find(FavedSetId);
 	if (it == sets.end()) {
@@ -330,7 +333,7 @@ void SetIsNotFaved(not_null<DocumentData*> document) {
 	Auth().data().stickersUpdated().notify(true);
 }
 
-void SetFaved(not_null<DocumentData*> document, bool faved) {
+void SetFaved(not_null<DocumentData *> document, bool faved) {
 	if (faved) {
 		SetIsFaved(document);
 	} else {
@@ -396,7 +399,9 @@ void SetsReceived(const QVector<MTPStickerSet> &data, qint32 hash) {
 	if (writeRecent) Local::writeUserSettings();
 
 	if (Local::countStickersHash() != hash) {
-		LOG(("API Error: received stickers hash %1 while counted hash is %2").arg(hash).arg(Local::countStickersHash()));
+		LOG(("API Error: received stickers hash %1 while counted hash is %2")
+		        .arg(hash)
+		        .arg(Local::countStickersHash()));
 	}
 
 	Auth().data().stickersUpdated().notify(true);
@@ -425,7 +430,8 @@ void SetPackAndEmoji(Set &set, StickerPack &&pack, const QVector<MTPStickerPack>
 	}
 }
 
-void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MTPDocument> &items, qint32 hash, const QVector<MTPStickerPack> &packs) {
+void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MTPDocument> &items, qint32 hash,
+                        const QVector<MTPStickerPack> &packs) {
 	auto &sets = Global::RefStickerSets();
 	auto it = sets.find(setId);
 
@@ -487,13 +493,17 @@ void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MT
 	switch (setId) {
 	case CloudRecentSetId: {
 		if (Local::countRecentStickersHash() != hash) {
-			LOG(("API Error: received recent stickers hash %1 while counted hash is %2").arg(hash).arg(Local::countRecentStickersHash()));
+			LOG(("API Error: received recent stickers hash %1 while counted hash is %2")
+			        .arg(hash)
+			        .arg(Local::countRecentStickersHash()));
 		}
 		Local::writeRecentStickers();
 	} break;
 	case FavedSetId: {
 		if (Local::countFavedStickersHash() != hash) {
-			LOG(("API Error: received faved stickers hash %1 while counted hash is %2").arg(hash).arg(Local::countFavedStickersHash()));
+			LOG(("API Error: received faved stickers hash %1 while counted hash is %2")
+			        .arg(hash)
+			        .arg(Local::countFavedStickersHash()));
 		}
 		Local::writeFavedStickers();
 	} break;
@@ -505,9 +515,7 @@ void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MT
 
 void FeaturedSetsReceived(const QVector<MTPStickerSetCovered> &data, const QVector<MTPlong> &unread, qint32 hash) {
 	OrderedSet<quint64> unreadMap;
-	for_const (auto &unreadSetId, unread) {
-		unreadMap.insert(unreadSetId.v);
-	}
+	for_const (auto &unreadSetId, unread) { unreadMap.insert(unreadSetId.v); }
 
 	auto &setsOrder = Global::RefFeaturedStickerSetsOrder();
 	setsOrder.clear();
@@ -543,12 +551,15 @@ void FeaturedSetsReceived(const QVector<MTPStickerSetCovered> &data, const QVect
 				if (unreadMap.contains(set->vid.v)) {
 					setClientFlags |= MTPDstickerSet_ClientFlag::f_unread;
 				}
-				it = sets.insert(set->vid.v, Set(set->vid.v, set->vaccess_hash.v, title, qs(set->vshort_name), set->vcount.v, set->vhash.v, set->vflags.v | setClientFlags));
+				it = sets.insert(set->vid.v, Set(set->vid.v, set->vaccess_hash.v, title, qs(set->vshort_name),
+				                                 set->vcount.v, set->vhash.v, set->vflags.v | setClientFlags));
 			} else {
 				it->access = set->vaccess_hash.v;
 				it->title = title;
 				it->shortName = qs(set->vshort_name);
-				auto clientFlags = it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_unread | MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_special);
+				auto clientFlags =
+				    it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_unread |
+				                 MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_special);
 				it->flags = set->vflags.v | clientFlags;
 				it->flags |= MTPDstickerSet_ClientFlag::f_featured;
 				if (unreadMap.contains(it->id)) {
@@ -590,7 +601,9 @@ void FeaturedSetsReceived(const QVector<MTPStickerSetCovered> &data, const QVect
 	}
 
 	if (Local::countFeaturedStickersHash() != hash) {
-		LOG(("API Error: received featured stickers hash %1 while counted hash is %2").arg(hash).arg(Local::countFeaturedStickersHash()));
+		LOG(("API Error: received featured stickers hash %1 while counted hash is %2")
+		        .arg(hash)
+		        .arg(Local::countFeaturedStickersHash()));
 	}
 
 	if (!setsToRequest.isEmpty()) {
@@ -621,7 +634,9 @@ void GifsReceived(const QVector<MTPDocument> &items, qint32 hash) {
 		saved.push_back(document);
 	}
 	if (Local::countSavedGifsHash() != hash) {
-		LOG(("API Error: received saved gifs hash %1 while counted hash is %2").arg(hash).arg(Local::countSavedGifsHash()));
+		LOG(("API Error: received saved gifs hash %1 while counted hash is %2")
+		        .arg(hash)
+		        .arg(Local::countSavedGifsHash()));
 	}
 
 	Local::writeSavedGifs();
@@ -673,8 +688,7 @@ StickerPack GetListByEmoji(not_null<EmojiPtr> emoji) {
 	return result;
 }
 
-base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
-		not_null<DocumentData*> document) {
+base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(not_null<DocumentData *> document) {
 	if (auto sticker = document->sticker()) {
 		auto &inputSet = sticker->set;
 		if (inputSet.type() != mtpc_inputStickerSetID) {
@@ -705,13 +719,16 @@ Set *FeedSet(const MTPDstickerSet &set) {
 	auto title = GetSetTitle(set);
 	auto flags = MTPDstickerSet::Flags(0);
 	if (it == sets.cend()) {
-		it = sets.insert(set.vid.v, Stickers::Set(set.vid.v, set.vaccess_hash.v, title, qs(set.vshort_name), set.vcount.v, set.vhash.v, set.vflags.v | MTPDstickerSet_ClientFlag::f_not_loaded));
+		it = sets.insert(set.vid.v,
+		                 Stickers::Set(set.vid.v, set.vaccess_hash.v, title, qs(set.vshort_name), set.vcount.v,
+		                               set.vhash.v, set.vflags.v | MTPDstickerSet_ClientFlag::f_not_loaded));
 	} else {
 		it->access = set.vaccess_hash.v;
 		it->title = title;
 		it->shortName = qs(set.vshort_name);
 		flags = it->flags;
-		auto clientFlags = it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_unread | MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_special);
+		auto clientFlags = it->flags & (MTPDstickerSet_ClientFlag::f_featured | MTPDstickerSet_ClientFlag::f_unread |
+		                                MTPDstickerSet_ClientFlag::f_not_loaded | MTPDstickerSet_ClientFlag::f_special);
 		it->flags = set.vflags.v | clientFlags;
 		if (it->count != set.vcount.v || it->hash != set.vhash.v || it->emoji.isEmpty()) {
 			it->count = set.vcount.v;
@@ -835,8 +852,9 @@ QString GetSetTitle(const MTPDstickerSet &s) {
 
 namespace internal {
 
-FeaturedReader::FeaturedReader(QObject *parent) : QObject(parent)
-, _timer(this) {
+FeaturedReader::FeaturedReader(QObject *parent)
+    : QObject(parent)
+    , _timer(this) {
 	_timer->setTimeoutHandler([this] { readSets(); });
 }
 
@@ -865,12 +883,14 @@ void FeaturedReader::readSets() {
 	_setIds.clear();
 
 	if (!wrappedIds.empty()) {
-		request(MTPmessages_ReadFeaturedStickers(MTP_vector<MTPlong>(wrappedIds))).done([](const MTPBool &result) {
-			Local::writeFeaturedStickers();
-			if (AuthSession::Exists()) {
-				Auth().data().stickersUpdated().notify(true);
-			}
-		}).send();
+		request(MTPmessages_ReadFeaturedStickers(MTP_vector<MTPlong>(wrappedIds)))
+		    .done([](const MTPBool &result) {
+			    Local::writeFeaturedStickers();
+			    if (AuthSession::Exists()) {
+				    Auth().data().stickersUpdated().notify(true);
+			    }
+		    })
+		    .send();
 
 		if (Global::FeaturedStickerSetsUnreadCount() != count) {
 			Global::SetFeaturedStickerSetsUnreadCount(count);
diff --git a/Telegram/SourceFiles/chat_helpers/stickers.h b/Telegram/SourceFiles/chat_helpers/stickers.h
index ab6dfed17..b5456f14e 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers.h
@@ -31,17 +31,17 @@ bool ApplyArchivedResultFake(); // For testing.
 void InstallLocally(quint64 setId);
 void UndoInstallLocally(quint64 setId);
 void MarkFeaturedAsRead(quint64 setId);
-bool IsFaved(not_null<DocumentData*> document);
-void SetFaved(not_null<DocumentData*> document, bool faved);
+bool IsFaved(not_null<DocumentData *> document);
+void SetFaved(not_null<DocumentData *> document, bool faved);
 
 void SetsReceived(const QVector<MTPStickerSet> &data, qint32 hash);
-void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MTPDocument> &items, qint32 hash, const QVector<MTPStickerPack> &packs = QVector<MTPStickerPack>());
+void SpecialSetReceived(quint64 setId, const QString &setTitle, const QVector<MTPDocument> &items, qint32 hash,
+                        const QVector<MTPStickerPack> &packs = QVector<MTPStickerPack>());
 void FeaturedSetsReceived(const QVector<MTPStickerSetCovered> &data, const QVector<MTPlong> &unread, qint32 hash);
 void GifsReceived(const QVector<MTPDocument> &items, qint32 hash);
 
 StickerPack GetListByEmoji(not_null<EmojiPtr> emoji);
-base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(
-	not_null<DocumentData*> document);
+base::optional<std::vector<not_null<EmojiPtr>>> GetEmojiListFromSet(not_null<DocumentData *> document);
 
 Set *FeedSet(const MTPDstickerSet &data);
 Set *FeedSetFull(const MTPmessages_StickerSet &data);
@@ -60,7 +60,6 @@ private:
 
 	object_ptr<SingleTimer> _timer;
 	OrderedSet<quint64> _setIds;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 82667e655..626582d64 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -20,24 +20,23 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/stickers_list_widget.h"
 
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/effects/ripple_animation.h"
-#include "boxes/stickers_box.h"
-#include "inline_bots/inline_bot_result.h"
-#include "chat_helpers/stickers.h"
-#include "storage/localstorage.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "dialogs/dialogs_layout.h"
+#include "apiwrap.h"
+#include "app.h"
+#include "auth_session.h"
+#include "boxes/confirm_box.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
-#include "boxes/confirm_box.h"
-#include "auth_session.h"
-#include "observer_peer.h"
-#include "apiwrap.h"
+#include "chat_helpers/stickers.h"
 #include "chat_helpers/tabbed_selector.h"
-#include "app.h"
+#include "dialogs/dialogs_layout.h"
+#include "inline_bots/inline_bot_result.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "observer_peer.h"
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/buttons.h"
 
 #include <QApplication>
 #include <QWidget>
@@ -51,21 +50,23 @@ constexpr auto kInlineItemsMaxPerRow = 5;
 } // namespace
 
 struct StickerIcon {
-	StickerIcon(quint64 setId) : setId(setId) {
-	}
-	StickerIcon(quint64 setId, DocumentData *sticker, qint32 pixw, qint32 pixh) : setId(setId), sticker(sticker), pixw(pixw), pixh(pixh) {
-	}
+	StickerIcon(quint64 setId)
+	    : setId(setId) {}
+	StickerIcon(quint64 setId, DocumentData *sticker, qint32 pixw, qint32 pixh)
+	    : setId(setId)
+	    , sticker(sticker)
+	    , pixw(pixw)
+	    , pixh(pixh) {}
 	quint64 setId = 0;
 	DocumentData *sticker = nullptr;
 	ChannelData *megagroup = nullptr;
 	int pixw = 0;
 	int pixh = 0;
-
 };
 
 class StickersListWidget::Footer : public TabbedSelector::InnerFooter, private base::Subscriber {
 public:
-	Footer(not_null<StickersListWidget*> parent);
+	Footer(not_null<StickersListWidget *> parent);
 
 	void preloadImages();
 	void validateSelectedIcon(quint64 setId, ValidateIconAnimations animations);
@@ -84,8 +85,7 @@ protected:
 	void processHideFinished() override;
 
 private:
-	template <typename Callback>
-	void enumerateVisibleIcons(Callback callback);
+	template <typename Callback> void enumerateVisibleIcons(Callback callback);
 
 	void step_icons(TimeMs ms, bool timer);
 
@@ -93,7 +93,7 @@ private:
 	void paintStickerSettingsIcon(Painter &p) const;
 	void paintFeaturedStickerSetsBadge(Painter &p, int iconLeft) const;
 
-	not_null<StickersListWidget*> _pan;
+	not_null<StickersListWidget *> _pan;
 
 	static constexpr auto kVisibleIconsCount = 8;
 
@@ -113,28 +113,26 @@ private:
 	TimeMs _iconsStartAnim = 0;
 
 	bool _horizontal = false;
-
 };
 
-StickersListWidget::Footer::Footer(not_null<StickersListWidget*> parent) : InnerFooter(parent)
-, _pan(parent)
-, _a_icons(animation(this, &Footer::step_icons)) {
+StickersListWidget::Footer::Footer(not_null<StickersListWidget *> parent)
+    : InnerFooter(parent)
+    , _pan(parent)
+    , _a_icons(animation(this, &Footer::step_icons)) {
 	setMouseTracking(true);
 
 	_iconsLeft = (st::emojiPanWidth - kVisibleIconsCount * st::emojiCategory.width) / 2;
 
-	subscribe(Auth().downloaderTaskFinished(), [this] {
-		update();
-	});
+	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 }
 
-template <typename Callback>
-void StickersListWidget::Footer::enumerateVisibleIcons(Callback callback) {
+template <typename Callback> void StickersListWidget::Footer::enumerateVisibleIcons(Callback callback) {
 	int iconsX = std::round(_iconsX.current());
 	auto index = iconsX / st::emojiCategory.width;
 	auto x = _iconsLeft - (iconsX % st::emojiCategory.width);
 	for (auto index = std::min<int>(_icons.size(), iconsX / st::emojiCategory.width),
-		last = std::min(_icons.size(), index + kVisibleIconsCount); index != last; ++index) {
+	          last = std::min(_icons.size(), index + kVisibleIconsCount);
+	     index != last; ++index) {
 		callback(_icons[index], x);
 		x += st::emojiCategory.width;
 	}
@@ -206,7 +204,9 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) {
 	auto selxrel = _iconsLeft + std::round(_iconSelX.current());
 	auto selx = selxrel - std::round(_iconsX.current());
 
-	auto clip = QRect(_iconsLeft, _iconsTop, _iconsLeft + (kVisibleIconsCount - 1) * st::emojiCategory.width - _iconsLeft, st::emojiCategory.height);
+	auto clip =
+	    QRect(_iconsLeft, _iconsTop, _iconsLeft + (kVisibleIconsCount - 1) * st::emojiCategory.width - _iconsLeft,
+	          st::emojiCategory.height);
 	if (rtl()) clip.moveLeft(width() - _iconsLeft - clip.width());
 	p.setClipRect(clip);
 
@@ -215,9 +215,12 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) {
 			icon.sticker->thumb->load();
 			auto pix = icon.sticker->thumb->pix(icon.pixw, icon.pixh);
 
-			p.drawPixmapLeft(x + (st::emojiCategory.width - icon.pixw) / 2, _iconsTop + (st::emojiCategory.height - icon.pixh) / 2, width(), pix);
+			p.drawPixmapLeft(x + (st::emojiCategory.width - icon.pixw) / 2,
+			                 _iconsTop + (st::emojiCategory.height - icon.pixh) / 2, width(), pix);
 		} else if (icon.megagroup) {
-			icon.megagroup->paintUserpicLeft(p, x + (st::emojiCategory.width - st::stickerGroupCategorySize) / 2, _iconsTop + (st::emojiCategory.height - st::stickerGroupCategorySize) / 2, width(), st::stickerGroupCategorySize);
+			icon.megagroup->paintUserpicLeft(p, x + (st::emojiCategory.width - st::stickerGroupCategorySize) / 2,
+			                                 _iconsTop + (st::emojiCategory.height - st::stickerGroupCategorySize) / 2,
+			                                 width(), st::stickerGroupCategorySize);
 		} else {
 			auto getSpecialSetIcon = [](quint64 setId) {
 				if (setId == Stickers::FeaturedSetId) {
@@ -227,7 +230,9 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) {
 				}
 				return &st::emojiRecent;
 			};
-			getSpecialSetIcon(icon.setId)->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width());
+			getSpecialSetIcon(icon.setId)
+			    ->paint(p, x + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(),
+			            width());
 			if (icon.setId == Stickers::FeaturedSetId) {
 				paintFeaturedStickerSetsBadge(p, x);
 			}
@@ -235,18 +240,22 @@ void StickersListWidget::Footer::paintEvent(QPaintEvent *e) {
 	});
 
 	if (rtl()) selx = width() - selx - st::emojiCategory.width;
-	p.fillRect(selx, _iconsTop + st::emojiCategory.height - st::stickerIconPadding, st::emojiCategory.width, st::stickerIconSel, st::stickerIconSelColor);
+	p.fillRect(selx, _iconsTop + st::emojiCategory.height - st::stickerIconPadding, st::emojiCategory.width,
+	           st::stickerIconSel, st::stickerIconSelColor);
 
 	auto o_left = snap(_iconsX.current() / st::stickerIconLeft.width(), 0., 1.);
 	if (o_left > 0) {
 		p.setOpacity(o_left);
-		st::stickerIconLeft.fill(p, rtlrect(_iconsLeft, _iconsTop, st::stickerIconLeft.width(), st::emojiCategory.height, width()));
+		st::stickerIconLeft.fill(
+		    p, rtlrect(_iconsLeft, _iconsTop, st::stickerIconLeft.width(), st::emojiCategory.height, width()));
 		p.setOpacity(1.);
 	}
 	auto o_right = snap((_iconsMax - _iconsX.current()) / st::stickerIconRight.width(), 0., 1.);
 	if (o_right > 0) {
 		p.setOpacity(o_right);
-		st::stickerIconRight.fill(p, rtlrect(_iconsLeft + (kVisibleIconsCount - 1) * st::emojiCategory.width - st::stickerIconRight.width(), _iconsTop, st::stickerIconRight.width(), st::emojiCategory.height, width()));
+		st::stickerIconRight.fill(
+		    p, rtlrect(_iconsLeft + (kVisibleIconsCount - 1) * st::emojiCategory.width - st::stickerIconRight.width(),
+		               _iconsTop, st::stickerIconRight.width(), st::emojiCategory.height, width()));
 		p.setOpacity(1.);
 	}
 }
@@ -259,7 +268,8 @@ void StickersListWidget::Footer::mousePressEvent(QMouseEvent *e) {
 	updateSelected();
 
 	if (_iconOver == _icons.size()) {
-		Ui::show(Box<StickersBox>(hasOnlyFeaturedSets() ? StickersBox::Section::Featured : StickersBox::Section::Installed));
+		Ui::show(
+		    Box<StickersBox>(hasOnlyFeaturedSets() ? StickersBox::Section::Featured : StickersBox::Section::Installed));
 	} else {
 		_iconDown = _iconOver;
 		_iconsMouseDown = _iconsMousePos;
@@ -318,17 +328,18 @@ void StickersListWidget::Footer::mouseReleaseEvent(QMouseEvent *e) {
 
 bool StickersListWidget::Footer::event(QEvent *e) {
 	if (e->type() == QEvent::TouchBegin) {
-
 	} else if (e->type() == QEvent::Wheel) {
 		if (!_icons.isEmpty() && _iconOver >= 0 && _iconOver < _icons.size() && _iconDown < 0) {
-			auto ev = static_cast<QWheelEvent*>(e);
+			auto ev = static_cast<QWheelEvent *>(e);
 			auto horizontal = (ev->angleDelta().x() != 0 || ev->orientation() == Qt::Horizontal);
 			auto vertical = (ev->angleDelta().y() != 0 || ev->orientation() == Qt::Vertical);
 			if (horizontal) _horizontal = true;
 			int newX = std::round(_iconsX.current());
-			if (/*_horizontal && */horizontal) {
-				newX = snap(newX - (rtl() ? -1 : 1) * (ev->pixelDelta().x() ? ev->pixelDelta().x() : ev->angleDelta().x()), 0, _iconsMax);
-			} else if (/*!_horizontal && */vertical) {
+			if (/*_horizontal && */ horizontal) {
+				newX =
+				    snap(newX - (rtl() ? -1 : 1) * (ev->pixelDelta().x() ? ev->pixelDelta().x() : ev->angleDelta().x()),
+				         0, _iconsMax);
+			} else if (/*!_horizontal && */ vertical) {
 				newX = snap(newX - (ev->pixelDelta().y() ? ev->pixelDelta().y() : ev->angleDelta().y()), 0, _iconsMax);
 			}
 			if (newX != std::round(_iconsX.current())) {
@@ -352,12 +363,14 @@ void StickersListWidget::Footer::updateSelected() {
 	qint32 x = p.x(), y = p.y(), newOver = -1;
 	if (rtl()) x = width() - x;
 	x -= _iconsLeft;
-	if (x >= st::emojiCategory.width * (kVisibleIconsCount - 1) && x < st::emojiCategory.width * kVisibleIconsCount && y >= _iconsTop && y < _iconsTop + st::emojiCategory.height) {
+	if (x >= st::emojiCategory.width * (kVisibleIconsCount - 1) && x < st::emojiCategory.width * kVisibleIconsCount &&
+	    y >= _iconsTop && y < _iconsTop + st::emojiCategory.height) {
 		if (!_icons.isEmpty() && !hasOnlyFeaturedSets()) {
 			newOver = _icons.size();
 		}
 	} else if (!_icons.isEmpty()) {
-		if (y >= _iconsTop && y < _iconsTop + st::emojiCategory.height && x >= 0 && x < (kVisibleIconsCount - 1) * st::emojiCategory.width && x < _icons.size() * st::emojiCategory.width) {
+		if (y >= _iconsTop && y < _iconsTop + st::emojiCategory.height && x >= 0 &&
+		    x < (kVisibleIconsCount - 1) * st::emojiCategory.width && x < _icons.size() * st::emojiCategory.width) {
 			x += std::round(_iconsX.current());
 			newOver = std::floor(x / st::emojiCategory.width);
 		}
@@ -398,7 +411,8 @@ bool StickersListWidget::Footer::hasOnlyFeaturedSets() const {
 
 void StickersListWidget::Footer::paintStickerSettingsIcon(Painter &p) const {
 	int settingsLeft = _iconsLeft + (kVisibleIconsCount - 1) * st::emojiCategory.width;
-	st::stickersSettings.paint(p, settingsLeft + st::emojiCategory.iconPosition.x(), _iconsTop + st::emojiCategory.iconPosition.y(), width());
+	st::stickersSettings.paint(p, settingsLeft + st::emojiCategory.iconPosition.x(),
+	                           _iconsTop + st::emojiCategory.iconPosition.y(), width());
 }
 
 void StickersListWidget::Footer::paintFeaturedStickerSetsBadge(Painter &p, int iconLeft) const {
@@ -439,12 +453,13 @@ void StickersListWidget::Footer::step_icons(TimeMs ms, bool timer) {
 	}
 }
 
-StickersListWidget::StickersListWidget(QWidget *parent, not_null<Window::Controller*> controller) : Inner(parent, controller)
-, _section(Section::Stickers)
-, _megagroupSetAbout(st::emojiPanWidth - st::emojiScroll.width - st::emojiPanHeaderLeft)
-, _addText(lang(lng_stickers_featured_add).toUpper())
-, _addWidth(st::stickersTrendingAdd.font->width(_addText))
-, _settings(this, lang(lng_stickers_you_have)) {
+StickersListWidget::StickersListWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : Inner(parent, controller)
+    , _section(Section::Stickers)
+    , _megagroupSetAbout(st::emojiPanWidth - st::emojiScroll.width - st::emojiPanHeaderLeft)
+    , _addText(lang(lng_stickers_featured_add).toUpper())
+    , _addWidth(st::stickersTrendingAdd.font->width(_addText))
+    , _settings(this, lang(lng_stickers_you_have)) {
 	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, countHeight());
 
 	setMouseTracking(true);
@@ -459,11 +474,12 @@ StickersListWidget::StickersListWidget(QWidget *parent, not_null<Window::Control
 		update();
 		readVisibleSets();
 	});
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelStickersChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _megagroupSet) {
-			refreshStickers();
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelStickersChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _megagroupSet) {
+			                                                            refreshStickers();
+		                                                            }
+	                                                            }));
 }
 
 object_ptr<TabbedSelector::InnerFooter> StickersListWidget::createFooter() {
@@ -513,8 +529,7 @@ int StickersListWidget::featuredRowHeight() const {
 	return st::stickersTrendingHeader + st::stickerPanSize.height() + st::stickersTrendingSkip;
 }
 
-template <typename Callback>
-bool StickersListWidget::enumerateSections(Callback callback) const {
+template <typename Callback> bool StickersListWidget::enumerateSections(Callback callback) const {
 	Expects(_section == Section::Stickers);
 	auto info = SectionInfo();
 	for (auto i = 0; i != _mySets.size(); ++i) {
@@ -524,7 +539,8 @@ bool StickersListWidget::enumerateSections(Callback callback) const {
 		info.rowsTop = info.top + (setHasTitle(set) ? st::emojiPanHeader : st::stickerPanPadding);
 		if (set.id == Stickers::MegagroupSetId && !info.count) {
 			info.rowsCount = 0;
-			info.rowsBottom = info.rowsTop + _megagroupSetButtonRect.y() + _megagroupSetButtonRect.height() + st::stickerGroupCategoryAddMargin.bottom();
+			info.rowsBottom = info.rowsTop + _megagroupSetButtonRect.y() + _megagroupSetButtonRect.height() +
+			                  st::stickerGroupCategoryAddMargin.bottom();
 		} else {
 			info.rowsCount = (info.count / kStickersPanelPerRow) + ((info.count % kStickersPanelPerRow) ? 1 : 0);
 			info.rowsBottom = info.rowsTop + info.rowsCount * st::stickerPanSize.height();
@@ -631,7 +647,8 @@ void StickersListWidget::paintEvent(QPaintEvent *e) {
 
 void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 	auto fromColumn = floorclamp(clip.x() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
-	auto toColumn = ceilclamp(clip.x() + clip.width() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
+	auto toColumn =
+	    ceilclamp(clip.x() + clip.width() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
 	if (rtl()) {
 		qSwap(fromColumn, toColumn);
 		fromColumn = kStickersPanelPerRow - fromColumn;
@@ -668,7 +685,8 @@ void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 			}
 			p.setFont(st::stickersTrendingAdd.font);
 			p.setPen(selected ? st::stickersTrendingAdd.textFgOver : st::stickersTrendingAdd.textFg);
-			p.drawTextLeft(add.x() - (st::stickersTrendingAdd.width / 2), add.y() + st::stickersTrendingAdd.textTop, width(), _addText, _addWidth);
+			p.drawTextLeft(add.x() - (st::stickersTrendingAdd.width / 2), add.y() + st::stickersTrendingAdd.textTop,
+			               width(), _addText, _addWidth);
 
 			widthForTitle -= add.width() - (st::stickersTrendingAdd.width / 2);
 		} else {
@@ -689,7 +707,8 @@ void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 		}
 		p.setFont(st::stickersTrendingHeaderFont);
 		p.setPen(st::stickersTrendingHeaderFg);
-		p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, y + st::stickersTrendingHeaderTop, width(), titleText, titleWidth);
+		p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, y + st::stickersTrendingHeaderTop, width(), titleText,
+		               titleWidth);
 
 		if (set.flags & MTPDstickerSet_ClientFlag::f_unread) {
 			p.setPen(Qt::NoPen);
@@ -697,14 +716,18 @@ void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(rtlrect(st::emojiPanHeaderLeft - st::buttonRadius + titleWidth + st::stickersFeaturedUnreadSkip, y + st::stickersTrendingHeaderTop + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
+				p.drawEllipse(
+				    rtlrect(st::emojiPanHeaderLeft - st::buttonRadius + titleWidth + st::stickersFeaturedUnreadSkip,
+				            y + st::stickersTrendingHeaderTop + st::stickersFeaturedUnreadTop,
+				            st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
 			}
 		}
 
 		auto statusText = (size > 0) ? lng_stickers_count(lt_count, size) : lang(lng_contacts_loading);
 		p.setFont(st::stickersTrendingSubheaderFont);
 		p.setPen(st::stickersTrendingSubheaderFg);
-		p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, y + st::stickersTrendingSubheaderTop, width(), statusText);
+		p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, y + st::stickersTrendingSubheaderTop, width(),
+		               statusText);
 
 		y += st::stickersTrendingHeader;
 		if (y >= clip.y() + clip.height()) break;
@@ -713,7 +736,8 @@ void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 			int index = j;
 			if (index >= size) break;
 
-			auto selected = selectedSticker ? (selectedSticker->section == c && selectedSticker->index == index) : false;
+			auto selected =
+			    selectedSticker ? (selectedSticker->section == c && selectedSticker->index == index) : false;
 			auto deleteSelected = false;
 			paintSticker(p, set, y, index, selected, deleteSelected);
 		}
@@ -722,7 +746,8 @@ void StickersListWidget::paintFeaturedStickers(Painter &p, QRect clip) {
 
 void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 	auto fromColumn = floorclamp(clip.x() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
-	auto toColumn = ceilclamp(clip.x() + clip.width() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
+	auto toColumn =
+	    ceilclamp(clip.x() + clip.width() - stickersLeft(), st::stickerPanSize.width(), 0, kStickersPanelPerRow);
 	if (rtl()) {
 		qSwap(fromColumn, toColumn);
 		fromColumn = kStickersPanelPerRow - fromColumn;
@@ -733,7 +758,8 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 	auto &sets = shownSets();
 	auto selectedSticker = base::get_if<OverSticker>(&_selected);
 	auto selectedButton = base::get_if<OverButton>(_pressed ? &_pressed : &_selected);
-	enumerateSections([this, &p, clip, fromColumn, toColumn, selectedSticker, selectedButton, ms](const SectionInfo &info) {
+	enumerateSections([this, &p, clip, fromColumn, toColumn, selectedSticker, selectedButton,
+	                   ms](const SectionInfo &info) {
 		if (clip.top() >= info.rowsBottom) {
 			return true;
 		} else if (clip.top() + clip.height() <= info.top) {
@@ -748,12 +774,14 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				auto remove = removeButtonRect(info.section);
 				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
 				if (set.ripple) {
-					set.ripple->paint(p, remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(), remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(), width(), ms);
+					set.ripple->paint(p, remove.x() + st::stickerPanRemoveSet.rippleAreaPosition.x(),
+					                  remove.y() + st::stickerPanRemoveSet.rippleAreaPosition.y(), width(), ms);
 					if (set.ripple->empty()) {
 						set.ripple.reset();
 					}
 				}
-				(selected ? st::stickerPanRemoveSet.iconOver : st::stickerPanRemoveSet.icon).paint(p, remove.topLeft() + st::stickerPanRemoveSet.iconPosition, width());
+				(selected ? st::stickerPanRemoveSet.iconOver : st::stickerPanRemoveSet.icon)
+				    .paint(p, remove.topLeft() + st::stickerPanRemoveSet.iconPosition, width());
 
 				widthForTitle -= remove.width();
 			}
@@ -763,7 +791,8 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 			}
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st::emojiPanHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), titleText, titleWidth);
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(),
+			               titleText, titleWidth);
 		}
 		if (clip.top() + clip.height() > info.rowsTop) {
 			if (set.id == Stickers::MegagroupSetId && set.pack.empty()) {
@@ -772,13 +801,16 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 			} else {
 				auto special = (set.flags & MTPDstickerSet::Flag::f_official) != 0;
 				auto fromRow = floorclamp(clip.y() - info.rowsTop, st::stickerPanSize.height(), 0, info.rowsCount);
-				auto toRow = ceilclamp(clip.y() + clip.height() - info.rowsTop, st::stickerPanSize.height(), 0, info.rowsCount);
+				auto toRow =
+				    ceilclamp(clip.y() + clip.height() - info.rowsTop, st::stickerPanSize.height(), 0, info.rowsCount);
 				for (int i = fromRow; i < toRow; ++i) {
 					for (int j = fromColumn; j < toColumn; ++j) {
 						int index = i * kStickersPanelPerRow + j;
 						if (index >= info.count) break;
 
-						auto selected = selectedSticker ? (selectedSticker->section == info.section && selectedSticker->index == index) : false;
+						auto selected = selectedSticker ? (selectedSticker->section == info.section &&
+						                                   selectedSticker->index == index) :
+						                                  false;
 						auto deleteSelected = selected && selectedSticker->overDelete;
 						paintSticker(p, set, info.rowsTop, index, selected, deleteSelected);
 					}
@@ -809,7 +841,9 @@ void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSe
 	}
 	p.setFont(st::stickerGroupCategoryAdd.font);
 	p.setPen(buttonSelected ? st::stickerGroupCategoryAdd.textFgOver : st::stickerGroupCategoryAdd.textFg);
-	p.drawTextLeft(button.x() - (st::stickerGroupCategoryAdd.width / 2), button.y() + st::stickerGroupCategoryAdd.textTop, width(), _megagroupSetButtonText, _megagroupSetButtonTextWidth);
+	p.drawTextLeft(button.x() - (st::stickerGroupCategoryAdd.width / 2),
+	               button.y() + st::stickerGroupCategoryAdd.textTop, width(), _megagroupSetButtonText,
+	               _megagroupSetButtonTextWidth);
 }
 
 void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int index, bool selected, bool deleteSelected) {
@@ -825,14 +859,16 @@ void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int index, bo
 		App::roundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
 	}
 
-	auto goodThumb = !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
+	auto goodThumb =
+	    !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
 	if (goodThumb) {
 		sticker->thumb->load();
 	} else {
 		sticker->checkSticker();
 	}
 
-	auto coef = std::min((st::stickerPanSize.width() - st::buttonRadius * 2) / double(sticker->dimensions.width()), (st::stickerPanSize.height() - st::buttonRadius * 2) / double(sticker->dimensions.height()));
+	auto coef = std::min((st::stickerPanSize.width() - st::buttonRadius * 2) / double(sticker->dimensions.width()),
+	                     (st::stickerPanSize.height() - st::buttonRadius * 2) / double(sticker->dimensions.height()));
 	if (coef > 1) coef = 1;
 	auto w = std::max<int>(std::round(coef * sticker->dimensions.width()), 1);
 	auto h = std::max<int>(std::round(coef * sticker->dimensions.height()), 1);
@@ -938,11 +974,12 @@ void StickersListWidget::setPressed(OverState newPressed) {
 		if (!_megagroupSetButtonRipple) {
 			auto maskSize = _megagroupSetButtonRect.size();
 			auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::buttonRadius);
-			_megagroupSetButtonRipple = std::make_unique<Ui::RippleAnimation>(st::stickerGroupCategoryAdd.ripple, std::move(mask), [this] {
-				rtlupdate(megagroupSetButtonRectFinal());
-			});
+			_megagroupSetButtonRipple =
+			    std::make_unique<Ui::RippleAnimation>(st::stickerGroupCategoryAdd.ripple, std::move(mask),
+			                                          [this] { rtlupdate(megagroupSetButtonRectFinal()); });
 		}
-		_megagroupSetButtonRipple->add(mapFromGlobal(QCursor::pos()) - myrtlrect(megagroupSetButtonRectFinal()).topLeft());
+		_megagroupSetButtonRipple->add(mapFromGlobal(QCursor::pos()) -
+		                               myrtlrect(megagroupSetButtonRectFinal()).topLeft());
 	}
 }
 
@@ -964,15 +1001,13 @@ QSharedPointer<Ui::RippleAnimation> StickersListWidget::createButtonRipple(int s
 	if (_section == Section::Featured) {
 		auto maskSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
 		auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::buttonRadius);
-		return MakeShared<Ui::RippleAnimation>(st::stickersTrendingAdd.ripple, std::move(mask), [this, section] {
-			rtlupdate(featuredAddRect(section));
-		});
+		return MakeShared<Ui::RippleAnimation>(st::stickersTrendingAdd.ripple, std::move(mask),
+		                                       [this, section] { rtlupdate(featuredAddRect(section)); });
 	}
 	auto maskSize = QSize(st::stickerPanRemoveSet.rippleAreaSize, st::stickerPanRemoveSet.rippleAreaSize);
 	auto mask = Ui::RippleAnimation::ellipseMask(maskSize);
-	return MakeShared<Ui::RippleAnimation>(st::stickerPanRemoveSet.ripple, std::move(mask), [this, section] {
-		rtlupdate(removeButtonRect(section));
-	});
+	return MakeShared<Ui::RippleAnimation>(st::stickerPanRemoveSet.ripple, std::move(mask),
+	                                       [this, section] { rtlupdate(removeButtonRect(section)); });
 }
 
 QPoint StickersListWidget::buttonRippleTopLeft(int section) const {
@@ -1025,8 +1060,7 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
 			if (_section == Section::Featured) {
 				installSet(sets[button->section].id);
 			} else if (sets[button->section].id == Stickers::MegagroupSetId) {
-				auto removeLocally = sets[button->section].pack.empty()
-					|| !_megagroupSet->canEditStickers();
+				auto removeLocally = sets[button->section].pack.empty() || !_megagroupSet->canEditStickers();
 				removeMegagroupSet(removeLocally);
 			} else {
 				removeSet(sets[button->section].id);
@@ -1129,7 +1163,7 @@ void StickersListWidget::processPanelHideFinished() {
 
 	// Preserve panel state through visibility toggles.
 	//// Reset to the recent stickers section.
-	//if (_section == Section::Featured && (!_footer || !_footer->hasOnlyFeaturedSets())) {
+	// if (_section == Section::Featured && (!_footer || !_footer->hasOnlyFeaturedSets())) {
 	//	_section = Section::Stickers;
 	//	validateSelectedIcon(ValidateIconAnimations::None);
 	//}
@@ -1145,9 +1179,7 @@ void StickersListWidget::refreshStickers() {
 	refreshFavedStickers();
 	refreshRecentStickers(false);
 	refreshMegagroupStickers(GroupStickersPlace::Visible);
-	for_const (auto setId, Global::StickerSetsOrder()) {
-		appendSet(_mySets, setId, AppendSkip::Archived);
-	}
+	for_const (auto setId, Global::StickerSetsOrder()) { appendSet(_mySets, setId, AppendSkip::Archived); }
 	refreshMegagroupStickers(GroupStickersPlace::Hidden);
 
 	_featuredSets.clear();
@@ -1189,7 +1221,8 @@ void StickersListWidget::preloadImages() {
 			auto sticker = sets.at(i).pack.at(j);
 			if (!sticker || !sticker->sticker()) continue;
 
-			bool goodThumb = !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
+			bool goodThumb =
+			    !sticker->thumb->isNull() && ((sticker->thumb->width() >= 128) || (sticker->thumb->height() >= 128));
 			if (goodThumb) {
 				sticker->thumb->load();
 			} else {
@@ -1215,7 +1248,8 @@ void StickersListWidget::appendSet(Sets &to, quint64 setId, AppendSkip skip) {
 	auto it = sets.constFind(setId);
 	if (it == sets.cend() || it->stickers.isEmpty()) return;
 	if ((skip == AppendSkip::Archived) && (it->flags & MTPDstickerSet::Flag::f_archived)) return;
-	if ((skip == AppendSkip::Installed) && (it->flags & MTPDstickerSet::Flag::f_installed) && !(it->flags & MTPDstickerSet::Flag::f_archived)) {
+	if ((skip == AppendSkip::Installed) && (it->flags & MTPDstickerSet::Flag::f_installed) &&
+	    !(it->flags & MTPDstickerSet::Flag::f_archived)) {
 		if (!_installedLocallySets.contains(setId)) {
 			return;
 		}
@@ -1272,12 +1306,13 @@ void StickersListWidget::refreshRecentStickers(bool performResize) {
 			}
 		}
 	}
-	auto recentIt = std::find_if(_mySets.begin(), _mySets.end(), [](auto &set) {
-		return set.id == Stickers::RecentSetId;
-	});
+	auto recentIt =
+	    std::find_if(_mySets.begin(), _mySets.end(), [](auto &set) { return set.id == Stickers::RecentSetId; });
 	if (!recentPack.empty()) {
 		if (recentIt == _mySets.end()) {
-			_mySets.push_back(Set(Stickers::RecentSetId, MTPDstickerSet::Flag::f_official | MTPDstickerSet_ClientFlag::f_special, lang(lng_recent_stickers), recentPack.size() * 2, recentPack));
+			_mySets.push_back(Set(Stickers::RecentSetId,
+			                      MTPDstickerSet::Flag::f_official | MTPDstickerSet_ClientFlag::f_special,
+			                      lang(lng_recent_stickers), recentPack.size() * 2, recentPack));
 		} else {
 			recentIt->pack = recentPack;
 		}
@@ -1303,8 +1338,9 @@ void StickersListWidget::refreshFavedStickers() {
 	if (it == sets.cend() || it->stickers.isEmpty()) {
 		return;
 	}
-	_mySets.push_back(Set(Stickers::FavedSetId, MTPDstickerSet::Flag::f_official | MTPDstickerSet_ClientFlag::f_special, lang(lng_faved_stickers), it->stickers.size() * 2, it->stickers));
-	_favedStickersMap = base::flat_set<not_null<DocumentData*>> { it->stickers.begin(), it->stickers.end() };
+	_mySets.push_back(Set(Stickers::FavedSetId, MTPDstickerSet::Flag::f_official | MTPDstickerSet_ClientFlag::f_special,
+	                      lang(lng_faved_stickers), it->stickers.size() * 2, it->stickers));
+	_favedStickersMap = base::flat_set<not_null<DocumentData *>>{it->stickers.begin(), it->stickers.end()};
 }
 
 void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
@@ -1312,14 +1348,13 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 		return;
 	}
 	auto canEdit = _megagroupSet->canEditStickers();
-	auto isShownHere = [place](bool hidden) {
-		return (hidden == (place == GroupStickersPlace::Hidden));
-	};
+	auto isShownHere = [place](bool hidden) { return (hidden == (place == GroupStickersPlace::Hidden)); };
 	if (_megagroupSet->mgInfo->stickerSet.type() == mtpc_inputStickerSetEmpty) {
 		if (canEdit) {
 			auto hidden = Auth().data().isGroupStickersSectionHidden(_megagroupSet->id);
 			if (isShownHere(hidden)) {
-				_mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0, lang(lng_group_stickers), 0));
+				_mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0,
+				                      lang(lng_group_stickers), 0));
 			}
 		}
 		return;
@@ -1340,12 +1375,13 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 		auto &sets = Global::StickerSets();
 		auto it = sets.constFind(set.vid.v);
 		if (it != sets.cend()) {
-			auto isInstalled = (it->flags & MTPDstickerSet::Flag::f_installed)
-				&& !(it->flags & MTPDstickerSet::Flag::f_archived);
+			auto isInstalled =
+			    (it->flags & MTPDstickerSet::Flag::f_installed) && !(it->flags & MTPDstickerSet::Flag::f_archived);
 			if (isInstalled && !canEdit) {
 				removeHiddenForGroup();
 			} else if (isShownHere(hidden)) {
-				_mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0, lang(lng_group_stickers), it->stickers.size() + 1, it->stickers));
+				_mySets.push_back(Set(Stickers::MegagroupSetId, MTPDstickerSet_ClientFlag::f_special | 0,
+				                      lang(lng_group_stickers), it->stickers.size() + 1, it->stickers));
 			}
 			return;
 		}
@@ -1353,11 +1389,13 @@ void StickersListWidget::refreshMegagroupStickers(GroupStickersPlace place) {
 	if (!isShownHere(hidden)) {
 		return;
 	}
-	request(MTPmessages_GetStickerSet(_megagroupSet->mgInfo->stickerSet)).done([this](const MTPmessages_StickerSet &result) {
-		if (auto set = Stickers::FeedSetFull(result)) {
-			refreshStickers();
-		}
-	}).send();
+	request(MTPmessages_GetStickerSet(_megagroupSet->mgInfo->stickerSet))
+	    .done([this](const MTPmessages_StickerSet &result) {
+		    if (auto set = Stickers::FeedSetFull(result)) {
+			    refreshStickers();
+		    }
+	    })
+	    .send();
 }
 
 void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
@@ -1383,7 +1421,8 @@ void StickersListWidget::fillIcons(QList<StickerIcon> &icons) {
 			continue;
 		}
 		auto s = _mySets[i].pack[0];
-		auto availw = st::emojiCategory.width - 2 * st::stickerIconPadding, availh = st::emojiCategory.height - 2 * st::stickerIconPadding;
+		auto availw = st::emojiCategory.width - 2 * st::stickerIconPadding,
+		     availh = st::emojiCategory.height - 2 * st::stickerIconPadding;
 		auto thumbw = s->thumb->width(), thumbh = s->thumb->height(), pixw = 1, pixh = 1;
 		if (availw * thumbh > availh * thumbw) {
 			pixh = availh;
@@ -1411,11 +1450,9 @@ void StickersListWidget::updateSelected() {
 		return;
 	}
 
-	auto newSelected = OverState { base::none };
+	auto newSelected = OverState{base::none};
 	auto p = mapFromGlobal(_lastMousePosition);
-	if (!rect().contains(p)
-		|| p.y() < getVisibleTop() || p.y() >= getVisibleBottom()
-		|| !isVisible()) {
+	if (!rect().contains(p) || p.y() < getVisibleTop() || p.y() >= getVisibleBottom() || !isVisible()) {
 		clearSelection();
 		return;
 	}
@@ -1430,16 +1467,17 @@ void StickersListWidget::updateSelected() {
 			auto &set = sets[section];
 			if (yOffset < st::stickersTrendingHeader) {
 				if (featuredHasAddButton(section) && myrtlrect(featuredAddRect(section)).contains(p.x(), p.y())) {
-					newSelected = OverButton { section };
+					newSelected = OverButton{section};
 				} else {
-					newSelected = OverSet { section };
+					newSelected = OverSet{section};
 				}
-			} else if (yOffset >= st::stickersTrendingHeader  && yOffset < st::stickersTrendingHeader + st::stickerPanSize.height()) {
+			} else if (yOffset >= st::stickersTrendingHeader &&
+			           yOffset < st::stickersTrendingHeader + st::stickerPanSize.height()) {
 				if (sx >= 0 && sx < kStickersPanelPerRow * st::stickerPanSize.width()) {
 					int index = std::floor(sx / st::stickerPanSize.width());
 					if (index >= 0 && index < set.pack.size()) {
 						auto overDelete = false;
-						newSelected = OverSticker { section, index, overDelete };
+						newSelected = OverSticker{section, index, overDelete};
 					}
 				}
 			}
@@ -1449,19 +1487,19 @@ void StickersListWidget::updateSelected() {
 		auto section = info.section;
 		if (p.y() >= info.top && p.y() < info.rowsTop) {
 			if (hasRemoveButton(section) && myrtlrect(removeButtonRect(section)).contains(p.x(), p.y())) {
-				newSelected = OverButton { section };
+				newSelected = OverButton{section};
 			} else if (!(sets[section].flags & MTPDstickerSet_ClientFlag::f_special)) {
-				newSelected = OverSet { section };
-			} else if (sets[section].id == Stickers::MegagroupSetId
-					&& (_megagroupSet->canEditStickers() || !sets[section].pack.empty())) {
-				newSelected = OverSet { section };
+				newSelected = OverSet{section};
+			} else if (sets[section].id == Stickers::MegagroupSetId &&
+			           (_megagroupSet->canEditStickers() || !sets[section].pack.empty())) {
+				newSelected = OverSet{section};
 			}
 		} else if (p.y() >= info.rowsTop && p.y() < info.rowsBottom && sx >= 0) {
 			auto yOffset = p.y() - info.rowsTop;
 			auto &set = sets[section];
 			if (set.id == Stickers::MegagroupSetId && set.pack.empty()) {
 				if (_megagroupSetButtonRect.contains(stickersLeft() + sx, yOffset)) {
-					newSelected = OverGroupAdd {};
+					newSelected = OverGroupAdd{};
 				}
 			} else {
 				auto special = ((set.flags & MTPDstickerSet::Flag::f_official) != 0);
@@ -1473,11 +1511,12 @@ void StickersListWidget::updateSelected() {
 					if (stickerHasDeleteButton(set, index)) {
 						auto inx = sx - (columnIndex * st::stickerPanSize.width());
 						auto iny = yOffset - (rowIndex * st::stickerPanSize.height());
-						if (inx >= st::stickerPanSize.width() - st::stickerPanDeleteIconBg.width() && iny < st::stickerPanDeleteIconBg.height()) {
+						if (inx >= st::stickerPanSize.width() - st::stickerPanDeleteIconBg.width() &&
+						    iny < st::stickerPanDeleteIconBg.height()) {
 							overDelete = true;
 						}
 					}
-					newSelected = OverSticker { section, index, overDelete };
+					newSelected = OverSticker{section, index, overDelete};
 				}
 			}
 		}
@@ -1652,14 +1691,17 @@ void StickersListWidget::installSet(quint64 setId) {
 	auto &sets = Global::StickerSets();
 	auto it = sets.constFind(setId);
 	if (it != sets.cend()) {
-		request(MTPmessages_InstallStickerSet(Stickers::inputSetId(*it), MTP_bool(false))).done([this](const MTPmessages_StickerSetInstallResult &result) {
-			if (result.type() == mtpc_messages_stickerSetInstallResultArchive) {
-				Stickers::ApplyArchivedResult(result.c_messages_stickerSetInstallResultArchive());
-			}
-		}).fail([this, setId](const RPCError &error) {
-			notInstalledLocally(setId);
-			Stickers::UndoInstallLocally(setId);
-		}).send();
+		request(MTPmessages_InstallStickerSet(Stickers::inputSetId(*it), MTP_bool(false)))
+		    .done([this](const MTPmessages_StickerSetInstallResult &result) {
+			    if (result.type() == mtpc_messages_stickerSetInstallResultArchive) {
+				    Stickers::ApplyArchivedResult(result.c_messages_stickerSetInstallResultArchive());
+			    }
+		    })
+		    .fail([this, setId](const RPCError &error) {
+			    notInstalledLocally(setId);
+			    Stickers::UndoInstallLocally(setId);
+		    })
+		    .send();
 
 		installedLocally(setId);
 		Stickers::InstallLocally(setId);
@@ -1674,18 +1716,22 @@ void StickersListWidget::removeMegagroupSet(bool locally) {
 		return;
 	}
 	_removingSetId = Stickers::MegagroupSetId;
-	Ui::show(Box<ConfirmBox>(lang(lng_stickers_remove_group_set), base::lambda_guarded(this, [this, group = _megagroupSet] {
-		Expects(group->mgInfo != nullptr);
-		if (group->mgInfo->stickerSet.type() != mtpc_inputStickerSetEmpty) {
-			Auth().api().setGroupStickerSet(group, MTP_inputStickerSetEmpty());
-		}
-		Ui::hideLayer();
-		_removingSetId = 0;
-		emit checkForHide();
-	}), base::lambda_guarded(this, [this] {
-		_removingSetId = 0;
-		emit checkForHide();
-	})));
+	Ui::show(
+	    Box<ConfirmBox>(lang(lng_stickers_remove_group_set),
+	                    base::lambda_guarded(this,
+	                                         [this, group = _megagroupSet] {
+		                                         Expects(group->mgInfo != nullptr);
+		                                         if (group->mgInfo->stickerSet.type() != mtpc_inputStickerSetEmpty) {
+			                                         Auth().api().setGroupStickerSet(group, MTP_inputStickerSetEmpty());
+		                                         }
+		                                         Ui::hideLayer();
+		                                         _removingSetId = 0;
+		                                         emit checkForHide();
+	                                         }),
+	                    base::lambda_guarded(this, [this] {
+		                    _removingSetId = 0;
+		                    emit checkForHide();
+	                    })));
 }
 
 void StickersListWidget::removeSet(quint64 setId) {
@@ -1694,42 +1740,51 @@ void StickersListWidget::removeSet(quint64 setId) {
 	if (it != sets.cend()) {
 		_removingSetId = it->id;
 		auto text = lng_stickers_remove_pack(lt_sticker_pack, it->title);
-		Ui::show(Box<ConfirmBox>(text, lang(lng_box_remove), base::lambda_guarded(this, [this] {
-			Ui::hideLayer();
-			auto &sets = Global::RefStickerSets();
-			auto it = sets.find(_removingSetId);
-			if (it != sets.cend()) {
-				if (it->id && it->access) {
-					request(MTPmessages_UninstallStickerSet(MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access)))).send();
-				} else if (!it->shortName.isEmpty()) {
-					request(MTPmessages_UninstallStickerSet(MTP_inputStickerSetShortName(MTP_string(it->shortName)))).send();
-				}
-				auto writeRecent = false;
-				auto &recent = cGetRecentStickers();
-				for (auto i = recent.begin(); i != recent.cend();) {
-					if (it->stickers.indexOf(i->first) >= 0) {
-						i = recent.erase(i);
-						writeRecent = true;
-					} else {
-						++i;
-					}
-				}
-				it->flags &= ~MTPDstickerSet::Flag::f_installed;
-				if (!(it->flags & MTPDstickerSet_ClientFlag::f_featured) && !(it->flags & MTPDstickerSet_ClientFlag::f_special)) {
-					sets.erase(it);
-				}
-				int removeIndex = Global::StickerSetsOrder().indexOf(_removingSetId);
-				if (removeIndex >= 0) Global::RefStickerSetsOrder().removeAt(removeIndex);
-				refreshStickers();
-				Local::writeInstalledStickers();
-				if (writeRecent) Local::writeUserSettings();
-			}
-			_removingSetId = 0;
-			emit checkForHide();
-		}), base::lambda_guarded(this, [this] {
-			_removingSetId = 0;
-			emit checkForHide();
-		})));
+		Ui::show(Box<ConfirmBox>(
+		    text, lang(lng_box_remove),
+		    base::lambda_guarded(this,
+		                         [this] {
+			                         Ui::hideLayer();
+			                         auto &sets = Global::RefStickerSets();
+			                         auto it = sets.find(_removingSetId);
+			                         if (it != sets.cend()) {
+				                         if (it->id && it->access) {
+					                         request(MTPmessages_UninstallStickerSet(
+					                                     MTP_inputStickerSetID(MTP_long(it->id), MTP_long(it->access))))
+					                             .send();
+				                         } else if (!it->shortName.isEmpty()) {
+					                         request(MTPmessages_UninstallStickerSet(
+					                                     MTP_inputStickerSetShortName(MTP_string(it->shortName))))
+					                             .send();
+				                         }
+				                         auto writeRecent = false;
+				                         auto &recent = cGetRecentStickers();
+				                         for (auto i = recent.begin(); i != recent.cend();) {
+					                         if (it->stickers.indexOf(i->first) >= 0) {
+						                         i = recent.erase(i);
+						                         writeRecent = true;
+					                         } else {
+						                         ++i;
+					                         }
+				                         }
+				                         it->flags &= ~MTPDstickerSet::Flag::f_installed;
+				                         if (!(it->flags & MTPDstickerSet_ClientFlag::f_featured) &&
+				                             !(it->flags & MTPDstickerSet_ClientFlag::f_special)) {
+					                         sets.erase(it);
+				                         }
+				                         int removeIndex = Global::StickerSetsOrder().indexOf(_removingSetId);
+				                         if (removeIndex >= 0) Global::RefStickerSetsOrder().removeAt(removeIndex);
+				                         refreshStickers();
+				                         Local::writeInstalledStickers();
+				                         if (writeRecent) Local::writeUserSettings();
+			                         }
+			                         _removingSetId = 0;
+			                         emit checkForHide();
+		                         }),
+		    base::lambda_guarded(this, [this] {
+			    _removingSetId = 0;
+			    emit checkForHide();
+		    })));
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
index c1dd9eb38..8a70a8972 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "chat_helpers/tabbed_selector.h"
 #include "base/variant.h"
+#include "chat_helpers/tabbed_selector.h"
 #include "ui/effects/ripple_animation.h"
 
 namespace Window {
@@ -40,7 +40,7 @@ class StickersListWidget : public TabbedSelector::Inner, private base::Subscribe
 	Q_OBJECT
 
 public:
-	StickersListWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	StickersListWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void refreshRecent() override;
 	void preloadImages() override;
@@ -108,8 +108,7 @@ private:
 	struct OverButton {
 		int section;
 	};
-	struct OverGroupAdd {
-	};
+	struct OverGroupAdd {};
 	friend inline bool operator==(OverSticker a, OverSticker b) {
 		return (a.section == b.section) && (a.index == b.index) && (a.overDelete == b.overDelete);
 	}
@@ -134,8 +133,12 @@ private:
 	};
 
 	struct Set {
-		Set(quint64 id, MTPDstickerSet::Flags flags, const QString &title, qint32 hoversSize, const StickerPack &pack = StickerPack()) : id(id), flags(flags), title(title), pack(pack) {
-		}
+		Set(quint64 id, MTPDstickerSet::Flags flags, const QString &title, qint32 hoversSize,
+		    const StickerPack &pack = StickerPack())
+		    : id(id)
+		    , flags(flags)
+		    , title(title)
+		    , pack(pack) {}
 		quint64 id;
 		MTPDstickerSet::Flags flags;
 		QString title;
@@ -144,8 +147,7 @@ private:
 	};
 	using Sets = QList<Set>;
 
-	template <typename Callback>
-	bool enumerateSections(Callback callback) const;
+	template <typename Callback> bool enumerateSections(Callback callback) const;
 	SectionInfo sectionInfo(int section) const;
 	SectionInfo sectionInfoByOffset(int yOffset) const;
 
@@ -219,7 +221,7 @@ private:
 	Sets _featuredSets;
 	OrderedSet<quint64> _installedLocallySets;
 	QList<bool> _custom;
-	base::flat_set<not_null<DocumentData*>> _favedStickersMap;
+	base::flat_set<not_null<DocumentData *>> _favedStickersMap;
 
 	Section _section = Section::Stickers;
 
@@ -245,7 +247,6 @@ private:
 
 	QTimer _previewTimer;
 	bool _previewShown = false;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 9d2a54485..ba531b0d6 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -18,15 +18,15 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
 #include "chat_helpers/tabbed_panel.h"
+#include <QWindow>
 
-#include "ui/widgets/shadow.h"
-#include "styles/style_chat_helpers.h"
-#include "chat_helpers/tabbed_selector.h"
-#include "window/window_controller.h"
-#include "mainwindow.h"
 #include "app.h"
+#include "chat_helpers/tabbed_selector.h"
+#include "mainwindow.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/widgets/shadow.h"
+#include "window/window_controller.h"
 
 namespace ChatHelpers {
 namespace {
@@ -36,12 +36,14 @@ constexpr auto kDelayedHideTimeoutMs = 3000;
 
 } // namespace
 
-TabbedPanel::TabbedPanel(QWidget *parent, not_null<Window::Controller*> controller) : TabbedPanel(parent, controller, object_ptr<TabbedSelector>(nullptr, controller)) {
-}
+TabbedPanel::TabbedPanel(QWidget *parent, not_null<Window::Controller *> controller)
+    : TabbedPanel(parent, controller, object_ptr<TabbedSelector>(nullptr, controller)) {}
 
-TabbedPanel::TabbedPanel(QWidget *parent, not_null<Window::Controller*> controller, object_ptr<TabbedSelector> selector) : TWidget(parent)
-, _controller(controller)
-, _selector(std::move(selector)) {
+TabbedPanel::TabbedPanel(QWidget *parent, not_null<Window::Controller *> controller,
+                         object_ptr<TabbedSelector> selector)
+    : TWidget(parent)
+    , _controller(controller)
+    , _selector(std::move(selector)) {
 	_selector->setParent(this);
 	_selector->setRoundRadius(st::buttonRadius);
 	_selector->setAfterShownCallback([this](SelectorTab tab) {
@@ -70,9 +72,7 @@ TabbedPanel::TabbedPanel(QWidget *parent, not_null<Window::Controller*> controll
 			_hideTimer.callOnce(kDelayedHideTimeoutMs);
 		}
 	});
-	connect(_selector, &TabbedSelector::cancelled, this, [this] {
-		hideAnimated();
-	});
+	connect(_selector, &TabbedSelector::cancelled, this, [this] { hideAnimated(); });
 	connect(_selector, &TabbedSelector::slideFinished, this, [this] {
 		InvokeQueued(this, [this] {
 			if (_hideAfterSlide) {
@@ -256,16 +256,19 @@ void TabbedPanel::startOpacityAnimation(bool hiding) {
 	prepareCache();
 	_hiding = hiding;
 	hideChildren();
-	_a_opacity.start([this] { opacityAnimationCallback(); }, _hiding ? 1. : 0., _hiding ? 0. : 1., st::emojiPanDuration);
+	_a_opacity.start([this] { opacityAnimationCallback(); }, _hiding ? 1. : 0., _hiding ? 0. : 1.,
+	                 st::emojiPanDuration);
 }
 
 void TabbedPanel::startShowAnimation() {
 	if (!_a_show.animating()) {
 		auto image = grabForAnimation();
 
-		_showAnimation = std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::BottomRight);
+		_showAnimation =
+		    std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::BottomRight);
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
-		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(std::move(image),
+		                              QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
 		auto corners = App::cornersMask(ImageRoundRadius::Small);
 		_showAnimation->setCornerMasks(corners[0], corners[1], corners[2], corners[3]);
 		_showAnimation->start();
@@ -413,8 +416,8 @@ bool TabbedPanel::overlaps(const QRect &globalRect) const {
 
 	auto testRect = QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size());
 	auto inner = rect().marginsRemoved(st::emojiPanMargins);
-	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect)
-		|| inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
+	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect) ||
+	       inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
 }
 
 TabbedPanel::~TabbedPanel() = default;
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
index 3347ea040..acca4a0f9 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
-#include "ui/animation.h"
 #include "base/timer.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
 
 namespace Window {
 class Controller;
@@ -40,8 +40,8 @@ class TabbedPanel : public TWidget {
 	Q_OBJECT
 
 public:
-	TabbedPanel(QWidget *parent, not_null<Window::Controller*> controller);
-	TabbedPanel(QWidget *parent, not_null<Window::Controller*> controller, object_ptr<TabbedSelector> selector);
+	TabbedPanel(QWidget *parent, not_null<Window::Controller *> controller);
+	TabbedPanel(QWidget *parent, not_null<Window::Controller *> controller, object_ptr<TabbedSelector> selector);
 
 	object_ptr<TabbedSelector> takeSelector();
 	QPointer<TabbedSelector> getSelector() const;
@@ -107,7 +107,7 @@ private:
 	bool preventAutoHide() const;
 	void updateContentHeight();
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 	object_ptr<TabbedSelector> _selector;
 
 	int _contentMaxHeight = 0;
@@ -122,7 +122,6 @@ private:
 	QPixmap _cache;
 	Animation _a_opacity;
 	base::Timer _hideTimer;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
index 4620500d4..cfd4f4637 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.cpp
@@ -20,16 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/tabbed_section.h"
 
-#include "styles/style_chat_helpers.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "styles/style_chat_helpers.h"
 
 namespace ChatHelpers {
 
-TabbedSection::TabbedSection(QWidget *parent, not_null<Window::Controller*> controller) : TabbedSection(parent, controller, object_ptr<TabbedSelector>(this, controller)) {
-}
+TabbedSection::TabbedSection(QWidget *parent, not_null<Window::Controller *> controller)
+    : TabbedSection(parent, controller, object_ptr<TabbedSelector>(this, controller)) {}
 
-TabbedSection::TabbedSection(QWidget *parent, not_null<Window::Controller*> controller, object_ptr<TabbedSelector> selector) : Window::AbstractSectionWidget(parent, controller)
-, _selector(std::move(selector)) {
+TabbedSection::TabbedSection(QWidget *parent, not_null<Window::Controller *> controller,
+                             object_ptr<TabbedSelector> selector)
+    : Window::AbstractSectionWidget(parent, controller)
+    , _selector(std::move(selector)) {
 	resize(st::emojiPanWidth, st::emojiPanMaxHeight);
 
 	_selector->setParent(this);
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_section.h b/Telegram/SourceFiles/chat_helpers/tabbed_section.h
index 39e2e753f..fb05aef32 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_section.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_section.h
@@ -28,8 +28,8 @@ class TabbedSelector;
 
 class TabbedSection : public Window::AbstractSectionWidget {
 public:
-	TabbedSection(QWidget *parent, not_null<Window::Controller*> controller);
-	TabbedSection(QWidget *parent, not_null<Window::Controller*> controller, object_ptr<TabbedSelector> selector);
+	TabbedSection(QWidget *parent, not_null<Window::Controller *> controller);
+	TabbedSection(QWidget *parent, not_null<Window::Controller *> controller, object_ptr<TabbedSelector> selector);
 
 	void beforeHiding();
 	void afterShown();
@@ -52,7 +52,6 @@ protected:
 private:
 	object_ptr<TabbedSelector> _selector;
 	base::lambda<void()> _cancelledCallback;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 668f7a7bf..49c609094 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -20,22 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "chat_helpers/tabbed_selector.h"
 
+#include "apiwrap.h"
+#include "app.h"
 #include "chat_helpers/emoji_list_widget.h"
-#include "chat_helpers/stickers_list_widget.h"
 #include "chat_helpers/gifs_list_widget.h"
 #include "chat_helpers/stickers.h"
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/discrete_sliders.h"
-#include "ui/widgets/scroll_area.h"
-#include "storage/localstorage.h"
+#include "chat_helpers/stickers_list_widget.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "observer_peer.h"
-#include "apiwrap.h"
-#include "app.h"
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/discrete_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
 
 namespace ChatHelpers {
 namespace {
@@ -77,14 +77,16 @@ private:
 
 	int _frameIntsPerLineAdd = 0;
 	bool _wasSectionIcons = false;
-
 };
 
-void TabbedSelector::SlideAnimation::setFinalImages(Direction direction, QImage &&left, QImage &&right, QRect inner, bool wasSectionIcons) {
+void TabbedSelector::SlideAnimation::setFinalImages(Direction direction, QImage &&left, QImage &&right, QRect inner,
+                                                    bool wasSectionIcons) {
 	Expects(!started());
 	_direction = direction;
-	_leftImage = QPixmap::fromImage(std::move(left).convertToFormat(QImage::Format_ARGB32_Premultiplied), Qt::ColorOnly);
-	_rightImage = QPixmap::fromImage(std::move(right).convertToFormat(QImage::Format_ARGB32_Premultiplied), Qt::ColorOnly);
+	_leftImage =
+	    QPixmap::fromImage(std::move(left).convertToFormat(QImage::Format_ARGB32_Premultiplied), Qt::ColorOnly);
+	_rightImage =
+	    QPixmap::fromImage(std::move(right).convertToFormat(QImage::Format_ARGB32_Premultiplied), Qt::ColorOnly);
 
 	Assert(!_leftImage.isNull());
 	Assert(!_rightImage.isNull());
@@ -172,16 +174,21 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, double dt, double o
 	{
 		Painter p(&_frame);
 		p.setOpacity(opacity);
-		p.fillRect(_painterInnerLeft, _painterInnerTop, _painterInnerWidth, _painterCategoriesTop - _painterInnerTop, st::emojiPanBg);
-		p.fillRect(_painterInnerLeft, _painterCategoriesTop, _painterInnerWidth, _painterInnerBottom - _painterCategoriesTop, _wasSectionIcons ? st::emojiPanCategories : st::emojiPanBg);
+		p.fillRect(_painterInnerLeft, _painterInnerTop, _painterInnerWidth, _painterCategoriesTop - _painterInnerTop,
+		           st::emojiPanBg);
+		p.fillRect(_painterInnerLeft, _painterCategoriesTop, _painterInnerWidth,
+		           _painterInnerBottom - _painterCategoriesTop,
+		           _wasSectionIcons ? st::emojiPanCategories : st::emojiPanBg);
 		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
 		if (leftTo > _innerLeft) {
 			p.setOpacity(opacity * leftAlpha);
-			p.drawPixmap(_painterInnerLeft, _painterInnerTop, _leftImage, _innerLeft - leftCoord, _innerTop, leftTo - _innerLeft, _innerHeight);
+			p.drawPixmap(_painterInnerLeft, _painterInnerTop, _leftImage, _innerLeft - leftCoord, _innerTop,
+			             leftTo - _innerLeft, _innerHeight);
 		}
 		if (rightFrom < _innerRight) {
 			p.setOpacity(opacity * rightAlpha);
-			p.drawPixmap(painterRightFrom, _painterInnerTop, _rightImage, _innerLeft, _innerTop, _innerRight - rightFrom, _innerHeight);
+			p.drawPixmap(painterRightFrom, _painterInnerTop, _rightImage, _innerLeft, _innerTop,
+			             _innerRight - rightFrom, _innerHeight);
 		}
 	}
 
@@ -263,14 +270,15 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, double dt, double o
 	//		frameInts += _frameIntsPerLineAdded;
 	//	}
 
-	p.drawImage(outerLeft / cIntRetinaFactor(), outerTop / cIntRetinaFactor(), _frame, outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop);
+	p.drawImage(outerLeft / cIntRetinaFactor(), outerTop / cIntRetinaFactor(), _frame, outerLeft, outerTop,
+	            outerRight - outerLeft, outerBottom - outerTop);
 }
 
 TabbedSelector::Tab::Tab(SelectorTab type, object_ptr<Inner> widget)
-: _type(type)
-, _widget(std::move(widget))
-, _weak(_widget)
-, _footer(_widget->createFooter()) {
+    : _type(type)
+    , _widget(std::move(widget))
+    , _weak(_widget)
+    , _footer(_widget->createFooter()) {
 	_footer->setParent(_widget->parentWidget());
 }
 
@@ -287,17 +295,18 @@ void TabbedSelector::Tab::saveScrollTop() {
 	_scrollTop = widget()->getVisibleTop();
 }
 
-TabbedSelector::TabbedSelector(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _tabsSlider(this, st::emojiTabs)
-, _topShadow(this, st::shadowFg)
-, _bottomShadow(this, st::shadowFg)
-, _scroll(this, st::emojiScroll)
-, _tabs { {
-	Tab { SelectorTab::Emoji, object_ptr<EmojiListWidget>(this, controller) },
-	Tab { SelectorTab::Stickers, object_ptr<StickersListWidget>(this, controller) },
-	Tab { SelectorTab::Gifs, object_ptr<GifsListWidget>(this, controller) },
-} }
-, _currentTabType(Auth().data().selectorTab()) {
+TabbedSelector::TabbedSelector(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _tabsSlider(this, st::emojiTabs)
+    , _topShadow(this, st::shadowFg)
+    , _bottomShadow(this, st::shadowFg)
+    , _scroll(this, st::emojiScroll)
+    , _tabs{{
+          Tab{SelectorTab::Emoji, object_ptr<EmojiListWidget>(this, controller)},
+          Tab{SelectorTab::Stickers, object_ptr<StickersListWidget>(this, controller)},
+          Tab{SelectorTab::Gifs, object_ptr<GifsListWidget>(this, controller)},
+      }}
+    , _currentTabType(Auth().data().selectorTab()) {
 	resize(st::emojiPanWidth, st::emojiPanMaxHeight);
 
 	for (auto &tab : _tabs) {
@@ -307,10 +316,12 @@ TabbedSelector::TabbedSelector(QWidget *parent, not_null<Window::Controller*> co
 
 	createTabsSlider();
 
-	_scroll->setGeometryToLeft(st::buttonRadius, marginTop(), st::emojiPanWidth - st::buttonRadius, height() - marginTop() - marginBottom());
+	_scroll->setGeometryToLeft(st::buttonRadius, marginTop(), st::emojiPanWidth - st::buttonRadius,
+	                           height() - marginTop() - marginBottom());
 	setWidgetToScrollArea();
 
-	_bottomShadow->setGeometry(_tabsSlider->x(), _scroll->y() + _scroll->height() - st::lineWidth, _tabsSlider->width(), st::lineWidth);
+	_bottomShadow->setGeometry(_tabsSlider->x(), _scroll->y() + _scroll->height() - st::lineWidth, _tabsSlider->width(),
+	                           st::lineWidth);
 
 	for (auto &tab : _tabs) {
 		auto widget = tab.widget();
@@ -331,22 +342,24 @@ TabbedSelector::TabbedSelector(QWidget *parent, not_null<Window::Controller*> co
 	connect(stickers(), SIGNAL(scrollUpdated()), this, SLOT(onScroll()));
 	connect(_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
 	connect(emoji(), SIGNAL(selected(EmojiPtr)), this, SIGNAL(emojiSelected(EmojiPtr)));
-	connect(stickers(), SIGNAL(selected(DocumentData*)), this, SIGNAL(stickerSelected(DocumentData*)));
+	connect(stickers(), SIGNAL(selected(DocumentData *)), this, SIGNAL(stickerSelected(DocumentData *)));
 	connect(stickers(), SIGNAL(checkForHide()), this, SIGNAL(checkForHide()));
-	connect(gifs(), SIGNAL(selected(DocumentData*)), this, SIGNAL(stickerSelected(DocumentData*)));
-	connect(gifs(), SIGNAL(selected(PhotoData*)), this, SIGNAL(photoSelected(PhotoData*)));
-	connect(gifs(), SIGNAL(selected(InlineBots::Result*, UserData*)), this, SIGNAL(inlineResultSelected(InlineBots::Result*, UserData*)));
+	connect(gifs(), SIGNAL(selected(DocumentData *)), this, SIGNAL(stickerSelected(DocumentData *)));
+	connect(gifs(), SIGNAL(selected(PhotoData *)), this, SIGNAL(photoSelected(PhotoData *)));
+	connect(gifs(), SIGNAL(selected(InlineBots::Result *, UserData *)), this,
+	        SIGNAL(inlineResultSelected(InlineBots::Result *, UserData *)));
 	connect(gifs(), SIGNAL(cancelled()), this, SIGNAL(cancelled()));
 
 	_topShadow->raise();
 	_bottomShadow->raise();
 	_tabsSlider->raise();
 
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelRightsChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _currentPeer) {
-			checkRestrictedPeer();
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelRightsChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _currentPeer) {
+			                                                            checkRestrictedPeer();
+		                                                            }
+	                                                            }));
 
 	//	setAttribute(Qt::WA_AcceptTouchEvents);
 	setAttribute(Qt::WA_OpaquePaintEvent, false);
@@ -364,7 +377,8 @@ void TabbedSelector::resizeEvent(QResizeEvent *e) {
 		currentTab()->widget()->setVisibleTopBottom(scrollTop, scrollTop + contentHeight);
 		_scroll->resize(_scroll->width(), contentHeight);
 	}
-	_bottomShadow->setGeometry(_tabsSlider->x(), _scroll->y() + _scroll->height() - st::lineWidth, _tabsSlider->width(), st::lineWidth);
+	_bottomShadow->setGeometry(_tabsSlider->x(), _scroll->y() + _scroll->height() - st::lineWidth, _tabsSlider->width(),
+	                           st::lineWidth);
 	if (_restrictedLabel) {
 		_restrictedLabel->move((width() - _restrictedLabel->width()), (height() / 3 - _restrictedLabel->height() / 2));
 	}
@@ -426,7 +440,8 @@ void TabbedSelector::paintContent(Painter &p) {
 	if (_restrictedLabel) {
 		p.fillRect(0, sidesTop, width(), sidesHeight, st::emojiPanBg);
 	} else {
-		p.fillRect(myrtlrect(width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight), st::emojiPanBg);
+		p.fillRect(myrtlrect(width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight),
+		           st::emojiPanBg);
 		p.fillRect(myrtlrect(0, sidesTop, st::buttonRadius, sidesHeight), st::emojiPanBg);
 	}
 }
@@ -533,15 +548,19 @@ void TabbedSelector::setCurrentPeer(PeerData *peer) {
 
 void TabbedSelector::checkRestrictedPeer() {
 	if (auto megagroup = _currentPeer ? _currentPeer->asMegagroup() : nullptr) {
-		auto restricted = (_currentTabType == SelectorTab::Stickers) ? megagroup->restrictedRights().is_send_stickers() :
-			(_currentTabType == SelectorTab::Gifs) ? megagroup->restrictedRights().is_send_gifs() : false;
+		auto restricted =
+		    (_currentTabType == SelectorTab::Stickers) ?
+		        megagroup->restrictedRights().is_send_stickers() :
+		        (_currentTabType == SelectorTab::Gifs) ? megagroup->restrictedRights().is_send_gifs() : false;
 		if (restricted) {
 			if (!_restrictedLabel) {
-				auto text = (_currentTabType == SelectorTab::Stickers) ? lang(lng_restricted_send_stickers) :
-					(_currentTabType == SelectorTab::Gifs) ? lang(lng_restricted_send_gifs) : QString();
+				auto text = (_currentTabType == SelectorTab::Stickers) ?
+				                lang(lng_restricted_send_stickers) :
+				                (_currentTabType == SelectorTab::Gifs) ? lang(lng_restricted_send_gifs) : QString();
 				_restrictedLabel.create(this, text, Ui::FlatLabel::InitType::Simple, st::stickersRestrictedLabel);
 				_restrictedLabel->show();
-				_restrictedLabel->move((width() - _restrictedLabel->width()), (height() / 3 - _restrictedLabel->height() / 2));
+				_restrictedLabel->move((width() - _restrictedLabel->width()),
+				                       (height() / 3 - _restrictedLabel->height() / 2));
 				currentTab()->footer()->hide();
 				_scroll->hide();
 				_bottomShadow->hide();
@@ -604,13 +623,12 @@ void TabbedSelector::createTabsSlider() {
 	_tabsSlider->setSections(sections);
 
 	_tabsSlider->setActiveSectionFast(static_cast<int>(_currentTabType));
-	_tabsSlider->setSectionActivatedCallback([this] {
-		switchTab();
-	});
+	_tabsSlider->setSectionActivatedCallback([this] { switchTab(); });
 
 	_tabsSlider->resizeToWidth(width());
 	_tabsSlider->moveToLeft(0, 0);
-	_topShadow->setGeometry(_tabsSlider->x(), _tabsSlider->bottomNoMargins() - st::lineWidth, _tabsSlider->width(), st::lineWidth);
+	_topShadow->setGeometry(_tabsSlider->x(), _tabsSlider->bottomNoMargins() - st::lineWidth, _tabsSlider->width(),
+	                        st::lineWidth);
 }
 
 bool TabbedSelector::hasSectionIcons() const {
@@ -649,12 +667,14 @@ void TabbedSelector::switchTab() {
 
 	auto nowCache = grabForAnimation();
 
-	auto direction = (wasTab > _currentTabType) ? SlideAnimation::Direction::LeftToRight : SlideAnimation::Direction::RightToLeft;
+	auto direction =
+	    (wasTab > _currentTabType) ? SlideAnimation::Direction::LeftToRight : SlideAnimation::Direction::RightToLeft;
 	if (direction == SlideAnimation::Direction::LeftToRight) {
 		std::swap(wasCache, nowCache);
 	}
 	_slideAnimation = std::make_unique<SlideAnimation>();
-	auto slidingRect = QRect(_tabsSlider->x() * cIntRetinaFactor(), _scroll->y() * cIntRetinaFactor(), _tabsSlider->width() * cIntRetinaFactor(), (height() - _scroll->y()) * cIntRetinaFactor());
+	auto slidingRect = QRect(_tabsSlider->x() * cIntRetinaFactor(), _scroll->y() * cIntRetinaFactor(),
+	                         _tabsSlider->width() * cIntRetinaFactor(), (height() - _scroll->y()) * cIntRetinaFactor());
 	_slideAnimation->setFinalImages(direction, std::move(wasCache), std::move(nowCache), slidingRect, wasSectionIcons);
 	auto corners = App::cornersMask(ImageRoundRadius::Small);
 	_slideAnimation->setCornerMasks(corners[0], corners[1], corners[2], corners[3]);
@@ -671,16 +691,16 @@ void TabbedSelector::switchTab() {
 	Auth().saveDataDelayed(kSaveChosenTabTimeout);
 }
 
-not_null<EmojiListWidget*> TabbedSelector::emoji() const {
-	return static_cast<EmojiListWidget*>(getTab(SelectorTab::Emoji)->widget().get());
+not_null<EmojiListWidget *> TabbedSelector::emoji() const {
+	return static_cast<EmojiListWidget *>(getTab(SelectorTab::Emoji)->widget().get());
 }
 
-not_null<StickersListWidget*> TabbedSelector::stickers() const {
-	return static_cast<StickersListWidget*>(getTab(SelectorTab::Stickers)->widget().get());
+not_null<StickersListWidget *> TabbedSelector::stickers() const {
+	return static_cast<StickersListWidget *>(getTab(SelectorTab::Stickers)->widget().get());
 }
 
-not_null<GifsListWidget*> TabbedSelector::gifs() const {
-	return static_cast<GifsListWidget*>(getTab(SelectorTab::Gifs)->widget().get());
+not_null<GifsListWidget *> TabbedSelector::gifs() const {
+	return static_cast<GifsListWidget *>(getTab(SelectorTab::Gifs)->widget().get());
 }
 
 void TabbedSelector::setWidgetToScrollArea() {
@@ -699,9 +719,9 @@ void TabbedSelector::scrollToY(int y) {
 	_topShadow->update();
 }
 
-TabbedSelector::Inner::Inner(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller) {
-}
+TabbedSelector::Inner::Inner(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller) {}
 
 void TabbedSelector::Inner::setVisibleTopBottom(int visibleTop, int visibleBottom) {
 	auto oldVisibleHeight = getVisibleBottom() - getVisibleTop();
@@ -728,7 +748,8 @@ void TabbedSelector::Inner::panelHideFinished() {
 	}
 }
 
-TabbedSelector::InnerFooter::InnerFooter(QWidget *parent) : TWidget(parent) {
+TabbedSelector::InnerFooter::InnerFooter(QWidget *parent)
+    : TWidget(parent) {
 	resize(st::emojiPanWidth, st::emojiCategory.height);
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 7a1943c3b..2db88e458 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
-#include "ui/effects/panel_animation.h"
-#include "mtproto/sender.h"
 #include "auth_session.h"
+#include "mtproto/sender.h"
+#include "ui/effects/panel_animation.h"
+#include "ui/twidget.h"
 
 namespace InlineBots {
 class Result;
@@ -34,7 +34,7 @@ class PlainShadow;
 class ScrollArea;
 class SettingsSlider;
 class FlatLabel;
-} // namesapce Ui
+} // namespace Ui
 
 namespace Window {
 class Controller;
@@ -56,7 +56,7 @@ class TabbedSelector : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	TabbedSelector(QWidget *parent, not_null<Window::Controller*> controller);
+	TabbedSelector(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void setRoundRadius(int radius);
 	void refreshStickers();
@@ -123,10 +123,10 @@ private:
 		SelectorTab type() const {
 			return _type;
 		}
-		not_null<Inner*> widget() const {
+		not_null<Inner *> widget() const {
 			return _weak;
 		}
-		not_null<InnerFooter*> footer() const {
+		not_null<InnerFooter *> footer() const {
 			return _footer;
 		}
 
@@ -140,11 +140,10 @@ private:
 
 	private:
 		SelectorTab _type = SelectorTab::Emoji;
-		object_ptr<Inner> _widget = { nullptr };
+		object_ptr<Inner> _widget = {nullptr};
 		QPointer<Inner> _weak;
 		object_ptr<InnerFooter> _footer;
 		int _scrollTop = 0;
-
 	};
 
 	void paintSlideFrame(Painter &p, TimeMs ms);
@@ -164,21 +163,21 @@ private:
 	void setWidgetToScrollArea();
 	void createTabsSlider();
 	void switchTab();
-	not_null<Tab*> getTab(SelectorTab type) {
+	not_null<Tab *> getTab(SelectorTab type) {
 		return &_tabs[static_cast<int>(type)];
 	}
-	not_null<const Tab*> getTab(SelectorTab type) const {
+	not_null<const Tab *> getTab(SelectorTab type) const {
 		return &_tabs[static_cast<int>(type)];
 	}
-	not_null<Tab*> currentTab() {
+	not_null<Tab *> currentTab() {
 		return getTab(_currentTabType);
 	}
-	not_null<const Tab*> currentTab() const {
+	not_null<const Tab *> currentTab() const {
 		return getTab(_currentTabType);
 	}
-	not_null<EmojiListWidget*> emoji() const;
-	not_null<StickersListWidget*> stickers() const;
-	not_null<GifsListWidget*> gifs() const;
+	not_null<EmojiListWidget *> emoji() const;
+	not_null<StickersListWidget *> stickers() const;
+	not_null<GifsListWidget *> gifs() const;
 
 	int _roundRadius = 0;
 	int _footerTop = 0;
@@ -188,24 +187,23 @@ private:
 	std::unique_ptr<SlideAnimation> _slideAnimation;
 	Animation _a_slide;
 
-	object_ptr<Ui::SettingsSlider> _tabsSlider = { nullptr };
+	object_ptr<Ui::SettingsSlider> _tabsSlider = {nullptr};
 	object_ptr<Ui::PlainShadow> _topShadow;
 	object_ptr<Ui::PlainShadow> _bottomShadow;
 	object_ptr<Ui::ScrollArea> _scroll;
-	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
+	object_ptr<Ui::FlatLabel> _restrictedLabel = {nullptr};
 	std::array<Tab, Tab::kCount> _tabs;
 	SelectorTab _currentTabType = SelectorTab::Emoji;
 
 	base::lambda<void(SelectorTab)> _afterShownCallback;
 	base::lambda<void(SelectorTab)> _beforeHidingCallback;
-
 };
 
 class TabbedSelector::Inner : public TWidget {
 	Q_OBJECT
 
 public:
-	Inner(QWidget *parent, not_null<Window::Controller*> controller);
+	Inner(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void setVisibleTopBottom(int visibleTop, int visibleBottom) override;
 
@@ -217,16 +215,13 @@ public:
 	}
 
 	virtual void refreshRecent() = 0;
-	virtual void preloadImages() {
-	}
+	virtual void preloadImages() {}
 	void hideFinished();
 	void panelHideFinished();
 	virtual void clearSelection() = 0;
 
-	virtual void afterShown() {
-	}
-	virtual void beforeHiding() {
-	}
+	virtual void afterShown() {}
+	virtual void beforeHiding() {}
 
 	virtual object_ptr<InnerFooter> createFooter() = 0;
 
@@ -235,23 +230,20 @@ signals:
 	void disableScroll(bool disabled);
 
 protected:
-	not_null<Window::Controller*> controller() const {
+	not_null<Window::Controller *> controller() const {
 		return _controller;
 	}
 
 	virtual int countHeight() = 0;
 	virtual InnerFooter *getFooter() const = 0;
-	virtual void processHideFinished() {
-	}
-	virtual void processPanelHideFinished() {
-	}
+	virtual void processHideFinished() {}
+	virtual void processPanelHideFinished() {}
 
 private:
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
-
 };
 
 class TabbedSelector::InnerFooter : public TWidget {
@@ -259,12 +251,9 @@ public:
 	InnerFooter(QWidget *parent);
 
 protected:
-	virtual void processHideFinished() {
-	}
-	virtual void processPanelHideFinished() {
-	}
+	virtual void processHideFinished() {}
+	virtual void processPanelHideFinished() {}
 	friend class Inner;
-
 };
 
 } // namespace ChatHelpers
diff --git a/Telegram/SourceFiles/codegen/common/basic_tokenized_file.cpp b/Telegram/SourceFiles/codegen/common/basic_tokenized_file.cpp
index c2816c40d..e88af6c8e 100644
--- a/Telegram/SourceFiles/codegen/common/basic_tokenized_file.cpp
+++ b/Telegram/SourceFiles/codegen/common/basic_tokenized_file.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/common/basic_tokenized_file.h"
 
-#include "codegen/common/logging.h"
-#include "codegen/common/clean_file_reader.h"
 #include "codegen/common/checked_utf8_string.h"
+#include "codegen/common/clean_file_reader.h"
+#include "codegen/common/logging.h"
 
 using Token = codegen::common::BasicTokenizedFile::Token;
 using Type = Token::Type;
@@ -32,9 +32,9 @@ namespace common {
 namespace {
 
 constexpr int kErrorUnterminatedStringLiteral = 201;
-constexpr int kErrorIncorrectUtf8String       = 202;
-constexpr int kErrorIncorrectToken            = 203;
-constexpr int kErrorUnexpectedToken           = 204;
+constexpr int kErrorIncorrectUtf8String = 202;
+constexpr int kErrorIncorrectToken = 203;
+constexpr int kErrorUnexpectedToken = 204;
 
 bool isDigitChar(char ch) {
 	return (ch >= '0') && (ch <= '9');
@@ -49,16 +49,16 @@ bool isWhitespaceChar(char ch) {
 }
 
 Token invalidToken() {
-	return { Type::Invalid, QString(), ConstUtf8String(nullptr, 0), false };
+	return {Type::Invalid, QString(), ConstUtf8String(nullptr, 0), false};
 }
 
 } // namespace
 
-BasicTokenizedFile::BasicTokenizedFile(const QString &filepath) : reader_(filepath) {
-}
+BasicTokenizedFile::BasicTokenizedFile(const QString &filepath)
+    : reader_(filepath) {}
 
-BasicTokenizedFile::BasicTokenizedFile(const QByteArray &content, const QString &filepath) : reader_(content, filepath) {
-}
+BasicTokenizedFile::BasicTokenizedFile(const QByteArray &content, const QString &filepath)
+    : reader_(content, filepath) {}
 
 bool BasicTokenizedFile::putBack() {
 	if (currentToken_ > 0) {
@@ -103,7 +103,7 @@ Type BasicTokenizedFile::readToken() {
 		}
 	} else if (result == Type::Dot) {
 		if (readOneToken(StartWithWhitespace::Deny) == Type::Int) {
-			//We got dot and int, so it is double.
+			// We got dot and int, so it is double.
 			result = uniteLastTokens(Type::Double);
 		}
 	}
@@ -129,8 +129,8 @@ Type BasicTokenizedFile::readOneToken(StartWithWhitespace condition) {
 }
 
 Type BasicTokenizedFile::saveToken(Type type, const QString &value) {
-	ConstUtf8String original = { tokenStart_, reader_.currentPtr() };
-	tokens_.push_back({ type, value, original, tokenStartWhitespace_ });
+	ConstUtf8String original = {tokenStart_, reader_.currentPtr()};
+	tokens_.push_back({type, value, original, tokenStartWhitespace_});
 	return type;
 }
 
@@ -144,7 +144,7 @@ Type BasicTokenizedFile::uniteLastTokens(Type type) {
 	auto originalFrom = token.original.data();
 	auto originalTill = tokens_.back().original.end();
 	token.type = type;
-	token.original = { originalFrom, originalTill };
+	token.original = {originalFrom, originalTill};
 	token.value += tokens_.back().value;
 	tokens_.pop_back();
 	return type;
@@ -152,7 +152,8 @@ Type BasicTokenizedFile::uniteLastTokens(Type type) {
 
 QString BasicTokenizedFile::getCurrentLineComment() {
 	if (lineNumber_ > singleLineComments_.size()) {
-		reader_.logError(kErrorInternal, lineNumber_) << "internal tokenizer error (line number larger than comments list size).";
+		reader_.logError(kErrorInternal, lineNumber_)
+		    << "internal tokenizer error (line number larger than comments list size).";
 		failed_ = true;
 		return QString();
 	}
diff --git a/Telegram/SourceFiles/codegen/common/basic_tokenized_file.h b/Telegram/SourceFiles/codegen/common/basic_tokenized_file.h
index fca8c5992..97b0fdfb7 100644
--- a/Telegram/SourceFiles/codegen/common/basic_tokenized_file.h
+++ b/Telegram/SourceFiles/codegen/common/basic_tokenized_file.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
+#include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QList>
+#include <memory>
 
-#include "codegen/common/const_utf8_string.h"
 #include "codegen/common/clean_file_reader.h"
+#include "codegen/common/const_utf8_string.h"
 
 namespace codegen {
 namespace common {
@@ -139,31 +139,32 @@ private:
 	bool tokenStartWhitespace_ = false;
 
 	const QMap<char, Type> singleLetterTokens_ = {
-		{ '(', Type::LeftParenthesis },
-		{ ')', Type::RightParenthesis },
-		{ '{', Type::LeftBrace },
-		{ '}', Type::RightBrace },
-		{ '[', Type::LeftBracket },
-		{ ']', Type::RightBracket },
-		{ ':', Type::Colon },
-		{ ';', Type::Semicolon },
-		{ ',', Type::Comma },
-		{ '.', Type::Dot },
-		{ '#', Type::Number },
-		{ '+', Type::Plus },
-		{ '-', Type::Minus },
-		{ '=', Type::Equals },
-		{ '&', Type::And },
-		{ '|', Type::Or },
+	    {'(', Type::LeftParenthesis},
+	    {')', Type::RightParenthesis},
+	    {'{', Type::LeftBrace},
+	    {'}', Type::RightBrace},
+	    {'[', Type::LeftBracket},
+	    {']', Type::RightBracket},
+	    {':', Type::Colon},
+	    {';', Type::Semicolon},
+	    {',', Type::Comma},
+	    {'.', Type::Dot},
+	    {'#', Type::Number},
+	    {'+', Type::Plus},
+	    {'-', Type::Minus},
+	    {'=', Type::Equals},
+	    {'&', Type::And},
+	    {'|', Type::Or},
 	};
-
 };
 
 LogStream operator<<(LogStream &&stream, BasicTokenizedFile::Token::Type type);
 template <>
-LogStream operator<< <BasicTokenizedFile::Token::Type>(LogStream &&stream, BasicTokenizedFile::Token::Type &&value) = delete;
+LogStream operator<<<BasicTokenizedFile::Token::Type>(LogStream &&stream,
+                                                      BasicTokenizedFile::Token::Type &&value) = delete;
 template <>
-LogStream operator<< <const BasicTokenizedFile::Token::Type&>(LogStream &&stream, const BasicTokenizedFile::Token::Type &value) = delete;
+LogStream operator<<<const BasicTokenizedFile::Token::Type &>(LogStream &&stream,
+                                                              const BasicTokenizedFile::Token::Type &value) = delete;
 
 } // namespace common
 } // namespace codegen
diff --git a/Telegram/SourceFiles/codegen/common/checked_utf8_string.cpp b/Telegram/SourceFiles/codegen/common/checked_utf8_string.cpp
index bab885881..5dac99672 100644
--- a/Telegram/SourceFiles/codegen/common/checked_utf8_string.cpp
+++ b/Telegram/SourceFiles/codegen/common/checked_utf8_string.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/common/checked_utf8_string.h"
 
-#include <iostream>
 #include <QtCore/QTextCodec>
+#include <iostream>
 
 #include "codegen/common/const_utf8_string.h"
 
@@ -44,11 +44,11 @@ CheckedUtf8String::CheckedUtf8String(const char *string, int size) {
 	}
 }
 
-CheckedUtf8String::CheckedUtf8String(const QByteArray &string) : CheckedUtf8String(string.constData(), string.size()) {
-}
+CheckedUtf8String::CheckedUtf8String(const QByteArray &string)
+    : CheckedUtf8String(string.constData(), string.size()) {}
 
-CheckedUtf8String::CheckedUtf8String(const ConstUtf8String &string) : CheckedUtf8String(string.data(), string.size()) {
-}
+CheckedUtf8String::CheckedUtf8String(const ConstUtf8String &string)
+    : CheckedUtf8String(string.data(), string.size()) {}
 
 } // namespace common
 } // namespace codegen
diff --git a/Telegram/SourceFiles/codegen/common/checked_utf8_string.h b/Telegram/SourceFiles/codegen/common/checked_utf8_string.h
index 169ac39dd..9cc91bfd4 100644
--- a/Telegram/SourceFiles/codegen/common/checked_utf8_string.h
+++ b/Telegram/SourceFiles/codegen/common/checked_utf8_string.h
@@ -50,7 +50,6 @@ public:
 private:
 	QString string_;
 	bool valid_ = true;
-
 };
 
 } // namespace common
diff --git a/Telegram/SourceFiles/codegen/common/clean_file.cpp b/Telegram/SourceFiles/codegen/common/clean_file.cpp
index b93a3880e..74b0473e9 100644
--- a/Telegram/SourceFiles/codegen/common/clean_file.cpp
+++ b/Telegram/SourceFiles/codegen/common/clean_file.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/common/clean_file.h"
 
-#include <iostream>
 #include <QtCore/QDir>
+#include <iostream>
 
 #include "codegen/common/logging.h"
 
@@ -52,15 +52,13 @@ bool readFile(const QString &filepath, QByteArray *outResult) {
 
 
 CleanFile::CleanFile(const QString &filepath)
-: filepath_(filepath)
-, read_(true) {
-}
+    : filepath_(filepath)
+    , read_(true) {}
 
 CleanFile::CleanFile(const QByteArray &content, const QString &filepath)
-: filepath_(filepath)
-, content_(content)
-, read_(false) {
-}
+    : filepath_(filepath)
+    , content_(content)
+    , read_(false) {}
 
 bool CleanFile::read() {
 	if (read_) {
diff --git a/Telegram/SourceFiles/codegen/common/clean_file.h b/Telegram/SourceFiles/codegen/common/clean_file.h
index 51f13dcb3..66fc27e66 100644
--- a/Telegram/SourceFiles/codegen/common/clean_file.h
+++ b/Telegram/SourceFiles/codegen/common/clean_file.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QByteArray>
+#include <QtCore/QString>
 #include <QtCore/QVector>
 
 #include "codegen/common/logging.h"
@@ -58,7 +58,6 @@ private:
 	bool read_;
 
 	QVector<QByteArray> singleLineComments_;
-
 };
 
 } // namespace common
diff --git a/Telegram/SourceFiles/codegen/common/clean_file_reader.h b/Telegram/SourceFiles/codegen/common/clean_file_reader.h
index f43a5e43c..550a0d21d 100644
--- a/Telegram/SourceFiles/codegen/common/clean_file_reader.h
+++ b/Telegram/SourceFiles/codegen/common/clean_file_reader.h
@@ -30,10 +30,10 @@ namespace common {
 // Wrapper allows you to read forward the CleanFile without overflow checks.
 class CleanFileReader {
 public:
-	explicit CleanFileReader(const QString &filepath) : file_(filepath) {
-	}
-	explicit CleanFileReader(const QByteArray &content, const QString &filepath = QString()) : file_(content, filepath) {
-	}
+	explicit CleanFileReader(const QString &filepath)
+	    : file_(filepath) {}
+	explicit CleanFileReader(const QByteArray &content, const QString &filepath = QString())
+	    : file_(content, filepath) {}
 
 	bool read() {
 		if (!file_.read()) {
@@ -77,7 +77,6 @@ private:
 	CleanFile file_;
 	const char *pos_ = nullptr;
 	const char *end_ = nullptr;
-
 };
 
 } // namespace common
diff --git a/Telegram/SourceFiles/codegen/common/const_utf8_string.h b/Telegram/SourceFiles/codegen/common/const_utf8_string.h
index 0e077aa14..74e7bbce5 100644
--- a/Telegram/SourceFiles/codegen/common/const_utf8_string.h
+++ b/Telegram/SourceFiles/codegen/common/const_utf8_string.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <string>
-#include <QtCore/QString>
 #include <QtCore/QByteArray>
+#include <QtCore/QString>
+#include <string>
 
 namespace codegen {
 namespace common {
@@ -31,14 +31,15 @@ namespace common {
 // Not null-terminated! It does not hold any ownership.
 class ConstUtf8String {
 public:
-	explicit ConstUtf8String(const char *string, int size = -1) : string_(string) {
+	explicit ConstUtf8String(const char *string, int size = -1)
+	    : string_(string) {
 		if (size < 0) {
 			size = strlen(string);
 		}
 		size_ = size;
 	}
-	ConstUtf8String(const char *string, const char *end) : ConstUtf8String(string, end - string) {
-	}
+	ConstUtf8String(const char *string, const char *end)
+	    : ConstUtf8String(string, end - string) {}
 
 	QByteArray toByteArray() const {
 		return QByteArray(string_, size_);
@@ -68,7 +69,6 @@ public:
 private:
 	const char *string_;
 	int size_;
-
 };
 
 } // namespace common
diff --git a/Telegram/SourceFiles/codegen/common/cpp_file.cpp b/Telegram/SourceFiles/codegen/common/cpp_file.cpp
index 1b3bb499c..0992b2df6 100644
--- a/Telegram/SourceFiles/codegen/common/cpp_file.cpp
+++ b/Telegram/SourceFiles/codegen/common/cpp_file.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/common/cpp_file.h"
 
-#include <QtCore/QFileInfo>
 #include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 namespace codegen {
 namespace common {
@@ -31,7 +31,8 @@ void writeLicense(QTextStream &stream, const ProjectInfo &project) {
 	stream << "\
 /*\n\
 WARNING! All changes made in this file will be lost!\n\
-Created from '" << project.source << "' by '" << project.name << "'\n\
+Created from '"
+	       << project.source << "' by '" << project.name << "'\n\
 \n\
 This file is part of Telegram Desktop,\n\
 the official desktop version of Telegram messaging app, see https://telegram.org\n\
@@ -57,8 +58,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org\n\
 } // namespace
 
 CppFile::CppFile(const QString &path, const ProjectInfo &project)
-: stream_(&content_)
-, forceReGenerate_(project.forceReGenerate) {
+    : stream_(&content_)
+    , forceReGenerate_(project.forceReGenerate) {
 	bool cpp = path.toLower().endsWith(".cpp");
 
 	QFileInfo info(path);
@@ -74,11 +75,11 @@ CppFile::CppFile(const QString &path, const ProjectInfo &project)
 	}
 }
 
-CppFile &CppFile::include(const QString &header, bool global ) {
-    if (global)
-        stream() << QString("#include <%1>").arg(header);
-    else
-        stream() << QString("#include \"%1\"").arg(header);
+CppFile &CppFile::include(const QString &header, bool global) {
+	if (global)
+		stream() << QString("#include <%1>").arg(header);
+	else
+		stream() << QString("#include \"%1\"").arg(header);
 	return newline();
 }
 
diff --git a/Telegram/SourceFiles/codegen/common/cpp_file.h b/Telegram/SourceFiles/codegen/common/cpp_file.h
index 283bbb42a..ee7c3b8f5 100644
--- a/Telegram/SourceFiles/codegen/common/cpp_file.h
+++ b/Telegram/SourceFiles/codegen/common/cpp_file.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <QtCore/QString>
-#include <QtCore/QVector>
 #include <QtCore/QTextStream>
+#include <QtCore/QVector>
 
 namespace codegen {
 namespace common {
@@ -48,7 +48,7 @@ public:
 		stream() << "\n";
 		return *this;
 	}
-    CppFile &include(const QString &header, bool global = false);
+	CppFile &include(const QString &header, bool global = false);
 
 	// Empty name adds anonymous namespace.
 	CppFile &pushNamespace(const QString &name = QString());
@@ -62,7 +62,6 @@ private:
 	QTextStream stream_;
 	QVector<QString> namespaces_;
 	bool forceReGenerate_;
-
 };
 
 } // namespace common
diff --git a/Telegram/SourceFiles/codegen/common/logging.cpp b/Telegram/SourceFiles/codegen/common/logging.cpp
index 001efc3ef..a7c080bae 100644
--- a/Telegram/SourceFiles/codegen/common/logging.cpp
+++ b/Telegram/SourceFiles/codegen/common/logging.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/common/logging.h"
 
-#include <iostream>
 #include <QtCore/QDir>
+#include <iostream>
 
 namespace codegen {
 namespace common {
diff --git a/Telegram/SourceFiles/codegen/common/logging.h b/Telegram/SourceFiles/codegen/common/logging.h
index 71b6ef356..341f524d9 100644
--- a/Telegram/SourceFiles/codegen/common/logging.h
+++ b/Telegram/SourceFiles/codegen/common/logging.h
@@ -27,9 +27,9 @@ namespace codegen {
 namespace common {
 
 // Common error codes.
-constexpr int kErrorFileNotFound        = 101;
-constexpr int kErrorFileTooLarge        = 102;
-constexpr int kErrorFileNotOpened       = 103;
+constexpr int kErrorFileNotFound = 101;
+constexpr int kErrorFileTooLarge = 102;
+constexpr int kErrorFileNotOpened = 103;
 constexpr int kErrorUnexpectedEndOfFile = 104;
 
 // Wrapper around std::ostream that adds '\n' to the end of the logging line.
@@ -38,11 +38,13 @@ public:
 	enum NullType {
 		Null,
 	};
-	explicit LogStream(NullType) : final_(false) {
-	}
-	explicit LogStream(std::ostream &stream) : stream_(&stream) {
-	}
-	LogStream(LogStream &&other) : stream_(other.stream_), final_(other.final_) {
+	explicit LogStream(NullType)
+	    : final_(false) {}
+	explicit LogStream(std::ostream &stream)
+	    : stream_(&stream) {}
+	LogStream(LogStream &&other)
+	    : stream_(other.stream_)
+	    , final_(other.final_) {
 		other.final_ = false;
 	}
 	std::ostream *stream() const {
@@ -57,11 +59,9 @@ public:
 private:
 	std::ostream *stream_ = nullptr;
 	bool final_ = true;
-
 };
 
-template <typename T>
-LogStream operator<<(LogStream &&stream, T &&value) {
+template <typename T> LogStream operator<<(LogStream &&stream, T &&value) {
 	if (auto ostream = stream.stream()) {
 		*ostream << std::forward<T>(value);
 	}
diff --git a/Telegram/SourceFiles/codegen/emoji/data.cpp b/Telegram/SourceFiles/codegen/emoji/data.cpp
index 5f0e81d44..8fb39051e 100644
--- a/Telegram/SourceFiles/codegen/emoji/data.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/data.cpp
@@ -24,13 +24,13 @@ namespace codegen {
 namespace emoji {
 namespace {
 
-using std::vector;
-using std::map;
-using std::find;
-using std::make_pair;
-using std::move;
 using std::begin;
 using std::end;
+using std::find;
+using std::make_pair;
+using std::map;
+using std::move;
+using std::vector;
 
 using InputId = vector<quint32>;
 using InputCategory = vector<InputId>;
@@ -1832,17 +1832,17 @@ void fillReplaces(Data &result) {
 }
 
 bool AddItemBeforeItem(const InputId &add, const InputId &before) {
-	auto addToCategory = (InputCategory*)nullptr;
+	auto addToCategory = (InputCategory *)nullptr;
 	auto addBeforeIterator = InputCategory::iterator();
 	for (auto category : {
-		&Category1,
-		&Category2,
-		&Category3,
-		&Category4,
-		&Category5,
-		&Category6,
-		&Category7,
-	}) {
+	         &Category1,
+	         &Category2,
+	         &Category3,
+	         &Category4,
+	         &Category5,
+	         &Category6,
+	         &Category7,
+	     }) {
 		for (auto i = category->begin(), e = category->end(); i != e; ++i) {
 			if (*i == add) {
 				return true;
@@ -1874,19 +1874,19 @@ Data PrepareData() {
 	}
 
 	// Manually add :speech_left: emoji before eye-with-speech emoji.
-	if (!AddItemBeforeItem({ 0xD83DDDE8U }, { 0xD83DDC41U, 0x200DU, 0xD83DDDE8U })) {
+	if (!AddItemBeforeItem({0xD83DDDE8U}, {0xD83DDC41U, 0x200DU, 0xD83DDDE8U})) {
 		return Data();
 	}
 
 	for (auto category : {
-		&Category1,
-		&Category2,
-		&Category3,
-		&Category4,
-		&Category5,
-		&Category6,
-		&Category7,
-	}) {
+	         &Category1,
+	         &Category2,
+	         &Category3,
+	         &Category4,
+	         &Category5,
+	         &Category6,
+	         &Category7,
+	     }) {
 		appendCategory(result, *category, variatedIds);
 		if (result.list.empty()) {
 			return Data();
diff --git a/Telegram/SourceFiles/codegen/emoji/data.h b/Telegram/SourceFiles/codegen/emoji/data.h
index 387a57a49..c2c666621 100644
--- a/Telegram/SourceFiles/codegen/emoji/data.h
+++ b/Telegram/SourceFiles/codegen/emoji/data.h
@@ -21,13 +21,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "codegen/common/logging.h"
-#include <vector>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <functional>
 #include <map>
 #include <memory>
-#include <functional>
-#include <QtCore/QString>
-#include <QtCore/QSet>
-#include <QtCore/QMap>
+#include <vector>
 
 namespace codegen {
 namespace emoji {
diff --git a/Telegram/SourceFiles/codegen/emoji/generator.cpp b/Telegram/SourceFiles/codegen/emoji/generator.cpp
index bd530ebf3..077bb7cbf 100644
--- a/Telegram/SourceFiles/codegen/emoji/generator.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/generator.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/emoji/generator.h"
 
-#include <QtCore/QtPlugin>
 #include <QtCore/QBuffer>
+#include <QtCore/QDir>
+#include <QtCore/QtPlugin>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
-#include <QtCore/QDir>
 
 #ifdef SUPPORT_IMAGE_GENERATION
 Q_IMPORT_PLUGIN(QWebpPlugin)
@@ -51,21 +51,18 @@ constexpr auto kColumnBits = 6;
 constexpr auto kRowBits = 6;
 
 common::ProjectInfo Project = {
-	"codegen_emoji",
-	"empty",
-	false, // forceReGenerate
+    "codegen_emoji", "empty",
+    false, // forceReGenerate
 };
 
 QRect computeSourceRect(const QImage &image) {
 	auto size = image.width();
 	auto result = QRect(2, 2, size - 4, size - 4);
 	auto top = 1, bottom = 1, left = 1, right = 1;
-	auto rgbBits = reinterpret_cast<const QRgb*>(image.constBits());
+	auto rgbBits = reinterpret_cast<const QRgb *>(image.constBits());
 	for (auto i = 0; i != size; ++i) {
-		if (rgbBits[i] > 0
-			|| rgbBits[(size - 1) * size + i] > 0
-			|| rgbBits[i * size] > 0
-			|| rgbBits[i * size + (size - 1)] > 0) {
+		if (rgbBits[i] > 0 || rgbBits[(size - 1) * size + i] > 0 || rgbBits[i * size] > 0 ||
+		    rgbBits[i * size + (size - 1)] > 0) {
 			logDataError() << "Bad border.";
 			return QRect();
 		}
@@ -148,13 +145,12 @@ private:
 		}
 		return result;
 	}
-
 };
 
 quint32 countCrc32(const void *data, std::size_t size) {
 	static Crc32Initializer InitTable;
 
-	auto buffer = static_cast<const unsigned char*>(data);
+	auto buffer = static_cast<const unsigned char *>(data);
 	auto result = quint32(0xFFFFFFFFU);
 	for (auto i = std::size_t(0); i != size; ++i) {
 		result = (result >> 8) ^ Crc32Table[(result & 0xFFU) ^ buffer[i]];
@@ -164,15 +160,17 @@ quint32 countCrc32(const void *data, std::size_t size) {
 
 } // namespace
 
-Generator::Generator(const Options &options) : project_(Project)
+Generator::Generator(const Options &options)
+    : project_(Project)
 #ifdef SUPPORT_IMAGE_GENERATION
-, writeImages_(options.writeImages)
+    , writeImages_(options.writeImages)
 #endif // SUPPORT_IMAGE_GENERATION
-, data_(PrepareData())
-, replaces_(PrepareReplaces(options.replacesPath)) {
+    , data_(PrepareData())
+    , replaces_(PrepareReplaces(options.replacesPath)) {
 	QDir dir(options.outputPath);
 	if (!dir.mkpath(".")) {
-		common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
+		common::logError(kErrorCantWritePath, "Command Line")
+		    << "can not open path for writing: " << dir.absolutePath().toStdString();
 		data_ = Data();
 	}
 	if (!CheckAndConvertReplaces(replaces_, data_)) {
@@ -216,10 +214,10 @@ constexpr auto kEmojiInRow = 40;
 
 #ifdef SUPPORT_IMAGE_GENERATION
 QImage Generator::generateImage(int variantIndex) {
-	constexpr int kEmojiSizes[kVariantsCount + 1] = { 18, 22, 27, 36, 45, 180 };
-	constexpr bool kBadSizes[kVariantsCount] = { true, true, false, false, false };
-	constexpr int kEmojiFontSizes[kVariantsCount + 1] = { 14, 20, 27, 36, 45, 180 };
-	constexpr int kEmojiDeltas[kVariantsCount + 1] = { 15, 20, 25, 34, 42, 167 };
+	constexpr int kEmojiSizes[kVariantsCount + 1] = {18, 22, 27, 36, 45, 180};
+	constexpr bool kBadSizes[kVariantsCount] = {true, true, false, false, false};
+	constexpr int kEmojiFontSizes[kVariantsCount + 1] = {14, 20, 27, 36, 45, 180};
+	constexpr int kEmojiDeltas[kVariantsCount + 1] = {15, 20, 25, 34, 42, 167};
 
 	auto emojiCount = data_.list.size();
 	auto columnsCount = kEmojiInRow;
@@ -258,7 +256,9 @@ QImage Generator::generateImage(int variantIndex) {
 			}
 			auto targetRect = QRect(column * emojiSize, row * emojiSize, emojiSize, emojiSize);
 			if (isBad) {
-				p.drawImage(targetRect, singleImage.copy(sourceRect).scaled(emojiSize, emojiSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+				p.drawImage(targetRect,
+				            singleImage.copy(sourceRect)
+				                .scaled(emojiSize, emojiSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 			} else {
 				p.drawImage(targetRect, singleImage, sourceRect);
 			}
@@ -273,7 +273,7 @@ QImage Generator::generateImage(int variantIndex) {
 }
 
 bool Generator::writeImages() {
-	constexpr const char *variantPostfix[] = { "", "_125x", "_150x", "_200x", "_250x" };
+	constexpr const char *variantPostfix[] = {"", "_125x", "_150x", "_200x", "_250x"};
 	for (auto variantIndex = 0; variantIndex != kVariantsCount; variantIndex++) {
 		auto image = generateImage(variantIndex);
 		auto postfix = variantPostfix[variantIndex];
@@ -318,7 +318,7 @@ bool Generator::writeImages() {
 bool Generator::writeSource() {
 	source_ = std::make_unique<common::CppFile>(outputPath_ + ".cpp", project_);
 
-    source_->include("ui/emoji_config.h").newline();
+	source_->include("ui/emoji_config.h").newline();
 	source_->include("emoji_suggestions_data.h").newline();
 	source_->pushNamespace("Ui").pushNamespace("Emoji").pushNamespace();
 	source_->stream() << "\
@@ -381,8 +381,8 @@ void Init() {\n\
 bool Generator::writeHeader() {
 	auto header = std::make_unique<common::CppFile>(outputPath_ + ".h", project_);
 
-    header->include("QChar", true);
-    header->include("settings.h");
+	header->include("QChar", true);
+	header->include("settings.h");
 	header->pushNamespace("Ui").pushNamespace("Emoji").pushNamespace("internal");
 	header->stream() << "\
 \n\
@@ -429,8 +429,7 @@ EmojiPack GetSection(Section section);\n\
 	return header->finalize();
 }
 
-template <typename Callback>
-bool Generator::enumerateWholeList(Callback callback) {
+template <typename Callback> bool Generator::enumerateWholeList(Callback callback) {
 	auto column = 0;
 	auto row = 0;
 	auto index = 0;
@@ -472,19 +471,22 @@ bool Generator::enumerateWholeList(Callback callback) {
 bool Generator::writeInitCode() {
 	source_->stream() << "\
 struct DataStruct {\n\
-	ushort original : " << kOriginalBits << ";\n\
-	uchar idSize : " << kIdSizeBits << ";\n\
-	uchar column : " << kColumnBits << ";\n\
-	uchar row : " << kRowBits << ";\n\
+	ushort original : "
+	                  << kOriginalBits << ";\n\
+	uchar idSize : " << kIdSizeBits
+	                  << ";\n\
+	uchar column : " << kColumnBits
+	                  << ";\n\
+	uchar row : " << kRowBits
+	                  << ";\n\
 	bool postfixed : 1;\n\
 	bool variated : 1;\n\
 };\n\
 \n\
 const ushort IdData[] = {";
 	startBinary();
-	if (!enumerateWholeList([this](Id id, int column, int row, bool isPostfixed, bool isVariated, bool isColored, int original) {
-		return writeStringBinary(source_.get(), id);
-	})) {
+	if (!enumerateWholeList([this](Id id, int column, int row, bool isPostfixed, bool isVariated, bool isColored,
+	                               int original) { return writeStringBinary(source_.get(), id); })) {
 		return false;
 	}
 	if (_binaryFullLength >= std::numeric_limits<ushort>::max()) {
@@ -494,23 +496,26 @@ const ushort IdData[] = {";
 	source_->stream() << " };\n\
 \n\
 const DataStruct Data[] = {\n";
-	if (!enumerateWholeList([this](Id id, int column, int row, bool isPostfixed, bool isVariated, bool isColored, int original) {
-		if (original + 1 >= (1 << kOriginalBits)) {
-			logDataError() << "Too many entries.";
-			return false;
-		}
-		if (id.size() >= (1 << kIdSizeBits)) {
-			logDataError() << "Too large id.";
-			return false;
-		}
-		if (column >= (1 << kColumnBits) || row >= (1 << kRowBits)) {
-			logDataError() << "Bad row-column.";
-			return false;
-		}
-		source_->stream() << "\
-	{ ushort(" << (isColored ? (original + 1) : 0) << "), uchar(" << id.size() << "), uchar(" << column << "), uchar(" << row << "), " << (isPostfixed ? "true" : "false") << ", " << (isVariated ? "true" : "false") << " },\n";
-		return true;
-	})) {
+	if (!enumerateWholeList([this](Id id, int column, int row, bool isPostfixed, bool isVariated, bool isColored,
+	                               int original) {
+		    if (original + 1 >= (1 << kOriginalBits)) {
+			    logDataError() << "Too many entries.";
+			    return false;
+		    }
+		    if (id.size() >= (1 << kIdSizeBits)) {
+			    logDataError() << "Too large id.";
+			    return false;
+		    }
+		    if (column >= (1 << kColumnBits) || row >= (1 << kRowBits)) {
+			    logDataError() << "Bad row-column.";
+			    return false;
+		    }
+		    source_->stream() << "\
+	{ ushort(" << (isColored ? (original + 1) : 0)
+		                      << "), uchar(" << id.size() << "), uchar(" << column << "), uchar(" << row << "), "
+		                      << (isPostfixed ? "true" : "false") << ", " << (isVariated ? "true" : "false") << " },\n";
+		    return true;
+	    })) {
 		return false;
 	}
 
@@ -544,13 +549,8 @@ EmojiPack FillSection(int offset, int size) {\n\
 
 bool Generator::writeGetSections() {
 	constexpr const char *sectionNames[] = {
-		"Section::People",
-		"Section::Nature",
-		"Section::Food",
-		"Section::Activity",
-		"Section::Travel",
-		"Section::Objects",
-		"Section::Symbols",
+	    "Section::People", "Section::Nature",  "Section::Food",    "Section::Activity",
+	    "Section::Travel", "Section::Objects", "Section::Symbols",
 	};
 	source_->stream() << "\
 \n\
@@ -564,7 +564,8 @@ int GetSectionCount(Section section) {\n\
 			return false;
 		}
 		source_->stream() << "\
-	case " << name << ": return " << data_.categories[countIndex++].size() << ";\n";
+	case " << name << ": return "
+		                  << data_.categories[countIndex++].size() << ";\n";
 	}
 	source_->stream() << "\
 	}\n\
@@ -592,7 +593,8 @@ EmojiPack GetSection(Section section) {\n\
 		source_->stream() << "\
 \n\
 	case " << name << ": {\n\
-		static auto result = FillSection(" << offset << ", " << category.size() << ");\n\
+		static auto result = FillSection("
+		                  << offset << ", " << category.size() << ");\n\
 		return result;\n\
 	} break;\n";
 		offset += category.size();
@@ -640,10 +642,9 @@ int FindIndex(const QChar *start, const QChar *end, int *outLength) {\n\
 	return true;
 }
 
-bool Generator::writeFindFromDictionary(const std::map<QString, int, std::greater<QString>> &dictionary, bool skipPostfixes) {
-	auto tabs = [](int size) {
-		return QString(size, '\t');
-	};
+bool Generator::writeFindFromDictionary(const std::map<QString, int, std::greater<QString>> &dictionary,
+                                        bool skipPostfixes) {
+	auto tabs = [](int size) { return QString(size, '\t'); };
 
 	std::map<int, int> uniqueFirstChars;
 	auto foundMax = 0, foundMin = 65535;
@@ -747,9 +748,10 @@ bool Generator::writeFindFromDictionary(const std::map<QString, int, std::greate
 		}
 
 		// While IsReplaceEdge() currently is always true we just return the value.
-		//source_->stream() << tabs(1 + chars.size()) << "if (ch + " << chars.size() << " == end || IsReplaceEdge(*(ch + " << chars.size() << ")) || (ch + " << chars.size() << ")->unicode() == ' ') {\n";
-		//source_->stream() << tabs(1 + chars.size()) << "\treturn &Items[" << item.second << "];\n";
-		//source_->stream() << tabs(1 + chars.size()) << "}\n";
+		// source_->stream() << tabs(1 + chars.size()) << "if (ch + " << chars.size() << " == end || IsReplaceEdge(*(ch
+		// + " << chars.size() << ")) || (ch + " << chars.size() << ")->unicode() == ' ') {\n"; source_->stream() <<
+		// tabs(1 + chars.size()) << "\treturn &Items[" << item.second << "];\n"; source_->stream() << tabs(1 +
+		// chars.size()) << "}\n";
 		source_->stream() << tabs(tabsUsed) << "return " << (item.second + 1) << ";\n";
 	}
 	finishChecksTillKey(QString());
@@ -797,7 +799,8 @@ struct Replacement {\n\
 	std::vector<utf16string> words;\n\
 };\n\
 \n\
-constexpr auto kReplacementMaxLength = " << maxLength << ";\n\
+constexpr auto kReplacementMaxLength = "
+	                 << maxLength << ";\n\
 \n\
 void InitReplacements();\n\
 const std::vector<const Replacement*> *GetReplacements(char16_t first);\n\
@@ -850,7 +853,8 @@ const uint8_t ReplacementWordLengths[] = {";
 const ReplacementStruct ReplacementInitData[] = {\n";
 	for (auto &replace : replaces_.list) {
 		suggestionsSource_->stream() << "\
-	{ uint8_t(" << replace.id.size() << "), uint8_t(" << replace.replacement.size() << "), uint8_t(" << replace.words.size() << ") },\n";
+	{ uint8_t(" << replace.id.size() << "), uint8_t("
+		                             << replace.replacement.size() << "), uint8_t(" << replace.words.size() << ") },\n";
 	}
 	suggestionsSource_->stream() << "};\n\
 \n\
@@ -871,7 +875,8 @@ struct ReplacementIndexStruct {\n\
 const internal::checksum ReplacementChecksums[] = {\n";
 	startBinary();
 	for (auto &replace : replaces_.list) {
-		writeUintBinary(suggestionsSource_.get(), countCrc32(replace.replacement.constData(), replace.replacement.size() * sizeof(QChar)));
+		writeUintBinary(suggestionsSource_.get(),
+		                countCrc32(replace.replacement.constData(), replace.replacement.size() * sizeof(QChar)));
 	}
 	suggestionsSource_->stream() << " };\n\
 \n\
@@ -879,7 +884,8 @@ const ReplacementIndexStruct ReplacementIndexData[] = {\n";
 	startBinary();
 	for (auto i = byCharIndices.cbegin(), e = byCharIndices.cend(); i != e; ++i) {
 		suggestionsSource_->stream() << "\
-	{ char16_t(" << i.key().unicode() << "), uint16_t(" << i.value().size() << ") },\n";
+	{ char16_t(" << i.key().unicode() << "), uint16_t("
+		                             << i.value().size() << ") },\n";
 	}
 	suggestionsSource_->stream() << "};\n\
 \n\
@@ -904,7 +910,8 @@ void InitReplacements() {\n\
 	};\n\
 	auto wordSize = ReplacementWordLengths;\n\
 \n\
-	Replacements.reserve(" << replaces_.list.size() << ");\n\
+	Replacements.reserve(" << replaces_.list.size()
+	                             << ");\n\
 	for (auto item : ReplacementInitData) {\n\
 		auto emoji = takeString(item.emojiSize);\n\
 		auto replacement = takeString(item.replacementSize);\n\
diff --git a/Telegram/SourceFiles/codegen/emoji/generator.h b/Telegram/SourceFiles/codegen/emoji/generator.h
index dad80edca..df1f263cb 100644
--- a/Telegram/SourceFiles/codegen/emoji/generator.h
+++ b/Telegram/SourceFiles/codegen/emoji/generator.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <QtCore/QString>
-#include <QtCore/QSet>
 #include "codegen/common/cpp_file.h"
-#include "codegen/emoji/options.h"
 #include "codegen/emoji/data.h"
+#include "codegen/emoji/options.h"
 #include "codegen/emoji/replaces.h"
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <memory>
 
 namespace codegen {
 namespace emoji {
@@ -50,8 +50,7 @@ private:
 	bool writeSuggestionsSource();
 	bool writeSuggestionsHeader();
 
-	template <typename Callback>
-	bool enumerateWholeList(Callback callback);
+	template <typename Callback> bool enumerateWholeList(Callback callback);
 
 	bool writeInitCode();
 	bool writeSections();
@@ -59,7 +58,8 @@ private:
 	bool writeGetSections();
 	bool writeFindReplace();
 	bool writeFind();
-	bool writeFindFromDictionary(const std::map<QString, int, std::greater<QString>> &dictionary, bool skipPostfixes = false);
+	bool writeFindFromDictionary(const std::map<QString, int, std::greater<QString>> &dictionary,
+	                             bool skipPostfixes = false);
 	bool writeGetReplacements();
 	void startBinary();
 	bool writeStringBinary(common::CppFile *source, const QString &string);
@@ -82,7 +82,6 @@ private:
 
 	int _binaryFullLength = 0;
 	int _binaryCount = 0;
-
 };
 
 } // namespace emoji
diff --git a/Telegram/SourceFiles/codegen/emoji/main.cpp b/Telegram/SourceFiles/codegen/emoji/main.cpp
index 94e009658..344ee62ec 100644
--- a/Telegram/SourceFiles/codegen/emoji/main.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/main.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include <QtGui/QGuiApplication>
 
-#include "codegen/emoji/options.h"
 #include "codegen/emoji/generator.h"
+#include "codegen/emoji/options.h"
 
 int main(int argc, char *argv[]) {
 #ifdef SUPPORT_IMAGE_GENERATION
diff --git a/Telegram/SourceFiles/codegen/emoji/options.cpp b/Telegram/SourceFiles/codegen/emoji/options.cpp
index 9afbc3b80..a696bfafe 100644
--- a/Telegram/SourceFiles/codegen/emoji/options.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/options.cpp
@@ -20,16 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/emoji/options.h"
 
-#include <ostream>
-#include <QtCore/QCoreApplication>
 #include "codegen/common/logging.h"
+#include <QtCore/QCoreApplication>
+#include <ostream>
 
 namespace codegen {
 namespace emoji {
 namespace {
 
-constexpr int kErrorOutputPathExpected      = 902;
-constexpr int kErrorReplacesPathExpected    = 903;
+constexpr int kErrorOutputPathExpected = 902;
+constexpr int kErrorReplacesPathExpected = 903;
 constexpr int kErrorOneReplacesPathExpected = 904;
 
 } // namespace
diff --git a/Telegram/SourceFiles/codegen/emoji/replaces.cpp b/Telegram/SourceFiles/codegen/emoji/replaces.cpp
index 298b421c3..f5a3d15fc 100644
--- a/Telegram/SourceFiles/codegen/emoji/replaces.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/replaces.cpp
@@ -49,7 +49,6 @@ private:
 	friend ReplacementWords operator+(const ReplacementWords &a, const ReplacementWords &b);
 
 	QMap<QString, int> wordsWithCounts_;
-
 };
 
 ReplacementWords::ReplacementWords(const QString &string) {
@@ -102,7 +101,7 @@ bool AddReplacement(Replaces &result, const Id &id, const QString &replacement,
 	auto replace = Replace();
 	replace.id = id;
 	replace.replacement = replacement;
-	replace.words = (ReplacementWords(replacement)).result();// + ReplacementWords(name)).result();
+	replace.words = (ReplacementWords(replacement)).result(); // + ReplacementWords(name)).result();
 	if (replace.words.isEmpty()) {
 		logReplacesError(result.filename) << "Child '" << replacement.toStdString() << "' has no words.";
 		return false;
@@ -122,9 +121,7 @@ QString ComposeString(const std::initializer_list<QChar> &chars) {
 
 const auto NotSupported = ([] {
 	auto result = QSet<QString>();
-	auto insert = [&result](auto... args) {
-		result.insert(ComposeString({ args... }));
-	};
+	auto insert = [&result](auto... args) { result.insert(ComposeString({args...})); };
 	insert(0x0023, 0xFE0F); // :pound_symbol:
 	insert(0x002A, 0xFE0F); // :asterisk_symbol:
 	for (auto i = 0; i != 10; ++i) {
@@ -138,9 +135,12 @@ const auto NotSupported = ([] {
 	}
 	insert(0xD83C, 0xDDFA, 0xD83C, 0xDDF3); // :united_nations:
 
-	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC65, 0xDB40, 0xDC6E, 0xDB40, 0xDC67, 0xDB40, 0xDC7F); // :england:
-	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC73, 0xDB40, 0xDC63, 0xDB40, 0xDC74, 0xDB40, 0xDC7F); // :scotland:
-	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC77, 0xDB40, 0xDC6C, 0xDB40, 0xDC73, 0xDB40, 0xDC7F); // :wales:
+	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC65, 0xDB40, 0xDC6E, 0xDB40, 0xDC67, 0xDB40,
+	       0xDC7F); // :england:
+	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC73, 0xDB40, 0xDC63, 0xDB40, 0xDC74, 0xDB40,
+	       0xDC7F); // :scotland:
+	insert(0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC77, 0xDB40, 0xDC6C, 0xDB40, 0xDC73, 0xDB40,
+	       0xDC7F); // :wales:
 
 	insert(0xD83D, 0xDEF7); // :sled:
 	insert(0xD83D, 0xDEF8); // :flying_saucer:
@@ -237,27 +237,28 @@ const auto ConvertMap = ([] {
 		auto code = ComposeString(from);
 		result.insert(code, code + added);
 	};
-	auto maleModifier = ComposeString({ 0x200D, 0x2642, 0xFE0F });
-	auto femaleModifier = ComposeString({ 0x200D, 0x2640, 0xFE0F });
-	insertWithAdd({ 0xD83E, 0xDD26 }, maleModifier);
-	insertWithAdd({ 0xD83E, 0xDD37 }, femaleModifier);
-	insertWithAdd({ 0xD83E, 0xDD38 }, maleModifier);
-	insertWithAdd({ 0xD83E, 0xDD39 }, maleModifier);
-	insertWithAdd({ 0xD83E, 0xDD3C }, maleModifier);
-	insertWithAdd({ 0xD83E, 0xDD3D }, maleModifier);
-	insertWithAdd({ 0xD83E, 0xDD3E }, femaleModifier);
+	auto maleModifier = ComposeString({0x200D, 0x2642, 0xFE0F});
+	auto femaleModifier = ComposeString({0x200D, 0x2640, 0xFE0F});
+	insertWithAdd({0xD83E, 0xDD26}, maleModifier);
+	insertWithAdd({0xD83E, 0xDD37}, femaleModifier);
+	insertWithAdd({0xD83E, 0xDD38}, maleModifier);
+	insertWithAdd({0xD83E, 0xDD39}, maleModifier);
+	insertWithAdd({0xD83E, 0xDD3C}, maleModifier);
+	insertWithAdd({0xD83E, 0xDD3D}, maleModifier);
+	insertWithAdd({0xD83E, 0xDD3E}, femaleModifier);
 
 	// :kiss_woman_man:
-	insert({ 0xD83D, 0xDC69, 0x200D, 0x2764, 0xFE0F, 0x200D, 0xD83D, 0xDC8B, 0x200D, 0xD83D, 0xDC68 }, { 0xD83D, 0xDC8F });
+	insert({0xD83D, 0xDC69, 0x200D, 0x2764, 0xFE0F, 0x200D, 0xD83D, 0xDC8B, 0x200D, 0xD83D, 0xDC68}, {0xD83D, 0xDC8F});
 
 	// :family_man_woman_boy:
-	insert({ 0xD83D, 0xDC68, 0x200D, 0xD83D, 0xDC69, 0x200D, 0xD83D, 0xDC66 }, { 0xD83D, 0xDC6A });
+	insert({0xD83D, 0xDC68, 0x200D, 0xD83D, 0xDC69, 0x200D, 0xD83D, 0xDC66}, {0xD83D, 0xDC6A});
 
 	// :couple_with_heart_woman_man:
-	insert({ 0xD83D, 0xDC69, 0x200D, 0x2764, 0xFE0F, 0x200D, 0xD83D, 0xDC68 }, { 0xD83D, 0xDC91 });
+	insert({0xD83D, 0xDC69, 0x200D, 0x2764, 0xFE0F, 0x200D, 0xD83D, 0xDC68}, {0xD83D, 0xDC91});
 
 	auto insertFlag = [insert](char ch1, char ch2, char ch3, char ch4) {
-		insert({ 0xD83C, 0xDDE6 + (ch1 - 'a'), 0xD83C, 0xDDe6 + (ch2 - 'a') }, { 0xD83C, 0xDDE6 + (ch3 - 'a'), 0xD83C, 0xDDe6 + (ch4 - 'a') });
+		insert({0xD83C, 0xDDE6 + (ch1 - 'a'), 0xD83C, 0xDDe6 + (ch2 - 'a')},
+		       {0xD83C, 0xDDE6 + (ch3 - 'a'), 0xD83C, 0xDDe6 + (ch4 - 'a')});
 	};
 	insertFlag('a', 'c', 's', 'h');
 	insertFlag('b', 'v', 'n', 'o');
@@ -299,7 +300,8 @@ Replaces PrepareReplaces(const QString &filename) {
 	auto error = QJsonParseError();
 	auto document = QJsonDocument::fromJson(content, &error);
 	if (error.error != QJsonParseError::NoError) {
-		logReplacesError(filename) << "Could not parse data (" << int(error.error) << "): " << error.errorString().toStdString();
+		logReplacesError(filename) << "Could not parse data (" << int(error.error)
+		                           << "): " << error.errorString().toStdString();
 		return result;
 	}
 	if (!document.isObject()) {
@@ -318,7 +320,8 @@ Replaces PrepareReplaces(const QString &filename) {
 		auto getString = [filename, childKey, &child, &failed](const QString &key) {
 			auto it = child.constFind(key);
 			if (it == child.constEnd() || !(*it).isString()) {
-				logReplacesError(filename) << "Child '" << childKey.toStdString() << "' field not found: " << key.toStdString();
+				logReplacesError(filename)
+				    << "Child '" << childKey.toStdString() << "' field not found: " << key.toStdString();
 				failed = true;
 				return QString();
 			}
@@ -335,12 +338,14 @@ Replaces PrepareReplaces(const QString &filename) {
 			return Replaces(filename);
 		}
 		if (!RegExpCode.match(replacement).hasMatch()) {
-			logReplacesError(filename) << "Child '" << childKey.toStdString() << "' alpha_code invalid: " << replacement.toStdString();
+			logReplacesError(filename) << "Child '" << childKey.toStdString()
+			                           << "' alpha_code invalid: " << replacement.toStdString();
 			return Replaces(filename);
 		}
 		for (auto &alias : aliases) {
 			if (!RegExpCode.match(alias).hasMatch()) {
-				logReplacesError(filename) << "Child '" << childKey.toStdString() << "' alias invalid: " << alias.toStdString();
+				logReplacesError(filename)
+				    << "Child '" << childKey.toStdString() << "' alias invalid: " << alias.toStdString();
 				return Replaces(filename);
 			}
 		}
@@ -349,13 +354,15 @@ Replaces PrepareReplaces(const QString &filename) {
 			auto ok = true;
 			auto utf32 = idPart.toInt(&ok, 0x10);
 			if (!ok || !RegExpHex.match(idPart).hasMatch()) {
-				logReplacesError(filename) << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
+				logReplacesError(filename)
+				    << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
 				return Replaces(filename);
 			}
 			if (utf32 >= 0 && utf32 < 0x10000) {
 				auto ch = QChar(ushort(utf32));
 				if (ch.isLowSurrogate() || ch.isHighSurrogate()) {
-					logReplacesError(filename) << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
+					logReplacesError(filename)
+					    << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
 					return Replaces(filename);
 				}
 				id.append(ch);
@@ -365,7 +372,8 @@ Replaces PrepareReplaces(const QString &filename) {
 				id.append(QChar(ushort(hi)));
 				id.append(QChar(ushort(lo)));
 			} else {
-				logReplacesError(filename) << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
+				logReplacesError(filename)
+				    << "Child '" << childKey.toStdString() << "' output part invalid: " << idPart.toStdString();
 				return Replaces(filename);
 			}
 		}
@@ -382,13 +390,13 @@ Replaces PrepareReplaces(const QString &filename) {
 			}
 		}
 	}
-	if (!AddReplacement(result, ComposeString({ 0xD83D, 0xDC4D }), ":like:", "thumbs up")) {
+	if (!AddReplacement(result, ComposeString({0xD83D, 0xDC4D}), ":like:", "thumbs up")) {
 		return Replaces(filename);
 	}
-	if (!AddReplacement(result, ComposeString({ 0xD83D, 0xDC4E }), ":dislike:", "thumbs down")) {
+	if (!AddReplacement(result, ComposeString({0xD83D, 0xDC4E}), ":dislike:", "thumbs down")) {
 		return Replaces(filename);
 	}
-	if (!AddReplacement(result, ComposeString({ 0xD83E, 0xDD14 }), ":hmm:", "thinking")) {
+	if (!AddReplacement(result, ComposeString({0xD83E, 0xDD14}), ":hmm:", "thinking")) {
 		return Replaces(filename);
 	}
 	return result;
@@ -397,9 +405,7 @@ Replaces PrepareReplaces(const QString &filename) {
 bool CheckAndConvertReplaces(Replaces &replaces, const Data &data) {
 	auto result = Replaces(replaces.filename);
 	auto sorted = QMap<Id, Replace>();
-	auto findId = [&data](const Id &id) {
-		return data.map.find(id) != data.map.cend();
-	};
+	auto findId = [&data](const Id &id) { return data.map.find(id) != data.map.cend(); };
 	auto findAndSort = [findId, &data, &sorted](Id id, const Replace &replace) {
 		if (!findId(id)) {
 			id.replace(QChar(0xFE0F), QString());
@@ -419,8 +425,8 @@ bool CheckAndConvertReplaces(Replaces &replaces, const Data &data) {
 
 	// Find all replaces in data.map, adjust id if necessary.
 	// Store all replaces in sorted map to find them fast afterwards.
-	auto maleModifier = ComposeString({ 0x200D, 0x2642, 0xFE0F });
-	auto femaleModifier = ComposeString({ 0x200D, 0x2640, 0xFE0F });
+	auto maleModifier = ComposeString({0x200D, 0x2642, 0xFE0F});
+	auto femaleModifier = ComposeString({0x200D, 0x2640, 0xFE0F});
 	for (auto &replace : replaces.list) {
 		if (findAndSort(replace.id, replace)) {
 			continue;
@@ -437,7 +443,8 @@ bool CheckAndConvertReplaces(Replaces &replaces, const Data &data) {
 			}
 		} else if (findId(replace.id + maleModifier)) {
 			if (findId(replace.id + femaleModifier)) {
-				logReplacesError(replaces.filename) << "Replace '" << replace.replacement.toStdString() << "' ambiguous.";
+				logReplacesError(replaces.filename)
+				    << "Replace '" << replace.replacement.toStdString() << "' ambiguous.";
 				return false;
 			} else {
 				findAndSort(replace.id + maleModifier, replace);
diff --git a/Telegram/SourceFiles/codegen/emoji/replaces.h b/Telegram/SourceFiles/codegen/emoji/replaces.h
index de34956e1..ee0e8b5b6 100644
--- a/Telegram/SourceFiles/codegen/emoji/replaces.h
+++ b/Telegram/SourceFiles/codegen/emoji/replaces.h
@@ -34,8 +34,8 @@ struct Replace {
 };
 
 struct Replaces {
-	Replaces(const QString &filename) : filename(filename) {
-	}
+	Replaces(const QString &filename)
+	    : filename(filename) {}
 	QString filename;
 	QVector<Replace> list;
 };
diff --git a/Telegram/SourceFiles/codegen/lang/generator.cpp b/Telegram/SourceFiles/codegen/lang/generator.cpp
index c8cf983d5..9b2d8fb43 100644
--- a/Telegram/SourceFiles/codegen/lang/generator.cpp
+++ b/Telegram/SourceFiles/codegen/lang/generator.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/lang/generator.h"
 
-#include <memory>
-#include <functional>
 #include <QtCore/QDir>
 #include <QtCore/QSet>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
+#include <functional>
+#include <memory>
 
 namespace codegen {
 namespace lang {
@@ -41,11 +41,11 @@ char hexChar(uchar ch) {
 }
 
 char hexSecondChar(char ch) {
-	return hexChar((*reinterpret_cast<uchar*>(&ch)) & 0x0F);
+	return hexChar((*reinterpret_cast<uchar *>(&ch)) & 0x0F);
 }
 
 char hexFirstChar(char ch) {
-	return hexChar((*reinterpret_cast<uchar*>(&ch)) >> 4);
+	return hexChar((*reinterpret_cast<uchar *>(&ch)) >> 4);
 }
 
 QString stringToEncodedString(const QString &str) {
@@ -107,18 +107,17 @@ QString stringToBinaryArray(const std::string &str) {
 } // namespace
 
 Generator::Generator(const LangPack &langpack, const QString &destBasePath, const common::ProjectInfo &project)
-: langpack_(langpack)
-, basePath_(destBasePath)
-, baseName_(QFileInfo(basePath_).baseName())
-, project_(project) {
-}
+    : langpack_(langpack)
+    , basePath_(destBasePath)
+    , baseName_(QFileInfo(basePath_).baseName())
+    , project_(project) {}
 
 bool Generator::writeHeader() {
 	header_ = std::make_unique<common::CppFile>(basePath_ + ".h", project_);
 
-    header_->include("utility", true);
-    header_->include("QString", true);
-    header_->include("QLatin1String", true);
+	header_->include("utility", true);
+	header_->include("QString", true);
+	header_->include("QLatin1String", true);
 
 	header_->include("lang/lang_tag.h").newline().pushNamespace("Lang").stream() << "\
 \n\
@@ -155,27 +154,33 @@ QString lang(LangKey key);\n\
 		for (auto &tagData : entry.tags) {
 			auto &tag = tagData.tag;
 			auto isPluralTag = isPlural && (tag == kPluralTag);
-			genericParams.push_back("lngtag_" + tag + ", " + (isPluralTag ? "double " : "const ResultString &") + tag + "__val");
+			genericParams.push_back("lngtag_" + tag + ", " + (isPluralTag ? "double " : "const ResultString &") + tag +
+			                        "__val");
 			params.push_back("lngtag_" + tag + ", " + (isPluralTag ? "double " : "const QString &") + tag + "__val");
 			if (isPluralTag) {
 				plural = "\tauto plural = Lang::Plural(" + key + ", " + kPluralTag + "__val);\n";
-				applyTags.push_back("\tresult = Lang::ReplaceTag<ResultString>::Call(std::move(result), lt_" + tag + ", Lang::StartReplacements<ResultString>::Call(std::move(plural.replacement)));\n");
+				applyTags.push_back("\tresult = Lang::ReplaceTag<ResultString>::Call(std::move(result), lt_" + tag +
+				                    ", Lang::StartReplacements<ResultString>::Call(std::move(plural.replacement)));\n");
 			} else {
 				nonPluralTagFound = true;
-				applyTags.push_back("\tresult = Lang::ReplaceTag<ResultString>::Call(std::move(result), lt_" + tag + ", " + tag + "__val);\n");
+				applyTags.push_back("\tresult = Lang::ReplaceTag<ResultString>::Call(std::move(result), lt_" + tag +
+				                    ", " + tag + "__val);\n");
 			}
 		}
 		if (!entry.tags.empty() && (!isPlural || key == ComputePluralKey(entry.keyBase, 0))) {
 			auto initialString = isPlural ? ("std::move(plural.string)") : ("lang(" + getFullKey(entry) + ")");
 			header_->stream() << "\
 template <typename ResultString>\n\
-inline ResultString " << (isPlural ? entry.keyBase : key) << "__generic(" << genericParams.join(QString(", ")) << ") {\n\
+inline ResultString " << (isPlural ? entry.keyBase : key)
+			                  << "__generic(" << genericParams.join(QString(", ")) << ") {\n\
 " << plural << "\
-	auto result = Lang::StartReplacements<ResultString>::Call(" << initialString << ");\n\
+	auto result = Lang::StartReplacements<ResultString>::Call("
+			                  << initialString << ");\n\
 " << applyTags.join(QString()) << "\
 	return result;\n\
 }\n\
-constexpr auto " << (isPlural ? entry.keyBase : key) << " = &" << (isPlural ? entry.keyBase : key) << "__generic<QString>;\n\
+constexpr auto " << (isPlural ? entry.keyBase : key)
+			                  << " = &" << (isPlural ? entry.keyBase : key) << "__generic<QString>;\n\
 \n";
 		}
 	}
@@ -261,9 +266,7 @@ ushort GetTagIndex(QLatin1String tag) {\n\
 		tagsSet.insert(tag.tag);
 	}
 
-	writeSetSearch(tagsSet, [](const QString &tag) {
-		return "lt_" + tag;
-	}, "kTagsCount");
+	writeSetSearch(tagsSet, [](const QString &tag) { return "lt_" + tag; }, "kTagsCount");
 
 	source_->stream() << "\
 }\n\
@@ -290,10 +293,12 @@ LangKey GetKeyIndex(QLatin1String key) {\n\
 		}
 	}
 
-	writeSetSearch(keysSet, [&taggedKeys](const QString &key) {
-		auto it = taggedKeys.find(key);
-		return (it != taggedKeys.end()) ? it->second : key;
-	}, "kLangKeysCount");
+	writeSetSearch(keysSet,
+	               [&taggedKeys](const QString &key) {
+		               auto it = taggedKeys.find(key);
+		               return (it != taggedKeys.end()) ? it->second : key;
+	               },
+	               "kLangKeysCount");
 
 	source_->stream() << "\
 }\n\
@@ -313,11 +318,13 @@ bool IsTagReplaced(LangKey key, ushort tag) {\n\
 			lastWrittenPluralEntry = entry.keyBase;
 			for (auto i = 0; i != kPluralPartCount; ++i) {
 				source_->stream() << "\
-	case " << ComputePluralKey(entry.keyBase, i) << ":" << ((i + 1 == kPluralPartCount) ? " {" : "") << "\n";
+	case " << ComputePluralKey(entry.keyBase, i)
+				                  << ":" << ((i + 1 == kPluralPartCount) ? " {" : "") << "\n";
 			}
 		} else {
 			source_->stream() << "\
-	case " << getFullKey(entry) << ": {\n";
+	case " << getFullKey(entry)
+			                  << ": {\n";
 		}
 		source_->stream() << "\
 		switch (tag) {\n";
@@ -348,10 +355,9 @@ QString GetOriginalValue(LangKey key) {\n\
 }
 
 template <typename ComputeResult>
-void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &set, ComputeResult computeResult, const QString &invalidResult) {
-	auto tabs = [](int size) {
-		return QString(size, '\t');
-	};
+void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &set, ComputeResult computeResult,
+                               const QString &invalidResult) {
+	auto tabs = [](int size) { return QString(size, '\t'); };
 
 	enum class UsedCheckType {
 		Switch,
@@ -434,8 +440,8 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
 			auto usedIfForCheckCount = 0;
 			auto minimalLengthCheck = countMinimalLength(i, e, checking);
 			for (; checking + usedIfForCheckCount != name.size(); ++usedIfForCheckCount) {
-				if (!canUseIfForCheck(i, e, checking + usedIfForCheckCount)
-					|| countMinimalLength(i, e, checking + usedIfForCheckCount) != minimalLengthCheck) {
+				if (!canUseIfForCheck(i, e, checking + usedIfForCheckCount) ||
+				    countMinimalLength(i, e, checking + usedIfForCheckCount) != minimalLengthCheck) {
 					break;
 				}
 			}
@@ -444,15 +450,22 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
 			if (weContinueOldSwitch) {
 				weContinueOldSwitch = false;
 			} else {
-				checkLengthCondition = (minimalLengthCheck > checkLengthHistory.back()) ? ("size >= " + QString::number(minimalLengthCheck)) : QString();
+				checkLengthCondition = (minimalLengthCheck > checkLengthHistory.back()) ?
+				                           ("size >= " + QString::number(minimalLengthCheck)) :
+				                           QString();
 				if (!usedIfForCheck) {
-					source_->stream() << tabs(tabsUsed) << (checkLengthCondition.isEmpty() ? QString() : ("if (" + checkLengthCondition + ") ")) << "switch (data[" << checking << "]) {\n";
+					source_->stream() << tabs(tabsUsed)
+					                  << (checkLengthCondition.isEmpty() ? QString() :
+					                                                       ("if (" + checkLengthCondition + ") "))
+					                  << "switch (data[" << checking << "]) {\n";
 				}
 			}
 			if (usedIfForCheck) {
 				auto conditions = QStringList();
 				if (usedIfForCheckCount > 1) {
-					conditions.push_back("!memcmp(data + " + QString::number(checking) + ", \"" + name.mid(checking, usedIfForCheckCount) + "\", " + QString::number(usedIfForCheckCount) + ")");
+					conditions.push_back("!memcmp(data + " + QString::number(checking) + ", \"" +
+					                     name.mid(checking, usedIfForCheckCount) + "\", " +
+					                     QString::number(usedIfForCheckCount) + ")");
 				} else {
 					conditions.push_back("data[" + QString::number(checking) + "] == '" + keyChar + "'");
 				}
@@ -475,13 +488,15 @@ void Generator::writeSetSearch(const std::set<QString, std::greater<QString>> &s
 			chars.push_back(keyChar);
 			checkLengthHistory.push_back(std::max(minimalLengthCheck, checkLengthHistory.back()));
 		}
-		source_->stream() << tabs(tabsUsed) << "return (size == " << chars.size() << ") ? " << computeResult(name) << " : " << invalidResult << ";\n";
+		source_->stream() << tabs(tabsUsed) << "return (size == " << chars.size() << ") ? " << computeResult(name)
+		                  << " : " << invalidResult << ";\n";
 	}
 	finishChecksTillKey(QString());
 
 	source_->stream() << "\
 \n\
-	return " << invalidResult << ";\n";
+	return " << invalidResult
+	                  << ";\n";
 }
 
 QString Generator::getFullKey(const LangPack::Entry &entry) {
diff --git a/Telegram/SourceFiles/codegen/lang/generator.h b/Telegram/SourceFiles/codegen/lang/generator.h
index e5f868176..92412536a 100644
--- a/Telegram/SourceFiles/codegen/lang/generator.h
+++ b/Telegram/SourceFiles/codegen/lang/generator.h
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <map>
-#include <set>
-#include <functional>
-#include <QtCore/QString>
-#include <QtCore/QSet>
 #include "codegen/common/cpp_file.h"
 #include "codegen/lang/parsed_file.h"
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <functional>
+#include <map>
+#include <memory>
+#include <set>
 
 namespace codegen {
 namespace lang {
@@ -45,13 +45,13 @@ private:
 	QString getFullKey(const LangPack::Entry &entry);
 
 	template <typename ComputeResult>
-	void writeSetSearch(const std::set<QString, std::greater<QString>> &set, ComputeResult computeResult, const QString &invalidResult);
+	void writeSetSearch(const std::set<QString, std::greater<QString>> &set, ComputeResult computeResult,
+	                    const QString &invalidResult);
 
 	const LangPack &langpack_;
 	QString basePath_, baseName_;
 	const common::ProjectInfo &project_;
 	std::unique_ptr<common::CppFile> source_, header_;
-
 };
 
 } // namespace lang
diff --git a/Telegram/SourceFiles/codegen/lang/options.cpp b/Telegram/SourceFiles/codegen/lang/options.cpp
index a9cf04e51..ceca6c6fa 100644
--- a/Telegram/SourceFiles/codegen/lang/options.cpp
+++ b/Telegram/SourceFiles/codegen/lang/options.cpp
@@ -20,19 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/lang/options.h"
 
-#include <ostream>
+#include "codegen/common/logging.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
-#include "codegen/common/logging.h"
+#include <ostream>
 
 namespace codegen {
 namespace lang {
 namespace {
 
-constexpr int kErrorOutputPathExpected      = 902;
-constexpr int kErrorInputPathExpected       = 903;
+constexpr int kErrorOutputPathExpected = 902;
+constexpr int kErrorInputPathExpected = 903;
 constexpr int kErrorSingleInputPathExpected = 904;
-constexpr int kErrorWorkingPathExpected     = 905;
+constexpr int kErrorWorkingPathExpected = 905;
 
 } // namespace
 
@@ -55,7 +55,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-o")) {
 			result.outputPath = arg.mid(2);
 
-		// Working path
+			// Working path
 		} else if (arg == "-w") {
 			if (++i == count) {
 				logError(kErrorWorkingPathExpected, "Command Line") << "working path expected after -w";
@@ -66,7 +66,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-w")) {
 			common::logSetWorkingPath(arg.mid(2));
 
-		// Input path
+			// Input path
 		} else {
 			if (result.inputPath.isEmpty()) {
 				result.inputPath = arg;
diff --git a/Telegram/SourceFiles/codegen/lang/parsed_file.cpp b/Telegram/SourceFiles/codegen/lang/parsed_file.cpp
index a2833ff53..668a5ba86 100644
--- a/Telegram/SourceFiles/codegen/lang/parsed_file.cpp
+++ b/Telegram/SourceFiles/codegen/lang/parsed_file.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/lang/parsed_file.h"
 
-#include <iostream>
-#include <QtCore/QMap>
-#include <QtCore/QDir>
-#include <QtCore/QRegularExpression>
 #include "codegen/common/basic_tokenized_file.h"
 #include "codegen/common/logging.h"
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+#include <QtCore/QRegularExpression>
+#include <iostream>
 
 namespace codegen {
 namespace lang {
@@ -34,7 +34,7 @@ namespace {
 using BasicToken = codegen::common::BasicTokenizedFile::Token;
 using BasicType = BasicToken::Type;
 
-constexpr int kErrorBadString          = 806;
+constexpr int kErrorBadString = 806;
 
 bool ValidateAnsiString(const QString &value) {
 	for (auto ch : value) {
@@ -46,7 +46,8 @@ bool ValidateAnsiString(const QString &value) {
 }
 
 bool ValidateKey(const QString &key) {
-	static const auto validator = QRegularExpression("^[a-z0-9_.-]+(#(one|other))?$", QRegularExpression::CaseInsensitiveOption);
+	static const auto validator =
+	    QRegularExpression("^[a-z0-9_.-]+(#(one|other))?$", QRegularExpression::CaseInsensitiveOption);
 	if (!validator.match(key).hasMatch()) {
 		return false;
 	}
@@ -78,14 +79,14 @@ QString PrepareCommandString(int index) {
 
 } // namespace
 
-const std::array<QString, kPluralPartCount> kPluralParts = { {
-	"zero",
-	"one",
-	"two",
-	"few",
-	"many",
-	"other",
-} };
+const std::array<QString, kPluralPartCount> kPluralParts = {{
+    "zero",
+    "one",
+    "two",
+    "few",
+    "many",
+    "other",
+}};
 
 const QString kPluralTag = "count";
 
@@ -94,10 +95,9 @@ QString ComputePluralKey(const QString &base, int index) {
 }
 
 ParsedFile::ParsedFile(const Options &options)
-: filePath_(options.inputPath)
-, file_(filePath_)
-, options_(options) {
-}
+    : filePath_(options.inputPath)
+    , file_(filePath_)
+    , options_(options) {}
 
 bool ParsedFile::read() {
 	if (!file_.read()) {
@@ -232,7 +232,7 @@ QString ParsedFile::extractTagData(const QString &tagText, LangPack *to) {
 		++index;
 	}
 	if (tagIndex == result_.tags.size()) {
-		result_.tags.push_back({ tag });
+		result_.tags.push_back({tag});
 	}
 	if (numericPart > 0) {
 		auto numericParts = tagText.mid(numericPart + 1).split('|');
@@ -245,14 +245,15 @@ QString ParsedFile::extractTagData(const QString &tagText, LangPack *to) {
 			auto numericPartEntry = LangPack::Entry();
 			numericPartEntry.key = tag + QString::number(index++);
 			if (part.indexOf('#') != part.lastIndexOf('#')) {
-				logErrorBadString() << "bad option for plural key part in tag: '" << tagText.toStdString() << "', too many '#'.";
+				logErrorBadString() << "bad option for plural key part in tag: '" << tagText.toStdString()
+				                    << "', too many '#'.";
 				return QString();
 			}
 			numericPartEntry.value = part.replace('#', PrepareCommandString(tagIndex));
 			to->entries.push_back(numericPartEntry);
 		}
 	}
-	to->tags.push_back({ tag });
+	to->tags.push_back({tag});
 	return PrepareCommandString(tagIndex);
 }
 
@@ -263,7 +264,8 @@ void ParsedFile::addEntity(QString key, const QString &value) {
 		auto pluralPart = key.mid(pluralPartOffset + 1);
 		pluralIndex = std::find(kPluralParts.begin(), kPluralParts.end(), pluralPart) - kPluralParts.begin();
 		if (pluralIndex < 0 || pluralIndex >= kPluralParts.size()) {
-			logError(kErrorBadString) << "bad plural part for key '" << key.toStdString() << "': '" << pluralPart.toStdString() << "'";
+			logError(kErrorBadString) << "bad plural part for key '" << key.toStdString() << "': '"
+			                          << pluralPart.toStdString() << "'";
 			return;
 		}
 		key = key.mid(0, pluralPartOffset);
@@ -321,7 +323,7 @@ void ParsedFile::addEntity(QString key, const QString &value) {
 		realEntry.value = entry.value;
 
 		// Add all new tags to the existing ones.
-		realEntry.tags = std::vector<LangPack::Tag>(1, LangPack::Tag { kPluralTag });
+		realEntry.tags = std::vector<LangPack::Tag>(1, LangPack::Tag{kPluralTag});
 		for (auto &tag : entry.tags) {
 			if (std::find(realEntry.tags.begin(), realEntry.tags.end(), tag) == realEntry.tags.end()) {
 				realEntry.tags.push_back(tag);
diff --git a/Telegram/SourceFiles/codegen/lang/parsed_file.h b/Telegram/SourceFiles/codegen/lang/parsed_file.h
index a638d34c1..b34c9f87e 100644
--- a/Telegram/SourceFiles/codegen/lang/parsed_file.h
+++ b/Telegram/SourceFiles/codegen/lang/parsed_file.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <string>
-#include <array>
-#include <functional>
-#include <QImage>
 #include "codegen/common/basic_tokenized_file.h"
 #include "codegen/lang/options.h"
+#include <QImage>
+#include <array>
+#include <functional>
+#include <memory>
+#include <string>
 
 namespace codegen {
 namespace lang {
@@ -48,7 +48,6 @@ struct LangPack {
 	};
 	std::vector<Entry> entries;
 	std::vector<Tag> tags;
-
 };
 
 inline bool operator==(const LangPack::Tag &a, const LangPack::Tag &b) {
@@ -109,7 +108,6 @@ private:
 	Options options_;
 	bool failed_ = false;
 	LangPack result_;
-
 };
 
 } // namespace lang
diff --git a/Telegram/SourceFiles/codegen/lang/processor.cpp b/Telegram/SourceFiles/codegen/lang/processor.cpp
index 87a87c18a..f3d5a1c34 100644
--- a/Telegram/SourceFiles/codegen/lang/processor.cpp
+++ b/Telegram/SourceFiles/codegen/lang/processor.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/lang/processor.h"
 
+#include "codegen/common/cpp_file.h"
+#include "codegen/lang/generator.h"
+#include "codegen/lang/parsed_file.h"
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include "codegen/common/cpp_file.h"
-#include "codegen/lang/parsed_file.h"
-#include "codegen/lang/generator.h"
 
 namespace codegen {
 namespace lang {
@@ -35,9 +35,8 @@ constexpr int kErrorCantWritePath = 821;
 } // namespace
 
 Processor::Processor(const Options &options)
-: parser_(std::make_unique<ParsedFile>(options))
-, options_(options) {
-}
+    : parser_(std::make_unique<ParsedFile>(options))
+    , options_(options) {}
 
 int Processor::launch() {
 	if (!parser_->read()) {
@@ -55,18 +54,15 @@ bool Processor::write(const LangPack &langpack) const {
 	bool forceReGenerate = false;
 	QDir dir(options_.outputPath);
 	if (!dir.mkpath(".")) {
-		common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
+		common::logError(kErrorCantWritePath, "Command Line")
+		    << "can not open path for writing: " << dir.absolutePath().toStdString();
 		return false;
 	}
 
 	QFileInfo srcFile(options_.inputPath);
 	QString dstFilePath = dir.absolutePath() + "/lang_auto";
 
-	common::ProjectInfo project = {
-		"codegen_style",
-		srcFile.fileName(),
-		forceReGenerate
-	};
+	common::ProjectInfo project = {"codegen_style", srcFile.fileName(), forceReGenerate};
 
 	Generator generator(langpack, dstFilePath, project);
 	if (!generator.writeHeader()) {
diff --git a/Telegram/SourceFiles/codegen/lang/processor.h b/Telegram/SourceFiles/codegen/lang/processor.h
index d885495d1..7b9d5a6d3 100644
--- a/Telegram/SourceFiles/codegen/lang/processor.h
+++ b/Telegram/SourceFiles/codegen/lang/processor.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <QtCore/QString>
 #include "codegen/lang/options.h"
+#include <QtCore/QString>
+#include <memory>
 
 namespace codegen {
 namespace lang {
@@ -46,7 +46,6 @@ private:
 
 	std::unique_ptr<ParsedFile> parser_;
 	const Options &options_;
-
 };
 
 } // namespace lang
diff --git a/Telegram/SourceFiles/codegen/numbers/generator.cpp b/Telegram/SourceFiles/codegen/numbers/generator.cpp
index 6cfea5765..71e2deed3 100644
--- a/Telegram/SourceFiles/codegen/numbers/generator.cpp
+++ b/Telegram/SourceFiles/codegen/numbers/generator.cpp
@@ -26,20 +26,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace codegen {
 namespace numbers {
-namespace {
-
-} // namespace
+namespace {} // namespace
 
 Generator::Generator(const Rules &rules, const QString &destBasePath, const common::ProjectInfo &project)
-: rules_(rules)
-, basePath_(destBasePath)
-, project_(project) {
-}
+    : rules_(rules)
+    , basePath_(destBasePath)
+    , project_(project) {}
 
 bool Generator::writeHeader() {
 	header_ = std::make_unique<common::CppFile>(basePath_ + ".h", project_);
 
-    header_->include("QString", true);
+	header_->include("QString", true);
 	header_->stream() << "QVector<int> phoneNumberParse(const QString &number);\n";
 
 	return header_->finalize();
@@ -48,7 +45,7 @@ bool Generator::writeHeader() {
 bool Generator::writeSource() {
 	source_ = std::make_unique<common::CppFile>(basePath_ + ".cpp", project_);
 
-    source_->include("QVector", true);
+	source_->include("QVector", true);
 	source_->stream() << "\
 QVector<int> phoneNumberParse(const QString &number) {\n\
 	QVector<int> result;\n\
@@ -74,19 +71,26 @@ QVector<int> phoneNumberParse(const QString &number) {\n\
 		} else {
 			bool onlyFirstCheck = true;
 			while (already.size() < k.size()) {
-				if (!onlyFirstCheck) source_->stream() << QString("\t").repeated(1 + already.size()) << "if (len > " << already.size() << ") switch (number.at(" << already.size() << ").unicode()) {\n";
-				source_->stream() << QString("\t").repeated(1 + already.size()) << "case '" << k.at(already.size()).toLatin1() << "':\n";
+				if (!onlyFirstCheck)
+					source_->stream() << QString("\t").repeated(1 + already.size()) << "if (len > " << already.size()
+					                  << ") switch (number.at(" << already.size() << ").unicode()) {\n";
+				source_->stream() << QString("\t").repeated(1 + already.size()) << "case '"
+				                  << k.at(already.size()).toLatin1() << "':\n";
 				already.push_back(k.at(already.size()));
 				onlyFirstCheck = false;
 			}
 		}
 		if (i.value().isEmpty()) {
-			source_->stream() << QString("\t").repeated(1 + already.size()) << "return QVector<int>(1, " << k.size() << ");\n";
+			source_->stream() << QString("\t").repeated(1 + already.size()) << "return QVector<int>(1, " << k.size()
+			                  << ");\n";
 		} else {
-			source_->stream() << QString("\t").repeated(1 + already.size()) << "result.reserve(" << (i.value().size() + 1) << ");\n";
-			source_->stream() << QString("\t").repeated(1 + already.size()) << "result.push_back(" << k.size() << ");\n";
+			source_->stream() << QString("\t").repeated(1 + already.size()) << "result.reserve("
+			                  << (i.value().size() + 1) << ");\n";
+			source_->stream() << QString("\t").repeated(1 + already.size()) << "result.push_back(" << k.size()
+			                  << ");\n";
 			for (int j = 0, l = i.value().size(); j < l; ++j) {
-				source_->stream() << QString("\t").repeated(1 + already.size()) << "result.push_back(" << i.value().at(j) << ");\n";
+				source_->stream() << QString("\t").repeated(1 + already.size()) << "result.push_back("
+				                  << i.value().at(j) << ");\n";
 			}
 			source_->stream() << QString("\t").repeated(1 + already.size()) << "return result;\n";
 		}
diff --git a/Telegram/SourceFiles/codegen/numbers/generator.h b/Telegram/SourceFiles/codegen/numbers/generator.h
index 29b67a4c8..633849c4c 100644
--- a/Telegram/SourceFiles/codegen/numbers/generator.h
+++ b/Telegram/SourceFiles/codegen/numbers/generator.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <QtCore/QString>
-#include <QtCore/QSet>
 #include "codegen/common/cpp_file.h"
 #include "codegen/numbers/parsed_file.h"
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <memory>
 
 namespace codegen {
 namespace numbers {
@@ -43,7 +43,6 @@ private:
 	QString basePath_;
 	const common::ProjectInfo &project_;
 	std::unique_ptr<common::CppFile> source_, header_;
-
 };
 
 } // namespace numbers
diff --git a/Telegram/SourceFiles/codegen/numbers/options.cpp b/Telegram/SourceFiles/codegen/numbers/options.cpp
index 6495f6779..06d07d6a3 100644
--- a/Telegram/SourceFiles/codegen/numbers/options.cpp
+++ b/Telegram/SourceFiles/codegen/numbers/options.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/numbers/options.h"
 
-#include <ostream>
-#include <QtCore/QCoreApplication>
 #include "codegen/common/logging.h"
+#include <QtCore/QCoreApplication>
+#include <ostream>
 
 namespace codegen {
 namespace numbers {
 namespace {
 
-constexpr int kErrorOutputPathExpected      = 902;
-constexpr int kErrorInputPathExpected       = 903;
+constexpr int kErrorOutputPathExpected = 902;
+constexpr int kErrorInputPathExpected = 903;
 constexpr int kErrorSingleInputPathExpected = 904;
-constexpr int kErrorWorkingPathExpected     = 905;
+constexpr int kErrorWorkingPathExpected = 905;
 
 } // namespace
 
@@ -54,7 +54,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-o")) {
 			result.outputPath = arg.mid(2);
 
-		// Working path
+			// Working path
 		} else if (arg == "-w") {
 			if (++i == count) {
 				logError(kErrorWorkingPathExpected, "Command Line") << "working path expected after -w";
@@ -65,7 +65,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-w")) {
 			common::logSetWorkingPath(arg.mid(2));
 
-		// Input path
+			// Input path
 		} else {
 			if (result.inputPath.isEmpty()) {
 				result.inputPath = arg;
diff --git a/Telegram/SourceFiles/codegen/numbers/parsed_file.cpp b/Telegram/SourceFiles/codegen/numbers/parsed_file.cpp
index 2f6516d8e..89cad3224 100644
--- a/Telegram/SourceFiles/codegen/numbers/parsed_file.cpp
+++ b/Telegram/SourceFiles/codegen/numbers/parsed_file.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/numbers/parsed_file.h"
 
-#include <iostream>
-#include <QtCore/QMap>
-#include <QtCore/QDir>
-#include <QtCore/QRegularExpression>
 #include "codegen/common/basic_tokenized_file.h"
-#include "codegen/common/logging.h"
-#include "codegen/common/clean_file_reader.h"
 #include "codegen/common/checked_utf8_string.h"
+#include "codegen/common/clean_file_reader.h"
+#include "codegen/common/logging.h"
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+#include <QtCore/QRegularExpression>
+#include <iostream>
 
 using BasicToken = codegen::common::BasicTokenizedFile::Token;
 using BasicType = BasicToken::Type;
@@ -59,10 +59,9 @@ QByteArray replaceStrings(const QString &filepath) {
 } // namespace
 
 ParsedFile::ParsedFile(const Options &options)
-: content_(replaceStrings(options.inputPath))
-, file_(content_, options.inputPath)
-, options_(options) {
-}
+    : content_(replaceStrings(options.inputPath))
+    , file_(content_, options.inputPath)
+    , options_(options) {}
 
 bool ParsedFile::read() {
 	if (content_.isEmpty() || !file_.read()) {
diff --git a/Telegram/SourceFiles/codegen/numbers/parsed_file.h b/Telegram/SourceFiles/codegen/numbers/parsed_file.h
index c4703b5ed..8d4d951d9 100644
--- a/Telegram/SourceFiles/codegen/numbers/parsed_file.h
+++ b/Telegram/SourceFiles/codegen/numbers/parsed_file.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <string>
 #include "codegen/common/basic_tokenized_file.h"
 #include "codegen/numbers/options.h"
+#include <memory>
+#include <string>
 
 namespace codegen {
 namespace numbers {
@@ -47,7 +47,6 @@ public:
 	}
 
 private:
-
 	bool failed() const {
 		return failed_ || file_.failed();
 	}
@@ -67,7 +66,6 @@ private:
 	Options options_;
 	bool failed_ = false;
 	Rules result_;
-
 };
 
 } // namespace numbers
diff --git a/Telegram/SourceFiles/codegen/numbers/processor.cpp b/Telegram/SourceFiles/codegen/numbers/processor.cpp
index 5bbc1f715..ed0cef5e2 100644
--- a/Telegram/SourceFiles/codegen/numbers/processor.cpp
+++ b/Telegram/SourceFiles/codegen/numbers/processor.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/numbers/processor.h"
 
+#include "codegen/common/cpp_file.h"
+#include "codegen/numbers/generator.h"
+#include "codegen/numbers/parsed_file.h"
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include "codegen/common/cpp_file.h"
-#include "codegen/numbers/parsed_file.h"
-#include "codegen/numbers/generator.h"
 
 namespace codegen {
 namespace numbers {
@@ -35,9 +35,8 @@ constexpr int kErrorCantWritePath = 851;
 } // namespace
 
 Processor::Processor(const Options &options)
-: parser_(std::make_unique<ParsedFile>(options))
-, options_(options) {
-}
+    : parser_(std::make_unique<ParsedFile>(options))
+    , options_(options) {}
 
 int Processor::launch() {
 	if (!parser_->read()) {
@@ -55,7 +54,8 @@ int Processor::launch() {
 bool Processor::write(const Rules &rules) const {
 	QDir dir(options_.outputPath);
 	if (!dir.mkpath(".")) {
-		common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
+		common::logError(kErrorCantWritePath, "Command Line")
+		    << "can not open path for writing: " << dir.absolutePath().toStdString();
 		return false;
 	}
 
@@ -63,9 +63,8 @@ bool Processor::write(const Rules &rules) const {
 	QString dstFilePath = dir.absolutePath() + "/numbers";
 
 	common::ProjectInfo project = {
-		"codegen_style",
-		srcFile.fileName(),
-		false, // forceReGenerate
+	    "codegen_style", srcFile.fileName(),
+	    false, // forceReGenerate
 	};
 
 	Generator generator(rules, dstFilePath, project);
diff --git a/Telegram/SourceFiles/codegen/numbers/processor.h b/Telegram/SourceFiles/codegen/numbers/processor.h
index b4ac662ae..761280040 100644
--- a/Telegram/SourceFiles/codegen/numbers/processor.h
+++ b/Telegram/SourceFiles/codegen/numbers/processor.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <QtCore/QString>
 #include "codegen/numbers/options.h"
+#include <QtCore/QString>
+#include <memory>
 
 namespace codegen {
 namespace numbers {
@@ -46,7 +46,6 @@ private:
 
 	std::unique_ptr<ParsedFile> parser_;
 	const Options &options_;
-
 };
 
 } // namespace numbers
diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp
index e5cb9e9ca..2cd12a962 100644
--- a/Telegram/SourceFiles/codegen/style/generator.cpp
+++ b/Telegram/SourceFiles/codegen/style/generator.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/style/generator.h"
 
-#include <memory>
-#include <functional>
+#include "codegen/style/parsed_file.h"
+#include <QtCore/QBuffer>
 #include <QtCore/QDir>
 #include <QtCore/QSet>
-#include <QtCore/QBuffer>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
-#include "codegen/style/parsed_file.h"
+#include <functional>
+#include <memory>
 
 using Module = codegen::style::structure::Module;
 using Struct = codegen::style::structure::Struct;
@@ -38,8 +38,8 @@ namespace codegen {
 namespace style {
 namespace {
 
-constexpr int kErrorBadIconSize     = 861;
-constexpr int kErrorBadIconFormat   = 862;
+constexpr int kErrorBadIconSize = 861;
+constexpr int kErrorBadIconFormat = 862;
 
 // crc32 hash, taken somewhere from the internet
 
@@ -73,7 +73,6 @@ private:
 	}
 
 	quint32 _data[256];
-
 };
 
 qint32 hashCrc32(const void *data, int len) {
@@ -99,11 +98,11 @@ char hexChar(uchar ch) {
 }
 
 char hexSecondChar(char ch) {
-	return hexChar((*reinterpret_cast<uchar*>(&ch)) & 0x0F);
+	return hexChar((*reinterpret_cast<uchar *>(&ch)) & 0x0F);
 }
 
 char hexFirstChar(char ch) {
-	return hexChar((*reinterpret_cast<uchar*>(&ch)) >> 4);
+	return hexChar((*reinterpret_cast<uchar *>(&ch)) >> 4);
 }
 
 QString stringToEncodedString(const QString &str) {
@@ -198,25 +197,26 @@ QString paletteColorComponent(uchar value) {
 }
 
 QString paletteColorValue(const structure::data::color &value) {
-	auto result = paletteColorComponent(value.red) + paletteColorComponent(value.green) + paletteColorComponent(value.blue);
+	auto result =
+	    paletteColorComponent(value.red) + paletteColorComponent(value.green) + paletteColorComponent(value.blue);
 	if (value.alpha != 255) result += paletteColorComponent(value.alpha);
 	return result;
 }
 
 } // namespace
 
-Generator::Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project, bool isPalette)
-: module_(module)
-, basePath_(destBasePath)
-, baseName_(QFileInfo(basePath_).baseName())
-, project_(project)
-, isPalette_(isPalette) {
-}
+Generator::Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project,
+                     bool isPalette)
+    : module_(module)
+    , basePath_(destBasePath)
+    , baseName_(QFileInfo(basePath_).baseName())
+    , project_(project)
+    , isPalette_(isPalette) {}
 
 bool Generator::writeHeader() {
 	header_ = std::make_unique<common::CppFile>(basePath_ + ".h", project_);
 
-    header_->include("styles/style_basic.h").newline();
+	header_->include("styles/style_basic.h").newline();
 	header_->include("ui/style/style_core.h").newline();
 
 	if (!writeHeaderStyleNamespace()) {
@@ -239,13 +239,15 @@ bool Generator::writeSource() {
 		source_->stream() << "\
 bool inited = false;\n\
 \n\
-class Module_" << baseName_ << " : public style::internal::ModuleBase {\n\
+class Module_" << baseName_
+		                  << " : public style::internal::ModuleBase {\n\
 public:\n\
 	Module_" << baseName_ << "() { style::internal::registerModule(this); }\n\
 	~Module_" << baseName_ << "() { style::internal::unregisterModule(this); }\n\
 \n\
 	void start() override {\n\
-		style::internal::init_" << baseName_ << "();\n\
+		style::internal::init_"
+		                  << baseName_ << "();\n\
 	}\n\
 	void stop() override {\n\
 	}\n\
@@ -363,7 +365,11 @@ QString Generator::valueAssignmentCode(structure::Value value) const {
 	case Tag::Align: return QString("style::al_%1").arg(value.String().c_str());
 	case Tag::Margins: {
 		auto v(value.Margins());
-		return QString("{ %1, %2, %3, %4 }").arg(pxValueName(v.left)).arg(pxValueName(v.top)).arg(pxValueName(v.right)).arg(pxValueName(v.bottom));
+		return QString("{ %1, %2, %3, %4 }")
+		    .arg(pxValueName(v.left))
+		    .arg(pxValueName(v.top))
+		    .arg(pxValueName(v.right))
+		    .arg(pxValueName(v.bottom));
 	} break;
 	case Tag::Font: {
 		auto v(value.Font());
@@ -471,15 +477,17 @@ public:\n\
 
 	int indexInPalette = 1;
 	if (!module_.enumVariables([this, &indexInPalette](const Variable &variable) -> bool {
-		auto name = variable.name.back();
-		if (variable.value.type().tag != structure::TypeTag::Color) {
-			return false;
-		}
+		    auto name = variable.name.back();
+		    if (variable.value.type().tag != structure::TypeTag::Color) {
+			    return false;
+		    }
 
-		auto index = (indexInPalette++);
-		header_->stream() << "\tinline const color &get_" << name << "() const { return _colors[" << index << "]; };\n";
-		return true;
-	})) return false;
+		    auto index = (indexInPalette++);
+		    header_->stream() << "\tinline const color &get_" << name << "() const { return _colors[" << index
+		                      << "]; };\n";
+		    return true;
+	    }))
+		return false;
 
 	auto count = indexInPalette;
 	header_->stream() << "\
@@ -512,7 +520,8 @@ public:\n\
 	}\n\
 \n\
 private:\n\
-	static constexpr auto kCount = " << count << ";\n\
+	static constexpr auto kCount = "
+	                  << count << ";\n\
 \n\
 	void clear() {\n\
 		for (int i = 0; i != kCount; ++i) {\n\
@@ -629,7 +638,8 @@ bool Generator::writeStructsDefinitions() {
 
 	bool result = module_.enumStructs([this](const Struct &value) -> bool {
 		header_->stream() << "\
-struct " << value.name.back() << " {\n";
+struct " << value.name.back()
+		                  << " {\n";
 		for (auto &field : value.fields) {
 			auto type = typeToString(field.type);
 			if (type.isEmpty()) {
@@ -677,7 +687,7 @@ bool Generator::writeIncludesInSource() {
 	}
 
 	auto includes = QStringList();
-	std::function<bool(const Module&)> collector = [this, &collector, &includes](const Module &module) {
+	std::function<bool(const Module &)> collector = [this, &collector, &includes](const Module &module) {
 		module.enumIncludes(collector);
 		auto base = moduleBaseName(module);
 		if (!includes.contains(base)) {
@@ -770,37 +780,41 @@ void palette::finalize() {\n\
 	int indexInPalette = 1;
 	QByteArray checksumString;
 	checksumString.append("&transparent:{ 255, 255, 255, 0 }");
-	auto result = module_.enumVariables([this, &indexInPalette, &checksumString, &dataRows, &names](const Variable &variable) -> bool {
-		auto name = variable.name.back();
-		auto index = indexInPalette++;
-		paletteIndices_.emplace(name, index);
-		if (variable.value.type().tag != structure::TypeTag::Color) {
-			return false;
-		}
-		auto color = variable.value.Color();
-		auto fallbackIterator = paletteIndices_.find(colorFallbackName(variable.value));
-		auto fallbackIndex = (fallbackIterator == paletteIndices_.end()) ? -1 : fallbackIterator->second;
-		auto assignment = QString("{ %1, %2, %3, %4 }").arg(color.red).arg(color.green).arg(color.blue).arg(color.alpha);
-		source_->stream() << "\tcompute(" << index << ", " << fallbackIndex << ", " << assignment << ");\n";
-		checksumString.append('&' + name + ':' + assignment);
+	auto result = module_.enumVariables(
+	    [this, &indexInPalette, &checksumString, &dataRows, &names](const Variable &variable) -> bool {
+		    auto name = variable.name.back();
+		    auto index = indexInPalette++;
+		    paletteIndices_.emplace(name, index);
+		    if (variable.value.type().tag != structure::TypeTag::Color) {
+			    return false;
+		    }
+		    auto color = variable.value.Color();
+		    auto fallbackIterator = paletteIndices_.find(colorFallbackName(variable.value));
+		    auto fallbackIndex = (fallbackIterator == paletteIndices_.end()) ? -1 : fallbackIterator->second;
+		    auto assignment =
+		        QString("{ %1, %2, %3, %4 }").arg(color.red).arg(color.green).arg(color.blue).arg(color.alpha);
+		    source_->stream() << "\tcompute(" << index << ", " << fallbackIndex << ", " << assignment << ");\n";
+		    checksumString.append('&' + name + ':' + assignment);
 
-		auto isCopy = !variable.value.copyOf().isEmpty();
-		auto colorString = paletteColorValue(color);
-		auto fallbackName = QString();
-		if (fallbackIndex > 0) {
-			auto fallbackVariable = module_.findVariableInModule(names[fallbackIndex - 1], module_);
-			if (fallbackVariable && fallbackVariable->value.type().tag == structure::TypeTag::Color) {
-				fallbackName = fallbackVariable->name.back();
-			}
-		}
-		auto value = isCopy ? fallbackName : '#' + colorString;
-		if (value.isEmpty()) {
-			return false;
-		}
+		    auto isCopy = !variable.value.copyOf().isEmpty();
+		    auto colorString = paletteColorValue(color);
+		    auto fallbackName = QString();
+		    if (fallbackIndex > 0) {
+			    auto fallbackVariable = module_.findVariableInModule(names[fallbackIndex - 1], module_);
+			    if (fallbackVariable && fallbackVariable->value.type().tag == structure::TypeTag::Color) {
+				    fallbackName = fallbackVariable->name.back();
+			    }
+		    }
+		    auto value = isCopy ? fallbackName : '#' + colorString;
+		    if (value.isEmpty()) {
+			    return false;
+		    }
 
-		dataRows.append("\tresult.push_back({ qstr(\"" + name + "\"), qstr(\"" + value + "\"), qstr(\"" + (isCopy ? QString() : fallbackName) + "\"), qstr(" + stringToEncodedString(variable.description.toStdString()) + ") });\n");
-		return true;
-	});
+		    dataRows.append("\tresult.push_back({ qstr(\"" + name + "\"), qstr(\"" + value + "\"), qstr(\"" +
+		                    (isCopy ? QString() : fallbackName) + "\"), qstr(" +
+		                    stringToEncodedString(variable.description.toStdString()) + ") });\n");
+		    return true;
+	    });
 	if (!result) {
 		return false;
 	}
@@ -811,7 +825,8 @@ void palette::finalize() {\n\
 }\n\
 \n\
 qint32 palette::Checksum() {\n\
-	return " << checksum << ";\n\
+	return " << checksum
+	                  << ";\n\
 }\n";
 
 	source_->newline().pushNamespace().newline();
@@ -820,9 +835,7 @@ int getPaletteIndex(QLatin1String name) {\n\
 	auto size = name.size();\n\
 	auto data = name.data();\n";
 
-	auto tabs = [](int size) {
-		return QString(size, '\t');
-	};
+	auto tabs = [](int size) { return QString(size, '\t'); };
 
 	enum class UsedCheckType {
 		Switch,
@@ -902,8 +915,8 @@ int getPaletteIndex(QLatin1String name) {\n\
 			auto usedIfForCheckCount = 0;
 			auto minimalLengthCheck = countMinimalLength(i, e, checking);
 			for (; checking + usedIfForCheckCount != name.size(); ++usedIfForCheckCount) {
-				if (!canUseIfForCheck(i, e, checking + usedIfForCheckCount)
-					|| countMinimalLength(i, e, checking + usedIfForCheckCount) != minimalLengthCheck) {
+				if (!canUseIfForCheck(i, e, checking + usedIfForCheckCount) ||
+				    countMinimalLength(i, e, checking + usedIfForCheckCount) != minimalLengthCheck) {
 					break;
 				}
 			}
@@ -912,15 +925,22 @@ int getPaletteIndex(QLatin1String name) {\n\
 			if (weContinueOldSwitch) {
 				weContinueOldSwitch = false;
 			} else {
-				checkLengthCondition = (minimalLengthCheck > checkLengthHistory.back()) ? ("size >= " + QString::number(minimalLengthCheck)) : QString();
+				checkLengthCondition = (minimalLengthCheck > checkLengthHistory.back()) ?
+				                           ("size >= " + QString::number(minimalLengthCheck)) :
+				                           QString();
 				if (!usedIfForCheck) {
-					source_->stream() << tabs(tabsUsed) << (checkLengthCondition.isEmpty() ? QString() : ("if (" + checkLengthCondition + ") ")) << "switch (data[" << checking << "]) {\n";
+					source_->stream() << tabs(tabsUsed)
+					                  << (checkLengthCondition.isEmpty() ? QString() :
+					                                                       ("if (" + checkLengthCondition + ") "))
+					                  << "switch (data[" << checking << "]) {\n";
 				}
 			}
 			if (usedIfForCheck) {
 				auto conditions = QStringList();
 				if (usedIfForCheckCount > 1) {
-					conditions.push_back("!memcmp(data + " + QString::number(checking) + ", \"" + name.mid(checking, usedIfForCheckCount) + "\", " + QString::number(usedIfForCheckCount) + ")");
+					conditions.push_back("!memcmp(data + " + QString::number(checking) + ", \"" +
+					                     name.mid(checking, usedIfForCheckCount) + "\", " +
+					                     QString::number(usedIfForCheckCount) + ")");
 				} else {
 					conditions.push_back("data[" + QString::number(checking) + "] == '" + keyChar + "'");
 				}
@@ -957,8 +977,10 @@ int getPaletteIndex(QLatin1String name) {\n\
 QByteArray palette::save() const {\n\
 	if (!_ready) const_cast<palette*>(this)->finalize();\n\
 \n\
-	auto result = QByteArray(" << (count * 4) << ", Qt::Uninitialized);\n\
-	for (auto i = 0, index = 0; i != " << count << "; ++i) {\n\
+	auto result = QByteArray("
+	                  << (count * 4) << ", Qt::Uninitialized);\n\
+	for (auto i = 0, index = 0; i != "
+	                  << count << "; ++i) {\n\
 		result[index++] = static_cast<uchar>(data(i)->c.red());\n\
 		result[index++] = static_cast<uchar>(data(i)->c.green());\n\
 		result[index++] = static_cast<uchar>(data(i)->c.blue());\n\
@@ -968,10 +990,12 @@ QByteArray palette::save() const {\n\
 }\n\
 \n\
 bool palette::load(const QByteArray &cache) {\n\
-	if (cache.size() != " << (count * 4) << ") return false;\n\
+	if (cache.size() != "
+	                  << (count * 4) << ") return false;\n\
 \n\
 	auto p = reinterpret_cast<const uchar*>(cache.constData());\n\
-	for (auto i = 0; i != " << count << "; ++i) {\n\
+	for (auto i = 0; i != "
+	                  << count << "; ++i) {\n\
 		setData(i, { p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3] });\n\
 	}\n\
 	return true;\n\
@@ -1036,7 +1060,8 @@ int indexOfColor(color c) {\n\
 \n\
 QList<row> data() {\n\
 	auto result = QList<row>();\n\
-	result.reserve(" << count << ");\n\
+	result.reserve(" << count
+	                  << ");\n\
 \n\
 " << dataRows << "\n\
 	return result;\n\
@@ -1072,13 +1097,14 @@ bool Generator::writeVariableInit() {
 	}
 
 	source_->stream() << "\
-void init_" << baseName_ << "() {\n\
+void init_" << baseName_
+	                  << "() {\n\
 	if (inited) return;\n\
 	inited = true;\n\n";
 
 	if (module_.hasIncludes()) {
 		bool writtenAtLeastOne = false;
-		bool result = module_.enumIncludes([this,&writtenAtLeastOne](const Module &module) -> bool {
+		bool result = module_.enumIncludes([this, &writtenAtLeastOne](const Module &module) -> bool {
 			if (module.hasVariables()) {
 				source_->stream() << "\tinit_" + moduleBaseName(module) + "();\n";
 				writtenAtLeastOne = true;
@@ -1106,14 +1132,14 @@ void init_" << baseName_ << "() {\n\
 	if (isPalette_) {
 		source_->stream() << "\t_palette.finalize();\n";
 	} else if (!module_.enumVariables([this](const Variable &variable) -> bool {
-		auto name = variable.name.back();
-		auto value = valueAssignmentCode(variable.value);
-		if (value.isEmpty()) {
-			return false;
-		}
-		source_->stream() << "\t_" << name << " = " << value << ";\n";
-		return true;
-	})) {
+		           auto name = variable.name.back();
+		           auto value = valueAssignmentCode(variable.value);
+		           if (value.isEmpty()) {
+			           return false;
+		           }
+		           source_->stream() << "\t_" << name << " = " << value << ";\n";
+		           return true;
+	           })) {
 		return false;
 	}
 	source_->stream() << "\
@@ -1162,7 +1188,8 @@ bool Generator::writeFontFamiliesInit() {
 	source_->stream() << "void initFontFamilies() {\n";
 	for (auto i = fontFamilies_.cbegin(), e = fontFamilies_.cend(); i != e; ++i) {
 		auto family = stringToEncodedString(i.key());
-		source_->stream() << "\tfont" << i.value() << "index = style::internal::registerFontFamily(" << family << ");\n";
+		source_->stream() << "\tfont" << i.value() << "index = style::internal::registerFontFamily(" << family
+		                  << ");\n";
 	}
 	source_->stream() << "}\n\n";
 	return true;
@@ -1210,19 +1237,26 @@ QByteArray iconMaskValuePng(QString filepath) {
 		return result;
 	}
 	if (png100x.width() * 2 != png200x.width() || png100x.height() * 2 != png200x.height()) {
-		common::logError(kErrorBadIconSize, filepath + ".png") << "bad icons size, 1x: " << png100x.width() << "x" << png100x.height() << ", 2x: " << png200x.width() << "x" << png200x.height();
+		common::logError(kErrorBadIconSize, filepath + ".png")
+		    << "bad icons size, 1x: " << png100x.width() << "x" << png100x.height() << ", 2x: " << png200x.width()
+		    << "x" << png200x.height();
 		return result;
 	}
 	for (auto modifierName : modifiers) {
 		if (auto modifier = GetModifier(modifierName)) {
 			modifier(png100x, png200x);
 		} else {
-			common::logError(common::kErrorInternal, filepath) << "modifier should be valid here, name: " << modifierName.toStdString();
+			common::logError(common::kErrorInternal, filepath)
+			    << "modifier should be valid here, name: " << modifierName.toStdString();
 			return result;
 		}
 	}
-	QImage png125x = png200x.scaled(structure::data::pxAdjust(png100x.width(), 5), structure::data::pxAdjust(png100x.height(), 5), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-	QImage png150x = png200x.scaled(structure::data::pxAdjust(png100x.width(), 6), structure::data::pxAdjust(png100x.height(), 6), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+	QImage png125x =
+	    png200x.scaled(structure::data::pxAdjust(png100x.width(), 5), structure::data::pxAdjust(png100x.height(), 5),
+	                   Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+	QImage png150x =
+	    png200x.scaled(structure::data::pxAdjust(png100x.width(), 6), structure::data::pxAdjust(png100x.height(), 6),
+	                   Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
 	QImage composed(png200x.width() + png100x.width(), png200x.height() + png150x.height(), png100x.format());
 	{
@@ -1265,7 +1299,9 @@ bool Generator::writeIconValues() {
 		if (maskData.isEmpty()) {
 			return false;
 		}
-		source_->stream() << "const uchar iconMask" << i.value() << "Data[] = " << stringToBinaryArray(std::string(maskData.constData(), maskData.size())) << ";\n";
+		source_->stream() << "const uchar iconMask" << i.value()
+		                  << "Data[] = " << stringToBinaryArray(std::string(maskData.constData(), maskData.size()))
+		                  << ";\n";
 		source_->stream() << "IconMask iconMask" << i.value() << "(iconMask" << i.value() << "Data);\n\n";
 	}
 	return true;
@@ -1274,7 +1310,8 @@ bool Generator::writeIconValues() {
 bool Generator::collectUniqueValues() {
 	int fontFamilyIndex = 0;
 	int iconMaskIndex = 0;
-	std::function<bool(const Variable&)> collector = [this, &collector, &fontFamilyIndex, &iconMaskIndex](const Variable &variable) {
+	std::function<bool(const Variable &)> collector = [this, &collector, &fontFamilyIndex,
+	                                                   &iconMaskIndex](const Variable &variable) {
 		auto value = variable.value;
 		if (!value.copyOf().isEmpty()) {
 			return true;
diff --git a/Telegram/SourceFiles/codegen/style/generator.h b/Telegram/SourceFiles/codegen/style/generator.h
index e4f8fc69d..8d72edbe6 100644
--- a/Telegram/SourceFiles/codegen/style/generator.h
+++ b/Telegram/SourceFiles/codegen/style/generator.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <map>
-#include <functional>
-#include <QtCore/QString>
-#include <QtCore/QSet>
 #include "codegen/common/cpp_file.h"
 #include "codegen/style/structure_types.h"
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <functional>
+#include <map>
+#include <memory>
 
 namespace codegen {
 namespace style {
@@ -36,7 +36,8 @@ class Module;
 
 class Generator {
 public:
-	Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project, bool isPalette);
+	Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project,
+	          bool isPalette);
 	Generator(const Generator &other) = delete;
 	Generator &operator=(const Generator &other) = delete;
 
@@ -77,9 +78,8 @@ private:
 	QMap<QString, int> iconMasks_; // icon file -> index
 	std::map<QString, int, std::greater<QString>> paletteIndices_;
 
-	std::vector<int> _scales = { 4, 5, 6, 8 }; // scale / 4 gives our 1.00, 1.25, 1.50, 2.00
-	std::vector<const char *> _scaleNames = { "dbisOne", "dbisOneAndQuarter", "dbisOneAndHalf", "dbisTwo" };
-
+	std::vector<int> _scales = {4, 5, 6, 8}; // scale / 4 gives our 1.00, 1.25, 1.50, 2.00
+	std::vector<const char *> _scaleNames = {"dbisOne", "dbisOneAndQuarter", "dbisOneAndHalf", "dbisTwo"};
 };
 
 } // namespace style
diff --git a/Telegram/SourceFiles/codegen/style/module.cpp b/Telegram/SourceFiles/codegen/style/module.cpp
index 54a5cf16d..e9c21be26 100644
--- a/Telegram/SourceFiles/codegen/style/module.cpp
+++ b/Telegram/SourceFiles/codegen/style/module.cpp
@@ -31,8 +31,8 @@ QString fullNameKey(const FullName &name) {
 
 } // namespace
 
-Module::Module(const QString &fullpath) : fullpath_(fullpath) {
-}
+Module::Module(const QString &fullpath)
+    : fullpath_(fullpath) {}
 
 void Module::addIncluded(std::unique_ptr<Module> &&value) {
 	included_.push_back(std::move(value));
diff --git a/Telegram/SourceFiles/codegen/style/module.h b/Telegram/SourceFiles/codegen/style/module.h
index 2dd45d1b9..11213a738 100644
--- a/Telegram/SourceFiles/codegen/style/module.h
+++ b/Telegram/SourceFiles/codegen/style/module.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QtCore/QString>
+#include "codegen/style/structure_types.h"
 #include <QtCore/QList>
 #include <QtCore/QMap>
+#include <QtCore/QString>
 #include <vector>
-#include "codegen/style/structure_types.h"
 
 namespace codegen {
 namespace style {
@@ -32,7 +32,6 @@ namespace structure {
 
 class Module {
 public:
-
 	explicit Module(const QString &fullpath);
 
 	QString filepath() const {
@@ -44,8 +43,7 @@ public:
 	bool hasIncludes() const {
 		return !included_.empty();
 	}
-	template <typename F>
-	bool enumIncludes(F functor) const {
+	template <typename F> bool enumIncludes(F functor) const {
 		for (const auto &module : included_) {
 			if (!functor(*module)) {
 				return false;
@@ -62,8 +60,7 @@ public:
 		return !structs_.isEmpty();
 	}
 
-	template <typename F>
-	bool enumStructs(F functor) const {
+	template <typename F> bool enumStructs(F functor) const {
 		for (const auto &value : structs_) {
 			if (!functor(value)) {
 				return false;
@@ -80,8 +77,7 @@ public:
 		return !variables_.isEmpty();
 	}
 
-	template <typename F>
-	bool enumVariables(F functor) const {
+	template <typename F> bool enumVariables(F functor) const {
 		for (const auto &value : variables_) {
 			if (!functor(value)) {
 				return false;
@@ -104,7 +100,6 @@ private:
 	QList<Variable> variables_;
 	QMap<QString, int> structsByName_;
 	QMap<QString, int> variablesByName_;
-
 };
 
 } // namespace structure
diff --git a/Telegram/SourceFiles/codegen/style/options.cpp b/Telegram/SourceFiles/codegen/style/options.cpp
index bc362ef8f..39e470cd2 100644
--- a/Telegram/SourceFiles/codegen/style/options.cpp
+++ b/Telegram/SourceFiles/codegen/style/options.cpp
@@ -20,20 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/style/options.h"
 
-#include <ostream>
+#include "codegen/common/logging.h"
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
-#include "codegen/common/logging.h"
+#include <ostream>
 
 namespace codegen {
 namespace style {
 namespace {
 
-constexpr int kErrorIncludePathExpected     = 901;
-constexpr int kErrorOutputPathExpected      = 902;
-constexpr int kErrorInputPathExpected       = 903;
+constexpr int kErrorIncludePathExpected = 901;
+constexpr int kErrorOutputPathExpected = 902;
+constexpr int kErrorInputPathExpected = 903;
 constexpr int kErrorSingleInputPathExpected = 904;
-constexpr int kErrorWorkingPathExpected     = 905;
+constexpr int kErrorWorkingPathExpected = 905;
 
 } // namespace
 
@@ -56,7 +56,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-I")) {
 			result.includePaths.push_back(arg.mid(2));
 
-		// Output path
+			// Output path
 		} else if (arg == "-o") {
 			if (++i == count) {
 				logError(kErrorOutputPathExpected, "Command Line") << "output path expected after -o";
@@ -67,7 +67,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-o")) {
 			result.outputPath = arg.mid(2);
 
-		// Working path
+			// Working path
 		} else if (arg == "-w") {
 			if (++i == count) {
 				logError(kErrorWorkingPathExpected, "Command Line") << "working path expected after -w";
@@ -78,7 +78,7 @@ Options parseOptions() {
 		} else if (arg.startsWith("-w")) {
 			common::logSetWorkingPath(arg.mid(2));
 
-		// Input path
+			// Input path
 		} else {
 			if (result.inputPath.isEmpty()) {
 				result.inputPath = arg;
diff --git a/Telegram/SourceFiles/codegen/style/options.h b/Telegram/SourceFiles/codegen/style/options.h
index f39d85cea..fff56b35f 100644
--- a/Telegram/SourceFiles/codegen/style/options.h
+++ b/Telegram/SourceFiles/codegen/style/options.h
@@ -27,7 +27,7 @@ namespace codegen {
 namespace style {
 
 struct Options {
-	QStringList includePaths = { "." };
+	QStringList includePaths = {"."};
 	QString outputPath = ".";
 	QString inputPath;
 	bool isPalette = false;
diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.cpp b/Telegram/SourceFiles/codegen/style/parsed_file.cpp
index 85f87eb6b..5b2bdaae8 100644
--- a/Telegram/SourceFiles/codegen/style/parsed_file.cpp
+++ b/Telegram/SourceFiles/codegen/style/parsed_file.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/style/parsed_file.h"
 
-#include <iostream>
-#include <QtCore/QMap>
-#include <QtCore/QDir>
-#include <QtCore/QRegularExpression>
 #include "codegen/common/basic_tokenized_file.h"
 #include "codegen/common/logging.h"
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+#include <QtCore/QRegularExpression>
+#include <iostream>
 
 using BasicToken = codegen::common::BasicTokenizedFile::Token;
 using BasicType = BasicToken::Type;
@@ -37,14 +37,14 @@ using structure::logFullName;
 
 namespace {
 
-constexpr int kErrorInIncluded         = 801;
-constexpr int kErrorTypeMismatch       = 802;
-constexpr int kErrorUnknownField       = 803;
+constexpr int kErrorInIncluded = 801;
+constexpr int kErrorTypeMismatch = 802;
+constexpr int kErrorUnknownField = 803;
 constexpr int kErrorIdentifierNotFound = 804;
-constexpr int kErrorAlreadyDefined     = 805;
-constexpr int kErrorBadString          = 806;
-constexpr int kErrorIconDuplicate      = 807;
-constexpr int kErrorBadIconModifier    = 808;
+constexpr int kErrorAlreadyDefined = 805;
+constexpr int kErrorBadString = 806;
+constexpr int kErrorIconDuplicate = 807;
+constexpr int kErrorBadIconModifier = 808;
 
 QString findInputFile(const Options &options) {
 	for (const auto &dir : options.includePaths) {
@@ -101,28 +101,23 @@ structure::data::color convertWebColor(const QString &str, const QString &fallba
 			a = readHexUchar(str.at(6), str.at(7));
 		}
 	}
-	return { r, g, b, a, fallback };
+	return {r, g, b, a, fallback};
 }
 
 structure::data::color convertIntColor(int r, int g, int b, int a) {
-	return { uchar(r & 0xFF), uchar(g & 0xFF), uchar(b & 0xFF), uchar(a & 0xFF) };
+	return {uchar(r & 0xFF), uchar(g & 0xFF), uchar(b & 0xFF), uchar(a & 0xFF)};
 }
 
 std::string logType(const structure::Type &type) {
 	if (type.tag == structure::TypeTag::Struct) {
 		return "struct " + logFullName(type.name);
 	}
-	static auto builtInTypes = new QMap<structure::TypeTag, std::string> {
-		{ structure::TypeTag::Int       , "int" },
-		{ structure::TypeTag::Double    , "double" },
-		{ structure::TypeTag::Pixels    , "pixels" },
-		{ structure::TypeTag::String    , "string" },
-		{ structure::TypeTag::Color     , "color" },
-		{ structure::TypeTag::Point     , "point" },
-		{ structure::TypeTag::Size      , "size" },
-		{ structure::TypeTag::Align     , "align" },
-		{ structure::TypeTag::Margins   , "margins" },
-		{ structure::TypeTag::Font      , "font" },
+	static auto builtInTypes = new QMap<structure::TypeTag, std::string>{
+	    {structure::TypeTag::Int, "int"},         {structure::TypeTag::Double, "double"},
+	    {structure::TypeTag::Pixels, "pixels"},   {structure::TypeTag::String, "string"},
+	    {structure::TypeTag::Color, "color"},     {structure::TypeTag::Point, "point"},
+	    {structure::TypeTag::Size, "size"},       {structure::TypeTag::Align, "align"},
+	    {structure::TypeTag::Margins, "margins"}, {structure::TypeTag::Font, "font"},
 	};
 	return builtInTypes->value(type.tag, "invalid");
 }
@@ -162,10 +157,9 @@ Modifier GetModifier(const QString &name) {
 }
 
 ParsedFile::ParsedFile(const Options &options)
-: filePath_(findInputFile(options))
-, file_(filePath_)
-, options_(options) {
-}
+    : filePath_(findInputFile(options))
+    , file_(filePath_)
+    , options_(options) {}
 
 bool ParsedFile::read() {
 	if (!file_.read()) {
@@ -186,7 +180,8 @@ bool ParsedFile::read() {
 					if (module_->addStruct(structResult)) {
 						continue;
 					}
-					logError(kErrorAlreadyDefined) << "struct '" << logFullName(structResult.name) << "' already defined";
+					logError(kErrorAlreadyDefined)
+					    << "struct '" << logFullName(structResult.name) << "' already defined";
 					break;
 				}
 			} else if (auto colonToken = file_.getToken(BasicType::Colon)) {
@@ -194,7 +189,8 @@ bool ParsedFile::read() {
 					if (module_->addVariable(variableResult)) {
 						continue;
 					}
-					logError(kErrorAlreadyDefined) << "variable '" << logFullName(variableResult.name) << "' already defined";
+					logError(kErrorAlreadyDefined)
+					    << "variable '" << logFullName(variableResult.name) << "' already defined";
 					break;
 				}
 			}
@@ -235,7 +231,7 @@ structure::Struct ParsedFile::readStruct(const QString &name) {
 		return {};
 	}
 
-	structure::Struct result = { composeFullName(name) };
+	structure::Struct result = {composeFullName(name)};
 	do {
 		if (auto fieldName = file_.getToken(BasicType::Name)) {
 			if (auto field = readStructField(tokenValue(fieldName))) {
@@ -252,7 +248,7 @@ structure::Struct ParsedFile::readStruct(const QString &name) {
 }
 
 structure::Variable ParsedFile::readVariable(const QString &name) {
-	structure::Variable result = { composeFullName(name) };
+	structure::Variable result = {composeFullName(name)};
 	if (auto value = readValue()) {
 		result.value = value;
 		if (options_.isPalette && value.type().tag != structure::TypeTag::Color) {
@@ -268,7 +264,7 @@ structure::Variable ParsedFile::readVariable(const QString &name) {
 }
 
 structure::StructField ParsedFile::readStructField(const QString &name) {
-	structure::StructField result = { composeFullName(name) };
+	structure::StructField result = {composeFullName(name)};
 	if (auto colonToken = assertNextToken(BasicType::Colon)) {
 		if (auto type = readType()) {
 			result.type = type;
@@ -350,14 +346,15 @@ structure::Value ParsedFile::defaultConstructedStruct(const structure::FullName
 		fields.reserve(pattern->fields.size());
 		for (const auto &fieldType : pattern->fields) {
 			fields.push_back({
-				{ // variable
-					fieldType.name,
-					{ fieldType.type, Qt::Uninitialized }, // value
-				},
-				structure::data::field::Status::Uninitialized, // status
+			    {
+			        // variable
+			        fieldType.name,
+			        {fieldType.type, Qt::Uninitialized}, // value
+			    },
+			    structure::data::field::Status::Uninitialized, // status
 			});
 		}
-		return { structName, fields };
+		return {structName, fields};
 	}
 	return {};
 }
@@ -366,7 +363,9 @@ void ParsedFile::applyStructParent(structure::Value &result, const structure::Fu
 	bool fromTheSameModule = false;
 	if (auto parent = module_->findVariable(parentName, &fromTheSameModule)) {
 		if (parent->value.type() != result.type()) {
-			logErrorTypeMismatch() << "parent '" << logFullName(parentName) << "' has type '" << logType(parent->value.type()) << "' while child value has type " << logType(result.type());
+			logErrorTypeMismatch() << "parent '" << logFullName(parentName) << "' has type '"
+			                       << logType(parent->value.type()) << "' while child value has type "
+			                       << logType(result.type());
 			return;
 		}
 
@@ -382,8 +381,7 @@ void ParsedFile::applyStructParent(structure::Value &result, const structure::Fu
 			const auto &srcField(srcFields->at(i));
 			auto &dstField((*dstFields)[i]);
 			using Status = structure::data::field::Status;
-			if (srcField.status == Status::Explicit ||
-				dstField.status == Status::Uninitialized) {
+			if (srcField.status == Status::Explicit || dstField.status == Status::Uninitialized) {
 				const auto &srcValue(srcField.variable.value);
 				auto &dstValue(dstField.variable.value);
 				logAssert(srcValue.type() == dstValue.type()) << "struct field type check failed";
@@ -396,11 +394,10 @@ void ParsedFile::applyStructParent(structure::Value &result, const structure::Fu
 				// a.style has "A: Struct { icon: icon { ..file.. } };" and
 				// b.style has "B: Struct(A) { .. };" with non-overriden icon field.
 				// Then both style_a.cpp and style_b.cpp will contain binary data of "file".
-				if (!fromTheSameModule
-					&& srcValue.type().tag == structure::TypeTag::Icon
-					&& !srcValue.Icon().parts.empty()
-					&& srcValue.copyOf().isEmpty()) {
-					logError(kErrorIconDuplicate) << "an unnamed icon field '" << logFullName(srcField.variable.name) << "' is inherited from parent '" << logFullName(parentName) << "'";
+				if (!fromTheSameModule && srcValue.type().tag == structure::TypeTag::Icon &&
+				    !srcValue.Icon().parts.empty() && srcValue.copyOf().isEmpty()) {
+					logError(kErrorIconDuplicate) << "an unnamed icon field '" << logFullName(srcField.variable.name)
+					                              << "' is inherited from parent '" << logFullName(parentName) << "'";
 					return;
 				}
 				dstValue = srcValue;
@@ -444,12 +441,15 @@ bool ParsedFile::assignStructField(structure::Value &result, const structure::Va
 				already.status = structure::data::field::Status::Explicit;
 				return true;
 			} else {
-				logErrorTypeMismatch() << "field '" << logFullName(already.variable.name) << "' has type '" << logType(already.variable.value.type()) << "' while value has type '" << logType(field.value.type()) << "'";
+				logErrorTypeMismatch() << "field '" << logFullName(already.variable.name) << "' has type '"
+				                       << logType(already.variable.value.type()) << "' while value has type '"
+				                       << logType(field.value.type()) << "'";
 				return false;
 			}
 		}
 	}
-	logError(kErrorUnknownField) << "field '" << logFullName(field.name) << "' was not found in struct of type '" << logType(result.type()) << "'";
+	logError(kErrorUnknownField) << "field '" << logFullName(field.name) << "' was not found in struct of type '"
+	                             << logType(result.type()) << "'";
 	return false;
 }
 
@@ -472,14 +472,14 @@ bool ParsedFile::readStructParents(structure::Value &result) {
 structure::Value ParsedFile::readPositiveValue() {
 	auto numericToken = file_.getAnyToken();
 	if (numericToken.type == BasicType::Int) {
-		return { structure::TypeTag::Int, tokenValue(numericToken).toInt() };
+		return {structure::TypeTag::Int, tokenValue(numericToken).toInt()};
 	} else if (numericToken.type == BasicType::Double) {
-		return { structure::TypeTag::Double, tokenValue(numericToken).toDouble() };
+		return {structure::TypeTag::Double, tokenValue(numericToken).toDouble()};
 	} else if (numericToken.type == BasicType::Name) {
 		auto value = tokenValue(numericToken);
 		auto match = QRegularExpression("^\\d+px$").match(value);
 		if (match.hasMatch()) {
-			return { structure::TypeTag::Pixels, value.mid(0, value.size() - 2).toInt() };
+			return {structure::TypeTag::Pixels, value.mid(0, value.size() - 2).toInt()};
 		}
 	}
 	file_.putBack();
@@ -491,7 +491,7 @@ structure::Value ParsedFile::readNumericValue() {
 		return value;
 	} else if (auto minusToken = file_.getToken(BasicType::Minus)) {
 		if (auto positiveValue = readNumericValue()) {
-			return { positiveValue.type().tag, -positiveValue.Int() };
+			return {positiveValue.type().tag, -positiveValue.Int()};
 		}
 		logErrorUnexpectedToken() << "numeric value";
 	}
@@ -502,7 +502,7 @@ structure::Value ParsedFile::readStringValue() {
 	if (auto stringToken = file_.getToken(BasicType::String)) {
 		auto value = tokenValue(stringToken);
 		if (validateAnsiString(value)) {
-			return { structure::TypeTag::String, stringToken.value.toStdString() };
+			return {structure::TypeTag::String, stringToken.value.toStdString()};
 		}
 		logError(kErrorBadString) << "unicode symbols are not supported";
 	}
@@ -519,9 +519,9 @@ structure::Value ParsedFile::readColorValue() {
 					if (auto fallbackSeparator = file_.getToken(BasicType::Or)) {
 						if (options_.isPalette) {
 							if (auto fallbackName = file_.getToken(BasicType::Name)) {
-								structure::FullName name = { tokenValue(fallbackName) };
+								structure::FullName name = {tokenValue(fallbackName)};
 								if (auto variable = module_->findVariableInModule(name, *module_)) {
-									return { convertWebColor(chars, tokenValue(fallbackName)) };
+									return {convertWebColor(chars, tokenValue(fallbackName))};
 								} else {
 									logError(kErrorIdentifierNotFound) << "fallback color name";
 								}
@@ -532,7 +532,7 @@ structure::Value ParsedFile::readColorValue() {
 							logErrorUnexpectedToken() << "';', color fallbacks are only allowed in palette module";
 						}
 					} else {
-						return { convertWebColor(chars) };
+						return {convertWebColor(chars)};
 					}
 				}
 			} else {
@@ -543,7 +543,7 @@ structure::Value ParsedFile::readColorValue() {
 		}
 	} else if (auto transparentName = file_.getToken(BasicType::Name)) {
 		if (tokenValue(transparentName) == "transparent") {
-			return { structure::data::color { 255, 255, 255, 0 } };
+			return {structure::data::color{255, 255, 255, 0}};
 		}
 		file_.putBack();
 	}
@@ -556,16 +556,16 @@ structure::Value ParsedFile::readPointValue() {
 		if (tokenValue(font) == "point") {
 			assertNextToken(BasicType::LeftParenthesis);
 
-			auto x = readNumericOrNumericCopyValue(); assertNextToken(BasicType::Comma);
+			auto x = readNumericOrNumericCopyValue();
+			assertNextToken(BasicType::Comma);
 			auto y = readNumericOrNumericCopyValue();
-			if (x.type().tag != structure::TypeTag::Pixels ||
-				y.type().tag != structure::TypeTag::Pixels) {
+			if (x.type().tag != structure::TypeTag::Pixels || y.type().tag != structure::TypeTag::Pixels) {
 				logErrorTypeMismatch() << "expected two px values for the point";
 			}
 
 			assertNextToken(BasicType::RightParenthesis);
 
-			return { structure::data::point { x.Int(), y.Int() } };
+			return {structure::data::point{x.Int(), y.Int()}};
 		}
 		file_.putBack();
 	}
@@ -577,16 +577,16 @@ structure::Value ParsedFile::readSizeValue() {
 		if (tokenValue(font) == "size") {
 			assertNextToken(BasicType::LeftParenthesis);
 
-			auto w = readNumericOrNumericCopyValue(); assertNextToken(BasicType::Comma);
+			auto w = readNumericOrNumericCopyValue();
+			assertNextToken(BasicType::Comma);
 			auto h = readNumericOrNumericCopyValue();
-			if (w.type().tag != structure::TypeTag::Pixels ||
-				h.type().tag != structure::TypeTag::Pixels) {
+			if (w.type().tag != structure::TypeTag::Pixels || h.type().tag != structure::TypeTag::Pixels) {
 				logErrorTypeMismatch() << "expected two px values for the size";
 			}
 
 			assertNextToken(BasicType::RightParenthesis);
 
-			return { structure::data::size { w.Int(), h.Int() } };
+			return {structure::data::size{w.Int(), h.Int()}};
 		}
 		file_.putBack();
 	}
@@ -603,7 +603,7 @@ structure::Value ParsedFile::readAlignValue() {
 			assertNextToken(BasicType::RightParenthesis);
 
 			if (validateAlignString(align)) {
-				return { structure::TypeTag::Align, align.toStdString() };
+				return {structure::TypeTag::Align, align.toStdString()};
 			} else {
 				logError(kErrorBadString) << "bad align string";
 			}
@@ -618,20 +618,21 @@ structure::Value ParsedFile::readMarginsValue() {
 		if (tokenValue(font) == "margins") {
 			assertNextToken(BasicType::LeftParenthesis);
 
-			auto l = readNumericOrNumericCopyValue(); assertNextToken(BasicType::Comma);
-			auto t = readNumericOrNumericCopyValue(); assertNextToken(BasicType::Comma);
-			auto r = readNumericOrNumericCopyValue(); assertNextToken(BasicType::Comma);
+			auto l = readNumericOrNumericCopyValue();
+			assertNextToken(BasicType::Comma);
+			auto t = readNumericOrNumericCopyValue();
+			assertNextToken(BasicType::Comma);
+			auto r = readNumericOrNumericCopyValue();
+			assertNextToken(BasicType::Comma);
 			auto b = readNumericOrNumericCopyValue();
-			if (l.type().tag != structure::TypeTag::Pixels ||
-				t.type().tag != structure::TypeTag::Pixels ||
-				r.type().tag != structure::TypeTag::Pixels ||
-				b.type().tag != structure::TypeTag::Pixels) {
+			if (l.type().tag != structure::TypeTag::Pixels || t.type().tag != structure::TypeTag::Pixels ||
+			    r.type().tag != structure::TypeTag::Pixels || b.type().tag != structure::TypeTag::Pixels) {
 				logErrorTypeMismatch() << "expected four px values for the margins";
 			}
 
 			assertNextToken(BasicType::RightParenthesis);
 
-			return { structure::data::margins { l.Int(), t.Int(), r.Int(), b.Int() } };
+			return {structure::data::margins{l.Int(), t.Int(), r.Int(), b.Int()}};
 		}
 		file_.putBack();
 	}
@@ -671,7 +672,7 @@ structure::Value ParsedFile::readFontValue() {
 			if (size.type().tag != structure::TypeTag::Pixels) {
 				logErrorTypeMismatch() << "px value for the font size expected";
 			}
-			return { structure::data::font { family.String(), size.Int(), flags } };
+			return {structure::data::font{family.String(), size.Int(), flags}};
 		}
 		file_.putBack();
 	}
@@ -707,7 +708,7 @@ structure::Value ParsedFile::readIconValue() {
 				}
 			}
 
-			return { structure::data::icon { parts } };
+			return {structure::data::icon{parts}};
 		}
 		file_.putBack();
 	}
@@ -716,7 +717,7 @@ structure::Value ParsedFile::readIconValue() {
 
 structure::Value ParsedFile::readCopyValue() {
 	if (auto copyName = file_.getToken(BasicType::Name)) {
-		structure::FullName name = { tokenValue(copyName) };
+		structure::FullName name = {tokenValue(copyName)};
 		if (auto variable = module_->findVariable(name)) {
 			return variable->value.makeCopy(variable->name);
 		}
@@ -730,9 +731,8 @@ structure::Value ParsedFile::readNumericOrNumericCopyValue() {
 		return result;
 	} else if (auto copy = readCopyValue()) {
 		auto type = copy.type().tag;
-		if (type == structure::TypeTag::Int
-			|| type == structure::TypeTag::Double
-			|| type == structure::TypeTag::Pixels) {
+		if (type == structure::TypeTag::Int || type == structure::TypeTag::Double ||
+		    type == structure::TypeTag::Pixels) {
 			return copy;
 		} else {
 			file_.putBack();
@@ -773,7 +773,7 @@ structure::data::monoicon ParsedFile::readMonoIconFields() {
 						logErrorUnexpectedToken() << "icon offset";
 					}
 				} else {
-					result.offset = { structure::data::point { 0, 0 } };
+					result.offset = {structure::data::point{0, 0}};
 				}
 			} else {
 				logErrorUnexpectedToken() << "icon color";
@@ -837,7 +837,7 @@ Options ParsedFile::includedOptions(const QString &filepath) {
 
 // Compose context-dependent full name.
 structure::FullName ParsedFile::composeFullName(const QString &name) {
-	return { name };
+	return {name};
 }
 
 } // namespace style
diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.h b/Telegram/SourceFiles/codegen/style/parsed_file.h
index 564d93be9..7263464b6 100644
--- a/Telegram/SourceFiles/codegen/style/parsed_file.h
+++ b/Telegram/SourceFiles/codegen/style/parsed_file.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "codegen/common/basic_tokenized_file.h"
+#include "codegen/style/module.h"
+#include "codegen/style/options.h"
+#include <QtGui/QImage>
+#include <functional>
 #include <memory>
 #include <string>
-#include <functional>
-#include <QtGui/QImage>
-#include "codegen/common/basic_tokenized_file.h"
-#include "codegen/style/options.h"
-#include "codegen/style/module.h"
 
 namespace codegen {
 namespace style {
@@ -122,19 +122,13 @@ private:
 	ModulePtr module_;
 
 	QMap<std::string, structure::Type> typeNames_ = {
-		{ "int"       , { structure::TypeTag::Int } },
-		{ "double"    , { structure::TypeTag::Double } },
-		{ "pixels"    , { structure::TypeTag::Pixels } },
-		{ "string"    , { structure::TypeTag::String } },
-		{ "color"     , { structure::TypeTag::Color } },
-		{ "point"     , { structure::TypeTag::Point } },
-		{ "size"      , { structure::TypeTag::Size } },
-		{ "align"     , { structure::TypeTag::Align } },
-		{ "margins"   , { structure::TypeTag::Margins } },
-		{ "font"      , { structure::TypeTag::Font } },
-		{ "icon"      , { structure::TypeTag::Icon } },
+	    {"int", {structure::TypeTag::Int}},         {"double", {structure::TypeTag::Double}},
+	    {"pixels", {structure::TypeTag::Pixels}},   {"string", {structure::TypeTag::String}},
+	    {"color", {structure::TypeTag::Color}},     {"point", {structure::TypeTag::Point}},
+	    {"size", {structure::TypeTag::Size}},       {"align", {structure::TypeTag::Align}},
+	    {"margins", {structure::TypeTag::Margins}}, {"font", {structure::TypeTag::Font}},
+	    {"icon", {structure::TypeTag::Icon}},
 	};
-
 };
 
 } // namespace style
diff --git a/Telegram/SourceFiles/codegen/style/processor.cpp b/Telegram/SourceFiles/codegen/style/processor.cpp
index b74822466..22569a8a9 100644
--- a/Telegram/SourceFiles/codegen/style/processor.cpp
+++ b/Telegram/SourceFiles/codegen/style/processor.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "codegen/style/processor.h"
 
+#include "codegen/common/cpp_file.h"
+#include "codegen/style/generator.h"
+#include "codegen/style/parsed_file.h"
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include "codegen/common/cpp_file.h"
-#include "codegen/style/parsed_file.h"
-#include "codegen/style/generator.h"
 
 namespace codegen {
 namespace style {
@@ -39,9 +39,8 @@ QString destFileBaseName(const structure::Module &module) {
 } // namespace
 
 Processor::Processor(const Options &options)
-: parser_(std::make_unique<ParsedFile>(options))
-, options_(options) {
-}
+    : parser_(std::make_unique<ParsedFile>(options))
+    , options_(options) {}
 
 int Processor::launch() {
 	if (!parser_->read()) {
@@ -60,18 +59,15 @@ bool Processor::write(const structure::Module &module) const {
 	bool forceReGenerate = false;
 	QDir dir(options_.outputPath);
 	if (!dir.mkpath(".")) {
-		common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
+		common::logError(kErrorCantWritePath, "Command Line")
+		    << "can not open path for writing: " << dir.absolutePath().toStdString();
 		return false;
 	}
 
 	QFileInfo srcFile(module.filepath());
 	QString dstFilePath = dir.absolutePath() + '/' + (options_.isPalette ? "palette" : destFileBaseName(module));
 
-	common::ProjectInfo project = {
-		"codegen_style",
-		srcFile.fileName(),
-		forceReGenerate
-	};
+	common::ProjectInfo project = {"codegen_style", srcFile.fileName(), forceReGenerate};
 
 	Generator generator(module, dstFilePath, project, options_.isPalette);
 	if (!generator.writeHeader()) {
diff --git a/Telegram/SourceFiles/codegen/style/processor.h b/Telegram/SourceFiles/codegen/style/processor.h
index a642a6150..65eed9368 100644
--- a/Telegram/SourceFiles/codegen/style/processor.h
+++ b/Telegram/SourceFiles/codegen/style/processor.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <QtCore/QString>
 #include "codegen/style/options.h"
+#include <QtCore/QString>
+#include <memory>
 
 namespace codegen {
 namespace style {
@@ -49,7 +49,6 @@ private:
 
 	std::unique_ptr<ParsedFile> parser_;
 	const Options &options_;
-
 };
 
 } // namespace style
diff --git a/Telegram/SourceFiles/codegen/style/structure_types.cpp b/Telegram/SourceFiles/codegen/style/structure_types.cpp
index 1a0c1cafc..25fff4604 100644
--- a/Telegram/SourceFiles/codegen/style/structure_types.cpp
+++ b/Telegram/SourceFiles/codegen/style/structure_types.cpp
@@ -27,184 +27,199 @@ namespace structure {
 struct Value::DataTypes {
 	class TInt : public DataBase {
 	public:
-		TInt(int value) : value_(value) {
+		TInt(int value)
+		    : value_(value) {}
+		int Int() const override {
+			return value_;
 		}
-		int Int() const override { return value_; }
 
 	private:
 		int value_;
-
 	};
 
 	class TDouble : public DataBase {
 	public:
-		TDouble(double value) : value_(value) {
+		TDouble(double value)
+		    : value_(value) {}
+		double Double() const override {
+			return value_;
 		}
-		double Double() const override { return value_; }
 
 	private:
 		double value_;
-
 	};
 
 	class TString : public DataBase {
 	public:
-		TString(std::string value) : value_(value) {
+		TString(std::string value)
+		    : value_(value) {}
+		std::string String() const override {
+			return value_;
 		}
-		std::string String() const override { return value_; }
 
 	private:
 		std::string value_;
-
 	};
 
 	class TPoint : public DataBase {
 	public:
-		TPoint(data::point value) : value_(value) {
+		TPoint(data::point value)
+		    : value_(value) {}
+		data::point Point() const override {
+			return value_;
 		}
-		data::point Point() const override { return value_; }
 
 	private:
 		data::point value_;
-
 	};
 
 	class TSize : public DataBase {
 	public:
-		TSize(data::size value) : value_(value) {
+		TSize(data::size value)
+		    : value_(value) {}
+		data::size Size() const override {
+			return value_;
 		}
-		data::size Size() const override { return value_; }
 
 	private:
 		data::size value_;
-
 	};
 
 	class TColor : public DataBase {
 	public:
-		TColor(data::color value) : value_(value) {
+		TColor(data::color value)
+		    : value_(value) {}
+		data::color Color() const override {
+			return value_;
 		}
-		data::color Color() const override { return value_; }
 
 	private:
 		data::color value_;
-
 	};
 
 	class TMargins : public DataBase {
 	public:
-		TMargins(data::margins value) : value_(value) {
+		TMargins(data::margins value)
+		    : value_(value) {}
+		data::margins Margins() const override {
+			return value_;
 		}
-		data::margins Margins() const override { return value_; }
 
 	private:
 		data::margins value_;
-
 	};
 
 	class TFont : public DataBase {
 	public:
-		TFont(data::font value) : value_(value) {
+		TFont(data::font value)
+		    : value_(value) {}
+		data::font Font() const override {
+			return value_;
 		}
-		data::font Font() const override { return value_; }
 
 	private:
 		data::font value_;
-
 	};
 
 	class TIcon : public DataBase {
 	public:
-		TIcon(data::icon value) : value_(value) {
+		TIcon(data::icon value)
+		    : value_(value) {}
+		data::icon Icon() const override {
+			return value_;
 		}
-		data::icon Icon() const override { return value_; }
 
 	private:
 		data::icon value_;
-
 	};
 
 	class TFields : public DataBase {
 	public:
-		TFields(data::fields value) : value_(value) {
+		TFields(data::fields value)
+		    : value_(value) {}
+		const data::fields *Fields() const override {
+			return &value_;
+		}
+		data::fields *Fields() override {
+			return &value_;
 		}
-		const data::fields *Fields() const override { return &value_; }
-		data::fields *Fields() override { return &value_; }
 
 	private:
 		data::fields value_;
-
 	};
 };
 
-Value::Value() : Value(TypeTag::Invalid, std::make_shared<DataBase>()) {
-}
+Value::Value()
+    : Value(TypeTag::Invalid, std::make_shared<DataBase>()) {}
 
-Value::Value(data::point value) : Value(TypeTag::Point, std::make_shared<DataTypes::TPoint>(value)) {
-}
+Value::Value(data::point value)
+    : Value(TypeTag::Point, std::make_shared<DataTypes::TPoint>(value)) {}
 
-Value::Value(data::size value) : Value(TypeTag::Size, std::make_shared<DataTypes::TSize>(value)) {
-}
+Value::Value(data::size value)
+    : Value(TypeTag::Size, std::make_shared<DataTypes::TSize>(value)) {}
 
-Value::Value(data::color value) : Value(TypeTag::Color, std::make_shared<DataTypes::TColor>(value)) {
-}
+Value::Value(data::color value)
+    : Value(TypeTag::Color, std::make_shared<DataTypes::TColor>(value)) {}
 
-Value::Value(data::margins value) : Value(TypeTag::Margins, std::make_shared<DataTypes::TMargins>(value)) {
-}
+Value::Value(data::margins value)
+    : Value(TypeTag::Margins, std::make_shared<DataTypes::TMargins>(value)) {}
 
-Value::Value(data::font value) : Value(TypeTag::Font, std::make_shared<DataTypes::TFont>(value)) {
-}
+Value::Value(data::font value)
+    : Value(TypeTag::Font, std::make_shared<DataTypes::TFont>(value)) {}
 
-Value::Value(data::icon value) : Value(TypeTag::Icon, std::make_shared<DataTypes::TIcon>(value)) {
-}
+Value::Value(data::icon value)
+    : Value(TypeTag::Icon, std::make_shared<DataTypes::TIcon>(value)) {}
 
 Value::Value(const FullName &type, data::fields value)
-: type_ { TypeTag::Struct, type }
-, data_(std::make_shared<DataTypes::TFields>(value)) {
-}
+    : type_{TypeTag::Struct, type}
+    , data_(std::make_shared<DataTypes::TFields>(value)) {}
 
-Value::Value(TypeTag type, double value) : Value(type, std::make_shared<DataTypes::TDouble>(value)) {
+Value::Value(TypeTag type, double value)
+    : Value(type, std::make_shared<DataTypes::TDouble>(value)) {
 	if (type_.tag != TypeTag::Double) {
 		type_.tag = TypeTag::Invalid;
 		data_ = std::make_shared<DataBase>();
 	}
 }
 
-Value::Value(TypeTag type, int value) : Value(type, std::make_shared<DataTypes::TInt>(value)) {
+Value::Value(TypeTag type, int value)
+    : Value(type, std::make_shared<DataTypes::TInt>(value)) {
 	if (type_.tag != TypeTag::Int && type_.tag != TypeTag::Pixels) {
 		type_.tag = TypeTag::Invalid;
 		data_ = std::make_shared<DataBase>();
 	}
 }
 
-Value::Value(TypeTag type, std::string value) : Value(type, std::make_shared<DataTypes::TString>(value)) {
-	if (type_.tag != TypeTag::String &&
-		type_.tag != TypeTag::Align) {
+Value::Value(TypeTag type, std::string value)
+    : Value(type, std::make_shared<DataTypes::TString>(value)) {
+	if (type_.tag != TypeTag::String && type_.tag != TypeTag::Align) {
 		type_.tag = TypeTag::Invalid;
 		data_ = std::make_shared<DataBase>();
 	}
 }
 
-Value::Value(Type type, Qt::Initialization) : type_(type) {
+Value::Value(Type type, Qt::Initialization)
+    : type_(type) {
 	switch (type_.tag) {
 	case TypeTag::Invalid: data_ = std::make_shared<DataBase>(); break;
 	case TypeTag::Int: data_ = std::make_shared<DataTypes::TInt>(0); break;
 	case TypeTag::Double: data_ = std::make_shared<DataTypes::TDouble>(0.); break;
 	case TypeTag::Pixels: data_ = std::make_shared<DataTypes::TInt>(0); break;
 	case TypeTag::String: data_ = std::make_shared<DataTypes::TString>(""); break;
-	case TypeTag::Color: data_ = std::make_shared<DataTypes::TColor>(data::color { 0, 0, 0, 255 }); break;
-	case TypeTag::Point: data_ = std::make_shared<DataTypes::TPoint>(data::point { 0, 0 }); break;
-	case TypeTag::Size: data_ = std::make_shared<DataTypes::TSize>(data::size { 0, 0 }); break;
+	case TypeTag::Color: data_ = std::make_shared<DataTypes::TColor>(data::color{0, 0, 0, 255}); break;
+	case TypeTag::Point: data_ = std::make_shared<DataTypes::TPoint>(data::point{0, 0}); break;
+	case TypeTag::Size: data_ = std::make_shared<DataTypes::TSize>(data::size{0, 0}); break;
 	case TypeTag::Align: data_ = std::make_shared<DataTypes::TString>("topleft"); break;
-	case TypeTag::Margins: data_ = std::make_shared<DataTypes::TMargins>(data::margins { 0, 0, 0, 0 }); break;
-	case TypeTag::Font: data_ = std::make_shared<DataTypes::TFont>(data::font { "", 13, 0 }); break;
-	case TypeTag::Icon: data_ = std::make_shared<DataTypes::TIcon>(data::icon {}); break;
-	case TypeTag::Struct: data_ = std::make_shared<DataTypes::TFields>(data::fields {}); break;
+	case TypeTag::Margins: data_ = std::make_shared<DataTypes::TMargins>(data::margins{0, 0, 0, 0}); break;
+	case TypeTag::Font: data_ = std::make_shared<DataTypes::TFont>(data::font{"", 13, 0}); break;
+	case TypeTag::Icon: data_ = std::make_shared<DataTypes::TIcon>(data::icon{}); break;
+	case TypeTag::Struct: data_ = std::make_shared<DataTypes::TFields>(data::fields{}); break;
 	}
 }
 
-Value::Value(TypeTag type, std::shared_ptr<DataBase> &&data) : type_ { type }, data_(std::move(data)) {
-}
+Value::Value(TypeTag type, std::shared_ptr<DataBase> &&data)
+    : type_{type}
+    , data_(std::move(data)) {}
 
 } // namespace structure
 } // namespace style
diff --git a/Telegram/SourceFiles/codegen/style/structure_types.h b/Telegram/SourceFiles/codegen/style/structure_types.h
index 8de7b8499..c94090c49 100644
--- a/Telegram/SourceFiles/codegen/style/structure_types.h
+++ b/Telegram/SourceFiles/codegen/style/structure_types.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
-#include <vector>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QtMath>
+#include <memory>
+#include <vector>
 
 namespace codegen {
 namespace style {
@@ -98,8 +98,8 @@ struct margins {
 
 struct font {
 	enum Flag {
-		Bold      = 0x01,
-		Italic    = 0x02,
+		Bold = 0x01,
+		Italic = 0x02,
 		Underline = 0x04,
 	};
 	std::string family;
@@ -140,18 +140,42 @@ public:
 	// Default constructed value (uninitialized).
 	Value(Type type, Qt::Initialization);
 
-	Type type() const { return type_; }
-	int Int() const { return data_->Int(); }
-	double Double() const { return data_->Double(); }
-	std::string String() const { return data_->String(); }
-	data::point Point() const { return data_->Point(); }
-	data::size Size() const { return data_->Size(); };
-	data::color Color() const { return data_->Color(); };
-	data::margins Margins() const { return data_->Margins(); };
-	data::font Font() const { return data_->Font(); };
-	data::icon Icon() const { return data_->Icon(); };
-	const data::fields *Fields() const { return data_->Fields(); };
-	data::fields *Fields() { return data_->Fields(); };
+	Type type() const {
+		return type_;
+	}
+	int Int() const {
+		return data_->Int();
+	}
+	double Double() const {
+		return data_->Double();
+	}
+	std::string String() const {
+		return data_->String();
+	}
+	data::point Point() const {
+		return data_->Point();
+	}
+	data::size Size() const {
+		return data_->Size();
+	};
+	data::color Color() const {
+		return data_->Color();
+	};
+	data::margins Margins() const {
+		return data_->Margins();
+	};
+	data::font Font() const {
+		return data_->Font();
+	};
+	data::icon Icon() const {
+		return data_->Icon();
+	};
+	const data::fields *Fields() const {
+		return data_->Fields();
+	};
+	data::fields *Fields() {
+		return data_->Fields();
+	};
 
 	explicit operator bool() const {
 		return type_.tag != TypeTag::Invalid;
@@ -170,19 +194,40 @@ public:
 private:
 	class DataBase {
 	public:
-		virtual int Int() const { return 0; }
-		virtual double Double() const { return 0.; }
-		virtual std::string String() const { return std::string(); }
-		virtual data::point Point() const { return {}; };
-		virtual data::size Size() const { return {}; };
-		virtual data::color Color() const { return {}; };
-		virtual data::margins Margins() const { return {}; };
-		virtual data::font Font() const { return {}; };
-		virtual data::icon Icon() const { return {}; };
-		virtual const data::fields *Fields() const { return nullptr; };
-		virtual data::fields *Fields() { return nullptr; };
-		virtual ~DataBase() {
+		virtual int Int() const {
+			return 0;
 		}
+		virtual double Double() const {
+			return 0.;
+		}
+		virtual std::string String() const {
+			return std::string();
+		}
+		virtual data::point Point() const {
+			return {};
+		};
+		virtual data::size Size() const {
+			return {};
+		};
+		virtual data::color Color() const {
+			return {};
+		};
+		virtual data::margins Margins() const {
+			return {};
+		};
+		virtual data::font Font() const {
+			return {};
+		};
+		virtual data::icon Icon() const {
+			return {};
+		};
+		virtual const data::fields *Fields() const {
+			return nullptr;
+		};
+		virtual data::fields *Fields() {
+			return nullptr;
+		};
+		virtual ~DataBase() {}
 	};
 	struct DataTypes;
 
@@ -192,7 +237,6 @@ private:
 	std::shared_ptr<DataBase> data_;
 
 	FullName copyOf_; // for copies of existing named values
-
 };
 
 struct Variable {
@@ -207,11 +251,7 @@ struct Variable {
 
 namespace data {
 struct field {
-	enum class Status {
-		Uninitialized,
-		Implicit,
-		Explicit
-	};
+	enum class Status { Uninitialized, Implicit, Explicit };
 	Variable variable;
 	Status status;
 };
diff --git a/Telegram/SourceFiles/core/basic_types.h b/Telegram/SourceFiles/core/basic_types.h
index 461b68a63..85b06de38 100644
--- a/Telegram/SourceFiles/core/basic_types.h
+++ b/Telegram/SourceFiles/core/basic_types.h
@@ -20,19 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <string>
-#include <exception>
-#include <memory>
-#include <ctime>
-#include <cstdint>
-#include <gsl/gsl>
-#include <QLatin1String>
-#include <QString>
 #include "base/build_config.h"
 #include "base/ordered_set.h"
+#include <QLatin1String>
+#include <QString>
+#include <cstdint>
+#include <ctime>
+#include <exception>
+#include <gsl/gsl>
+#include <memory>
+#include <string>
 
-template <typename Type>
-using not_null = gsl::not_null<Type>;
+template <typename Type> using not_null = gsl::not_null<Type>;
 
 #define qsl(s) QStringLiteral(s)
-#define qstr(s) QLatin1String(s, static_cast<int>(sizeof(s)-1))
+#define qstr(s) QLatin1String(s, static_cast<int>(sizeof(s) - 1))
diff --git a/Telegram/SourceFiles/core/click_handler.cpp b/Telegram/SourceFiles/core/click_handler.cpp
index cba214d55..51ff8fe1c 100644
--- a/Telegram/SourceFiles/core/click_handler.cpp
+++ b/Telegram/SourceFiles/core/click_handler.cpp
@@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "ui/text/text_entity.h"
 #include "core/click_handler.h"
+#include "ui/text/text_entity.h"
 
 ClickHandlerHost::~ClickHandlerHost() {
 	ClickHandler::hostDestroyed(this);
@@ -66,8 +66,9 @@ QString ClickHandler::getExpandedLinkText(ExpandLinksMode mode, const QStringRef
 	return QString();
 }
 
-TextWithEntities ClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
-	return { QString(), EntitiesInText() };
+TextWithEntities ClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                               const QStringRef &textPart) const {
+	return {QString(), EntitiesInText()};
 }
 
 TextWithEntities ClickHandler::simpleTextWithEntity(const EntityInText &entity) const {
diff --git a/Telegram/SourceFiles/core/click_handler.h b/Telegram/SourceFiles/core/click_handler.h
index c67a6f6e7..a1c20bb57 100644
--- a/Telegram/SourceFiles/core/click_handler.h
+++ b/Telegram/SourceFiles/core/click_handler.h
@@ -22,8 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include <QSharedPointer>
 
-#include "core/utils.h"
 #include "base/lambda.h"
+#include "core/utils.h"
 #include "ui/text/text_entity.h"
 
 class ClickHandler;
@@ -38,21 +38,17 @@ enum ExpandLinksMode {
 
 class ClickHandlerHost {
 protected:
-	virtual void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) {
-	}
-	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) {
-	}
+	virtual void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) {}
+	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) {}
 	virtual ~ClickHandlerHost() = 0;
 	friend class ClickHandler;
-
 };
 
 class EntityInText;
 
 class ClickHandler {
 public:
-	virtual ~ClickHandler() {
-	}
+	virtual ~ClickHandler() {}
 
 	virtual void onClick(Qt::MouseButton) const = 0;
 
@@ -67,8 +63,7 @@ public:
 	}
 
 	// Copy to clipboard support.
-	virtual void copyToClipboard() const {
-	}
+	virtual void copyToClipboard() const {}
 	virtual QString copyToClipboardContextItemText() const {
 		return QString();
 	}
@@ -77,7 +72,8 @@ public:
 
 	// This method returns empty string if just textPart should be used (nothing to expand).
 	virtual QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const;
-	virtual TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const;
+	virtual TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                         const QStringRef &textPart) const;
 
 	// This method should be called on mouse over a click handler.
 	// It returns true if the active handler was changed or false otherwise.
@@ -169,7 +165,6 @@ private:
 	static NeverFreedPointer<ClickHandlerPtr> _pressed;
 	static ClickHandlerHost *_activeHost;
 	static ClickHandlerHost *_pressedHost;
-
 };
 
 class LeftButtonClickHandler : public ClickHandler {
@@ -181,13 +176,12 @@ public:
 
 protected:
 	virtual void onClickImpl() const = 0;
-
 };
 
 class LambdaClickHandler : public ClickHandler {
 public:
-	LambdaClickHandler(base::lambda<void()> handler) : _handler(std::move(handler)) {
-	}
+	LambdaClickHandler(base::lambda<void()> handler)
+	    : _handler(std::move(handler)) {}
 	void onClick(Qt::MouseButton button) const override final {
 		if (button == Qt::LeftButton && _handler) {
 			_handler();
@@ -196,5 +190,4 @@ public:
 
 private:
 	base::lambda<void()> _handler;
-
 };
diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index db18ffa8b..c2479daa0 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -18,19 +18,19 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QDesktopServices>
 #include "core/click_handler_types.h"
+#include <QDesktopServices>
 
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
+#include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
+#include "facades.h"
 #include "lang/lang_keys.h"
 #include "messenger.h"
 #include "platform/platform_specific.h"
-#include "boxes/confirm_box.h"
-#include "base/qthelp_regex.h"
-#include "base/qthelp_url.h"
 #include "storage/localstorage.h"
 #include "ui/widgets/tooltip.h"
-#include "core/file_utilities.h"
-#include "facades.h"
 
 #include "app.h" // App::userLoaded
 
@@ -46,7 +46,8 @@ QString tryConvertUrlToLocal(QString url) {
 		auto query = telegramMeMatch->capturedRef(4);
 		if (auto joinChatMatch = regex_match(qsl("^joinchat/([a-zA-Z0-9\\.\\_\\-]+)(\\?|$)"), query, matchOptions)) {
 			return qsl("tg://join?invite=") + url_encode(joinChatMatch->captured(1));
-		} else if (auto stickerSetMatch = regex_match(qsl("^addstickers/([a-zA-Z0-9\\.\\_]+)(\\?|$)"), query, matchOptions)) {
+		} else if (auto stickerSetMatch =
+		               regex_match(qsl("^addstickers/([a-zA-Z0-9\\.\\_]+)(\\?|$)"), query, matchOptions)) {
 			return qsl("tg://addstickers?set=") + url_encode(stickerSetMatch->captured(1));
 		} else if (auto shareUrlMatch = regex_match(qsl("^share/url/?\\?(.+)$"), query, matchOptions)) {
 			return qsl("tg://msg_url?") + shareUrlMatch->captured(1);
@@ -55,19 +56,21 @@ QString tryConvertUrlToLocal(QString url) {
 		} else if (auto ivMatch = regex_match(qsl("iv/?\\?(.+)(#|$)"), query, matchOptions)) {
 			auto params = url_parse_params(ivMatch->captured(1), UrlParamNameTransform::ToLower);
 			auto previewedUrl = params.value(qsl("url"));
-			if (previewedUrl.startsWith(qstr("http://"), Qt::CaseInsensitive)
-				|| previewedUrl.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
+			if (previewedUrl.startsWith(qstr("http://"), Qt::CaseInsensitive) ||
+			    previewedUrl.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
 				return previewedUrl;
 			}
 		} else if (auto socksMatch = regex_match(qsl("socks/?\\?(.+)(#|$)"), query, matchOptions)) {
 			return qsl("tg://socks?") + socksMatch->captured(1);
-		} else if (auto usernameMatch = regex_match(qsl("^([a-zA-Z0-9\\.\\_]+)(/?\\?|/?$|/(\\d+)/?(?:\\?|$))"), query, matchOptions)) {
+		} else if (auto usernameMatch =
+		               regex_match(qsl("^([a-zA-Z0-9\\.\\_]+)(/?\\?|/?$|/(\\d+)/?(?:\\?|$))"), query, matchOptions)) {
 			auto params = query.mid(usernameMatch->captured(0).size()).toString();
 			auto postParam = QString();
 			if (auto postMatch = regex_match(qsl("^/\\d+/?(?:\\?|$)"), usernameMatch->captured(2))) {
 				postParam = qsl("&post=") + usernameMatch->captured(3);
 			}
-			return qsl("tg://resolve/?domain=") + url_encode(usernameMatch->captured(1)) + postParam + (params.isEmpty() ? QString() : '&' + params);
+			return qsl("tg://resolve/?domain=") + url_encode(usernameMatch->captured(1)) + postParam +
+			       (params.isEmpty() ? QString() : '&' + params);
 		}
 	}
 	return url;
@@ -75,7 +78,8 @@ QString tryConvertUrlToLocal(QString url) {
 
 bool UrlRequiresConfirmation(const QUrl &url) {
 	using namespace qthelp;
-	return !regex_match(qsl("(^|\\.)(telegram\\.org|telegra\\.ph|telesco\\.pe)$"), url.host(), RegExOption::CaseInsensitive);
+	return !regex_match(qsl("(^|\\.)(telegram\\.org|telegra\\.ph|telesco\\.pe)$"), url.host(),
+	                    RegExOption::CaseInsensitive);
 }
 
 } // namespace
@@ -123,7 +127,8 @@ QString UrlClickHandler::getExpandedLinkText(ExpandLinksMode mode, const QString
 	return result;
 }
 
-TextWithEntities UrlClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
+TextWithEntities UrlClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                  const QStringRef &textPart) const {
 	TextWithEntities result;
 	auto entityType = isEmail(_originalUrl) ? EntityInTextEmail : EntityInTextUrl;
 	int entityLength = textPart.size();
@@ -131,7 +136,7 @@ TextWithEntities UrlClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMod
 		result.text = _originalUrl;
 		entityLength = _originalUrl.size();
 	}
-	result.entities.push_back({ entityType, entityOffset, entityLength });
+	result.entities.push_back({entityType, entityOffset, entityLength});
 	return result;
 }
 
@@ -144,10 +149,11 @@ void HiddenUrlClickHandler::doOpen(QString url) {
 		auto parsedUrl = QUrl::fromUserInput(urlText);
 		if (UrlRequiresConfirmation(urlText)) {
 			auto displayUrl = parsedUrl.isValid() ? parsedUrl.toDisplayString() : urlText;
-			Ui::show(Box<ConfirmBox>(lang(lng_open_this_link) + qsl("\n\n") + displayUrl, lang(lng_open_link), [urlText] {
-				Ui::hideLayer();
-				UrlClickHandler::doOpen(urlText);
-			}));
+			Ui::show(
+			    Box<ConfirmBox>(lang(lng_open_this_link) + qsl("\n\n") + displayUrl, lang(lng_open_link), [urlText] {
+				    Ui::hideLayer();
+				    UrlClickHandler::doOpen(urlText);
+			    }));
 		} else {
 			UrlClickHandler::doOpen(urlText);
 		}
@@ -162,11 +168,12 @@ void BotGameUrlClickHandler::onClick(Qt::MouseButton button) const {
 	} else if (!_bot || _bot->isVerified() || Local::isBotTrusted(_bot)) {
 		doOpen(urlText);
 	} else {
-		Ui::show(Box<ConfirmBox>(lng_allow_bot_pass(lt_bot_name, _bot->name), lang(lng_allow_bot), [bot = _bot, urlText] {
-			Ui::hideLayer();
-			Local::makeBotTrusted(bot);
-			UrlClickHandler::doOpen(urlText);
-		}));
+		Ui::show(
+		    Box<ConfirmBox>(lng_allow_bot_pass(lt_bot_name, _bot->name), lang(lng_allow_bot), [bot = _bot, urlText] {
+			    Ui::hideLayer();
+			    Local::makeBotTrusted(bot);
+			    UrlClickHandler::doOpen(urlText);
+		    }));
 	}
 }
 
@@ -180,13 +187,14 @@ QString HiddenUrlClickHandler::getExpandedLinkText(ExpandLinksMode mode, const Q
 	return result;
 }
 
-TextWithEntities HiddenUrlClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
+TextWithEntities HiddenUrlClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                        const QStringRef &textPart) const {
 	TextWithEntities result;
 	if (mode == ExpandLinksUrlOnly) {
 		result.text = url();
-		result.entities.push_back({ EntityInTextUrl, entityOffset, result.text.size() });
+		result.entities.push_back({EntityInTextUrl, entityOffset, result.text.size()});
 	} else {
-		result.entities.push_back({ EntityInTextCustomUrl, entityOffset, textPart.size(), url() });
+		result.entities.push_back({EntityInTextCustomUrl, entityOffset, textPart.size(), url()});
 		if (mode == ExpandLinksAll) {
 			result.text = textPart.toString() + qsl(" (") + url() + ')';
 		}
@@ -204,8 +212,9 @@ void MentionClickHandler::onClick(Qt::MouseButton button) const {
 	}
 }
 
-TextWithEntities MentionClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
-	return simpleTextWithEntity({ EntityInTextMention, entityOffset, textPart.size() });
+TextWithEntities MentionClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                      const QStringRef &textPart) const {
+	return simpleTextWithEntity({EntityInTextMention, entityOffset, textPart.size()});
 }
 
 void MentionNameClickHandler::onClick(Qt::MouseButton button) const {
@@ -216,9 +225,10 @@ void MentionNameClickHandler::onClick(Qt::MouseButton button) const {
 	}
 }
 
-TextWithEntities MentionNameClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
+TextWithEntities MentionNameClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                          const QStringRef &textPart) const {
 	auto data = QString::number(_userId) + '.' + QString::number(_accessHash);
-	return simpleTextWithEntity({ EntityInTextMentionName, entityOffset, textPart.size(), data });
+	return simpleTextWithEntity({EntityInTextMentionName, entityOffset, textPart.size(), data});
 }
 
 QString MentionNameClickHandler::tooltip() const {
@@ -241,8 +251,9 @@ void HashtagClickHandler::onClick(Qt::MouseButton button) const {
 	}
 }
 
-TextWithEntities HashtagClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
-	return simpleTextWithEntity({ EntityInTextHashtag, entityOffset, textPart.size() });
+TextWithEntities HashtagClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                      const QStringRef &textPart) const {
+	return simpleTextWithEntity({EntityInTextHashtag, entityOffset, textPart.size()});
 }
 
 PeerData *BotCommandClickHandler::_peer = nullptr;
@@ -272,6 +283,7 @@ void BotCommandClickHandler::onClick(Qt::MouseButton button) const {
 	}
 }
 
-TextWithEntities BotCommandClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const {
-	return simpleTextWithEntity({ EntityInTextHashtag, entityOffset, textPart.size() });
+TextWithEntities BotCommandClickHandler::getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+                                                                         const QStringRef &textPart) const {
+	return simpleTextWithEntity({EntityInTextHashtag, entityOffset, textPart.size()});
 }
diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index 274abde78..33c1dab6a 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -20,17 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QUrl>
-#include <QApplication>
-#include <QClipboard>
 #include "core/click_handler.h"
 #include "structs.h"
+#include <QApplication>
+#include <QClipboard>
+#include <QUrl>
 
 class TextClickHandler : public ClickHandler {
 public:
-
-	TextClickHandler(bool fullDisplayed = true) : _fullDisplayed(fullDisplayed) {
-	}
+	TextClickHandler(bool fullDisplayed = true)
+	    : _fullDisplayed(fullDisplayed) {}
 
 	void copyToClipboard() const override {
 		auto u = url();
@@ -54,12 +53,13 @@ protected:
 	}
 
 	bool _fullDisplayed;
-
 };
 
 class UrlClickHandler : public TextClickHandler {
 public:
-	UrlClickHandler(const QString &url, bool fullDisplayed = true) : TextClickHandler(fullDisplayed), _originalUrl(url) {
+	UrlClickHandler(const QString &url, bool fullDisplayed = true)
+	    : TextClickHandler(fullDisplayed)
+	    , _originalUrl(url) {
 		if (isEmail()) {
 			_readable = _originalUrl;
 		} else {
@@ -74,7 +74,8 @@ public:
 	}
 
 	QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const override;
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 
 	static void doOpen(QString url);
 	void onClick(Qt::MouseButton button) const override {
@@ -99,14 +100,13 @@ private:
 	}
 
 	QString _originalUrl, _readable;
-
 };
 typedef QSharedPointer<TextClickHandler> TextClickHandlerPtr;
 
 class HiddenUrlClickHandler : public UrlClickHandler {
 public:
-	HiddenUrlClickHandler(QString url) : UrlClickHandler(url, false) {
-	}
+	HiddenUrlClickHandler(QString url)
+	    : UrlClickHandler(url, false) {}
 	QString copyToClipboardContextItemText() const override {
 		return url().isEmpty() ? QString() : UrlClickHandler::copyToClipboardContextItemText();
 	}
@@ -119,25 +119,25 @@ public:
 	}
 
 	QString getExpandedLinkText(ExpandLinksMode mode, const QStringRef &textPart) const override;
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
-
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 };
 
 class BotGameUrlClickHandler : public UrlClickHandler {
 public:
-	BotGameUrlClickHandler(UserData *bot, QString url) : UrlClickHandler(url, false), _bot(bot) {
-	}
+	BotGameUrlClickHandler(UserData *bot, QString url)
+	    : UrlClickHandler(url, false)
+	    , _bot(bot) {}
 	void onClick(Qt::MouseButton button) const override;
 
 private:
 	UserData *_bot;
-
 };
 
 class MentionClickHandler : public TextClickHandler {
 public:
-	MentionClickHandler(const QString &tag) : _tag(tag) {
-	}
+	MentionClickHandler(const QString &tag)
+	    : _tag(tag) {}
 
 	void onClick(Qt::MouseButton button) const override;
 
@@ -147,7 +147,8 @@ public:
 
 	QString copyToClipboardContextItemText() const override;
 
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 
 protected:
 	QString url() const override {
@@ -156,20 +157,19 @@ protected:
 
 private:
 	QString _tag;
-
 };
 
 class MentionNameClickHandler : public ClickHandler {
 public:
 	MentionNameClickHandler(QString text, UserId userId, quint64 accessHash)
-		: _text(text)
-		, _userId(userId)
-		, _accessHash(accessHash) {
-	}
+	    : _text(text)
+	    , _userId(userId)
+	    , _accessHash(accessHash) {}
 
 	void onClick(Qt::MouseButton button) const override;
 
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 
 	QString tooltip() const override;
 
@@ -177,13 +177,12 @@ private:
 	QString _text;
 	UserId _userId;
 	quint64 _accessHash;
-
 };
 
 class HashtagClickHandler : public TextClickHandler {
 public:
-	HashtagClickHandler(const QString &tag) : _tag(tag) {
-	}
+	HashtagClickHandler(const QString &tag)
+	    : _tag(tag) {}
 
 	void onClick(Qt::MouseButton button) const override;
 
@@ -193,7 +192,8 @@ public:
 
 	QString copyToClipboardContextItemText() const override;
 
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 
 protected:
 	QString url() const override {
@@ -202,15 +202,14 @@ protected:
 
 private:
 	QString _tag;
-
 };
 
 class PeerData;
 class UserData;
 class BotCommandClickHandler : public TextClickHandler {
 public:
-	BotCommandClickHandler(const QString &cmd) : _cmd(cmd) {
-	}
+	BotCommandClickHandler(const QString &cmd)
+	    : _cmd(cmd) {}
 
 	void onClick(Qt::MouseButton button) const override;
 
@@ -225,7 +224,8 @@ public:
 		_bot = bot;
 	}
 
-	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset, const QStringRef &textPart) const override;
+	TextWithEntities getExpandedLinkTextWithEntities(ExpandLinksMode mode, int entityOffset,
+	                                                 const QStringRef &textPart) const override;
 
 protected:
 	QString url() const override {
@@ -243,5 +243,4 @@ private:
 
 	static PeerData *_peer;
 	static UserData *_bot;
-
 };
diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 4bfa85f3b..41240123a 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -18,26 +18,28 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QDesktopServices>
-#include <QStandardPaths>
-#include <QFileDialog>
 #include "core/file_utilities.h"
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QStandardPaths>
 
-#include "mainwindow.h"
-#include "storage/localstorage.h"
-#include "platform/platform_file_utilities.h"
 #include "base/task_queue.h"
+#include "mainwindow.h"
 #include "messenger.h"
+#include "platform/platform_file_utilities.h"
+#include "storage/localstorage.h"
 
 bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath) {
 	QStringList files;
 	QByteArray remoteContent;
-	bool result = Platform::FileDialog::Get(files, remoteContent, caption, filter, FileDialog::internal::Type::WriteFile, initialPath);
+	bool result = Platform::FileDialog::Get(files, remoteContent, caption, filter,
+	                                        FileDialog::internal::Type::WriteFile, initialPath);
 	file = files.isEmpty() ? QString() : files.at(0);
 	return result;
 }
 
-QString filedialogDefaultName(const QString &prefix, const QString &extension, const QString &path, bool skipExistance, int fileTime) {
+QString filedialogDefaultName(const QString &prefix, const QString &extension, const QString &path, bool skipExistance,
+                              int fileTime) {
 	auto directoryPath = path;
 	if (directoryPath.isEmpty()) {
 		if (cDialogLastPath().isEmpty()) {
@@ -55,7 +57,13 @@ QString filedialogDefaultName(const QString &prefix, const QString &extension, c
 		mylocaltime(&tm, &t);
 
 		QChar zero('0');
-		base = prefix + qsl("_%1-%2-%3_%4-%5-%6").arg(tm.tm_year + 1900).arg(tm.tm_mon + 1, 2, 10, zero).arg(tm.tm_mday, 2, 10, zero).arg(tm.tm_hour, 2, 10, zero).arg(tm.tm_min, 2, 10, zero).arg(tm.tm_sec, 2, 10, zero);
+		base = prefix + qsl("_%1-%2-%3_%4-%5-%6")
+		                    .arg(tm.tm_year + 1900)
+		                    .arg(tm.tm_mon + 1, 2, 10, zero)
+		                    .arg(tm.tm_mday, 2, 10, zero)
+		                    .arg(tm.tm_hour, 2, 10, zero)
+		                    .arg(tm.tm_min, 2, 10, zero)
+		                    .arg(tm.tm_sec, 2, 10, zero);
 	}
 
 	QString name;
@@ -90,9 +98,7 @@ QString filedialogNextFilename(const QString &name, const QString &cur, const QS
 namespace File {
 
 void OpenEmailLink(const QString &email) {
-	base::TaskQueue::Main().Put([email] {
-		Platform::File::UnsafeOpenEmailLink(email);
-	});
+	base::TaskQueue::Main().Put([email] { Platform::File::UnsafeOpenEmailLink(email); });
 }
 
 void OpenWith(const QString &filepath, QPoint menuPosition) {
@@ -106,15 +112,11 @@ void OpenWith(const QString &filepath, QPoint menuPosition) {
 }
 
 void Launch(const QString &filepath) {
-	base::TaskQueue::Main().Put([filepath] {
-		Platform::File::UnsafeLaunch(filepath);
-	});
+	base::TaskQueue::Main().Put([filepath] { Platform::File::UnsafeLaunch(filepath); });
 }
 
 void ShowInFolder(const QString &filepath) {
-	base::TaskQueue::Main().Put([filepath] {
-		Platform::File::UnsafeShowInFolder(filepath);
-	});
+	base::TaskQueue::Main().Put([filepath] { Platform::File::UnsafeShowInFolder(filepath); });
 }
 
 namespace internal {
@@ -133,12 +135,13 @@ void UnsafeLaunchDefault(const QString &filepath) {
 
 namespace FileDialog {
 
-void GetOpenPath(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback, base::lambda<void()> failed) {
+void GetOpenPath(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback,
+                 base::lambda<void()> failed) {
 	base::TaskQueue::Main().Put([caption, filter, callback = std::move(callback), failed = std::move(failed)] {
 		auto files = QStringList();
 		auto remoteContent = QByteArray();
-		if (Platform::FileDialog::Get(files, remoteContent, caption, filter, FileDialog::internal::Type::ReadFile)
-			&& ((!files.isEmpty() && !files[0].isEmpty()) || !remoteContent.isEmpty())) {
+		if (Platform::FileDialog::Get(files, remoteContent, caption, filter, FileDialog::internal::Type::ReadFile) &&
+		    ((!files.isEmpty() && !files[0].isEmpty()) || !remoteContent.isEmpty())) {
 			if (callback) {
 				auto result = OpenResult();
 				if (!files.isEmpty() && !files[0].isEmpty()) {
@@ -153,12 +156,13 @@ void GetOpenPath(const QString &caption, const QString &filter, base::lambda<voi
 	});
 }
 
-void GetOpenPaths(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback, base::lambda<void()> failed) {
+void GetOpenPaths(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback,
+                  base::lambda<void()> failed) {
 	base::TaskQueue::Main().Put([caption, filter, callback = std::move(callback), failed = std::move(failed)] {
 		auto files = QStringList();
 		auto remoteContent = QByteArray();
-		if (Platform::FileDialog::Get(files, remoteContent, caption, filter, FileDialog::internal::Type::ReadFiles)
-			&& (!files.isEmpty() || !remoteContent.isEmpty())) {
+		if (Platform::FileDialog::Get(files, remoteContent, caption, filter, FileDialog::internal::Type::ReadFiles) &&
+		    (!files.isEmpty() || !remoteContent.isEmpty())) {
 			if (callback) {
 				auto result = OpenResult();
 				result.paths = files;
@@ -171,25 +175,29 @@ void GetOpenPaths(const QString &caption, const QString &filter, base::lambda<vo
 	});
 }
 
-void GetWritePath(const QString &caption, const QString &filter, const QString &initialPath, base::lambda<void(const QString &result)> callback, base::lambda<void()> failed) {
-	base::TaskQueue::Main().Put([caption, filter, initialPath, callback = std::move(callback), failed = std::move(failed)] {
-		auto file = QString();
-		if (filedialogGetSaveFile(file, caption, filter, initialPath)) {
-			if (callback) {
-				callback(file);
-			}
-		} else if (failed) {
-			failed();
-		}
-	});
+void GetWritePath(const QString &caption, const QString &filter, const QString &initialPath,
+                  base::lambda<void(const QString &result)> callback, base::lambda<void()> failed) {
+	base::TaskQueue::Main().Put(
+	    [caption, filter, initialPath, callback = std::move(callback), failed = std::move(failed)] {
+		    auto file = QString();
+		    if (filedialogGetSaveFile(file, caption, filter, initialPath)) {
+			    if (callback) {
+				    callback(file);
+			    }
+		    } else if (failed) {
+			    failed();
+		    }
+	    });
 }
 
-void GetFolder(const QString &caption, const QString &initialPath, base::lambda<void(const QString &result)> callback, base::lambda<void()> failed) {
+void GetFolder(const QString &caption, const QString &initialPath, base::lambda<void(const QString &result)> callback,
+               base::lambda<void()> failed) {
 	base::TaskQueue::Main().Put([caption, initialPath, callback = std::move(callback), failed = std::move(failed)] {
 		auto files = QStringList();
 		auto remoteContent = QByteArray();
-		if (Platform::FileDialog::Get(files, remoteContent, caption, QString(), FileDialog::internal::Type::ReadFolder, initialPath)
-			&& !files.isEmpty() && !files[0].isEmpty()) {
+		if (Platform::FileDialog::Get(files, remoteContent, caption, QString(), FileDialog::internal::Type::ReadFolder,
+		                              initialPath) &&
+		    !files.isEmpty() && !files[0].isEmpty()) {
 			if (callback) {
 				callback(files[0]);
 			}
@@ -213,12 +221,13 @@ void InitLastPathDefault() {
 	cSetDialogLastPath(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
 }
 
-bool GetDefault(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, FileDialog::internal::Type type, QString startFile = QString()) {
+bool GetDefault(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter,
+                FileDialog::internal::Type type, QString startFile = QString()) {
 	if (cDialogLastPath().isEmpty()) {
 		Platform::FileDialog::InitLastPath();
 	}
 
-    remoteContent = QByteArray();
+	remoteContent = QByteArray();
 	if (startFile.isEmpty() || startFile.at(0) != '/') {
 		startFile = cDialogLastPath() + '/' + startFile;
 	}
@@ -231,17 +240,17 @@ bool GetDefault(QStringList &files, QByteArray &remoteContent, const QString &ca
 			Local::writeUserSettings();
 		}
 		return !files.isEmpty();
-    } else if (type == Type::ReadFolder) {
+	} else if (type == Type::ReadFolder) {
 		file = QFileDialog::getExistingDirectory(Messenger::Instance().getFileDialogParent(), caption, startFile);
-    } else if (type == Type::WriteFile) {
+	} else if (type == Type::WriteFile) {
 		file = QFileDialog::getSaveFileName(Messenger::Instance().getFileDialogParent(), caption, startFile, filter);
-    } else {
+	} else {
 		file = QFileDialog::getOpenFileName(Messenger::Instance().getFileDialogParent(), caption, startFile, filter);
-    }
-    if (file.isEmpty()) {
-        files = QStringList();
-        return false;
-    }
+	}
+	if (file.isEmpty()) {
+		files = QStringList();
+		return false;
+	}
 	if (type != Type::ReadFolder) {
 		// Save last used directory for all queries except directory choosing.
 		auto path = QFileInfo(file).absoluteDir().absolutePath();
diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h
index dc7fa92ca..2ddc3a228 100644
--- a/Telegram/SourceFiles/core/file_utilities.h
+++ b/Telegram/SourceFiles/core/file_utilities.h
@@ -20,17 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QUrl>
+#include "base/observer.h"
+#include <QByteArray>
 #include <QPoint>
 #include <QString>
-#include <QByteArray>
 #include <QStringList>
-#include "base/observer.h"
+#include <QUrl>
 
 // legacy
 bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath);
 
-QString filedialogDefaultName(const QString &prefix, const QString &extension, const QString &path = QString(), bool skipExistance = false, int fileTime = 0);
+QString filedialogDefaultName(const QString &prefix, const QString &extension, const QString &path = QString(),
+                              bool skipExistance = false, int fileTime = 0);
 QString filedialogNextFilename(const QString &name, const QString &cur, const QString &path = QString());
 
 namespace File {
@@ -59,10 +60,15 @@ struct OpenResult {
 	QStringList paths;
 	QByteArray remoteContent;
 };
-void GetOpenPath(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback, base::lambda<void()> failed = base::lambda<void()>());
-void GetOpenPaths(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback, base::lambda<void()> failed = base::lambda<void()>());
-void GetWritePath(const QString &caption, const QString &filter, const QString &initialPath, base::lambda<void(const QString &result)> callback, base::lambda<void()> failed = base::lambda<void()>());
-void GetFolder(const QString &caption, const QString &initialPath, base::lambda<void(const QString &result)> callback, base::lambda<void()> failed = base::lambda<void()>());
+void GetOpenPath(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback,
+                 base::lambda<void()> failed = base::lambda<void()>());
+void GetOpenPaths(const QString &caption, const QString &filter, base::lambda<void(const OpenResult &result)> callback,
+                  base::lambda<void()> failed = base::lambda<void()>());
+void GetWritePath(const QString &caption, const QString &filter, const QString &initialPath,
+                  base::lambda<void(const QString &result)> callback,
+                  base::lambda<void()> failed = base::lambda<void()>());
+void GetFolder(const QString &caption, const QString &initialPath, base::lambda<void(const QString &result)> callback,
+               base::lambda<void()> failed = base::lambda<void()>());
 
 QString AllFilesFilter();
 
@@ -77,7 +83,8 @@ enum class Type {
 
 void InitLastPathDefault();
 
-bool GetDefault(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, ::FileDialog::internal::Type type, QString startFile);
+bool GetDefault(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter,
+                ::FileDialog::internal::Type type, QString startFile);
 
 } // namespace internal
 } // namespace FileDialog
diff --git a/Telegram/SourceFiles/core/single_timer.cpp b/Telegram/SourceFiles/core/single_timer.cpp
index b84723a97..9898ba82b 100644
--- a/Telegram/SourceFiles/core/single_timer.cpp
+++ b/Telegram/SourceFiles/core/single_timer.cpp
@@ -22,7 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "application.h"
 
-SingleTimer::SingleTimer(QObject *parent) : QTimer(parent) {
+SingleTimer::SingleTimer(QObject *parent)
+    : QTimer(parent) {
 	QTimer::setSingleShot(true);
 	Sandbox::connect(SIGNAL(adjustSingleTimers()), this, SLOT(adjust()));
 }
diff --git a/Telegram/SourceFiles/core/single_timer.h b/Telegram/SourceFiles/core/single_timer.h
index 727bfc237..3f39d0ac7 100644
--- a/Telegram/SourceFiles/core/single_timer.h
+++ b/Telegram/SourceFiles/core/single_timer.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <base/lambda.h>
 #include "core/basic_types.h"
 #include "core/utils.h"
+#include <base/lambda.h>
 
 #include <QTimer>
 
@@ -48,5 +48,4 @@ private slots:
 private:
 	TimeMs _finishing = 0;
 	base::lambda<void()> _handler;
-
 };
diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index dc1c6e3c9..4b7bcf687 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -18,19 +18,19 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
+#include "core/utils.h"
+#include <QMimeDatabase>
 #include <QMutex>
 #include <QThread>
-#include <QMimeDatabase>
-#include "core/utils.h"
 
+#include <QSslSocket>
+#include <openssl/conf.h>
 #include <openssl/crypto.h>
-#include <openssl/sha.h>
+#include <openssl/engine.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/engine.h>
-#include <openssl/conf.h>
+#include <openssl/sha.h>
 #include <openssl/ssl.h>
-#include <QSslSocket>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -40,7 +40,7 @@ extern "C" {
 #include "application.h"
 #include "platform/platform_specific.h"
 
-quint64 _SharedMemoryLocation[4] = { 0x00, 0x01, 0x02, 0x03 };
+quint64 _SharedMemoryLocation[4] = {0x00, 0x01, 0x02, 0x03};
 
 #ifdef Q_OS_WIN
 #elif defined Q_OS_MAC
@@ -74,30 +74,30 @@ static_assert(sizeof(MTPdouble) == 8, "Basic types size check failed");
 // Unixtime functions
 
 namespace {
-	QReadWriteLock unixtimeLock;
-	volatile qint32 unixtimeDelta = 0;
-	volatile bool unixtimeWasSet = false;
-    volatile quint64 _msgIdStart, _msgIdLocal = 0, _msgIdMsStart;
-	qint32 _reqId = 0;
+QReadWriteLock unixtimeLock;
+volatile qint32 unixtimeDelta = 0;
+volatile bool unixtimeWasSet = false;
+volatile quint64 _msgIdStart, _msgIdLocal = 0, _msgIdMsStart;
+qint32 _reqId = 0;
 
-	void _initMsgIdConstants() {
+void _initMsgIdConstants() {
 #ifdef Q_OS_WIN
-		LARGE_INTEGER li;
-		QueryPerformanceCounter(&li);
-		_msgIdMsStart = li.QuadPart;
+	LARGE_INTEGER li;
+	QueryPerformanceCounter(&li);
+	_msgIdMsStart = li.QuadPart;
 #elif defined Q_OS_MAC
-		_msgIdMsStart = mach_absolute_time();
+	_msgIdMsStart = mach_absolute_time();
 #else
-		timespec ts;
-		clock_gettime(CLOCK_REALTIME, &ts);
-		_msgIdMsStart = 1000000000 * quint64(ts.tv_sec) + quint64(ts.tv_nsec);
+	timespec ts;
+	clock_gettime(CLOCK_REALTIME, &ts);
+	_msgIdMsStart = 1000000000 * quint64(ts.tv_sec) + quint64(ts.tv_nsec);
 #endif
 
-		quint32 msgIdRand;
-		memset_rand(&msgIdRand, sizeof(quint32));
-		_msgIdStart = (((quint64)((quint32)unixtime()) << 32) | (quint64)msgIdRand);
-	}
+	quint32 msgIdRand;
+	memset_rand(&msgIdRand, sizeof(quint32));
+	_msgIdStart = (((quint64)((quint32)unixtime()) << 32) | (quint64)msgIdRand);
 }
+} // namespace
 
 TimeId myunixtime() {
 	return (TimeId)time(NULL);
@@ -156,178 +156,179 @@ struct CRYPTO_dynlock_value {
 };
 
 namespace {
-	bool _sslInited = false;
-	QMutex *_sslLocks = nullptr;
-	void _sslLockingCallback(int mode, int type, const char *file, int line) {
-		if (!_sslLocks) return; // not inited
+bool _sslInited = false;
+QMutex *_sslLocks = nullptr;
+void _sslLockingCallback(int mode, int type, const char *file, int line) {
+	if (!_sslLocks) return; // not inited
 
-		if (mode & CRYPTO_LOCK) {
-			_sslLocks[type].lock();
-		} else {
-			_sslLocks[type].unlock();
-		}
+	if (mode & CRYPTO_LOCK) {
+		_sslLocks[type].lock();
+	} else {
+		_sslLocks[type].unlock();
 	}
-	void _sslThreadId(CRYPTO_THREADID *id) {
-		CRYPTO_THREADID_set_pointer(id, QThread::currentThreadId());
-	}
-	CRYPTO_dynlock_value *_sslCreateFunction(const char *file, int line) {
-		return new CRYPTO_dynlock_value();
-	}
-	void _sslLockFunction(int mode, CRYPTO_dynlock_value *l, const char *file, int line) {
-		if (mode & CRYPTO_LOCK) {
-			l->mutex.lock();
-		} else {
-			l->mutex.unlock();
-		}
-	}
-	void _sslDestroyFunction(CRYPTO_dynlock_value *l, const char *file, int line) {
-		delete l;
-	}
-
-	int _ffmpegLockManager(void **mutex, AVLockOp op) {
-		switch (op) {
-		case AV_LOCK_CREATE: {
-			Assert(*mutex == 0);
-			*mutex = reinterpret_cast<void*>(new QMutex());
-		} break;
-
-		case AV_LOCK_OBTAIN: {
-			Assert(*mutex != 0);
-			reinterpret_cast<QMutex*>(*mutex)->lock();
-		} break;
-
-		case AV_LOCK_RELEASE: {
-			Assert(*mutex != 0);
-			reinterpret_cast<QMutex*>(*mutex)->unlock();
-		}; break;
-
-		case AV_LOCK_DESTROY: {
-			Assert(*mutex != 0);
-			delete reinterpret_cast<QMutex*>(*mutex);
-			*mutex = 0;
-		} break;
-		}
-		return 0;
-	}
-
-	double _msFreq;
-	double _msgIdCoef;
-	TimeMs _msStart = 0, _msAddToMsStart = 0, _msAddToUnixtime = 0;
-	qint32 _timeStart = 0;
-
-	class _MsInitializer {
-	public:
-		_MsInitializer() {
-#ifdef Q_OS_WIN
-			LARGE_INTEGER li;
-			QueryPerformanceFrequency(&li);
-            _msFreq = 1000. / double(li.QuadPart);
-
-			// 0xFFFF0000L istead of 0x100000000L to make msgId grow slightly slower, than unixtime and we had time to reconfigure
-			_msgIdCoef = double(0xFFFF0000L) / double(li.QuadPart);
-
-			QueryPerformanceCounter(&li);
-			_msStart = li.QuadPart;
-#elif defined Q_OS_MAC
-            mach_timebase_info_data_t tb = { 0, 0 };
-            mach_timebase_info(&tb);
-            _msFreq = (double(tb.numer) / tb.denom) / 1000000.;
-
-            _msgIdCoef = _msFreq * (double(0xFFFF0000L) / 1000.);
-
-            _msStart = mach_absolute_time();
-#else
-            timespec ts;
-            clock_gettime(CLOCK_MONOTONIC, &ts);
-            //_msFreq = 1 / 1000000.;
-            _msgIdCoef = double(0xFFFF0000L) / 1000000000.;
-            _msStart = 1000LL * static_cast<TimeMs>(ts.tv_sec) + (static_cast<TimeMs>(ts.tv_nsec) / 1000000LL);
-#endif
-			_timeStart = myunixtime();
-			srand((quint32)(_msStart & 0xFFFFFFFFL));
-		}
-	};
-
-	void _msInitialize() {
-		static _MsInitializer _msInitializer;
-	}
-
-	class _MsStarter {
-	public:
-		_MsStarter() {
-			getms();
-		}
-	};
-	_MsStarter _msStarter;
 }
+void _sslThreadId(CRYPTO_THREADID *id) {
+	CRYPTO_THREADID_set_pointer(id, QThread::currentThreadId());
+}
+CRYPTO_dynlock_value *_sslCreateFunction(const char *file, int line) {
+	return new CRYPTO_dynlock_value();
+}
+void _sslLockFunction(int mode, CRYPTO_dynlock_value *l, const char *file, int line) {
+	if (mode & CRYPTO_LOCK) {
+		l->mutex.lock();
+	} else {
+		l->mutex.unlock();
+	}
+}
+void _sslDestroyFunction(CRYPTO_dynlock_value *l, const char *file, int line) {
+	delete l;
+}
+
+int _ffmpegLockManager(void **mutex, AVLockOp op) {
+	switch (op) {
+	case AV_LOCK_CREATE: {
+		Assert(*mutex == 0);
+		*mutex = reinterpret_cast<void *>(new QMutex());
+	} break;
+
+	case AV_LOCK_OBTAIN: {
+		Assert(*mutex != 0);
+		reinterpret_cast<QMutex *>(*mutex)->lock();
+	} break;
+
+	case AV_LOCK_RELEASE: {
+		Assert(*mutex != 0);
+		reinterpret_cast<QMutex *>(*mutex)->unlock();
+	}; break;
+
+	case AV_LOCK_DESTROY: {
+		Assert(*mutex != 0);
+		delete reinterpret_cast<QMutex *>(*mutex);
+		*mutex = 0;
+	} break;
+	}
+	return 0;
+}
+
+double _msFreq;
+double _msgIdCoef;
+TimeMs _msStart = 0, _msAddToMsStart = 0, _msAddToUnixtime = 0;
+qint32 _timeStart = 0;
+
+class _MsInitializer {
+public:
+	_MsInitializer() {
+#ifdef Q_OS_WIN
+		LARGE_INTEGER li;
+		QueryPerformanceFrequency(&li);
+		_msFreq = 1000. / double(li.QuadPart);
+
+		// 0xFFFF0000L istead of 0x100000000L to make msgId grow slightly slower, than unixtime and we had time to
+		// reconfigure
+		_msgIdCoef = double(0xFFFF0000L) / double(li.QuadPart);
+
+		QueryPerformanceCounter(&li);
+		_msStart = li.QuadPart;
+#elif defined Q_OS_MAC
+		mach_timebase_info_data_t tb = {0, 0};
+		mach_timebase_info(&tb);
+		_msFreq = (double(tb.numer) / tb.denom) / 1000000.;
+
+		_msgIdCoef = _msFreq * (double(0xFFFF0000L) / 1000.);
+
+		_msStart = mach_absolute_time();
+#else
+		timespec ts;
+		clock_gettime(CLOCK_MONOTONIC, &ts);
+		//_msFreq = 1 / 1000000.;
+		_msgIdCoef = double(0xFFFF0000L) / 1000000000.;
+		_msStart = 1000LL * static_cast<TimeMs>(ts.tv_sec) + (static_cast<TimeMs>(ts.tv_nsec) / 1000000LL);
+#endif
+		_timeStart = myunixtime();
+		srand((quint32)(_msStart & 0xFFFFFFFFL));
+	}
+};
+
+void _msInitialize() {
+	static _MsInitializer _msInitializer;
+}
+
+class _MsStarter {
+public:
+	_MsStarter() {
+		getms();
+	}
+};
+_MsStarter _msStarter;
+} // namespace
 
 namespace ThirdParty {
 
-	void start() {
-		Platform::ThirdParty::start();
+void start() {
+	Platform::ThirdParty::start();
 
-		if (!RAND_status()) { // should be always inited in all modern OS
-			char buf[16];
-			memcpy(buf, &_msStart, 8);
-			memcpy(buf + 8, &_msFreq, 8);
-			uchar sha256Buffer[32];
-			RAND_seed(hashSha256(buf, 16, sha256Buffer), 32);
-			if (!RAND_status()) {
-				LOG(("MTP Error: Could not init OpenSSL rand, RAND_status() is 0..."));
-			}
+	if (!RAND_status()) { // should be always inited in all modern OS
+		char buf[16];
+		memcpy(buf, &_msStart, 8);
+		memcpy(buf + 8, &_msFreq, 8);
+		uchar sha256Buffer[32];
+		RAND_seed(hashSha256(buf, 16, sha256Buffer), 32);
+		if (!RAND_status()) {
+			LOG(("MTP Error: Could not init OpenSSL rand, RAND_status() is 0..."));
 		}
-
-		// Force OpenSSL loading if it is linked in Qt,
-		// so that we won't mess with our OpenSSL locking with Qt OpenSSL locking.
-		auto sslSupported = QSslSocket::supportsSsl();
-		if (!sslSupported) {
-			LOG(("Error: current Qt build doesn't support SSL requests."));
-		}
-		if (!CRYPTO_get_locking_callback()) {
-			// Qt didn't initialize OpenSSL, so we will.
-			auto numLocks = CRYPTO_num_locks();
-			if (numLocks) {
-				_sslLocks = new QMutex[numLocks];
-				CRYPTO_set_locking_callback(_sslLockingCallback);
-			} else {
-				LOG(("MTP Error: Could not init OpenSSL threads, CRYPTO_num_locks() returned zero!"));
-			}
-			CRYPTO_THREADID_set_callback(_sslThreadId);
-		}
-		if (!CRYPTO_get_dynlock_create_callback()) {
-			CRYPTO_set_dynlock_create_callback(_sslCreateFunction);
-			CRYPTO_set_dynlock_lock_callback(_sslLockFunction);
-			CRYPTO_set_dynlock_destroy_callback(_sslDestroyFunction);
-		} else if (!CRYPTO_get_dynlock_lock_callback()) {
-			LOG(("MTP Error: dynlock_create callback is set without dynlock_lock callback!"));
-		}
-
-		av_register_all();
-		avcodec_register_all();
-
-		av_lockmgr_register(_ffmpegLockManager);
-
-		_sslInited = true;
 	}
 
-	void finish() {
-		av_lockmgr_register(nullptr);
-
-		CRYPTO_cleanup_all_ex_data();
-		// FIPS_mode_set(0);
-		ENGINE_cleanup();
-		CONF_modules_unload(1);
-		ERR_remove_state(0);
-		ERR_free_strings();
-		ERR_remove_thread_state(nullptr);
-		EVP_cleanup();
-
-		delete[] base::take(_sslLocks);
-
-		Platform::ThirdParty::finish();
+	// Force OpenSSL loading if it is linked in Qt,
+	// so that we won't mess with our OpenSSL locking with Qt OpenSSL locking.
+	auto sslSupported = QSslSocket::supportsSsl();
+	if (!sslSupported) {
+		LOG(("Error: current Qt build doesn't support SSL requests."));
 	}
+	if (!CRYPTO_get_locking_callback()) {
+		// Qt didn't initialize OpenSSL, so we will.
+		auto numLocks = CRYPTO_num_locks();
+		if (numLocks) {
+			_sslLocks = new QMutex[numLocks];
+			CRYPTO_set_locking_callback(_sslLockingCallback);
+		} else {
+			LOG(("MTP Error: Could not init OpenSSL threads, CRYPTO_num_locks() returned zero!"));
+		}
+		CRYPTO_THREADID_set_callback(_sslThreadId);
+	}
+	if (!CRYPTO_get_dynlock_create_callback()) {
+		CRYPTO_set_dynlock_create_callback(_sslCreateFunction);
+		CRYPTO_set_dynlock_lock_callback(_sslLockFunction);
+		CRYPTO_set_dynlock_destroy_callback(_sslDestroyFunction);
+	} else if (!CRYPTO_get_dynlock_lock_callback()) {
+		LOG(("MTP Error: dynlock_create callback is set without dynlock_lock callback!"));
+	}
+
+	av_register_all();
+	avcodec_register_all();
+
+	av_lockmgr_register(_ffmpegLockManager);
+
+	_sslInited = true;
 }
 
+void finish() {
+	av_lockmgr_register(nullptr);
+
+	CRYPTO_cleanup_all_ex_data();
+	// FIPS_mode_set(0);
+	ENGINE_cleanup();
+	CONF_modules_unload(1);
+	ERR_remove_state(0);
+	ERR_free_strings();
+	ERR_remove_thread_state(nullptr);
+	EVP_cleanup();
+
+	delete[] base::take(_sslLocks);
+
+	Platform::ThirdParty::finish();
+}
+} // namespace ThirdParty
+
 bool checkms() {
 	auto unixms = (myunixtime() - _timeStart) * 1000LL + _msAddToUnixtime;
 	auto ms = getms(true);
@@ -342,39 +343,39 @@ bool checkms() {
 }
 
 TimeMs getms(bool checked) {
-    _msInitialize();
+	_msInitialize();
 #ifdef Q_OS_WIN
-    LARGE_INTEGER li;
-    QueryPerformanceCounter(&li);
+	LARGE_INTEGER li;
+	QueryPerformanceCounter(&li);
 	return ((li.QuadPart - _msStart) * _msFreq) + (checked ? _msAddToMsStart : 0LL);
 #elif defined Q_OS_MAC
 	auto msCount = static_cast<TimeMs>(mach_absolute_time());
 	return ((msCount - _msStart) * _msFreq) + (checked ? _msAddToMsStart : 0LL);
 #else
-    timespec ts;
-    auto res = clock_gettime(CLOCK_MONOTONIC, &ts);
-    if (res != 0) {
-        LOG(("Bad clock_gettime result: %1").arg(res));
-        return 0;
-    }
-    auto msCount = 1000LL * static_cast<TimeMs>(ts.tv_sec) + (static_cast<TimeMs>(ts.tv_nsec) / 1000000LL);
-    return (msCount - _msStart) + (checked ? _msAddToMsStart : 0LL);
+	timespec ts;
+	auto res = clock_gettime(CLOCK_MONOTONIC, &ts);
+	if (res != 0) {
+		LOG(("Bad clock_gettime result: %1").arg(res));
+		return 0;
+	}
+	auto msCount = 1000LL * static_cast<TimeMs>(ts.tv_sec) + (static_cast<TimeMs>(ts.tv_nsec) / 1000000LL);
+	return (msCount - _msStart) + (checked ? _msAddToMsStart : 0LL);
 #endif
 }
 
 quint64 msgid() {
 #ifdef Q_OS_WIN
-    LARGE_INTEGER li;
-    QueryPerformanceCounter(&li);
-    quint64 result = _msgIdStart + (quint64)floor((li.QuadPart - _msgIdMsStart) * _msgIdCoef);
+	LARGE_INTEGER li;
+	QueryPerformanceCounter(&li);
+	quint64 result = _msgIdStart + (quint64)floor((li.QuadPart - _msgIdMsStart) * _msgIdCoef);
 #elif defined Q_OS_MAC
-    quint64 msCount = mach_absolute_time();
-    quint64 result = _msgIdStart + (quint64)floor((msCount - _msgIdMsStart) * _msgIdCoef);
+	quint64 msCount = mach_absolute_time();
+	quint64 result = _msgIdStart + (quint64)floor((msCount - _msgIdMsStart) * _msgIdCoef);
 #else
-    timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    quint64 msCount = 1000000000 * quint64(ts.tv_sec) + quint64(ts.tv_nsec);
-    quint64 result = _msgIdStart + (quint64)floor((msCount - _msgIdMsStart) * _msgIdCoef);
+	timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	quint64 msCount = 1000000000 * quint64(ts.tv_sec) + quint64(ts.tv_nsec);
+	quint64 result = _msgIdStart + (quint64)floor((msCount - _msgIdMsStart) * _msgIdCoef);
 #endif
 
 	result &= ~0x03L;
@@ -393,33 +394,33 @@ qint32 reqid() {
 // crc32 hash, taken somewhere from the internet
 
 namespace {
-	quint32 _crc32Table[256];
-	class _Crc32Initializer {
-	public:
-		_Crc32Initializer() {
-			quint32 poly = 0x04c11db7;
-			for (quint32 i = 0; i < 256; ++i) {
-				_crc32Table[i] = reflect(i, 8) << 24;
-				for (quint32 j = 0; j < 8; ++j) {
-					_crc32Table[i] = (_crc32Table[i] << 1) ^ (_crc32Table[i] & (1 << 31) ? poly : 0);
-				}
-				_crc32Table[i] = reflect(_crc32Table[i], 32);
+quint32 _crc32Table[256];
+class _Crc32Initializer {
+public:
+	_Crc32Initializer() {
+		quint32 poly = 0x04c11db7;
+		for (quint32 i = 0; i < 256; ++i) {
+			_crc32Table[i] = reflect(i, 8) << 24;
+			for (quint32 j = 0; j < 8; ++j) {
+				_crc32Table[i] = (_crc32Table[i] << 1) ^ (_crc32Table[i] & (1 << 31) ? poly : 0);
 			}
+			_crc32Table[i] = reflect(_crc32Table[i], 32);
 		}
+	}
 
-	private:
-		quint32 reflect(quint32 val, char ch) {
-			quint32 result = 0;
-			for (int i = 1; i < (ch + 1); ++i) {
-				if (val & 1) {
-					result |= 1 << (ch - i);
-				}
-				val >>= 1;
+private:
+	quint32 reflect(quint32 val, char ch) {
+		quint32 result = 0;
+		for (int i = 1; i < (ch + 1); ++i) {
+			if (val & 1) {
+				result |= 1 << (ch - i);
 			}
-			return result;
+			val >>= 1;
 		}
-	};
-}
+		return result;
+	}
+};
+} // namespace
 
 qint32 hashCrc32(const void *data, quint32 len) {
 	static _Crc32Initializer _crc32Initializer;
@@ -427,84 +428,84 @@ qint32 hashCrc32(const void *data, quint32 len) {
 	const uchar *buf = (const uchar *)data;
 
 	quint32 crc(0xffffffff);
-    for (quint32 i = 0; i < len; ++i) {
+	for (quint32 i = 0; i < len; ++i) {
 		crc = (crc >> 8) ^ _crc32Table[(crc & 0xFF) ^ buf[i]];
 	}
 
-    return crc ^ 0xffffffff;
+	return crc ^ 0xffffffff;
 }
 
 qint32 *hashSha1(const void *data, quint32 len, void *dest) {
-	return (qint32*)SHA1((const uchar*)data, (size_t)len, (uchar*)dest);
+	return (qint32 *)SHA1((const uchar *)data, (size_t)len, (uchar *)dest);
 }
 
 qint32 *hashSha256(const void *data, quint32 len, void *dest) {
-	return (qint32*)SHA256((const uchar*)data, (size_t)len, (uchar*)dest);
+	return (qint32 *)SHA256((const uchar *)data, (size_t)len, (uchar *)dest);
 }
 
 // md5 hash, taken somewhere from the internet
 
 namespace {
 
-	inline void _md5_decode(quint32 *output, const uchar *input, quint32 len) {
-		for (quint32 i = 0, j = 0; j < len; i++, j += 4) {
-			output[i] = ((quint32)input[j]) | (((quint32)input[j + 1]) << 8) | (((quint32)input[j + 2]) << 16) | (((quint32)input[j + 3]) << 24);
-		}
+inline void _md5_decode(quint32 *output, const uchar *input, quint32 len) {
+	for (quint32 i = 0, j = 0; j < len; i++, j += 4) {
+		output[i] = ((quint32)input[j]) | (((quint32)input[j + 1]) << 8) | (((quint32)input[j + 2]) << 16) |
+		            (((quint32)input[j + 3]) << 24);
 	}
-
-	inline void _md5_encode(uchar *output, const quint32 *input, quint32 len) {
-		for (quint32 i = 0, j = 0; j < len; i++, j += 4) {
-			output[j + 0] = (input[i]) & 0xFF;
-			output[j + 1] = (input[i] >> 8) & 0xFF;
-			output[j + 2] = (input[i] >> 16) & 0xFF;
-			output[j + 3] = (input[i] >> 24) & 0xFF;
-		}
-	}
-
-	inline quint32 _md5_rotate_left(quint32 x, int n) {
-		return (x << n) | (x >> (32 - n));
-	}
-
-	inline quint32 _md5_F(quint32 x, quint32 y, quint32 z) {
-		return (x & y) | (~x & z);
-	}
-
-	inline quint32 _md5_G(quint32 x, quint32 y, quint32 z) {
-		return (x & z) | (y & ~z);
-	}
-
-	inline quint32 _md5_H(quint32 x, quint32 y, quint32 z) {
-		return x ^ y ^ z;
-	}
-
-	inline quint32 _md5_I(quint32 x, quint32 y, quint32 z) {
-		return y ^ (x | ~z);
-	}
-
-	inline void _md5_FF(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
-		a = _md5_rotate_left(a + _md5_F(b, c, d) + x + ac, s) + b;
-	}
-
-	inline void _md5_GG(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
-		a = _md5_rotate_left(a + _md5_G(b, c, d) + x + ac, s) + b;
-	}
-
-	inline void _md5_HH(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
-		a = _md5_rotate_left(a + _md5_H(b, c, d) + x + ac, s) + b;
-	}
-
-	inline void _md5_II(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
-		a = _md5_rotate_left(a + _md5_I(b, c, d) + x + ac, s) + b;
-	}
-
-	static uchar _md5_padding[64] = {
-		0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	};
 }
 
-HashMd5::HashMd5(const void *input, quint32 length) : _finalized(false) {
+inline void _md5_encode(uchar *output, const quint32 *input, quint32 len) {
+	for (quint32 i = 0, j = 0; j < len; i++, j += 4) {
+		output[j + 0] = (input[i]) & 0xFF;
+		output[j + 1] = (input[i] >> 8) & 0xFF;
+		output[j + 2] = (input[i] >> 16) & 0xFF;
+		output[j + 3] = (input[i] >> 24) & 0xFF;
+	}
+}
+
+inline quint32 _md5_rotate_left(quint32 x, int n) {
+	return (x << n) | (x >> (32 - n));
+}
+
+inline quint32 _md5_F(quint32 x, quint32 y, quint32 z) {
+	return (x & y) | (~x & z);
+}
+
+inline quint32 _md5_G(quint32 x, quint32 y, quint32 z) {
+	return (x & z) | (y & ~z);
+}
+
+inline quint32 _md5_H(quint32 x, quint32 y, quint32 z) {
+	return x ^ y ^ z;
+}
+
+inline quint32 _md5_I(quint32 x, quint32 y, quint32 z) {
+	return y ^ (x | ~z);
+}
+
+inline void _md5_FF(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
+	a = _md5_rotate_left(a + _md5_F(b, c, d) + x + ac, s) + b;
+}
+
+inline void _md5_GG(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
+	a = _md5_rotate_left(a + _md5_G(b, c, d) + x + ac, s) + b;
+}
+
+inline void _md5_HH(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
+	a = _md5_rotate_left(a + _md5_H(b, c, d) + x + ac, s) + b;
+}
+
+inline void _md5_II(quint32 &a, quint32 b, quint32 c, quint32 d, quint32 x, quint32 s, quint32 ac) {
+	a = _md5_rotate_left(a + _md5_I(b, c, d) + x + ac, s) + b;
+}
+
+static uchar _md5_padding[64] = {0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                 0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                 0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+} // namespace
+
+HashMd5::HashMd5(const void *input, quint32 length)
+    : _finalized(false) {
 	init();
 	if (input && length > 0) feed(input, length);
 }
@@ -541,7 +542,7 @@ void HashMd5::feed(const void *input, quint32 length) {
 
 qint32 *HashMd5::result() {
 	if (!_finalized) finalize();
-	return (qint32*)_digest;
+	return (qint32 *)_digest;
 }
 
 void HashMd5::init() {
@@ -573,73 +574,73 @@ void HashMd5::transform(const uchar *block) {
 	quint32 a = _state[0], b = _state[1], c = _state[2], d = _state[3], x[16];
 	_md5_decode(x, block, _md5_block_size);
 
-	_md5_FF(a, b, c, d, x[0] , 7 , 0xd76aa478);
-	_md5_FF(d, a, b, c, x[1] , 12, 0xe8c7b756);
-	_md5_FF(c, d, a, b, x[2] , 17, 0x242070db);
-	_md5_FF(b, c, d, a, x[3] , 22, 0xc1bdceee);
-	_md5_FF(a, b, c, d, x[4] , 7 , 0xf57c0faf);
-	_md5_FF(d, a, b, c, x[5] , 12, 0x4787c62a);
-	_md5_FF(c, d, a, b, x[6] , 17, 0xa8304613);
-	_md5_FF(b, c, d, a, x[7] , 22, 0xfd469501);
-	_md5_FF(a, b, c, d, x[8] , 7 , 0x698098d8);
-	_md5_FF(d, a, b, c, x[9] , 12, 0x8b44f7af);
+	_md5_FF(a, b, c, d, x[0], 7, 0xd76aa478);
+	_md5_FF(d, a, b, c, x[1], 12, 0xe8c7b756);
+	_md5_FF(c, d, a, b, x[2], 17, 0x242070db);
+	_md5_FF(b, c, d, a, x[3], 22, 0xc1bdceee);
+	_md5_FF(a, b, c, d, x[4], 7, 0xf57c0faf);
+	_md5_FF(d, a, b, c, x[5], 12, 0x4787c62a);
+	_md5_FF(c, d, a, b, x[6], 17, 0xa8304613);
+	_md5_FF(b, c, d, a, x[7], 22, 0xfd469501);
+	_md5_FF(a, b, c, d, x[8], 7, 0x698098d8);
+	_md5_FF(d, a, b, c, x[9], 12, 0x8b44f7af);
 	_md5_FF(c, d, a, b, x[10], 17, 0xffff5bb1);
 	_md5_FF(b, c, d, a, x[11], 22, 0x895cd7be);
-	_md5_FF(a, b, c, d, x[12], 7 , 0x6b901122);
+	_md5_FF(a, b, c, d, x[12], 7, 0x6b901122);
 	_md5_FF(d, a, b, c, x[13], 12, 0xfd987193);
 	_md5_FF(c, d, a, b, x[14], 17, 0xa679438e);
 	_md5_FF(b, c, d, a, x[15], 22, 0x49b40821);
 
-	_md5_GG(a, b, c, d, x[1] , 5 , 0xf61e2562);
-	_md5_GG(d, a, b, c, x[6] , 9 , 0xc040b340);
+	_md5_GG(a, b, c, d, x[1], 5, 0xf61e2562);
+	_md5_GG(d, a, b, c, x[6], 9, 0xc040b340);
 	_md5_GG(c, d, a, b, x[11], 14, 0x265e5a51);
-	_md5_GG(b, c, d, a, x[0] , 20, 0xe9b6c7aa);
-	_md5_GG(a, b, c, d, x[5] , 5 , 0xd62f105d);
-	_md5_GG(d, a, b, c, x[10], 9 , 0x2441453);
+	_md5_GG(b, c, d, a, x[0], 20, 0xe9b6c7aa);
+	_md5_GG(a, b, c, d, x[5], 5, 0xd62f105d);
+	_md5_GG(d, a, b, c, x[10], 9, 0x2441453);
 	_md5_GG(c, d, a, b, x[15], 14, 0xd8a1e681);
-	_md5_GG(b, c, d, a, x[4] , 20, 0xe7d3fbc8);
-	_md5_GG(a, b, c, d, x[9] , 5 , 0x21e1cde6);
-	_md5_GG(d, a, b, c, x[14], 9 , 0xc33707d6);
-	_md5_GG(c, d, a, b, x[3] , 14, 0xf4d50d87);
-	_md5_GG(b, c, d, a, x[8] , 20, 0x455a14ed);
-	_md5_GG(a, b, c, d, x[13], 5 , 0xa9e3e905);
-	_md5_GG(d, a, b, c, x[2] , 9 , 0xfcefa3f8);
-	_md5_GG(c, d, a, b, x[7] , 14, 0x676f02d9);
+	_md5_GG(b, c, d, a, x[4], 20, 0xe7d3fbc8);
+	_md5_GG(a, b, c, d, x[9], 5, 0x21e1cde6);
+	_md5_GG(d, a, b, c, x[14], 9, 0xc33707d6);
+	_md5_GG(c, d, a, b, x[3], 14, 0xf4d50d87);
+	_md5_GG(b, c, d, a, x[8], 20, 0x455a14ed);
+	_md5_GG(a, b, c, d, x[13], 5, 0xa9e3e905);
+	_md5_GG(d, a, b, c, x[2], 9, 0xfcefa3f8);
+	_md5_GG(c, d, a, b, x[7], 14, 0x676f02d9);
 	_md5_GG(b, c, d, a, x[12], 20, 0x8d2a4c8a);
 
-	_md5_HH(a, b, c, d, x[5] , 4 , 0xfffa3942);
-	_md5_HH(d, a, b, c, x[8] , 11, 0x8771f681);
+	_md5_HH(a, b, c, d, x[5], 4, 0xfffa3942);
+	_md5_HH(d, a, b, c, x[8], 11, 0x8771f681);
 	_md5_HH(c, d, a, b, x[11], 16, 0x6d9d6122);
 	_md5_HH(b, c, d, a, x[14], 23, 0xfde5380c);
-	_md5_HH(a, b, c, d, x[1] , 4 , 0xa4beea44);
-	_md5_HH(d, a, b, c, x[4] , 11, 0x4bdecfa9);
-	_md5_HH(c, d, a, b, x[7] , 16, 0xf6bb4b60);
+	_md5_HH(a, b, c, d, x[1], 4, 0xa4beea44);
+	_md5_HH(d, a, b, c, x[4], 11, 0x4bdecfa9);
+	_md5_HH(c, d, a, b, x[7], 16, 0xf6bb4b60);
 	_md5_HH(b, c, d, a, x[10], 23, 0xbebfbc70);
-	_md5_HH(a, b, c, d, x[13], 4 , 0x289b7ec6);
-	_md5_HH(d, a, b, c, x[0] , 11, 0xeaa127fa);
-	_md5_HH(c, d, a, b, x[3] , 16, 0xd4ef3085);
-	_md5_HH(b, c, d, a, x[6] , 23, 0x4881d05);
-	_md5_HH(a, b, c, d, x[9] , 4 , 0xd9d4d039);
+	_md5_HH(a, b, c, d, x[13], 4, 0x289b7ec6);
+	_md5_HH(d, a, b, c, x[0], 11, 0xeaa127fa);
+	_md5_HH(c, d, a, b, x[3], 16, 0xd4ef3085);
+	_md5_HH(b, c, d, a, x[6], 23, 0x4881d05);
+	_md5_HH(a, b, c, d, x[9], 4, 0xd9d4d039);
 	_md5_HH(d, a, b, c, x[12], 11, 0xe6db99e5);
 	_md5_HH(c, d, a, b, x[15], 16, 0x1fa27cf8);
-	_md5_HH(b, c, d, a, x[2] , 23, 0xc4ac5665);
+	_md5_HH(b, c, d, a, x[2], 23, 0xc4ac5665);
 
-	_md5_II(a, b, c, d, x[0] , 6 , 0xf4292244);
-	_md5_II(d, a, b, c, x[7] , 10, 0x432aff97);
+	_md5_II(a, b, c, d, x[0], 6, 0xf4292244);
+	_md5_II(d, a, b, c, x[7], 10, 0x432aff97);
 	_md5_II(c, d, a, b, x[14], 15, 0xab9423a7);
-	_md5_II(b, c, d, a, x[5] , 21, 0xfc93a039);
-	_md5_II(a, b, c, d, x[12], 6 , 0x655b59c3);
-	_md5_II(d, a, b, c, x[3] , 10, 0x8f0ccc92);
+	_md5_II(b, c, d, a, x[5], 21, 0xfc93a039);
+	_md5_II(a, b, c, d, x[12], 6, 0x655b59c3);
+	_md5_II(d, a, b, c, x[3], 10, 0x8f0ccc92);
 	_md5_II(c, d, a, b, x[10], 15, 0xffeff47d);
-	_md5_II(b, c, d, a, x[1] , 21, 0x85845dd1);
-	_md5_II(a, b, c, d, x[8] , 6 , 0x6fa87e4f);
+	_md5_II(b, c, d, a, x[1], 21, 0x85845dd1);
+	_md5_II(a, b, c, d, x[8], 6, 0x6fa87e4f);
 	_md5_II(d, a, b, c, x[15], 10, 0xfe2ce6e0);
-	_md5_II(c, d, a, b, x[6] , 15, 0xa3014314);
+	_md5_II(c, d, a, b, x[6], 15, 0xa3014314);
 	_md5_II(b, c, d, a, x[13], 21, 0x4e0811a1);
-	_md5_II(a, b, c, d, x[4] , 6 , 0xf7537e82);
+	_md5_II(a, b, c, d, x[4], 6, 0xf7537e82);
 	_md5_II(d, a, b, c, x[11], 10, 0xbd3af235);
-	_md5_II(c, d, a, b, x[2] , 15, 0x2ad7d2bb);
-	_md5_II(b, c, d, a, x[9] , 21, 0xeb86d391);
+	_md5_II(c, d, a, b, x[2], 15, 0x2ad7d2bb);
+	_md5_II(b, c, d, a, x[9], 21, 0xeb86d391);
 
 	_state[0] += a;
 	_state[1] += b;
@@ -651,12 +652,12 @@ qint32 *hashMd5(const void *data, quint32 len, void *dest) {
 	HashMd5 md5(data, len);
 	memcpy(dest, md5.result(), 16);
 
-	return (qint32*)dest;
+	return (qint32 *)dest;
 }
 
 char *hashMd5Hex(const qint32 *hashmd5, void *dest) {
-	char *md5To = (char*)dest;
-	const uchar *res = (const uchar*)hashmd5;
+	char *md5To = (char *)dest;
+	const uchar *res = (const uchar *)hashmd5;
 
 	for (int i = 0; i < 16; ++i) {
 		uchar ch(res[i]), high = (ch >> 4) & 0x0F, low = ch & 0x0F;
@@ -669,26 +670,33 @@ char *hashMd5Hex(const qint32 *hashmd5, void *dest) {
 
 void memset_rand(void *data, quint32 len) {
 	Assert(_sslInited);
-	RAND_bytes((uchar*)data, len);
+	RAND_bytes((uchar *)data, len);
 }
 
 namespace {
-	QMap<QString, QString> fastRusEng;
-	QHash<QChar, QString> fastLetterRusEng;
-	QMap<quint32, QString> fastDoubleLetterRusEng;
-	QHash<QChar, QChar> fastRusKeyboardSwitch;
-}
+QMap<QString, QString> fastRusEng;
+QHash<QChar, QString> fastLetterRusEng;
+QMap<quint32, QString> fastDoubleLetterRusEng;
+QHash<QChar, QChar> fastRusKeyboardSwitch;
+} // namespace
 
 QString translitLetterRusEng(QChar letter, QChar next, qint32 &toSkip) {
 	if (fastDoubleLetterRusEng.isEmpty()) {
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("Ы").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("Y"));
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("и").at(0).unicode() << 16) | QString::fromUtf8("я").at(0).unicode(), qsl("ia"));
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("и").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("y"));
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("к").at(0).unicode() << 16) | QString::fromUtf8("с").at(0).unicode(), qsl("x"));
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("ы").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("y"));
-		fastDoubleLetterRusEng.insert((QString::fromUtf8("ь").at(0).unicode() << 16) | QString::fromUtf8("е").at(0).unicode(), qsl("ye"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("Ы").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("Y"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("и").at(0).unicode() << 16) | QString::fromUtf8("я").at(0).unicode(), qsl("ia"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("и").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("y"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("к").at(0).unicode() << 16) | QString::fromUtf8("с").at(0).unicode(), qsl("x"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("ы").at(0).unicode() << 16) | QString::fromUtf8("й").at(0).unicode(), qsl("y"));
+		fastDoubleLetterRusEng.insert(
+		    (QString::fromUtf8("ь").at(0).unicode() << 16) | QString::fromUtf8("е").at(0).unicode(), qsl("ye"));
 	}
-	QMap<quint32, QString>::const_iterator i = fastDoubleLetterRusEng.constFind((letter.unicode() << 16) | next.unicode());
+	QMap<quint32, QString>::const_iterator i =
+	    fastDoubleLetterRusEng.constFind((letter.unicode() << 16) | next.unicode());
 	if (i != fastDoubleLetterRusEng.cend()) {
 		toSkip = 2;
 		return i.value();
diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
index 6c8005e84..ac2e752cb 100644
--- a/Telegram/SourceFiles/core/utils.h
+++ b/Telegram/SourceFiles/core/utils.h
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <set>
 #include <QByteArray>
 #include <QDateTime>
-#include <QReadWriteLock> 
-#include <QRegularExpression>
-#include <QMimeType>
-#include <QStringList>
 #include <QFileInfo>
+#include <QMimeType>
+#include <QReadWriteLock>
+#include <QRegularExpression>
+#include <QStringList>
+#include <set>
 
 #include "base/assertion.h"
-#include "core/basic_types.h"
 #include "base/flags.h"
+#include "core/basic_types.h"
 #include "logs.h"
 
 // Define specializations for QByteArray for Qt 5.3.2, because
@@ -39,13 +39,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #ifdef OS_MAC_OLD
 namespace gsl {
 
-template <>
-inline span<char> make_span<QByteArray>(QByteArray &cont) {
+template <> inline span<char> make_span<QByteArray>(QByteArray &cont) {
 	return span<char>(cont.data(), cont.size());
 }
 
-template <>
-inline span<const char> make_span(const QByteArray &cont) {
+template <> inline span<const char> make_span(const QByteArray &cont) {
 	return span<const char>(cont.constData(), cont.size());
 }
 
@@ -54,47 +52,41 @@ inline span<const char> make_span(const QByteArray &cont) {
 
 namespace base {
 
-template <typename T, size_t N>
-inline constexpr size_t array_size(const T(&)[N]) {
+template <typename T, size_t N> inline constexpr size_t array_size(const T (&)[N]) {
 	return N;
 }
 
-template <typename T>
-inline T take(T &source) {
+template <typename T> inline T take(T &source) {
 	return std::exchange(source, T());
 }
 
 namespace internal {
 
-template <typename D, typename T>
-inline constexpr D up_cast_helper(std::true_type, T object) {
+template <typename D, typename T> inline constexpr D up_cast_helper(std::true_type, T object) {
 	return object;
 }
 
-template <typename D, typename T>
-inline constexpr D up_cast_helper(std::false_type, T object) {
+template <typename D, typename T> inline constexpr D up_cast_helper(std::false_type, T object) {
 	return nullptr;
 }
 
 } // namespace internal
 
-template <typename D, typename T>
-inline constexpr D up_cast(T object) {
+template <typename D, typename T> inline constexpr D up_cast(T object) {
 	using DV = std::decay_t<decltype(*D())>;
 	using TV = std::decay_t<decltype(*T())>;
-	return internal::up_cast_helper<D>(std::integral_constant<bool, std::is_base_of<DV, TV>::value || std::is_same<DV, TV>::value>(), object);
+	return internal::up_cast_helper<D>(std::integral_constant < bool,
+	                                   std::is_base_of<DV, TV>::value || std::is_same<DV, TV>::value > (), object);
 }
 
-template <typename Container, typename T>
-inline bool contains(const Container &container, const T &value) {
+template <typename Container, typename T> inline bool contains(const Container &container, const T &value) {
 	auto end = std::end(container);
 	return std::find(std::begin(container), end, value) != end;
 }
 
 // We need a custom comparator for std::set<std::unique_ptr<T>>::find to work with pointers.
 // thanks to http://stackoverflow.com/questions/18939882/raw-pointer-lookup-for-sets-of-unique-ptrs
-template <typename T>
-struct pointer_comparator {
+template <typename T> struct pointer_comparator {
 	using is_transparent = std::true_type;
 
 	// helper does some magic in order to reduce the number of
@@ -105,16 +97,16 @@ struct pointer_comparator {
 		T *ptr = nullptr;
 		helper() = default;
 		helper(const helper &other) = default;
-		helper(T *p) : ptr(p) {
-		}
-		template <typename ...Ts>
-		helper(const std::shared_ptr<Ts...> &other) : ptr(other.get()) {
-		}
-		template <typename ...Ts>
-		helper(const std::unique_ptr<Ts...> &other) : ptr(other.get()) {
-		}
+		helper(T *p)
+		    : ptr(p) {}
+		template <typename... Ts>
+		helper(const std::shared_ptr<Ts...> &other)
+		    : ptr(other.get()) {}
+		template <typename... Ts>
+		helper(const std::unique_ptr<Ts...> &other)
+		    : ptr(other.get()) {}
 		bool operator<(helper other) const {
-			return std::less<T*>()(ptr, other.ptr);
+			return std::less<T *>()(ptr, other.ptr);
 		}
 	};
 
@@ -126,20 +118,16 @@ struct pointer_comparator {
 	bool operator()(const helper &&lhs, const helper &&rhs) const {
 		return lhs < rhs;
 	}
-
 };
 
-template <typename T>
-using set_of_unique_ptr = std::set<std::unique_ptr<T>, base::pointer_comparator<T>>;
+template <typename T> using set_of_unique_ptr = std::set<std::unique_ptr<T>, base::pointer_comparator<T>>;
 
-template <typename T>
-using set_of_shared_ptr = std::set<std::shared_ptr<T>, base::pointer_comparator<T>>;
+template <typename T> using set_of_shared_ptr = std::set<std::shared_ptr<T>, base::pointer_comparator<T>>;
 
 using byte_span = gsl::span<gsl::byte>;
 using const_byte_span = gsl::span<const gsl::byte>;
 using byte_vector = std::vector<gsl::byte>;
-template <size_t N>
-using byte_array = std::array<gsl::byte, N>;
+template <size_t N> using byte_array = std::array<gsl::byte, N>;
 
 inline void copy_bytes(byte_span destination, const_byte_span source) {
 	Expects(destination.size() >= source.size());
@@ -162,24 +150,18 @@ inline int compare_bytes(const_byte_span a, const_byte_span b) {
 
 // Thanks https://stackoverflow.com/a/28139075
 
-template <typename Container>
-struct reversion_wrapper {
-	Container &container;
-};
+template <typename Container> struct reversion_wrapper { Container &container; };
 
-template <typename Container>
-auto begin(reversion_wrapper<Container> wrapper) {
+template <typename Container> auto begin(reversion_wrapper<Container> wrapper) {
 	return std::rbegin(wrapper.container);
 }
 
-template <typename Container>
-auto end(reversion_wrapper<Container> wrapper) {
+template <typename Container> auto end(reversion_wrapper<Container> wrapper) {
 	return std::rend(wrapper.container);
 }
 
-template <typename Container>
-reversion_wrapper<Container> reversed(Container &&container) {
-	return { container };
+template <typename Container> reversion_wrapper<Container> reversed(Container &&container) {
+	return {container};
 }
 
 } // namespace base
@@ -190,8 +172,7 @@ reversion_wrapper<Container> reversed(Container &&container) {
 // while "for_const (T *p, v)" won't and "for_const (T *&p, v)" won't compile
 #define for_const(range_declaration, range_expression) for (range_declaration : std::as_const(range_expression))
 
-template <typename Lambda>
-inline void InvokeQueued(QObject *context, Lambda &&lambda) {
+template <typename Lambda> inline void InvokeQueued(QObject *context, Lambda &&lambda) {
 	QObject proxy;
 	QObject::connect(&proxy, &QObject::destroyed, context, std::forward<Lambda>(lambda), Qt::QueuedConnection);
 }
@@ -199,33 +180,36 @@ inline void InvokeQueued(QObject *context, Lambda &&lambda) {
 static const qint32 ScrollMax = INT_MAX;
 
 extern quint64 _SharedMemoryLocation[];
-template <typename T, unsigned int N>
-T *SharedMemoryLocation() {
+template <typename T, unsigned int N> T *SharedMemoryLocation() {
 	static_assert(N < 4, "Only 4 shared memory locations!");
-	return reinterpret_cast<T*>(_SharedMemoryLocation + N);
+	return reinterpret_cast<T *>(_SharedMemoryLocation + N);
 }
 
 // see https://github.com/boostcon/cppnow_presentations_2012/blob/master/wed/schurr_cpp11_tools_for_class_authors.pdf
 class str_const { // constexpr string
 public:
-	template<std::size_t N>
-	constexpr str_const(const char(&a)[N]) : _str(a), _size(N - 1) {
-	}
+	template <std::size_t N>
+	constexpr str_const(const char (&a)[N])
+	    : _str(a)
+	    , _size(N - 1) {}
 	constexpr char operator[](std::size_t n) const {
 		return (n < _size) ? _str[n] :
 #ifndef OS_MAC_OLD
-			throw std::out_of_range("");
+		                     throw std::out_of_range("");
 #else // OS_MAC_OLD
-			throw std::exception();
+		                     throw std::exception();
 #endif // OS_MAC_OLD
 	}
-	constexpr std::size_t size() const { return _size; }
-	const char *c_str() const { return _str; }
+	constexpr std::size_t size() const {
+		return _size;
+	}
+	const char *c_str() const {
+		return _str;
+	}
 
 private:
-	const char* const _str;
+	const char *const _str;
 	const std::size_t _size;
-
 };
 
 inline QString str_const_toString(const str_const &str) {
@@ -236,15 +220,19 @@ inline QByteArray str_const_toByteArray(const str_const &str) {
 	return QByteArray::fromRawData(str.c_str(), static_cast<int>(str.size()));
 }
 
-template <typename T>
-inline void accumulate_max(T &a, const T &b) { if (a < b) a = b; }
+template <typename T> inline void accumulate_max(T &a, const T &b) {
+	if (a < b) a = b;
+}
 
-template <typename T>
-inline void accumulate_min(T &a, const T &b) { if (a > b) a = b; }
+template <typename T> inline void accumulate_min(T &a, const T &b) {
+	if (a > b) a = b;
+}
 
 class Exception : public std::exception {
 public:
-	Exception(const QString &msg, bool isFatal = true) : _fatal(isFatal), _msg(msg.toUtf8()) {
+	Exception(const QString &msg, bool isFatal = true)
+	    : _fatal(isFatal)
+	    , _msg(msg.toUtf8()) {
 		LOG(("Exception: %1").arg(msg));
 	}
 	bool fatal() const {
@@ -254,13 +242,11 @@ public:
 	virtual const char *what() const throw() {
 		return _msg.constData();
 	}
-	virtual ~Exception() throw() {
-	}
+	virtual ~Exception() throw() {}
 
 private:
 	bool _fatal;
 	QByteArray _msg;
-
 };
 
 class MTPint;
@@ -290,7 +276,7 @@ inline QDateTime date(const MTPint &time) {
 
 QDateTime dateFromServerTime(TimeId time);
 
-inline void mylocaltime(struct tm * _Tm, const time_t * _Time) {
+inline void mylocaltime(struct tm *_Tm, const time_t *_Time) {
 #ifdef Q_OS_WIN
 	localtime_s(_Tm, _Time);
 #else
@@ -303,7 +289,7 @@ namespace ThirdParty {
 void start();
 void finish();
 
-}
+} // namespace ThirdParty
 
 using TimeMs = qint64; // @todo use std::chrono::milliseconds
 bool checkms(); // returns true if time has changed
@@ -312,13 +298,11 @@ TimeMs getms(bool checked = false);
 const static quint32 _md5_block_size = 64;
 class HashMd5 {
 public:
-
 	HashMd5(const void *input = 0, quint32 length = 0);
 	void feed(const void *input, quint32 length);
 	qint32 *result();
 
 private:
-
 	void init();
 	void finalize();
 	void transform(const uchar *block);
@@ -328,7 +312,6 @@ private:
 	quint32 _count[2];
 	quint32 _state[4];
 	uchar _digest[16];
-
 };
 
 qint32 hashCrc32(const void *data, quint32 len);
@@ -366,32 +349,32 @@ inline std::array<char, 32> hashMd5Hex(const void *data, int size) {
 
 // good random (using openssl implementation)
 void memset_rand(void *data, quint32 len);
-template <typename T>
-T rand_value() {
+template <typename T> T rand_value() {
 	T result;
 	memset_rand(&result, sizeof(result));
 	return result;
 }
 
 inline void memset_rand_bad(void *data, quint32 len) {
-	for (uchar *i = reinterpret_cast<uchar*>(data), *e = i + len; i != e; ++i) {
+	for (uchar *i = reinterpret_cast<uchar *>(data), *e = i + len; i != e; ++i) {
 		*i = uchar(rand() & 0xFF);
 	}
 }
 
-template <typename T>
-inline void memsetrnd_bad(T &value) {
+template <typename T> inline void memsetrnd_bad(T &value) {
 	memset_rand_bad(&value, sizeof(value));
 }
 
 class ReadLockerAttempt {
 public:
-	ReadLockerAttempt(not_null<QReadWriteLock*> lock) : _lock(lock), _locked(_lock->tryLockForRead()) {
-	}
+	ReadLockerAttempt(not_null<QReadWriteLock *> lock)
+	    : _lock(lock)
+	    , _locked(_lock->tryLockForRead()) {}
 	ReadLockerAttempt(const ReadLockerAttempt &other) = delete;
 	ReadLockerAttempt &operator=(const ReadLockerAttempt &other) = delete;
-	ReadLockerAttempt(ReadLockerAttempt &&other) : _lock(other._lock), _locked(base::take(other._locked)) {
-	}
+	ReadLockerAttempt(ReadLockerAttempt &&other)
+	    : _lock(other._lock)
+	    , _locked(base::take(other._locked)) {}
 	ReadLockerAttempt &operator=(ReadLockerAttempt &&other) {
 		_lock = other._lock;
 		_locked = base::take(other._locked);
@@ -408,9 +391,8 @@ public:
 	}
 
 private:
-	not_null<QReadWriteLock*> _lock;
+	not_null<QReadWriteLock *> _lock;
 	bool _locked = false;
-
 };
 
 inline QString fromUtf8Safe(const char *str, qint32 size = -1) {
@@ -426,19 +408,18 @@ inline QString fromUtf8Safe(const QByteArray &str) {
 	return fromUtf8Safe(str.constData(), str.size());
 }
 
-static const QRegularExpression::PatternOptions reMultiline(QRegularExpression::DotMatchesEverythingOption | QRegularExpression::MultilineOption);
+static const QRegularExpression::PatternOptions reMultiline(QRegularExpression::DotMatchesEverythingOption |
+                                                            QRegularExpression::MultilineOption);
 
-template <typename T>
-inline T snap(const T &v, const T &_min, const T &_max) { // @todo std::clamp()
+template <typename T> inline T snap(const T &v, const T &_min, const T &_max) { // @todo std::clamp()
 	return (v < _min) ? _min : ((v > _max) ? _max : v);
 }
 
-template <typename T>
-class ManagedPtr {
+template <typename T> class ManagedPtr {
 public:
 	ManagedPtr() = default;
-	ManagedPtr(T *p) : _data(p) {
-	}
+	ManagedPtr(T *p)
+	    : _data(p) {}
 	T *operator->() const {
 		return _data;
 	}
@@ -453,7 +434,6 @@ public:
 protected:
 	using Parent = ManagedPtr<T>;
 	T *_data = nullptr;
-
 };
 
 QString translitRusEng(const QString &rus);
@@ -518,8 +498,7 @@ enum DBIPeerReportSpamStatus {
 	dbiprsRequesting = 5, // requesting the cloud setting right now
 };
 
-template <int Size>
-inline QString strMakeFromLetters(const quint32 (&letters)[Size]) {
+template <int Size> inline QString strMakeFromLetters(const quint32 (&letters)[Size]) {
 	QString result;
 	result.reserve(Size);
 	for (qint32 i = 0; i < Size; ++i) {
@@ -537,10 +516,10 @@ public:
 		WebP,
 	};
 
-	MimeType(const QMimeType &type) : _typeStruct(type) {
-	}
-	MimeType(Known type) : _type(type) {
-	}
+	MimeType(const QMimeType &type)
+	    : _typeStruct(type) {}
+	MimeType(Known type)
+	    : _type(type) {}
 	QStringList globPatterns() const;
 	QString filterString() const;
 	QString name() const;
@@ -548,7 +527,6 @@ public:
 private:
 	QMimeType _typeStruct;
 	Known _type = Known::Unknown;
-
 };
 
 MimeType mimeTypeForName(const QString &mime);
@@ -581,37 +559,36 @@ enum ForwardWhatMessages {
 };
 
 enum ShowLayerOption {
-	CloseOtherLayers     = (1 << 0),
-	KeepOtherLayers      = (1 << 1),
+	CloseOtherLayers = (1 << 0),
+	KeepOtherLayers = (1 << 1),
 	ShowAfterOtherLayers = (1 << 2),
 
-	AnimatedShowLayer    = (1 << 3),
-	ForceFastShowLayer   = (1 << 4),
+	AnimatedShowLayer = (1 << 3),
+	ForceFastShowLayer = (1 << 4),
 };
 using ShowLayerOptions = base::flags<ShowLayerOption>;
-inline constexpr auto is_flag_type(ShowLayerOption) { return true; };
+inline constexpr auto is_flag_type(ShowLayerOption) {
+	return true;
+};
 
 static qint32 FullArcLength = 360 * 16;
 static qint32 QuarterArcLength = (FullArcLength / 4);
 static qint32 MinArcLength = (FullArcLength / 360);
 static qint32 AlmostFullArcLength = (FullArcLength - MinArcLength);
 
-template <typename T, typename... Args>
-inline QSharedPointer<T> MakeShared(Args&&... args) {
+template <typename T, typename... Args> inline QSharedPointer<T> MakeShared(Args &&... args) {
 	return QSharedPointer<T>(new T(std::forward<Args>(args)...));
 }
 
 // This pointer is used for global non-POD variables that are allocated
 // on demand by createIfNull(lambda) and are never automatically freed.
-template <typename T>
-class NeverFreedPointer {
+template <typename T> class NeverFreedPointer {
 public:
 	NeverFreedPointer() = default;
 	NeverFreedPointer(const NeverFreedPointer<T> &other) = delete;
 	NeverFreedPointer &operator=(const NeverFreedPointer<T> &other) = delete;
 
-	template <typename... Args>
-	void createIfNull(Args&&... args) {
+	template <typename... Args> void createIfNull(Args &&... args) {
 		if (isNull()) {
 			reset(new T(std::forward<Args>(args)...));
 		}
@@ -647,16 +624,14 @@ public:
 
 private:
 	T *_p;
-
 };
 
 // This pointer is used for static non-POD variables that are allocated
 // on first use by constructor and are never automatically freed.
-template <typename T>
-class StaticNeverFreedPointer {
+template <typename T> class StaticNeverFreedPointer {
 public:
-	explicit StaticNeverFreedPointer(T *p) : _p(p) {
-	}
+	explicit StaticNeverFreedPointer(T *p)
+	    : _p(p) {}
 	StaticNeverFreedPointer(const StaticNeverFreedPointer<T> &other) = delete;
 	StaticNeverFreedPointer &operator=(const StaticNeverFreedPointer<T> &other) = delete;
 
@@ -690,5 +665,4 @@ public:
 
 private:
 	T *_p = nullptr;
-
 };
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 662a9a9df..2035ddc45 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <cstdint>
 #include "utils.h"
+#include <cstdint>
 
 #define BETA_VERSION_MACRO (0ULL)
 
diff --git a/Telegram/SourceFiles/countries.h b/Telegram/SourceFiles/countries.h
index a956a80e4..23d929e97 100644
--- a/Telegram/SourceFiles/countries.h
+++ b/Telegram/SourceFiles/countries.h
@@ -22,243 +22,245 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 struct CountryInfo {
-	CountryInfo(const char *_name, const char *_iso2, const char *_code) : name(_name), iso2(_iso2), code(_code) {
-	}
+	CountryInfo(const char *_name, const char *_iso2, const char *_code)
+	    : name(_name)
+	    , iso2(_iso2)
+	    , code(_code) {}
 	const char *name, *iso2, *code;
 };
 
 static const CountryInfo countries[] = {
-	CountryInfo("Afghanistan", "AF", "93"),
-	CountryInfo("Albania", "AL", "355"),
-	CountryInfo("Algeria", "DZ", "213"),
-	CountryInfo("American Samoa", "AS", "1684"),
-	CountryInfo("Andorra", "AD", "376"),
-	CountryInfo("Angola", "AO", "244"),
-	CountryInfo("Anguilla", "AI", "1264"),
-	CountryInfo("Antigua & Barbuda", "AG", "1268"),
-	CountryInfo("Argentina", "AR", "54"),
-	CountryInfo("Armenia", "AM", "374"),
-	CountryInfo("Aruba", "AW", "297"),
-	CountryInfo("Australia", "AU", "61"),
-	CountryInfo("Austria", "AT", "43"),
-	CountryInfo("Azerbaijan", "AZ", "994"),
-	CountryInfo("Bahamas", "BS", "1242"),
-	CountryInfo("Bahrain", "BH", "973"),
-	CountryInfo("Bangladesh", "BD", "880"),
-	CountryInfo("Barbados", "BB", "1246"),
-	CountryInfo("Belarus", "BY", "375"),
-	CountryInfo("Belgium", "BE", "32"),
-	CountryInfo("Belize", "BZ", "501"),
-	CountryInfo("Benin", "BJ", "229"),
-	CountryInfo("Bermuda", "BM", "1441"),
-	CountryInfo("Bhutan", "BT", "975"),
-	CountryInfo("Bolivia", "BO", "591"),
-	CountryInfo("Bonaire, Sint Eustatius & Saba", "BQ", "599"),
-	CountryInfo("Bosnia & Herzegovina", "BA", "387"),
-	CountryInfo("Botswana", "BW", "267"),
-	CountryInfo("Brazil", "BR", "55"),
-	CountryInfo("British Virgin Islands", "VG", "1284"),
-	CountryInfo("Brunei Darussalam", "BN", "673"),
-	CountryInfo("Bulgaria", "BG", "359"),
-	CountryInfo("Burkina Faso", "BF", "226"),
-	CountryInfo("Burundi", "BI", "257"),
-	CountryInfo("Cambodia", "KH", "855"),
-	CountryInfo("Cameroon", "CM", "237"),
-	CountryInfo("Canada", "CA", "1"),
-	CountryInfo("Cape Verde", "CV", "238"),
-	CountryInfo("Cayman Islands", "KY", "1345"),
-	CountryInfo("Central African Republic", "CF", "236"),
-	CountryInfo("Chad", "TD", "235"),
-	CountryInfo("Chile", "CL", "56"),
-	CountryInfo("China", "CN", "86"),
-	CountryInfo("Colombia", "CO", "57"),
-	CountryInfo("Comoros", "KM", "269"),
-	CountryInfo("Congo", "CG", "242"),
-	CountryInfo("Congo, Democratic Republic", "CD", "243"),
-	CountryInfo("Cook Islands", "CK", "682"),
-	CountryInfo("Costa Rica", "CR", "506"),
-	CountryInfo("Croatia", "HR", "385"),
-	CountryInfo("Cuba", "CU", "53"),
-	CountryInfo("Curaçao", "CW", "599"),
-	CountryInfo("Cyprus", "CY", "357"),
-	CountryInfo("Czech Republic", "CZ", "420"),
-	CountryInfo("Côte d`Ivoire", "CI", "225"),
-	CountryInfo("Denmark", "DK", "45"),
-	CountryInfo("Diego Garcia", "IO", "246"),
-	CountryInfo("Djibouti", "DJ", "253"),
-	CountryInfo("Dominica", "DM", "1767"),
-	CountryInfo("Dominican Republic", "DO", "1"),
-	CountryInfo("Ecuador", "EC", "593"),
-	CountryInfo("Egypt", "EG", "20"),
-	CountryInfo("El Salvador", "SV", "503"),
-	CountryInfo("Equatorial Guinea", "GQ", "240"),
-	CountryInfo("Eritrea", "ER", "291"),
-	CountryInfo("Estonia", "EE", "372"),
-	CountryInfo("Ethiopia", "ET", "251"),
-	CountryInfo("Falkland Islands", "FK", "500"),
-	CountryInfo("Faroe Islands", "FO", "298"),
-	CountryInfo("Fiji", "FJ", "679"),
-	CountryInfo("Finland", "FI", "358"),
-	CountryInfo("France", "FR", "33"),
-	CountryInfo("French Guiana", "GF", "594"),
-	CountryInfo("French Polynesia", "PF", "689"),
-	CountryInfo("Gabon", "GA", "241"),
-	CountryInfo("Gambia", "GM", "220"),
-	CountryInfo("Georgia", "GE", "995"),
-	CountryInfo("Germany", "DE", "49"),
-	CountryInfo("Ghana", "GH", "233"),
-	CountryInfo("Gibraltar", "GI", "350"),
-	CountryInfo("Greece", "GR", "30"),
-	CountryInfo("Greenland", "GL", "299"),
-	CountryInfo("Grenada", "GD", "1473"),
-	CountryInfo("Guadeloupe", "GP", "590"),
-	CountryInfo("Guam", "GU", "1671"),
-	CountryInfo("Guatemala", "GT", "502"),
-	CountryInfo("Guinea", "GN", "224"),
-	CountryInfo("Guinea-Bissau", "GW", "245"),
-	CountryInfo("Guyana", "GY", "592"),
-	CountryInfo("Haiti", "HT", "509"),
-	CountryInfo("Honduras", "HN", "504"),
-	CountryInfo("Hong Kong", "HK", "852"),
-	CountryInfo("Hungary", "HU", "36"),
-	CountryInfo("Iceland", "IS", "354"),
-	CountryInfo("India", "IN", "91"),
-	CountryInfo("Indonesia", "ID", "62"),
-	CountryInfo("Iran", "IR", "98"),
-	CountryInfo("Iraq", "IQ", "964"),
-	CountryInfo("Ireland", "IE", "353"),
-	CountryInfo("Israel", "IL", "972"),
-	CountryInfo("Italy", "IT", "39"),
-	CountryInfo("Jamaica", "JM", "1876"),
-	CountryInfo("Japan", "JP", "81"),
-	CountryInfo("Jordan", "JO", "962"),
-	CountryInfo("Kazakhstan", "KZ", "7"),
-	CountryInfo("Kenya", "KE", "254"),
-	CountryInfo("Kiribati", "KI", "686"),
-	CountryInfo("Kuwait", "KW", "965"),
-	CountryInfo("Kyrgyzstan", "KG", "996"),
-	CountryInfo("Laos", "LA", "856"),
-	CountryInfo("Latvia", "LV", "371"),
-	CountryInfo("Lebanon", "LB", "961"),
-	CountryInfo("Lesotho", "LS", "266"),
-	CountryInfo("Liberia", "LR", "231"),
-	CountryInfo("Libya", "LY", "218"),
-	CountryInfo("Liechtenstein", "LI", "423"),
-	CountryInfo("Lithuania", "LT", "370"),
-	CountryInfo("Luxembourg", "LU", "352"),
-	CountryInfo("Macau", "MO", "853"),
-	CountryInfo("Macedonia", "MK", "389"),
-	CountryInfo("Madagascar", "MG", "261"),
-	CountryInfo("Malawi", "MW", "265"),
-	CountryInfo("Malaysia", "MY", "60"),
-	CountryInfo("Maldives", "MV", "960"),
-	CountryInfo("Mali", "ML", "223"),
-	CountryInfo("Malta", "MT", "356"),
-	CountryInfo("Marshall Islands", "MH", "692"),
-	CountryInfo("Martinique", "MQ", "596"),
-	CountryInfo("Mauritania", "MR", "222"),
-	CountryInfo("Mauritius", "MU", "230"),
-	CountryInfo("Mexico", "MX", "52"),
-	CountryInfo("Micronesia", "FM", "691"),
-	CountryInfo("Moldova", "MD", "373"),
-	CountryInfo("Monaco", "MC", "377"),
-	CountryInfo("Mongolia", "MN", "976"),
-	CountryInfo("Montenegro", "ME", "382"),
-	CountryInfo("Montserrat", "MS", "1664"),
-	CountryInfo("Morocco", "MA", "212"),
-	CountryInfo("Mozambique", "MZ", "258"),
-	CountryInfo("Myanmar", "MM", "95"),
-	CountryInfo("Namibia", "NA", "264"),
-	CountryInfo("Nauru", "NR", "674"),
-	CountryInfo("Nepal", "NP", "977"),
-	CountryInfo("Netherlands", "NL", "31"),
-	CountryInfo("New Caledonia", "NC", "687"),
-	CountryInfo("New Zealand", "NZ", "64"),
-	CountryInfo("Nicaragua", "NI", "505"),
-	CountryInfo("Niger", "NE", "227"),
-	CountryInfo("Nigeria", "NG", "234"),
-	CountryInfo("Niue", "NU", "683"),
-	CountryInfo("Norfolk Island", "NF", "672"),
-	CountryInfo("North Korea", "KP", "850"),
-	CountryInfo("Northern Mariana Islands", "MP", "1670"),
-	CountryInfo("Norway", "NO", "47"),
-	CountryInfo("Oman", "OM", "968"),
-	CountryInfo("Pakistan", "PK", "92"),
-	CountryInfo("Palau", "PW", "680"),
-	CountryInfo("Palestine", "PS", "970"),
-	CountryInfo("Panama", "PA", "507"),
-	CountryInfo("Papua New Guinea", "PG", "675"),
-	CountryInfo("Paraguay", "PY", "595"),
-	CountryInfo("Peru", "PE", "51"),
-	CountryInfo("Philippines", "PH", "63"),
-	CountryInfo("Poland", "PL", "48"),
-	CountryInfo("Portugal", "PT", "351"),
-	CountryInfo("Puerto Rico", "PR", "1"),
-	CountryInfo("Qatar", "QA", "974"),
-	CountryInfo("Romania", "RO", "40"),
-	CountryInfo("Russian Federation", "RU", "7"),
-	CountryInfo("Rwanda", "RW", "250"),
-	CountryInfo("Réunion", "RE", "262"),
-	CountryInfo("Saint Helena", "SH", "247"),
-	CountryInfo("Saint Helena", "SH2", "290"),
-	CountryInfo("Saint Kitts & Nevis", "KN", "1869"),
-	CountryInfo("Saint Lucia", "LC", "1758"),
-	CountryInfo("Saint Pierre & Miquelon", "PM", "508"),
-	CountryInfo("Saint Vincent & the Grenadines", "VC", "1784"),
-	CountryInfo("Samoa", "WS", "685"),
-	CountryInfo("San Marino", "SM", "378"),
-	CountryInfo("Saudi Arabia", "SA", "966"),
-	CountryInfo("Senegal", "SN", "221"),
-	CountryInfo("Serbia", "RS", "381"),
-	CountryInfo("Seychelles", "SC", "248"),
-	CountryInfo("Sierra Leone", "SL", "232"),
-	CountryInfo("Singapore", "SG", "65"),
-	CountryInfo("Sint Maarten", "SX", "1721"),
-	CountryInfo("Slovakia", "SK", "421"),
-	CountryInfo("Slovenia", "SI", "386"),
-	CountryInfo("Solomon Islands", "SB", "677"),
-	CountryInfo("Somalia", "SO", "252"),
-	CountryInfo("South Africa", "ZA", "27"),
-	CountryInfo("South Korea", "KR", "82"),
-	CountryInfo("South Sudan", "SS", "211"),
-	CountryInfo("Spain", "ES", "34"),
-	CountryInfo("Sri Lanka", "LK", "94"),
-	CountryInfo("Sudan", "SD", "249"),
-	CountryInfo("Suriname", "SR", "597"),
-	CountryInfo("Swaziland", "SZ", "268"),
-	CountryInfo("Sweden", "SE", "46"),
-	CountryInfo("Switzerland", "CH", "41"),
-	CountryInfo("Syrian Arab Republic", "SY", "963"),
-	CountryInfo("São Tomé & Príncipe", "ST", "239"),
-	CountryInfo("Taiwan", "TW", "886"),
-	CountryInfo("Tajikistan", "TJ", "992"),
-	CountryInfo("Tanzania", "TZ", "255"),
-	CountryInfo("Thailand", "TH", "66"),
-	CountryInfo("Timor-Leste", "TL", "670"),
-	CountryInfo("Togo", "TG", "228"),
-	CountryInfo("Tokelau", "TK", "690"),
-	CountryInfo("Tonga", "TO", "676"),
-	CountryInfo("Trinidad & Tobago", "TT", "1868"),
-	CountryInfo("Tunisia", "TN", "216"),
-	CountryInfo("Turkey", "TR", "90"),
-	CountryInfo("Turkmenistan", "TM", "993"),
-	CountryInfo("Turks & Caicos Islands", "TC", "1649"),
-	CountryInfo("Tuvalu", "TV", "688"),
-	CountryInfo("US Virgin Islands", "VI", "1340"),
-	CountryInfo("USA", "US", "1"),
-	CountryInfo("Uganda", "UG", "256"),
-	CountryInfo("Ukraine", "UA", "380"),
-	CountryInfo("United Arab Emirates", "AE", "971"),
-	CountryInfo("United Kingdom", "GB", "44"),
-	CountryInfo("Uruguay", "UY", "598"),
-	CountryInfo("Uzbekistan", "UZ", "998"),
-	CountryInfo("Vanuatu", "VU", "678"),
-	CountryInfo("Venezuela", "VE", "58"),
-	CountryInfo("Vietnam", "VN", "84"),
-	CountryInfo("Wallis & Futuna", "WF", "681"),
-	CountryInfo("Yemen", "YE", "967"),
-	CountryInfo("Zambia", "ZM", "260"),
-	CountryInfo("Zimbabwe", "ZW", "263"),
+    CountryInfo("Afghanistan", "AF", "93"),
+    CountryInfo("Albania", "AL", "355"),
+    CountryInfo("Algeria", "DZ", "213"),
+    CountryInfo("American Samoa", "AS", "1684"),
+    CountryInfo("Andorra", "AD", "376"),
+    CountryInfo("Angola", "AO", "244"),
+    CountryInfo("Anguilla", "AI", "1264"),
+    CountryInfo("Antigua & Barbuda", "AG", "1268"),
+    CountryInfo("Argentina", "AR", "54"),
+    CountryInfo("Armenia", "AM", "374"),
+    CountryInfo("Aruba", "AW", "297"),
+    CountryInfo("Australia", "AU", "61"),
+    CountryInfo("Austria", "AT", "43"),
+    CountryInfo("Azerbaijan", "AZ", "994"),
+    CountryInfo("Bahamas", "BS", "1242"),
+    CountryInfo("Bahrain", "BH", "973"),
+    CountryInfo("Bangladesh", "BD", "880"),
+    CountryInfo("Barbados", "BB", "1246"),
+    CountryInfo("Belarus", "BY", "375"),
+    CountryInfo("Belgium", "BE", "32"),
+    CountryInfo("Belize", "BZ", "501"),
+    CountryInfo("Benin", "BJ", "229"),
+    CountryInfo("Bermuda", "BM", "1441"),
+    CountryInfo("Bhutan", "BT", "975"),
+    CountryInfo("Bolivia", "BO", "591"),
+    CountryInfo("Bonaire, Sint Eustatius & Saba", "BQ", "599"),
+    CountryInfo("Bosnia & Herzegovina", "BA", "387"),
+    CountryInfo("Botswana", "BW", "267"),
+    CountryInfo("Brazil", "BR", "55"),
+    CountryInfo("British Virgin Islands", "VG", "1284"),
+    CountryInfo("Brunei Darussalam", "BN", "673"),
+    CountryInfo("Bulgaria", "BG", "359"),
+    CountryInfo("Burkina Faso", "BF", "226"),
+    CountryInfo("Burundi", "BI", "257"),
+    CountryInfo("Cambodia", "KH", "855"),
+    CountryInfo("Cameroon", "CM", "237"),
+    CountryInfo("Canada", "CA", "1"),
+    CountryInfo("Cape Verde", "CV", "238"),
+    CountryInfo("Cayman Islands", "KY", "1345"),
+    CountryInfo("Central African Republic", "CF", "236"),
+    CountryInfo("Chad", "TD", "235"),
+    CountryInfo("Chile", "CL", "56"),
+    CountryInfo("China", "CN", "86"),
+    CountryInfo("Colombia", "CO", "57"),
+    CountryInfo("Comoros", "KM", "269"),
+    CountryInfo("Congo", "CG", "242"),
+    CountryInfo("Congo, Democratic Republic", "CD", "243"),
+    CountryInfo("Cook Islands", "CK", "682"),
+    CountryInfo("Costa Rica", "CR", "506"),
+    CountryInfo("Croatia", "HR", "385"),
+    CountryInfo("Cuba", "CU", "53"),
+    CountryInfo("Curaçao", "CW", "599"),
+    CountryInfo("Cyprus", "CY", "357"),
+    CountryInfo("Czech Republic", "CZ", "420"),
+    CountryInfo("Côte d`Ivoire", "CI", "225"),
+    CountryInfo("Denmark", "DK", "45"),
+    CountryInfo("Diego Garcia", "IO", "246"),
+    CountryInfo("Djibouti", "DJ", "253"),
+    CountryInfo("Dominica", "DM", "1767"),
+    CountryInfo("Dominican Republic", "DO", "1"),
+    CountryInfo("Ecuador", "EC", "593"),
+    CountryInfo("Egypt", "EG", "20"),
+    CountryInfo("El Salvador", "SV", "503"),
+    CountryInfo("Equatorial Guinea", "GQ", "240"),
+    CountryInfo("Eritrea", "ER", "291"),
+    CountryInfo("Estonia", "EE", "372"),
+    CountryInfo("Ethiopia", "ET", "251"),
+    CountryInfo("Falkland Islands", "FK", "500"),
+    CountryInfo("Faroe Islands", "FO", "298"),
+    CountryInfo("Fiji", "FJ", "679"),
+    CountryInfo("Finland", "FI", "358"),
+    CountryInfo("France", "FR", "33"),
+    CountryInfo("French Guiana", "GF", "594"),
+    CountryInfo("French Polynesia", "PF", "689"),
+    CountryInfo("Gabon", "GA", "241"),
+    CountryInfo("Gambia", "GM", "220"),
+    CountryInfo("Georgia", "GE", "995"),
+    CountryInfo("Germany", "DE", "49"),
+    CountryInfo("Ghana", "GH", "233"),
+    CountryInfo("Gibraltar", "GI", "350"),
+    CountryInfo("Greece", "GR", "30"),
+    CountryInfo("Greenland", "GL", "299"),
+    CountryInfo("Grenada", "GD", "1473"),
+    CountryInfo("Guadeloupe", "GP", "590"),
+    CountryInfo("Guam", "GU", "1671"),
+    CountryInfo("Guatemala", "GT", "502"),
+    CountryInfo("Guinea", "GN", "224"),
+    CountryInfo("Guinea-Bissau", "GW", "245"),
+    CountryInfo("Guyana", "GY", "592"),
+    CountryInfo("Haiti", "HT", "509"),
+    CountryInfo("Honduras", "HN", "504"),
+    CountryInfo("Hong Kong", "HK", "852"),
+    CountryInfo("Hungary", "HU", "36"),
+    CountryInfo("Iceland", "IS", "354"),
+    CountryInfo("India", "IN", "91"),
+    CountryInfo("Indonesia", "ID", "62"),
+    CountryInfo("Iran", "IR", "98"),
+    CountryInfo("Iraq", "IQ", "964"),
+    CountryInfo("Ireland", "IE", "353"),
+    CountryInfo("Israel", "IL", "972"),
+    CountryInfo("Italy", "IT", "39"),
+    CountryInfo("Jamaica", "JM", "1876"),
+    CountryInfo("Japan", "JP", "81"),
+    CountryInfo("Jordan", "JO", "962"),
+    CountryInfo("Kazakhstan", "KZ", "7"),
+    CountryInfo("Kenya", "KE", "254"),
+    CountryInfo("Kiribati", "KI", "686"),
+    CountryInfo("Kuwait", "KW", "965"),
+    CountryInfo("Kyrgyzstan", "KG", "996"),
+    CountryInfo("Laos", "LA", "856"),
+    CountryInfo("Latvia", "LV", "371"),
+    CountryInfo("Lebanon", "LB", "961"),
+    CountryInfo("Lesotho", "LS", "266"),
+    CountryInfo("Liberia", "LR", "231"),
+    CountryInfo("Libya", "LY", "218"),
+    CountryInfo("Liechtenstein", "LI", "423"),
+    CountryInfo("Lithuania", "LT", "370"),
+    CountryInfo("Luxembourg", "LU", "352"),
+    CountryInfo("Macau", "MO", "853"),
+    CountryInfo("Macedonia", "MK", "389"),
+    CountryInfo("Madagascar", "MG", "261"),
+    CountryInfo("Malawi", "MW", "265"),
+    CountryInfo("Malaysia", "MY", "60"),
+    CountryInfo("Maldives", "MV", "960"),
+    CountryInfo("Mali", "ML", "223"),
+    CountryInfo("Malta", "MT", "356"),
+    CountryInfo("Marshall Islands", "MH", "692"),
+    CountryInfo("Martinique", "MQ", "596"),
+    CountryInfo("Mauritania", "MR", "222"),
+    CountryInfo("Mauritius", "MU", "230"),
+    CountryInfo("Mexico", "MX", "52"),
+    CountryInfo("Micronesia", "FM", "691"),
+    CountryInfo("Moldova", "MD", "373"),
+    CountryInfo("Monaco", "MC", "377"),
+    CountryInfo("Mongolia", "MN", "976"),
+    CountryInfo("Montenegro", "ME", "382"),
+    CountryInfo("Montserrat", "MS", "1664"),
+    CountryInfo("Morocco", "MA", "212"),
+    CountryInfo("Mozambique", "MZ", "258"),
+    CountryInfo("Myanmar", "MM", "95"),
+    CountryInfo("Namibia", "NA", "264"),
+    CountryInfo("Nauru", "NR", "674"),
+    CountryInfo("Nepal", "NP", "977"),
+    CountryInfo("Netherlands", "NL", "31"),
+    CountryInfo("New Caledonia", "NC", "687"),
+    CountryInfo("New Zealand", "NZ", "64"),
+    CountryInfo("Nicaragua", "NI", "505"),
+    CountryInfo("Niger", "NE", "227"),
+    CountryInfo("Nigeria", "NG", "234"),
+    CountryInfo("Niue", "NU", "683"),
+    CountryInfo("Norfolk Island", "NF", "672"),
+    CountryInfo("North Korea", "KP", "850"),
+    CountryInfo("Northern Mariana Islands", "MP", "1670"),
+    CountryInfo("Norway", "NO", "47"),
+    CountryInfo("Oman", "OM", "968"),
+    CountryInfo("Pakistan", "PK", "92"),
+    CountryInfo("Palau", "PW", "680"),
+    CountryInfo("Palestine", "PS", "970"),
+    CountryInfo("Panama", "PA", "507"),
+    CountryInfo("Papua New Guinea", "PG", "675"),
+    CountryInfo("Paraguay", "PY", "595"),
+    CountryInfo("Peru", "PE", "51"),
+    CountryInfo("Philippines", "PH", "63"),
+    CountryInfo("Poland", "PL", "48"),
+    CountryInfo("Portugal", "PT", "351"),
+    CountryInfo("Puerto Rico", "PR", "1"),
+    CountryInfo("Qatar", "QA", "974"),
+    CountryInfo("Romania", "RO", "40"),
+    CountryInfo("Russian Federation", "RU", "7"),
+    CountryInfo("Rwanda", "RW", "250"),
+    CountryInfo("Réunion", "RE", "262"),
+    CountryInfo("Saint Helena", "SH", "247"),
+    CountryInfo("Saint Helena", "SH2", "290"),
+    CountryInfo("Saint Kitts & Nevis", "KN", "1869"),
+    CountryInfo("Saint Lucia", "LC", "1758"),
+    CountryInfo("Saint Pierre & Miquelon", "PM", "508"),
+    CountryInfo("Saint Vincent & the Grenadines", "VC", "1784"),
+    CountryInfo("Samoa", "WS", "685"),
+    CountryInfo("San Marino", "SM", "378"),
+    CountryInfo("Saudi Arabia", "SA", "966"),
+    CountryInfo("Senegal", "SN", "221"),
+    CountryInfo("Serbia", "RS", "381"),
+    CountryInfo("Seychelles", "SC", "248"),
+    CountryInfo("Sierra Leone", "SL", "232"),
+    CountryInfo("Singapore", "SG", "65"),
+    CountryInfo("Sint Maarten", "SX", "1721"),
+    CountryInfo("Slovakia", "SK", "421"),
+    CountryInfo("Slovenia", "SI", "386"),
+    CountryInfo("Solomon Islands", "SB", "677"),
+    CountryInfo("Somalia", "SO", "252"),
+    CountryInfo("South Africa", "ZA", "27"),
+    CountryInfo("South Korea", "KR", "82"),
+    CountryInfo("South Sudan", "SS", "211"),
+    CountryInfo("Spain", "ES", "34"),
+    CountryInfo("Sri Lanka", "LK", "94"),
+    CountryInfo("Sudan", "SD", "249"),
+    CountryInfo("Suriname", "SR", "597"),
+    CountryInfo("Swaziland", "SZ", "268"),
+    CountryInfo("Sweden", "SE", "46"),
+    CountryInfo("Switzerland", "CH", "41"),
+    CountryInfo("Syrian Arab Republic", "SY", "963"),
+    CountryInfo("São Tomé & Príncipe", "ST", "239"),
+    CountryInfo("Taiwan", "TW", "886"),
+    CountryInfo("Tajikistan", "TJ", "992"),
+    CountryInfo("Tanzania", "TZ", "255"),
+    CountryInfo("Thailand", "TH", "66"),
+    CountryInfo("Timor-Leste", "TL", "670"),
+    CountryInfo("Togo", "TG", "228"),
+    CountryInfo("Tokelau", "TK", "690"),
+    CountryInfo("Tonga", "TO", "676"),
+    CountryInfo("Trinidad & Tobago", "TT", "1868"),
+    CountryInfo("Tunisia", "TN", "216"),
+    CountryInfo("Turkey", "TR", "90"),
+    CountryInfo("Turkmenistan", "TM", "993"),
+    CountryInfo("Turks & Caicos Islands", "TC", "1649"),
+    CountryInfo("Tuvalu", "TV", "688"),
+    CountryInfo("US Virgin Islands", "VI", "1340"),
+    CountryInfo("USA", "US", "1"),
+    CountryInfo("Uganda", "UG", "256"),
+    CountryInfo("Ukraine", "UA", "380"),
+    CountryInfo("United Arab Emirates", "AE", "971"),
+    CountryInfo("United Kingdom", "GB", "44"),
+    CountryInfo("Uruguay", "UY", "598"),
+    CountryInfo("Uzbekistan", "UZ", "998"),
+    CountryInfo("Vanuatu", "VU", "678"),
+    CountryInfo("Venezuela", "VE", "58"),
+    CountryInfo("Vietnam", "VN", "84"),
+    CountryInfo("Wallis & Futuna", "WF", "681"),
+    CountryInfo("Yemen", "YE", "967"),
+    CountryInfo("Zambia", "ZM", "260"),
+    CountryInfo("Zimbabwe", "ZW", "263"),
 };
 
 typedef QHash<QString, const CountryInfo *> CountriesByCode;
diff --git a/Telegram/SourceFiles/data/data_abstract_structure.cpp b/Telegram/SourceFiles/data/data_abstract_structure.cpp
index a90dceff5..a0662a5b1 100644
--- a/Telegram/SourceFiles/data/data_abstract_structure.cpp
+++ b/Telegram/SourceFiles/data/data_abstract_structure.cpp
@@ -18,14 +18,14 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
+#include "data/data_abstract_structure.h"
 #include "base/ordered_set.h"
 #include "core/utils.h"
-#include "data/data_abstract_structure.h"
 
 namespace Data {
 namespace {
 
-using DataStructures = OrderedSet<AbstractStructure**>;
+using DataStructures = OrderedSet<AbstractStructure **>;
 NeverFreedPointer<DataStructures> structures;
 
 } // namespace
diff --git a/Telegram/SourceFiles/data/data_abstract_structure.h b/Telegram/SourceFiles/data/data_abstract_structure.h
index a884a3b98..ed27ffc69 100644
--- a/Telegram/SourceFiles/data/data_abstract_structure.h
+++ b/Telegram/SourceFiles/data/data_abstract_structure.h
@@ -43,12 +43,11 @@ namespace internal {
 
 void registerAbstractStructure(AbstractStructure **p);
 
-} // namespace
+} // namespace internal
 
-  // Must be created in global scope!
-  // Structure is derived from AbstractStructure.
-template <typename Structure>
-class GlobalStructurePointer {
+// Must be created in global scope!
+// Structure is derived from AbstractStructure.
+template <typename Structure> class GlobalStructurePointer {
 public:
 	GlobalStructurePointer() = default;
 	GlobalStructurePointer(const GlobalStructurePointer<Structure> &other) = delete;
@@ -62,11 +61,11 @@ public:
 	}
 	Structure *operator->() {
 		Assert(_p != nullptr);
-		return static_cast<Structure*>(_p);
+		return static_cast<Structure *>(_p);
 	}
 	const Structure *operator->() const {
 		Assert(_p != nullptr);
-		return static_cast<const Structure*>(_p);
+		return static_cast<const Structure *>(_p);
 	}
 	explicit operator bool() const {
 		return _p != nullptr;
@@ -74,7 +73,6 @@ public:
 
 private:
 	AbstractStructure *_p;
-
 };
 
 // This method should be called at the end of the app launch.
diff --git a/Telegram/SourceFiles/data/data_drafts.cpp b/Telegram/SourceFiles/data/data_drafts.cpp
index 8c4b24408..ddea34612 100644
--- a/Telegram/SourceFiles/data/data_drafts.cpp
+++ b/Telegram/SourceFiles/data/data_drafts.cpp
@@ -20,30 +20,30 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "data/data_drafts.h"
 
-#include "ui/widgets/input_fields.h"
 #include "chat_helpers/message_field.h"
 #include "history/history_widget.h"
 #include "mainwidget.h"
 #include "storage/localstorage.h"
+#include "ui/widgets/input_fields.h"
 
 namespace Data {
-namespace {
-
-} // namespace
+namespace {} // namespace
 
 Draft::Draft(const Ui::FlatTextarea *field, MsgId msgId, bool previewCancelled, mtpRequestId saveRequestId)
-	: textWithTags(field->getTextWithTags())
-	, msgId(msgId)
-	, cursor(field)
-	, previewCancelled(previewCancelled) {
-}
+    : textWithTags(field->getTextWithTags())
+    , msgId(msgId)
+    , cursor(field)
+    , previewCancelled(previewCancelled) {}
 
 void applyPeerCloudDraft(PeerId peerId, const MTPDdraftMessage &draft) {
 	auto history = App::history(peerId);
-	auto text = TextWithEntities { qs(draft.vmessage), draft.has_entities() ? TextUtilities::EntitiesFromMTP(draft.ventities.v) : EntitiesInText() };
-	auto textWithTags = TextWithTags { TextUtilities::ApplyEntities(text), ConvertEntitiesToTextTags(text.entities) };
+	auto text =
+	    TextWithEntities{qs(draft.vmessage),
+	                     draft.has_entities() ? TextUtilities::EntitiesFromMTP(draft.ventities.v) : EntitiesInText()};
+	auto textWithTags = TextWithTags{TextUtilities::ApplyEntities(text), ConvertEntitiesToTextTags(text.entities)};
 	auto replyTo = draft.has_reply_to_msg_id() ? draft.vreply_to_msg_id.v : MsgId(0);
-	auto cloudDraft = std::make_unique<Draft>(textWithTags, replyTo, MessageCursor(QFIXED_MAX, QFIXED_MAX, QFIXED_MAX), draft.is_no_webpage());
+	auto cloudDraft = std::make_unique<Draft>(textWithTags, replyTo, MessageCursor(QFIXED_MAX, QFIXED_MAX, QFIXED_MAX),
+	                                          draft.is_no_webpage());
 	cloudDraft->date = ::date(draft.vdate);
 
 	history->setCloudDraft(std::move(cloudDraft));
diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h
index f49d4a5f5..add246651 100644
--- a/Telegram/SourceFiles/data/data_drafts.h
+++ b/Telegram/SourceFiles/data/data_drafts.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "structs.h"
 #include "history/history.h"
+#include "structs.h"
 
 namespace Ui {
 class FlatTextarea;
@@ -33,15 +33,14 @@ void applyPeerCloudDraft(PeerId peerId, const MTPDdraftMessage &draft);
 void clearPeerCloudDraft(PeerId peerId);
 
 struct Draft {
-	Draft() {
-	}
-	Draft(const TextWithTags &textWithTags, MsgId msgId, const MessageCursor &cursor, bool previewCancelled, mtpRequestId saveRequestId = 0)
-		: textWithTags(textWithTags)
-		, msgId(msgId)
-		, cursor(cursor)
-		, previewCancelled(previewCancelled)
-		, saveRequestId(saveRequestId) {
-	}
+	Draft() {}
+	Draft(const TextWithTags &textWithTags, MsgId msgId, const MessageCursor &cursor, bool previewCancelled,
+	      mtpRequestId saveRequestId = 0)
+	    : textWithTags(textWithTags)
+	    , msgId(msgId)
+	    , cursor(cursor)
+	    , previewCancelled(previewCancelled)
+	    , saveRequestId(saveRequestId) {}
 	Draft(const Ui::FlatTextarea *field, MsgId msgId, bool previewCancelled, mtpRequestId saveRequestId = 0);
 
 	QDateTime date;
@@ -74,7 +73,8 @@ inline bool draftsAreEqual(Draft *a, Draft *b) {
 		return false;
 	}
 
-	return (a->textWithTags == b->textWithTags) && (a->msgId == b->msgId) && (a->previewCancelled == b->previewCancelled);
+	return (a->textWithTags == b->textWithTags) && (a->msgId == b->msgId) &&
+	       (a->previewCancelled == b->previewCancelled);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/dialogs_common.h b/Telegram/SourceFiles/dialogs/dialogs_common.h
index 6f6a3f974..17ca24394 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_common.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_common.h
@@ -30,11 +30,11 @@ using RowsByLetter = QMap<QChar, Row*>;
 enum class SortMode {
 	Date = 0x00,
 	Name = 0x01,
-	Add  = 0x02,
+	Add = 0x02,
 };
 
 enum class Mode {
-	All       = 0x00,
+	All = 0x00,
 	Important = 0x01,
 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
index c8f79afa7..e20b3de4a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp
@@ -18,15 +18,14 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "history/history.h"
 #include "dialogs/dialogs_indexed_list.h"
+#include "history/history.h"
 
 namespace Dialogs {
 
 IndexedList::IndexedList(SortMode sortMode)
-: _sortMode(sortMode)
-, _list(sortMode) {
-}
+    : _sortMode(sortMode)
+    , _list(sortMode) {}
 
 RowsByLetter IndexedList::addToEnd(History *history) {
 	RowsByLetter result;
@@ -100,7 +99,8 @@ void IndexedList::movePinned(Row *row, int deltaSign) {
 	history2->setPinnedIndex(index1);
 }
 
-void IndexedList::peerNameChanged(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) {
+void IndexedList::peerNameChanged(PeerData *peer, const PeerData::Names &oldNames,
+                                  const PeerData::NameFirstChars &oldChars) {
 	Assert(_sortMode != SortMode::Date);
 	if (_sortMode == SortMode::Name) {
 		adjustByName(peer, oldNames, oldChars);
@@ -109,12 +109,14 @@ void IndexedList::peerNameChanged(PeerData *peer, const PeerData::Names &oldName
 	}
 }
 
-void IndexedList::peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) {
+void IndexedList::peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames,
+                                  const PeerData::NameFirstChars &oldChars) {
 	Assert(_sortMode == SortMode::Date);
 	adjustNames(list, peer, oldNames, oldChars);
 }
 
-void IndexedList::adjustByName(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) {
+void IndexedList::adjustByName(PeerData *peer, const PeerData::Names &oldNames,
+                               const PeerData::NameFirstChars &oldChars) {
 	Row *mainRow = _list.adjustByName(peer);
 	if (!mainRow) return;
 
@@ -148,7 +150,8 @@ void IndexedList::adjustByName(PeerData *peer, const PeerData::Names &oldNames,
 	}
 }
 
-void IndexedList::adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) {
+void IndexedList::adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames,
+                              const PeerData::NameFirstChars &oldChars) {
 	auto mainRow = _list.getRow(peer->id);
 	if (!mainRow) return;
 
@@ -194,9 +197,7 @@ void IndexedList::del(const PeerData *peer, Row *replacedBy) {
 }
 
 void IndexedList::clear() {
-	for_const (auto &list, _index) {
-		delete list;
-	}
+	for_const (auto &list, _index) { delete list; }
 }
 
 IndexedList::~IndexedList() {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
index 7c50f6c8c..3a2c5079c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "structs.h"
 #include "dialogs/dialogs_common.h"
 #include "dialogs/dialogs_list.h"
+#include "structs.h"
 
 class History;
 
@@ -43,8 +43,9 @@ public:
 	// For sortMode != SortMode::Date
 	void peerNameChanged(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars);
 
-	//For sortMode == SortMode::Date
-	void peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars);
+	// For sortMode == SortMode::Date
+	void peerNameChanged(Mode list, PeerData *peer, const PeerData::Names &oldNames,
+	                     const PeerData::NameFirstChars &oldChars);
 
 	void del(const PeerData *peer, Row *replacedBy = nullptr);
 	void clear();
@@ -60,36 +61,70 @@ public:
 	~IndexedList();
 
 	// Part of List interface is duplicated here for all() list.
-	int size() const { return all().size(); }
-	bool isEmpty() const { return all().isEmpty(); }
-	bool contains(PeerId peerId) const { return all().contains(peerId); }
-	Row *getRow(PeerId peerId) const { return all().getRow(peerId); }
-	Row *rowAtY(qint32 y, qint32 h) const { return all().rowAtY(y, h); }
+	int size() const {
+		return all().size();
+	}
+	bool isEmpty() const {
+		return all().isEmpty();
+	}
+	bool contains(PeerId peerId) const {
+		return all().contains(peerId);
+	}
+	Row *getRow(PeerId peerId) const {
+		return all().getRow(peerId);
+	}
+	Row *rowAtY(qint32 y, qint32 h) const {
+		return all().rowAtY(y, h);
+	}
 
 	using iterator = List::iterator;
 	using const_iterator = List::const_iterator;
-	const_iterator cbegin() const { return all().cbegin(); }
-	const_iterator cend() const { return all().cend(); }
-	const_iterator begin() const { return all().cbegin(); }
-	const_iterator end() const { return all().cend(); }
-	iterator begin() { return all().begin(); }
-	iterator end() { return all().end(); }
-	const_iterator cfind(Row *value) const { return all().cfind(value); }
-	const_iterator find(Row *value) const { return all().cfind(value); }
-	iterator find(Row *value) { return all().find(value); }
-	const_iterator cfind(int y, int h) const { return all().cfind(y, h); }
-	const_iterator find(int y, int h) const { return all().cfind(y, h); }
-	iterator find(int y, int h) { return all().find(y, h); }
+	const_iterator cbegin() const {
+		return all().cbegin();
+	}
+	const_iterator cend() const {
+		return all().cend();
+	}
+	const_iterator begin() const {
+		return all().cbegin();
+	}
+	const_iterator end() const {
+		return all().cend();
+	}
+	iterator begin() {
+		return all().begin();
+	}
+	iterator end() {
+		return all().end();
+	}
+	const_iterator cfind(Row *value) const {
+		return all().cfind(value);
+	}
+	const_iterator find(Row *value) const {
+		return all().cfind(value);
+	}
+	iterator find(Row *value) {
+		return all().find(value);
+	}
+	const_iterator cfind(int y, int h) const {
+		return all().cfind(y, h);
+	}
+	const_iterator find(int y, int h) const {
+		return all().cfind(y, h);
+	}
+	iterator find(int y, int h) {
+		return all().find(y, h);
+	}
 
 private:
 	void adjustByName(PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars);
-	void adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars);
+	void adjustNames(Mode list, PeerData *peer, const PeerData::Names &oldNames,
+	                 const PeerData::NameFirstChars &oldChars);
 
 	SortMode _sortMode;
 	List _list;
-	using Index = QMap<QChar, List*>;
+	using Index = QMap<QChar, List *>;
 	Index _index;
-
 };
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index c76b7a837..945630879 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -20,25 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "dialogs/dialogs_inner_widget.h"
 
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "data/data_drafts.h"
 #include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_layout.h"
 #include "dialogs/dialogs_search_from_controllers.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/popup_menu.h"
-#include "data/data_drafts.h"
 #include "lang/lang_keys.h"
-#include "mainwindow.h"
 #include "mainwidget.h"
-#include "storage/localstorage.h"
-#include "apiwrap.h"
-#include "window/themes/window_theme.h"
+#include "mainwindow.h"
 #include "observer_peer.h"
-#include "auth_session.h"
-#include "window/notifications_manager.h"
-#include "window/window_controller.h"
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/multi_select.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/notifications_manager.h"
+#include "window/themes/window_theme.h"
+#include "window/window_controller.h"
 
 #include <string.h> // memcmp
 
@@ -54,29 +54,29 @@ struct DialogsInner::ImportantSwitch {
 };
 
 struct DialogsInner::HashtagResult {
-	HashtagResult(const QString &tag) : tag(tag) {
-	}
+	HashtagResult(const QString &tag)
+	    : tag(tag) {}
 	QString tag;
 	Dialogs::RippleRow row;
 };
 
 struct DialogsInner::PeerSearchResult {
-	PeerSearchResult(PeerData *peer) : peer(peer) {
-	}
+	PeerSearchResult(PeerData *peer)
+	    : peer(peer) {}
 	PeerData *peer;
 	Dialogs::RippleRow row;
 };
 
-DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> controller, QWidget *main) : SplittedWidget(parent)
-, _controller(controller)
-, _dialogs(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Date))
-, _contactsNoDialogs(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Name))
-, _contacts(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Name))
-, _a_pinnedShifting(animation(this, &DialogsInner::step_pinnedShifting))
-, _addContactLnk(this, lang(lng_add_contact_button))
-, _cancelSearchInPeer(this, st::dialogsCancelSearchInPeer)
-, _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer) {
-
+DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller *> controller, QWidget *main)
+    : SplittedWidget(parent)
+    , _controller(controller)
+    , _dialogs(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Date))
+    , _contactsNoDialogs(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Name))
+    , _contacts(std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Name))
+    , _a_pinnedShifting(animation(this, &DialogsInner::step_pinnedShifting))
+    , _addContactLnk(this, lang(lng_add_contact_button))
+    , _cancelSearchInPeer(this, st::dialogsCancelSearchInPeer)
+    , _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer) {
 #ifdef OS_MAC_OLD
 	// Qt 5.3.2 build is working with glitches otherwise.
 	setAttribute(Qt::WA_OpaquePaintEvent, false);
@@ -86,7 +86,8 @@ DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> contro
 		_dialogsImportant = std::make_unique<Dialogs::IndexedList>(Dialogs::SortMode::Date);
 		_importantSwitch = std::make_unique<ImportantSwitch>();
 	}
-	connect(main, SIGNAL(dialogRowReplaced(Dialogs::Row*, Dialogs::Row*)), this, SLOT(onDialogRowReplaced(Dialogs::Row*, Dialogs::Row*)));
+	connect(main, SIGNAL(dialogRowReplaced(Dialogs::Row *, Dialogs::Row *)), this,
+	        SLOT(onDialogRowReplaced(Dialogs::Row *, Dialogs::Row *)));
 	connect(_addContactLnk, SIGNAL(clicked()), App::wnd(), SLOT(onShowAddContact()));
 	_cancelSearchInPeer->setClickedCallback([this] { cancelSearchInPeer(); });
 	_cancelSearchInPeer->hide();
@@ -94,13 +95,14 @@ DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> contro
 	_cancelSearchFromUser->hide();
 
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
-	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) {
-		itemRemoved(item);
-	});
-	subscribe(App::histories().sendActionAnimationUpdated(), [this](const Histories::SendActionAnimationUpdate &update) {
-		auto updateRect = Dialogs::Layout::RowPainter::sendActionAnimationRect(update.width, update.height, getFullWidth(), update.textUpdated);
-		updateDialogRow(update.history->peer, MsgId(0), updateRect, UpdateRowSection::Default | UpdateRowSection::Filtered);
-	});
+	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) { itemRemoved(item); });
+	subscribe(App::histories().sendActionAnimationUpdated(),
+	          [this](const Histories::SendActionAnimationUpdate &update) {
+		          auto updateRect = Dialogs::Layout::RowPainter::sendActionAnimationRect(
+		              update.width, update.height, getFullWidth(), update.textUpdated);
+		          updateDialogRow(update.history->peer, MsgId(0), updateRect,
+		                          UpdateRowSection::Default | UpdateRowSection::Filtered);
+	          });
 
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) {
 		if (data.paletteChanged()) {
@@ -109,21 +111,19 @@ DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> contro
 	});
 
 	using UpdateFlag = Notify::PeerUpdate::Flag;
-	auto changes = UpdateFlag::PinnedChanged
-		| UpdateFlag::NameChanged
-		| UpdateFlag::PhotoChanged;
+	auto changes = UpdateFlag::PinnedChanged | UpdateFlag::NameChanged | UpdateFlag::PhotoChanged;
 	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(changes, [this](const Notify::PeerUpdate &update) {
-		if (update.flags & UpdateFlag::PinnedChanged) {
-			stopReorderPinned();
-		}
-		if (update.flags & UpdateFlag::NameChanged) {
-			handlePeerNameChange(update.peer, update.oldNames, update.oldNameFirstChars);
-		}
-		if (update.flags & UpdateFlag::PhotoChanged) {
-			this->update();
-			emit App::main()->dialogsUpdated();
-		}
-	}));
+		          if (update.flags & UpdateFlag::PinnedChanged) {
+			          stopReorderPinned();
+		          }
+		          if (update.flags & UpdateFlag::NameChanged) {
+			          handlePeerNameChange(update.peer, update.oldNames, update.oldNameFirstChars);
+		          }
+		          if (update.flags & UpdateFlag::PhotoChanged) {
+			          this->update();
+			          emit App::main()->dialogsUpdated();
+		          }
+	          }));
 
 	refresh();
 }
@@ -141,7 +141,9 @@ int DialogsInner::peerSearchOffset() const {
 }
 
 int DialogsInner::searchedOffset() const {
-	auto result = peerSearchOffset() + (_peerSearchResults.empty() ? 0 : ((_peerSearchResults.size() * st::dialogsRowHeight) + st::searchedBarHeight));
+	auto result =
+	    peerSearchOffset() +
+	    (_peerSearchResults.empty() ? 0 : ((_peerSearchResults.size() * st::dialogsRowHeight) + st::searchedBarHeight));
 	if (_searchInPeer) {
 		result += searchInPeerSkip();
 	}
@@ -181,7 +183,9 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 		}
 		auto otherStart = rows->size() * st::dialogsRowHeight;
 		auto active = App::main()->activePeer();
-		auto selected = _menuPeer ? _menuPeer : (isPressed() ? (_pressed ? _pressed->history()->peer : nullptr) : (_selected ? _selected->history()->peer : nullptr));
+		auto selected = _menuPeer ? _menuPeer :
+		                            (isPressed() ? (_pressed ? _pressed->history()->peer : nullptr) :
+		                                           (_selected ? _selected->history()->peer : nullptr));
 		if (otherStart) {
 			auto reorderingPinned = (_aboveIndex >= 0 && !_pinnedRows.empty());
 			auto &list = rows->all();
@@ -231,7 +235,11 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 			if (!paintingOther) {
 				p.setFont(st::noContactsFont);
 				p.setPen(st::noContactsColor);
-				p.drawText(QRect(0, 0, fullWidth, st::noContactsHeight - (Auth().data().contactsLoaded().value() ? st::noContactsFont->height : 0)), lang(Auth().data().contactsLoaded().value() ? lng_no_chats : lng_contacts_loading), style::al_center);
+				p.drawText(QRect(0, 0, fullWidth,
+				                 st::noContactsHeight -
+				                     (Auth().data().contactsLoaded().value() ? st::noContactsFont->height : 0)),
+				           lang(Auth().data().contactsLoaded().value() ? lng_no_chats : lng_contacts_loading),
+				           style::al_center);
 			}
 		}
 	} else if (_state == FilteredState || _state == SearchedState) {
@@ -252,9 +260,11 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 						auto &tag = result->tag;
 						if (selected) {
 							int skip = (st::mentionHeight - st::smallCloseIconOver.height()) / 2;
-							st::smallCloseIconOver.paint(p, QPoint(fullWidth - st::smallCloseIconOver.width() - skip, skip), width());
+							st::smallCloseIconOver.paint(
+							    p, QPoint(fullWidth - st::smallCloseIconOver.width() - skip, skip), width());
 						}
-						auto first = (_hashtagFilter.size() < 2) ? QString() : ('#' + tag.mid(0, _hashtagFilter.size() - 1));
+						auto first =
+						    (_hashtagFilter.size() < 2) ? QString() : ('#' + tag.mid(0, _hashtagFilter.size() - 1));
 						auto second = (_hashtagFilter.size() < 2) ? ('#' + tag) : tag.mid(_hashtagFilter.size() - 1);
 						auto firstwidth = st::mentionFont->width(first);
 						auto secondwidth = st::mentionFont->width(second);
@@ -274,7 +284,8 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 						}
 						if (!second.isEmpty()) {
 							p.setPen(selected ? st::mentionFgOver : st::mentionFg);
-							p.drawText(st::dialogsPadding.x() + firstwidth, st::mentionTop + st::mentionFont->ascent, second);
+							p.drawText(st::dialogsPadding.x() + firstwidth, st::mentionTop + st::mentionFont->ascent,
+							           second);
 						}
 					}
 					p.translate(0, st::mentionHeight);
@@ -292,9 +303,12 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 				for (; from < to; ++from) {
 					auto row = _filterResults[from];
 					auto peer = row->history()->peer;
-					auto active = ((peer == activePeer) || (peer->migrateTo() && peer->migrateTo() == activePeer)) && !activeMsgId;
-					auto selected = _menuPeer ? (peer == _menuPeer) : (from == (isPressed() ? _filteredPressed : _filteredSelected));
-					Dialogs::Layout::RowPainter::paint(p, _filterResults[from], fullWidth, active, selected, paintingOther, ms);
+					auto active = ((peer == activePeer) || (peer->migrateTo() && peer->migrateTo() == activePeer)) &&
+					              !activeMsgId;
+					auto selected = _menuPeer ? (peer == _menuPeer) :
+					                            (from == (isPressed() ? _filteredPressed : _filteredSelected));
+					Dialogs::Layout::RowPainter::paint(p, _filterResults[from], fullWidth, active, selected,
+					                                   paintingOther, ms);
 					p.translate(0, st::dialogsRowHeight);
 				}
 			}
@@ -305,7 +319,8 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 			if (!paintingOther) {
 				p.setFont(st::searchedBarFont);
 				p.setPen(st::searchedBarFg);
-				p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), lang(lng_search_global_results));
+				p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(),
+				               lang(lng_search_global_results));
 			}
 			p.translate(0, st::searchedBarHeight);
 
@@ -319,8 +334,10 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 				for (; from < to; ++from) {
 					auto &result = _peerSearchResults[from];
 					auto peer = result->peer;
-					auto active = ((peer == activePeer) || (peer->migrateTo() && peer->migrateTo() == activePeer)) && !activeMsgId;
-					auto selected = false ? (peer == _menuPeer) : (from == (isPressed() ? _peerSearchPressed : _peerSearchSelected));
+					auto active = ((peer == activePeer) || (peer->migrateTo() && peer->migrateTo() == activePeer)) &&
+					              !activeMsgId;
+					auto selected = false ? (peer == _menuPeer) :
+					                        (from == (isPressed() ? _peerSearchPressed : _peerSearchSelected));
 					paintPeerSearchResult(p, result.get(), fullWidth, active, selected, paintingOther, ms);
 					p.translate(0, st::dialogsRowHeight);
 				}
@@ -335,14 +352,17 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 				if (!paintingOther) {
 					p.setFont(st::searchedBarFont);
 					p.setPen(st::searchedBarFg);
-					p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(), lang(lng_dlg_search_for_messages));
+					p.drawTextLeft(st::searchedBarPosition.x(), st::searchedBarPosition.y(), width(),
+					               lang(lng_dlg_search_for_messages));
 				}
 				p.translate(0, st::searchedBarHeight);
 			}
 		}
 
 		if (_state == SearchedState || !_searchResults.empty()) {
-			auto text = _searchResults.empty() ? lang(lng_search_no_results) : lng_search_found_results(lt_count, _searchedMigratedCount + _searchedCount);
+			auto text = _searchResults.empty() ?
+			                lang(lng_search_no_results) :
+			                lng_search_found_results(lt_count, _searchedMigratedCount + _searchedCount);
 			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
 			if (!paintingOther) {
 				p.setFont(st::searchedBarFont);
@@ -362,8 +382,10 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 					auto &result = _searchResults[from];
 					auto item = result->item();
 					auto peer = item->history()->peer;
-					auto active = (peer == activePeer && item->id == activeMsgId) || (peer->migrateTo() && peer->migrateTo() == activePeer && item->id == -activeMsgId);
-					auto selected = false ? (peer == _menuPeer) : (from == (isPressed() ? _searchedPressed : _searchedSelected));
+					auto active = (peer == activePeer && item->id == activeMsgId) ||
+					              (peer->migrateTo() && peer->migrateTo() == activePeer && item->id == -activeMsgId);
+					auto selected =
+					    false ? (peer == _menuPeer) : (from == (isPressed() ? _searchedPressed : _searchedSelected));
 					Dialogs::Layout::RowPainter::paint(p, result.get(), fullWidth, active, selected, paintingOther, ms);
 					p.translate(0, st::dialogsRowHeight);
 				}
@@ -372,20 +394,23 @@ void DialogsInner::paintRegion(Painter &p, const QRegion &region, bool paintingO
 	}
 }
 
-void DialogsInner::paintDialog(Painter &p, Dialogs::Row *row, int fullWidth, PeerData *active, PeerData *selected, bool onlyBackground, TimeMs ms) {
+void DialogsInner::paintDialog(Painter &p, Dialogs::Row *row, int fullWidth, PeerData *active, PeerData *selected,
+                               bool onlyBackground, TimeMs ms) {
 	auto pos = row->pos();
 	auto xadd = 0, yadd = 0;
 	if (pos < _pinnedRows.size()) {
 		yadd = std::round(_pinnedRows[pos].yadd.current());
 	}
 	if (xadd || yadd) p.translate(xadd, yadd);
-	auto isActive = (row->history()->peer == active) || (row->history()->peer->migrateTo() && row->history()->peer->migrateTo() == active);
+	auto isActive = (row->history()->peer == active) ||
+	                (row->history()->peer->migrateTo() && row->history()->peer->migrateTo() == active);
 	auto isSelected = (row->history()->peer == selected);
 	Dialogs::Layout::RowPainter::paint(p, row, fullWidth, isActive, isSelected, onlyBackground, ms);
 	if (xadd || yadd) p.translate(-xadd, -yadd);
 }
 
-void DialogsInner::paintPeerSearchResult(Painter &p, const PeerSearchResult *result, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms) const {
+void DialogsInner::paintPeerSearchResult(Painter &p, const PeerSearchResult *result, int fullWidth, bool active,
+                                         bool selected, bool onlyBackground, TimeMs ms) const {
 	QRect fullRect(0, 0, fullWidth, st::dialogsRowHeight);
 	p.fillRect(fullRect, active ? st::dialogsBgActive : (selected ? st::dialogsBgOver : st::dialogsBg));
 	if (!active) {
@@ -395,7 +420,8 @@ void DialogsInner::paintPeerSearchResult(Painter &p, const PeerSearchResult *res
 
 	auto peer = result->peer;
 	auto userpicPeer = (peer->migrateTo() ? peer->migrateTo() : peer);
-	userpicPeer->paintUserpicLeft(p, st::dialogsPadding.x(), st::dialogsPadding.y(), getFullWidth(), st::dialogsPhotoSize);
+	userpicPeer->paintUserpicLeft(p, st::dialogsPadding.x(), st::dialogsPadding.y(), getFullWidth(),
+	                              st::dialogsPhotoSize);
 
 	auto nameleft = st::dialogsPadding.x() + st::dialogsPhotoSize + st::dialogsPhotoPadding;
 	auto namewidth = fullWidth - nameleft - st::dialogsPadding.x();
@@ -407,12 +433,15 @@ void DialogsInner::paintPeerSearchResult(Painter &p, const PeerSearchResult *res
 		rectForName.setLeft(rectForName.left() + st::dialogsChatTypeSkip);
 	}
 	if (peer->isVerified()) {
-		auto icon = &(active ? st::dialogsVerifiedIconActive : (selected ? st::dialogsVerifiedIconOver : st::dialogsVerifiedIcon));
+		auto icon = &(active ? st::dialogsVerifiedIconActive :
+		                       (selected ? st::dialogsVerifiedIconOver : st::dialogsVerifiedIcon));
 		rectForName.setWidth(rectForName.width() - icon->width());
-		icon->paint(p, rectForName.topLeft() + QPoint(std::min(peer->dialogName().maxWidth(), rectForName.width()), 0), fullWidth);
+		icon->paint(p, rectForName.topLeft() + QPoint(std::min(peer->dialogName().maxWidth(), rectForName.width()), 0),
+		            fullWidth);
 	}
 
-	QRect tr(nameleft, st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip, namewidth, st::dialogsTextFont->height);
+	QRect tr(nameleft, st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip, namewidth,
+	         st::dialogsTextFont->height);
 	p.setFont(st::dialogsTextFont);
 	QString username = peer->userName();
 	if (!active && username.toLower().startsWith(_peerSearchQuery)) {
@@ -421,16 +450,19 @@ void DialogsInner::paintPeerSearchResult(Painter &p, const PeerSearchResult *res
 		auto w = st::dialogsTextFont->width(first);
 		if (w >= tr.width()) {
 			p.setPen(st::dialogsTextFgService);
-			p.drawText(tr.left(), tr.top() + st::dialogsTextFont->ascent, st::dialogsTextFont->elided(first, tr.width()));
+			p.drawText(tr.left(), tr.top() + st::dialogsTextFont->ascent,
+			           st::dialogsTextFont->elided(first, tr.width()));
 		} else {
 			p.setPen(st::dialogsTextFgService);
 			p.drawText(tr.left(), tr.top() + st::dialogsTextFont->ascent, first);
 			p.setPen(st::dialogsTextFg);
-			p.drawText(tr.left() + w, tr.top() + st::dialogsTextFont->ascent, st::dialogsTextFont->elided(second, tr.width() - w));
+			p.drawText(tr.left() + w, tr.top() + st::dialogsTextFont->ascent,
+			           st::dialogsTextFont->elided(second, tr.width() - w));
 		}
 	} else {
 		p.setPen(active ? st::dialogsTextFgActive : st::dialogsTextFgService);
-		p.drawText(tr.left(), tr.top() + st::dialogsTextFont->ascent, st::dialogsTextFont->elided('@' + username, tr.width()));
+		p.drawText(tr.left(), tr.top() + st::dialogsTextFont->ascent,
+		           st::dialogsTextFont->elided('@' + username, tr.width()));
 	}
 
 	p.setPen(active ? st::dialogsTextFgActive : st::dialogsNameFg);
@@ -466,13 +498,17 @@ void DialogsInner::paintSearchInPeer(Painter &p, int fullWidth, bool onlyBackgro
 	}
 }
 
-void DialogsInner::paintSearchInFilter(Painter &p, not_null<PeerData*> peer, int top, int fullWidth, const Text &text) const {
+void DialogsInner::paintSearchInFilter(Painter &p, not_null<PeerData *> peer, int top, int fullWidth,
+                                       const Text &text) const {
 	auto pen = p.pen();
-	peer->paintUserpicLeft(p, st::dialogsPadding.x(), top + (st::dialogsSearchInHeight - st::dialogsSearchInPhotoSize) / 2, getFullWidth(), st::dialogsSearchInPhotoSize);
+	peer->paintUserpicLeft(p, st::dialogsPadding.x(),
+	                       top + (st::dialogsSearchInHeight - st::dialogsSearchInPhotoSize) / 2, getFullWidth(),
+	                       st::dialogsSearchInPhotoSize);
 
 	auto nameleft = st::dialogsPadding.x() + st::dialogsSearchInPhotoSize + st::dialogsSearchInPhotoPadding;
 	auto namewidth = fullWidth - nameleft - st::dialogsPadding.x() * 2 - st::dialogsCancelSearch.width;
-	auto rectForName = QRect(nameleft, top + (st::dialogsSearchInHeight - st::msgNameFont->height) / 2, namewidth, st::msgNameFont->height);
+	auto rectForName = QRect(nameleft, top + (st::dialogsSearchInHeight - st::msgNameFont->height) / 2, namewidth,
+	                         st::msgNameFont->height);
 	if (auto chatTypeIcon = Dialogs::Layout::ChatTypeIcon(peer, false, false)) {
 		chatTypeIcon->paint(p, rectForName.topLeft(), fullWidth);
 		rectForName.setLeft(rectForName.left() + st::dialogsChatTypeSkip);
@@ -481,8 +517,7 @@ void DialogsInner::paintSearchInFilter(Painter &p, not_null<PeerData*> peer, int
 	text.drawLeftElided(p, rectForName.left(), rectForName.top(), rectForName.width(), width());
 }
 
-void DialogsInner::activate() {
-}
+void DialogsInner::activate() {}
 
 void DialogsInner::mouseMoveEvent(QMouseEvent *e) {
 	if (_mouseLastGlobalPosition != e->globalPos()) {
@@ -606,16 +641,16 @@ void DialogsInner::mousePressEvent(QMouseEvent *e) {
 	setPeerSearchPressed(_peerSearchSelected);
 	setSearchedPressed(_searchedSelected);
 	if (_importantSwitchPressed) {
-		_importantSwitch->row.addRipple(e->pos(), QSize(getFullWidth(), st::dialogsImportantBarHeight), [this] {
-			update(0, 0, getFullWidth(), st::dialogsImportantBarHeight);
-		});
+		_importantSwitch->row.addRipple(e->pos(), QSize(getFullWidth(), st::dialogsImportantBarHeight),
+		                                [this] { update(0, 0, getFullWidth(), st::dialogsImportantBarHeight); });
 	} else if (_pressed) {
 		auto row = _pressed;
-		row->addRipple(e->pos() - QPoint(0, dialogsOffset() + _pressed->pos() * st::dialogsRowHeight), QSize(getFullWidth(), st::dialogsRowHeight), [this, row] {
-			if (!_a_pinnedShifting.animating()) {
-				row->history()->updateChatListEntry();
-			}
-		});
+		row->addRipple(e->pos() - QPoint(0, dialogsOffset() + _pressed->pos() * st::dialogsRowHeight),
+		               QSize(getFullWidth(), st::dialogsRowHeight), [this, row] {
+			               if (!_a_pinnedShifting.animating()) {
+				               row->history()->updateChatListEntry();
+			               }
+		               });
 		_dragStart = e->pos();
 	} else if (_hashtagPressed >= 0 && _hashtagPressed < _hashtagResults.size() && !_hashtagDeletePressed) {
 		auto row = &_hashtagResults[_hashtagPressed]->row;
@@ -624,24 +659,28 @@ void DialogsInner::mousePressEvent(QMouseEvent *e) {
 		});
 	} else if (_filteredPressed >= 0 && _filteredPressed < _filterResults.size()) {
 		auto row = _filterResults[_filteredPressed];
-		row->addRipple(e->pos() - QPoint(0, filteredOffset() + _filteredPressed * st::dialogsRowHeight), QSize(getFullWidth(), st::dialogsRowHeight), [row] {
-			if (auto main = App::main()) {
-				main->dlgUpdated(row->history()->peer, 0);
-			}
-		});
+		row->addRipple(e->pos() - QPoint(0, filteredOffset() + _filteredPressed * st::dialogsRowHeight),
+		               QSize(getFullWidth(), st::dialogsRowHeight), [row] {
+			               if (auto main = App::main()) {
+				               main->dlgUpdated(row->history()->peer, 0);
+			               }
+		               });
 	} else if (_peerSearchPressed >= 0 && _peerSearchPressed < _peerSearchResults.size()) {
 		auto &result = _peerSearchResults[_peerSearchPressed];
 		auto row = &result->row;
-		row->addRipple(e->pos() - QPoint(0, peerSearchOffset() + _peerSearchPressed * st::dialogsRowHeight), QSize(getFullWidth(), st::dialogsRowHeight), [peer = result->peer] {
-			if (auto main = App::main()) {
-				main->dlgUpdated(peer, 0);
-			}
-		});
+		row->addRipple(e->pos() - QPoint(0, peerSearchOffset() + _peerSearchPressed * st::dialogsRowHeight),
+		               QSize(getFullWidth(), st::dialogsRowHeight), [peer = result->peer] {
+			               if (auto main = App::main()) {
+				               main->dlgUpdated(peer, 0);
+			               }
+		               });
 	} else if (_searchedPressed >= 0 && _searchedPressed < _searchResults.size()) {
 		auto &row = _searchResults[_searchedPressed];
-		row->addRipple(e->pos() - QPoint(0, searchedOffset() + _searchedPressed * st::dialogsRowHeight), QSize(getFullWidth(), st::dialogsRowHeight), [this, index = _searchedPressed] {
-			rtlupdate(0, searchedOffset() + index * st::dialogsRowHeight, getFullWidth(), st::dialogsRowHeight);
-		});
+		row->addRipple(e->pos() - QPoint(0, searchedOffset() + _searchedPressed * st::dialogsRowHeight),
+		               QSize(getFullWidth(), st::dialogsRowHeight), [this, index = _searchedPressed] {
+			               rtlupdate(0, searchedOffset() + index * st::dialogsRowHeight, getFullWidth(),
+			                         st::dialogsRowHeight);
+		               });
 	}
 }
 
@@ -769,7 +808,8 @@ bool DialogsInner::updateReorderPinned(QPoint localPosition) {
 			_pinnedRows[from].animStartTime = ms;
 		}
 	} else if (_dragStart.y() < localPosition.y() && _draggingIndex + 1 < pinnedCount) {
-		shift = floorclamp(localPosition.y() - _dragStart.y() + (rowHeight / 2), rowHeight, 0, pinnedCount - _draggingIndex - 1);
+		shift = floorclamp(localPosition.y() - _dragStart.y() + (rowHeight / 2), rowHeight, 0,
+		                   pinnedCount - _draggingIndex - 1);
 
 		for (auto from = _draggingIndex, to = _draggingIndex + shift; from < to; ++from) {
 			shownDialogs()->movePinned(_dragging, 1);
@@ -786,7 +826,7 @@ bool DialogsInner::updateReorderPinned(QPoint localPosition) {
 			_a_pinnedShifting.start();
 		}
 	}
-   _aboveTopShift = std::ceil(_pinnedRows[_aboveIndex].yadd.current());
+	_aboveTopShift = std::ceil(_pinnedRows[_aboveIndex].yadd.current());
 	_pinnedRows[_draggingIndex].yadd = anim::value(yaddWas - shift * rowHeight, localPosition.y() - _dragStart.y());
 	if (!_pinnedRows[_draggingIndex].animStartTime) {
 		_pinnedRows[_draggingIndex].yadd.finish();
@@ -893,7 +933,8 @@ void DialogsInner::mousePressReleased(Qt::MouseButton button) {
 			choosePeer();
 		} else if (pressed && pressed == _selected) {
 			choosePeer();
-		} else if (hashtagPressed >= 0 && hashtagPressed == _hashtagSelected && hashtagDeletePressed == _hashtagDeleteSelected) {
+		} else if (hashtagPressed >= 0 && hashtagPressed == _hashtagSelected &&
+		           hashtagDeletePressed == _hashtagDeleteSelected) {
 			choosePeer();
 		} else if (filteredPressed >= 0 && filteredPressed == _filteredSelected) {
 			choosePeer();
@@ -952,10 +993,15 @@ void DialogsInner::setSearchedPressed(int pressed) {
 }
 
 void DialogsInner::resizeEvent(QResizeEvent *e) {
-	_addContactLnk->move((width() - _addContactLnk->width()) / 2, (st::noContactsHeight + st::noContactsFont->height) / 2);
+	_addContactLnk->move((width() - _addContactLnk->width()) / 2,
+	                     (st::noContactsHeight + st::noContactsFont->height) / 2);
 	auto widthForCancelButton = std::max(width() + otherWidth(), st::dialogsWidthMin);
-	_cancelSearchInPeer->moveToLeft(widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchInPeer->width(), st::searchedBarHeight + (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2);
-	_cancelSearchFromUser->moveToLeft(widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchFromUser->width(), st::searchedBarHeight + st::dialogsSearchInHeight + st::lineWidth + (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2);
+	_cancelSearchInPeer->moveToLeft(widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchInPeer->width(),
+	                                st::searchedBarHeight +
+	                                    (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2);
+	_cancelSearchFromUser->moveToLeft(widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchFromUser->width(),
+	                                  st::searchedBarHeight + st::dialogsSearchInHeight + st::lineWidth +
+	                                      (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2);
 }
 
 void DialogsInner::onDialogRowReplaced(Dialogs::Row *oldRow, Dialogs::Row *newRow) {
@@ -1174,11 +1220,14 @@ void DialogsInner::updateSelectedRow(PeerData *peer) {
 		} else if (_hashtagSelected >= 0) {
 			update(0, _hashtagSelected * st::mentionHeight, getFullWidth(), st::mentionHeight);
 		} else if (_filteredSelected >= 0) {
-			update(0, filteredOffset() + _filteredSelected * st::dialogsRowHeight, getFullWidth(), st::dialogsRowHeight);
+			update(0, filteredOffset() + _filteredSelected * st::dialogsRowHeight, getFullWidth(),
+			       st::dialogsRowHeight);
 		} else if (_peerSearchSelected >= 0) {
-			update(0, peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight, getFullWidth(), st::dialogsRowHeight);
+			update(0, peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight, getFullWidth(),
+			       st::dialogsRowHeight);
 		} else if (_searchedSelected >= 0) {
-			update(0, searchedOffset() + _searchedSelected * st::dialogsRowHeight, getFullWidth(), st::dialogsRowHeight);
+			update(0, searchedOffset() + _searchedSelected * st::dialogsRowHeight, getFullWidth(),
+			       st::dialogsRowHeight);
 		}
 	}
 }
@@ -1195,7 +1244,8 @@ void DialogsInner::dragLeft() {
 
 void DialogsInner::clearSelection() {
 	_mouseSelection = false;
-	if (_importantSwitchSelected || _selected || _filteredSelected >= 0 || _hashtagSelected >= 0 || _peerSearchSelected >= 0 || _searchedSelected >= 0) {
+	if (_importantSwitchSelected || _selected || _filteredSelected >= 0 || _hashtagSelected >= 0 ||
+	    _peerSearchSelected >= 0 || _searchedSelected >= 0) {
 		updateSelectedRow();
 		_importantSwitchSelected = false;
 		_selected = nullptr;
@@ -1235,10 +1285,12 @@ void DialogsInner::contextMenuEvent(QContextMenuEvent *e) {
 	}
 
 	_menu = new Ui::PopupMenu(nullptr);
-	App::main()->fillPeerMenu(_menuPeer, [this](const QString &text, base::lambda<void()> callback) {
-		return _menu->addAction(text, std::move(callback));
-	}, true);
-	connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroyed(QObject*)));
+	App::main()->fillPeerMenu(_menuPeer,
+	                          [this](const QString &text, base::lambda<void()> callback) {
+		                          return _menu->addAction(text, std::move(callback));
+	                          },
+	                          true);
+	connect(_menu, SIGNAL(destroyed(QObject *)), this, SLOT(onMenuDestroyed(QObject *)));
 	_menu->popup(e->globalPos());
 	e->accept();
 }
@@ -1266,7 +1318,8 @@ void DialogsInner::onParentGeometryChanged() {
 	}
 }
 
-void DialogsInner::handlePeerNameChange(not_null<PeerData*> peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars) {
+void DialogsInner::handlePeerNameChange(not_null<PeerData *> peer, const PeerData::Names &oldNames,
+                                        const PeerData::NameFirstChars &oldChars) {
 	_dialogs->peerNameChanged(Dialogs::Mode::All, peer, oldNames, oldChars);
 	if (_dialogsImportant) {
 		_dialogsImportant->peerNameChanged(Dialogs::Mode::Important, peer, oldNames, oldChars);
@@ -1315,7 +1368,8 @@ void DialogsInner::onFilterUpdate(QString newFilter, bool force) {
 						}
 					}
 				}
-				_filterResults.reserve((toFilter ? toFilter->size() : 0) + (toFilterContacts ? toFilterContacts->size() : 0));
+				_filterResults.reserve((toFilter ? toFilter->size() : 0) +
+				                       (toFilterContacts ? toFilterContacts->size() : 0));
 				if (toFilter) {
 					for_const (auto row, *toFilter) {
 						const PeerData::Names &names(row->history()->peer->names);
@@ -1385,7 +1439,8 @@ void DialogsInner::onHashtagFilterUpdate(QStringRef newFilter) {
 	if (!recent.isEmpty()) {
 		_hashtagResults.reserve(std::min(recent.size(), kHashtagResultsLimit));
 		for (auto i = recent.cbegin(), e = recent.cend(); i != e; ++i) {
-			if (i->first.startsWith(_hashtagFilter.midRef(1), Qt::CaseInsensitive) && i->first.size() + 1 != newFilter.size()) {
+			if (i->first.startsWith(_hashtagFilter.midRef(1), Qt::CaseInsensitive) &&
+			    i->first.size() + 1 != newFilter.size()) {
 				_hashtagResults.push_back(std::make_unique<HashtagResult>(i->first));
 				if (_hashtagResults.size() == kHashtagResultsLimit) break;
 			}
@@ -1467,7 +1522,8 @@ void DialogsInner::dialogsReceived(const QVector<MTPDialog> &added) {
 			continue;
 		}
 
-		auto history = App::historyFromDialog(peerId, d.vunread_count.v, d.vread_inbox_max_id.v, d.vread_outbox_max_id.v);
+		auto history =
+		    App::historyFromDialog(peerId, d.vunread_count.v, d.vread_inbox_max_id.v, d.vread_outbox_max_id.v);
 		history->setUnreadMentionsCount(d.vunread_mentions_count.v);
 		auto peer = history->peer;
 		if (auto channel = peer->asChannel()) {
@@ -1517,7 +1573,8 @@ void DialogsInner::addAllSavedPeers() {
 	addSavedPeersAfter(QDateTime());
 }
 
-bool DialogsInner::searchReceived(const QVector<MTPMessage> &messages, DialogsSearchRequestType type, qint32 fullCount) {
+bool DialogsInner::searchReceived(const QVector<MTPMessage> &messages, DialogsSearchRequestType type,
+                                  qint32 fullCount) {
 	if (type == DialogsSearchFromStart || type == DialogsSearchPeerFromStart) {
 		clearSearchResults(false);
 	}
@@ -1555,7 +1612,9 @@ bool DialogsInner::searchReceived(const QVector<MTPMessage> &messages, DialogsSe
 	} else {
 		_searchedCount = fullCount;
 	}
-	if (_state == FilteredState && (!_searchResults.empty() || !_searchInMigrated || type == DialogsSearchMigratedFromStart || type == DialogsSearchMigratedFromOffset)) {
+	if (_state == FilteredState &&
+	    (!_searchResults.empty() || !_searchInMigrated || type == DialogsSearchMigratedFromStart ||
+	     type == DialogsSearchMigratedFromOffset)) {
 		_state = SearchedState;
 	}
 	refresh();
@@ -1687,7 +1746,8 @@ void DialogsInner::refresh(bool toTop) {
 	} else {
 		if (!_addContactLnk->isHidden()) _addContactLnk->hide();
 		if (_state == FilteredState) {
-			h = searchedOffset() + (_searchResults.size() * st::dialogsRowHeight) + ((_searchResults.empty() && !_searchInPeer) ? -st::searchedBarHeight : 0);
+			h = searchedOffset() + (_searchResults.size() * st::dialogsRowHeight) +
+			    ((_searchResults.empty() && !_searchInPeer) ? -st::searchedBarHeight : 0);
 		} else if (_state == SearchedState) {
 			h = searchedOffset() + (_searchResults.size() * st::dialogsRowHeight);
 		}
@@ -1748,7 +1808,9 @@ void DialogsInner::searchInPeer(PeerData *peer, UserData *from) {
 		_cancelSearchInPeer->hide();
 	}
 	if (_searchFromUser) {
-		_searchFromUserText.setText(st::dialogsSearchFromStyle, lng_dlg_search_from(lt_user, textcmdLink(1, App::peerName(_searchFromUser))), _textDlgOptions);
+		_searchFromUserText.setText(st::dialogsSearchFromStyle,
+		                            lng_dlg_search_from(lt_user, textcmdLink(1, App::peerName(_searchFromUser))),
+		                            _textDlgOptions);
 		_cancelSearchFromUser->show();
 	} else {
 		_cancelSearchFromUser->hide();
@@ -1811,11 +1873,12 @@ void DialogsInner::selectSkip(qint32 direction) {
 			emit mustScrollTo(fromY, fromY + st::dialogsRowHeight);
 		}
 	} else if (_state == FilteredState || _state == SearchedState) {
-		if (_hashtagResults.empty() && _filterResults.isEmpty() && _peerSearchResults.empty() && _searchResults.empty()) return;
+		if (_hashtagResults.empty() && _filterResults.isEmpty() && _peerSearchResults.empty() && _searchResults.empty())
+			return;
 		if ((_hashtagSelected < 0 || _hashtagSelected >= _hashtagResults.size()) &&
-			(_filteredSelected < 0 || _filteredSelected >= _filterResults.size()) &&
-			(_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size()) &&
-			(_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
+		    (_filteredSelected < 0 || _filteredSelected >= _filterResults.size()) &&
+		    (_peerSearchSelected < 0 || _peerSearchSelected >= _peerSearchResults.size()) &&
+		    (_searchedSelected < 0 || _searchedSelected >= _searchResults.size())) {
 			if (_hashtagResults.empty() && _filterResults.isEmpty() && _peerSearchResults.empty()) {
 				_searchedSelected = 0;
 			} else if (_hashtagResults.empty() && _filterResults.isEmpty()) {
@@ -1826,8 +1889,18 @@ void DialogsInner::selectSkip(qint32 direction) {
 				_hashtagSelected = 0;
 			}
 		} else {
-			qint32 cur = (_hashtagSelected >= 0 && _hashtagSelected < _hashtagResults.size()) ? _hashtagSelected : ((_filteredSelected >= 0 && _filteredSelected < _filterResults.size()) ? (_hashtagResults.size() + _filteredSelected) : ((_peerSearchSelected >= 0 && _peerSearchSelected < _peerSearchResults.size()) ? (_peerSearchSelected + _filterResults.size() + _hashtagResults.size()) : (_searchedSelected + _peerSearchResults.size() + _filterResults.size() + _hashtagResults.size())));
-			cur = snap(cur + direction, 0, static_cast<int>(_hashtagResults.size() + _filterResults.size() + _peerSearchResults.size() + _searchResults.size()) - 1);
+			qint32 cur = (_hashtagSelected >= 0 && _hashtagSelected < _hashtagResults.size()) ?
+			                 _hashtagSelected :
+			                 ((_filteredSelected >= 0 && _filteredSelected < _filterResults.size()) ?
+			                      (_hashtagResults.size() + _filteredSelected) :
+			                      ((_peerSearchSelected >= 0 && _peerSearchSelected < _peerSearchResults.size()) ?
+			                           (_peerSearchSelected + _filterResults.size() + _hashtagResults.size()) :
+			                           (_searchedSelected + _peerSearchResults.size() + _filterResults.size() +
+			                            _hashtagResults.size())));
+			cur = snap(cur + direction, 0,
+			           static_cast<int>(_hashtagResults.size() + _filterResults.size() + _peerSearchResults.size() +
+			                            _searchResults.size()) -
+			               1);
 			if (cur < _hashtagResults.size()) {
 				_hashtagSelected = cur;
 				_filteredSelected = _peerSearchSelected = _searchedSelected = -1;
@@ -1845,11 +1918,16 @@ void DialogsInner::selectSkip(qint32 direction) {
 		if (_hashtagSelected >= 0 && _hashtagSelected < _hashtagResults.size()) {
 			emit mustScrollTo(_hashtagSelected * st::mentionHeight, (_hashtagSelected + 1) * st::mentionHeight);
 		} else if (_filteredSelected >= 0 && _filteredSelected < _filterResults.size()) {
-			emit mustScrollTo(filteredOffset() + _filteredSelected * st::dialogsRowHeight, filteredOffset() + (_filteredSelected + 1) * st::dialogsRowHeight);
+			emit mustScrollTo(filteredOffset() + _filteredSelected * st::dialogsRowHeight,
+			                  filteredOffset() + (_filteredSelected + 1) * st::dialogsRowHeight);
 		} else if (_peerSearchSelected >= 0 && _peerSearchSelected < _peerSearchResults.size()) {
-			emit mustScrollTo(peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight + (_peerSearchSelected ? 0 : -st::searchedBarHeight), peerSearchOffset() + (_peerSearchSelected + 1) * st::dialogsRowHeight);
+			emit mustScrollTo(peerSearchOffset() + _peerSearchSelected * st::dialogsRowHeight +
+			                      (_peerSearchSelected ? 0 : -st::searchedBarHeight),
+			                  peerSearchOffset() + (_peerSearchSelected + 1) * st::dialogsRowHeight);
 		} else {
-			emit mustScrollTo(searchedOffset() + _searchedSelected * st::dialogsRowHeight + (_searchedSelected ? 0 : -st::searchedBarHeight), searchedOffset() + (_searchedSelected + 1) * st::dialogsRowHeight);
+			emit mustScrollTo(searchedOffset() + _searchedSelected * st::dialogsRowHeight +
+			                      (_searchedSelected ? 0 : -st::searchedBarHeight),
+			                  searchedOffset() + (_searchedSelected + 1) * st::dialogsRowHeight);
 		}
 	}
 	update();
@@ -1927,7 +2005,8 @@ void DialogsInner::loadPeerPhotos() {
 	if (_state == DefaultState) {
 		auto otherStart = shownDialogs()->size() * st::dialogsRowHeight;
 		if (yFrom < otherStart) {
-			for (auto i = shownDialogs()->cfind(yFrom, st::dialogsRowHeight), end = shownDialogs()->cend(); i != end; ++i) {
+			for (auto i = shownDialogs()->cfind(yFrom, st::dialogsRowHeight), end = shownDialogs()->cend(); i != end;
+			     ++i) {
 				if (((*i)->pos() * st::dialogsRowHeight) >= yTo) {
 					break;
 				}
@@ -1950,20 +2029,40 @@ void DialogsInner::loadPeerPhotos() {
 			}
 		}
 
-		from = (yFrom > filteredOffset() + st::searchedBarHeight ? ((yFrom - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size();
+		from = (yFrom > filteredOffset() + st::searchedBarHeight ?
+		            ((yFrom - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) :
+		            0) -
+		       _filterResults.size();
 		if (from < 0) from = 0;
 		if (from < _peerSearchResults.size()) {
-			qint32 to = (yTo > filteredOffset() + st::searchedBarHeight ? ((yTo - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size() + 1, w = width();
+			qint32 to = (yTo > filteredOffset() + st::searchedBarHeight ?
+			                 ((yTo - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) :
+			                 0) -
+			            _filterResults.size() + 1,
+			       w = width();
 			if (to > _peerSearchResults.size()) to = _peerSearchResults.size();
 
 			for (; from < to; ++from) {
 				_peerSearchResults[from]->peer->loadUserpic();
 			}
 		}
-		from = (yFrom > filteredOffset() + ((_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight) ? ((yFrom - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size() - _peerSearchResults.size();
+		from = (yFrom > filteredOffset() +
+		                    ((_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight) ?
+		            ((yFrom - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) -
+		              st::searchedBarHeight) /
+		             qint32(st::dialogsRowHeight)) :
+		            0) -
+		       _filterResults.size() - _peerSearchResults.size();
 		if (from < 0) from = 0;
 		if (from < _searchResults.size()) {
-			qint32 to = (yTo > filteredOffset() + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight ? ((yTo - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size() - _peerSearchResults.size() + 1, w = width();
+			qint32 to = (yTo > filteredOffset() + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) +
+			                         st::searchedBarHeight ?
+			                 ((yTo - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) -
+			                   st::searchedBarHeight) /
+			                  qint32(st::dialogsRowHeight)) :
+			                 0) -
+			            _filterResults.size() - _peerSearchResults.size() + 1,
+			       w = width();
 			if (to > _searchResults.size()) to = _searchResults.size();
 
 			for (; from < to; ++from) {
@@ -2028,7 +2127,8 @@ bool DialogsInner::choosePeer() {
 		if (msgId > 0) {
 			saveRecentHashtags(_filter);
 		}
-		bool chosen = (!App::main()->selectingPeer(true) && (_state == FilteredState || _state == SearchedState) && _filteredSelected >= 0 && _filteredSelected < _filterResults.size());
+		bool chosen = (!App::main()->selectingPeer(true) && (_state == FilteredState || _state == SearchedState) &&
+		               _filteredSelected >= 0 && _filteredSelected < _filterResults.size());
 		App::main()->choosePeer(history->peer->id, msgId);
 		if (chosen) {
 			emit searchResultChosen();
@@ -2250,4 +2350,3 @@ MsgId DialogsInner::lastSearchId() const {
 MsgId DialogsInner::lastSearchMigratedId() const {
 	return _lastSearchMigratedId;
 }
-
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index c736f62b7..f403c1ce6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "dialogs/dialogs_widget.h"
 #include "base/flags.h"
+#include "dialogs/dialogs_widget.h"
 #include "facades.h"
 
 namespace Dialogs {
@@ -44,7 +44,7 @@ class DialogsInner : public Ui::SplittedWidget, public RPCSender, private base::
 	Q_OBJECT
 
 public:
-	DialogsInner(QWidget *parent, not_null<Window::Controller*> controller, QWidget *main);
+	DialogsInner(QWidget *parent, not_null<Window::Controller *> controller, QWidget *main);
 
 	void dialogsReceived(const QVector<MTPDialog> &dialogs);
 	void addSavedPeersAfter(const QDateTime &date);
@@ -110,7 +110,7 @@ public:
 	}
 	void setVisibleTopBottom(int visibleTop, int visibleBottom) override;
 
-	base::Observable<UserData*> searchFromUserChanged;
+	base::Observable<UserData *> searchFromUserChanged;
 
 	void notify_userIsContactChanged(UserData *user, bool fromThisApp);
 	void notify_historyMuteUpdated(History *history);
@@ -121,7 +121,7 @@ public slots:
 	void onParentGeometryChanged();
 	void onDialogRowReplaced(Dialogs::Row *oldRow, Dialogs::Row *newRow);
 
-	void onMenuDestroyed(QObject*);
+	void onMenuDestroyed(QObject *);
 
 signals:
 	void draggingScrollDelta(int delta);
@@ -146,7 +146,7 @@ protected:
 private:
 	struct ImportantSwitch;
 	using DialogsList = std::unique_ptr<Dialogs::IndexedList>;
-	using FilteredDialogs = QVector<Dialogs::Row*>;
+	using FilteredDialogs = QVector<Dialogs::Row *>;
 	using SearchResults = std::vector<std::unique_ptr<Dialogs::FakeRow>>;
 	struct HashtagResult;
 	using HashtagResults = std::vector<std::unique_ptr<HashtagResult>>;
@@ -167,25 +167,31 @@ private:
 	void setPeerSearchPressed(int pressed);
 	void setSearchedPressed(int pressed);
 	bool isPressed() const {
-		return _importantSwitchPressed || _pressed || (_hashtagPressed >= 0) || (_filteredPressed >= 0) || (_peerSearchPressed >= 0) || (_searchedPressed >= 0);
+		return _importantSwitchPressed || _pressed || (_hashtagPressed >= 0) || (_filteredPressed >= 0) ||
+		       (_peerSearchPressed >= 0) || (_searchedPressed >= 0);
 	}
 	bool isSelected() const {
-		return _importantSwitchSelected || _selected || (_hashtagSelected >= 0) || (_filteredSelected >= 0) || (_peerSearchSelected >= 0) || (_searchedSelected >= 0);
+		return _importantSwitchSelected || _selected || (_hashtagSelected >= 0) || (_filteredSelected >= 0) ||
+		       (_peerSearchSelected >= 0) || (_searchedSelected >= 0);
 	}
-	void handlePeerNameChange(not_null<PeerData*> peer, const PeerData::Names &oldNames, const PeerData::NameFirstChars &oldChars);
+	void handlePeerNameChange(not_null<PeerData *> peer, const PeerData::Names &oldNames,
+	                          const PeerData::NameFirstChars &oldChars);
 
 	void itemRemoved(HistoryItem *item);
 	enum class UpdateRowSection {
-		Default       = (1 << 0),
-		Filtered      = (1 << 1),
-		PeerSearch    = (1 << 2),
+		Default = (1 << 0),
+		Filtered = (1 << 1),
+		PeerSearch = (1 << 2),
 		MessageSearch = (1 << 3),
-		All           = Default | Filtered | PeerSearch | MessageSearch,
+		All = Default | Filtered | PeerSearch | MessageSearch,
 	};
 	using UpdateRowSections = base::flags<UpdateRowSection>;
-	friend inline constexpr auto is_flag_type(UpdateRowSection) { return true; };
+	friend inline constexpr auto is_flag_type(UpdateRowSection) {
+		return true;
+	};
 
-	void updateDialogRow(PeerData *peer, MsgId msgId, QRect updateRect, UpdateRowSections sections = UpdateRowSection::All);
+	void updateDialogRow(PeerData *peer, MsgId msgId, QRect updateRect,
+	                     UpdateRowSections sections = UpdateRowSection::All);
 
 	int dialogsOffset() const;
 	int filteredOffset() const;
@@ -193,10 +199,12 @@ private:
 	int searchedOffset() const;
 	int searchInPeerSkip() const;
 
-	void paintDialog(Painter &p, Dialogs::Row *row, int fullWidth, PeerData *active, PeerData *selected, bool onlyBackground, TimeMs ms);
-	void paintPeerSearchResult(Painter &p, const PeerSearchResult *result, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms) const;
+	void paintDialog(Painter &p, Dialogs::Row *row, int fullWidth, PeerData *active, PeerData *selected,
+	                 bool onlyBackground, TimeMs ms);
+	void paintPeerSearchResult(Painter &p, const PeerSearchResult *result, int fullWidth, bool active, bool selected,
+	                           bool onlyBackground, TimeMs ms) const;
 	void paintSearchInPeer(Painter &p, int fullWidth, bool onlyBackground, TimeMs ms) const;
-	void paintSearchInFilter(Painter &p, not_null<PeerData*> peer, int top, int fullWidth, const Text &text) const;
+	void paintSearchInFilter(Painter &p, not_null<PeerData *> peer, int top, int fullWidth, const Text &text) const;
 
 	void clearSelection();
 	void clearSearchResults(bool clearPeerSearchResults = true);
@@ -216,7 +224,7 @@ private:
 	void savePinnedOrder();
 	void step_pinnedShifting(TimeMs ms, bool timer);
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	DialogsList _dialogs;
 	DialogsList _dialogsImportant;
@@ -244,7 +252,7 @@ private:
 	};
 	std::vector<PinnedRow> _pinnedRows;
 	BasicAnimation _a_pinnedShifting;
-	QList<History*> _pinnedOrder;
+	QList<History *> _pinnedOrder;
 
 	// Remember the last currently dragged row top shift for updating area.
 	int _aboveTopShift = -1;
@@ -294,5 +302,4 @@ private:
 	Ui::PopupMenu *_menu = nullptr;
 
 	base::lambda<void()> _loadMoreCallback;
-
 };
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index 04590e3e1..f30fcdb34 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -18,14 +18,14 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "app.h"
 #include "dialogs/dialogs_layout.h"
+#include "app.h"
 #include "data/data_abstract_structure.h"
 #include "data/data_drafts.h"
 #include "dialogs/dialogs_list.h"
-#include "styles/style_dialogs.h"
-#include "storage/localstorage.h"
 #include "lang/lang_keys.h"
+#include "storage/localstorage.h"
+#include "styles/style_dialogs.h"
 
 namespace Dialogs {
 namespace Layout {
@@ -54,11 +54,14 @@ void paintRowDate(Painter &p, const QDateTime &date, QRect &rectForName, bool ac
 	rectForName.setWidth(rectForName.width() - dtWidth - st::dialogsDateSkip);
 	p.setFont(st::dialogsDateFont);
 	p.setPen(active ? st::dialogsDateFgActive : (selected ? st::dialogsDateFgOver : st::dialogsDateFg));
-	p.drawText(rectForName.left() + rectForName.width() + st::dialogsDateSkip, rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, dt);
+	p.drawText(rectForName.left() + rectForName.width() + st::dialogsDateSkip,
+	           rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, dt);
 }
 
 template <typename PaintItemCallback, typename PaintCounterCallback>
-void paintRow(Painter &p, const RippleRow *row, History *history, not_null<PeerData*> from, HistoryItem *item, Data::Draft *draft, QDateTime date, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms, PaintItemCallback paintItemCallback, PaintCounterCallback paintCounterCallback) {
+void paintRow(Painter &p, const RippleRow *row, History *history, not_null<PeerData *> from, HistoryItem *item,
+              Data::Draft *draft, QDateTime date, int fullWidth, bool active, bool selected, bool onlyBackground,
+              TimeMs ms, PaintItemCallback paintItemCallback, PaintCounterCallback paintCounterCallback) {
 	QRect fullRect(0, 0, fullWidth, st::dialogsRowHeight);
 	p.fillRect(fullRect, active ? st::dialogsBgActive : (selected ? st::dialogsBgOver : st::dialogsBg));
 	row->paintRipple(p, 0, 0, fullWidth, ms, &(active ? st::dialogsRippleBgActive : st::dialogsRippleBg)->c);
@@ -88,33 +91,39 @@ void paintRow(Painter &p, const RippleRow *row, History *history, not_null<PeerD
 
 		auto availableWidth = namewidth;
 		if (history->isPinnedDialog()) {
-			auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
+			auto &icon =
+			    (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 			icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 			availableWidth -= icon.width() + st::dialogsUnreadPadding;
 		}
 
 		p.setFont(st::dialogsTextFont);
-		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
+		auto &color = active ? st::dialogsTextFgServiceActive :
+		                       (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
 		if (!history->paintSendAction(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			if (history->cloudDraftTextCache.isEmpty()) {
 				auto draftWrapped = textcmdLink(1, lng_dialogs_text_from_wrapped(lt_from, lang(lng_from_draft)));
-				auto draftText = lng_dialogs_text_with_from(lt_from_part, draftWrapped, lt_message, TextUtilities::Clean(draft->textWithTags.text));
+				auto draftText = lng_dialogs_text_with_from(lt_from_part, draftWrapped, lt_message,
+				                                            TextUtilities::Clean(draft->textWithTags.text));
 				history->cloudDraftTextCache.setText(st::dialogsTextStyle, draftText, _textDlgOptions);
 			}
 			p.setPen(active ? st::dialogsTextFgActive : (selected ? st::dialogsTextFgOver : st::dialogsTextFg));
-			p.setTextPalette(active ? st::dialogsTextPaletteDraftActive : (selected ? st::dialogsTextPaletteDraftOver : st::dialogsTextPaletteDraft));
+			p.setTextPalette(active ? st::dialogsTextPaletteDraftActive :
+			                          (selected ? st::dialogsTextPaletteDraftOver : st::dialogsTextPaletteDraft));
 			history->cloudDraftTextCache.drawElided(p, nameleft, texttop, availableWidth, 1);
 			p.restoreTextPalette();
 		}
 	} else if (!item) {
 		auto availableWidth = namewidth;
 		if (history->isPinnedDialog()) {
-			auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
+			auto &icon =
+			    (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 			icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 			availableWidth -= icon.width() + st::dialogsUnreadPadding;
 		}
 
-		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
+		auto &color = active ? st::dialogsTextFgServiceActive :
+		                       (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
 		p.setFont(st::dialogsTextFont);
 		if (!history->paintSendAction(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			// Empty history
@@ -125,23 +134,28 @@ void paintRow(Painter &p, const RippleRow *row, History *history, not_null<PeerD
 		paintItemCallback(nameleft, namewidth, item);
 	} else if (history->isPinnedDialog()) {
 		auto availableWidth = namewidth;
-		auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
+		auto &icon =
+		    (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
 		icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 		availableWidth -= icon.width() + st::dialogsUnreadPadding;
 	}
-	auto sendStateIcon = ([draft, item, active, selected]() -> const style::icon* {
+	auto sendStateIcon = ([draft, item, active, selected]() -> const style::icon * {
 		if (draft) {
 			if (draft->saveRequestId) {
-				return &(active ? st::dialogsSendingIconActive : (selected ? st::dialogsSendingIconOver : st::dialogsSendingIcon));
+				return &(active ? st::dialogsSendingIconActive :
+				                  (selected ? st::dialogsSendingIconOver : st::dialogsSendingIcon));
 			}
 		} else if (item && !item->isEmpty() && item->needCheck()) {
 			if (item->id > 0) {
 				if (item->unread()) {
-					return &(active ? st::dialogsSentIconActive : (selected ? st::dialogsSentIconOver : st::dialogsSentIcon));
+					return &(active ? st::dialogsSentIconActive :
+					                  (selected ? st::dialogsSentIconOver : st::dialogsSentIcon));
 				}
-				return &(active ? st::dialogsReceivedIconActive : (selected ? st::dialogsReceivedIconOver : st::dialogsReceivedIcon));
+				return &(active ? st::dialogsReceivedIconActive :
+				                  (selected ? st::dialogsReceivedIconOver : st::dialogsReceivedIcon));
 			}
-			return &(active ? st::dialogsSendingIconActive : (selected ? st::dialogsSendingIconOver : st::dialogsSendingIcon));
+			return &(active ? st::dialogsSendingIconActive :
+			                  (selected ? st::dialogsSendingIconOver : st::dialogsSendingIcon));
 		}
 		return nullptr;
 	})();
@@ -151,9 +165,11 @@ void paintRow(Painter &p, const RippleRow *row, History *history, not_null<PeerD
 	}
 
 	if (from == history->peer && from->isVerified()) {
-		auto icon = &(active ? st::dialogsVerifiedIconActive : (selected ? st::dialogsVerifiedIconOver : st::dialogsVerifiedIcon));
+		auto icon = &(active ? st::dialogsVerifiedIconActive :
+		                       (selected ? st::dialogsVerifiedIconOver : st::dialogsVerifiedIcon));
 		rectForName.setWidth(rectForName.width() - icon->width());
-		icon->paint(p, rectForName.topLeft() + QPoint(std::min(from->dialogName().maxWidth(), rectForName.width()), 0), fullWidth);
+		icon->paint(p, rectForName.topLeft() + QPoint(std::min(from->dialogName().maxWidth(), rectForName.width()), 0),
+		            fullWidth);
 	}
 
 	p.setPen(active ? st::dialogsNameFgActive : (selected ? st::dialogsNameFgOver : st::dialogsNameFg));
@@ -167,14 +183,8 @@ struct UnreadBadgeSizeData {
 class UnreadBadgeStyleData : public Data::AbstractStructure {
 public:
 	UnreadBadgeSizeData sizes[UnreadBadgeSizesCount];
-	style::color bg[6] = {
-		st::dialogsUnreadBg,
-		st::dialogsUnreadBgOver,
-		st::dialogsUnreadBgActive,
-		st::dialogsUnreadBgMuted,
-		st::dialogsUnreadBgMutedOver,
-		st::dialogsUnreadBgMutedActive
-	};
+	style::color bg[6] = {st::dialogsUnreadBg,      st::dialogsUnreadBgOver,      st::dialogsUnreadBgActive,
+	                      st::dialogsUnreadBgMuted, st::dialogsUnreadBgMutedOver, st::dialogsUnreadBgMutedActive};
 };
 Data::GlobalStructurePointer<UnreadBadgeStyleData> unreadBadgeStyle;
 
@@ -190,13 +200,14 @@ QImage colorizeCircleHalf(UnreadBadgeSizeData *data, int size, int half, int xof
 	return result;
 }
 
-} // namepsace
+} // namespace
 
 const style::icon *ChatTypeIcon(PeerData *peer, bool active, bool selected) {
 	if (peer->isChat() || peer->isMegagroup()) {
 		return &(active ? st::dialogsChatIconActive : (selected ? st::dialogsChatIconOver : st::dialogsChatIcon));
 	} else if (peer->isChannel()) {
-		return &(active ? st::dialogsChannelIconActive : (selected ? st::dialogsChannelIconOver : st::dialogsChannelIcon));
+		return &(active ? st::dialogsChannelIconActive :
+		                  (selected ? st::dialogsChannelIconOver : st::dialogsChannelIcon));
 	}
 	return nullptr;
 }
@@ -217,8 +228,10 @@ void paintUnreadBadge(Painter &p, const QRect &rect, const UnreadBadgeStyle &st)
 	if (badgeData->left[index].isNull()) {
 		int imgsize = size * cIntRetinaFactor(), imgsizehalf = sizehalf * cIntRetinaFactor();
 		createCircleMask(badgeData, size);
-		badgeData->left[index] = App::pixmapFromImageInPlace(colorizeCircleHalf(badgeData, imgsize, imgsizehalf, 0, bg));
-		badgeData->right[index] = App::pixmapFromImageInPlace(colorizeCircleHalf(badgeData, imgsize, imgsizehalf, imgsize - imgsizehalf, bg));
+		badgeData->left[index] =
+		    App::pixmapFromImageInPlace(colorizeCircleHalf(badgeData, imgsize, imgsizehalf, 0, bg));
+		badgeData->right[index] =
+		    App::pixmapFromImageInPlace(colorizeCircleHalf(badgeData, imgsize, imgsizehalf, imgsize - imgsizehalf, bg));
 	}
 
 	int bar = rect.width() - 2 * sizehalf;
@@ -230,15 +243,14 @@ void paintUnreadBadge(Painter &p, const QRect &rect, const UnreadBadgeStyle &st)
 }
 
 UnreadBadgeStyle::UnreadBadgeStyle()
-: align(style::al_right)
-, active(false)
-, selected(false)
-, muted(false)
-, size(st::dialogsUnreadHeight)
-, padding(st::dialogsUnreadPadding)
-, sizeId(UnreadBadgeInDialogs)
-, font(st::dialogsUnreadFont) {
-}
+    : align(style::al_right)
+    , active(false)
+    , selected(false)
+    , muted(false)
+    , size(st::dialogsUnreadHeight)
+    , padding(st::dialogsUnreadPadding)
+    , sizeId(UnreadBadgeInDialogs)
+    , font(st::dialogsUnreadFont) {}
 
 void paintUnreadCount(Painter &p, const QString &text, int x, int y, const UnreadBadgeStyle &st, int *outUnreadWidth) {
 	int unreadWidth = st.font->width(text);
@@ -265,7 +277,8 @@ void paintUnreadCount(Painter &p, const QString &text, int x, int y, const Unrea
 	p.drawText(unreadRectLeft + (unreadRectWidth - unreadWidth) / 2, unreadRectTop + textTop + st.font->ascent, text);
 }
 
-void RowPainter::paint(Painter &p, const Row *row, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms) {
+void RowPainter::paint(Painter &p, const Row *row, int fullWidth, bool active, bool selected, bool onlyBackground,
+                       TimeMs ms) {
 	auto history = row->history();
 	auto item = history->lastMsg;
 	auto cloudDraft = history->cloudDraft();
@@ -292,86 +305,85 @@ void RowPainter::paint(Painter &p, const Row *row, int fullWidth, bool active, b
 		cloudDraft = nullptr; // Draw item, if draft is older.
 	}
 	auto from = (history->peer->migrateTo() ? history->peer->migrateTo() : history->peer);
-	paintRow(p, row, history, from, item, cloudDraft, displayDate(), fullWidth, active, selected, onlyBackground, ms, [&p, fullWidth, active, selected, ms, history, unreadCount](int nameleft, int namewidth, HistoryItem *item) {
-		auto availableWidth = namewidth;
-		auto texttop = st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip;
-		auto hadOneBadge = false;
-		auto displayUnreadCounter = (unreadCount != 0);
-		auto displayMentionBadge = history->hasUnreadMentions();
-		auto displayPinnedIcon = !displayUnreadCounter && history->isPinnedDialog();
-		if (displayMentionBadge
-			&& unreadCount == 1
-			&& item
-			&& item->isMediaUnread()
-			&& item->mentionsMe()) {
-			displayUnreadCounter = false;
-		}
-		if (displayUnreadCounter) {
-			auto counter = QString::number(unreadCount);
-			auto mutedCounter = history->mute();
-			auto unreadRight = fullWidth - st::dialogsPadding.x();
-			auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent - (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
-			auto unreadWidth = 0;
+	paintRow(
+	    p, row, history, from, item, cloudDraft, displayDate(), fullWidth, active, selected, onlyBackground, ms,
+	    [&p, fullWidth, active, selected, ms, history, unreadCount](int nameleft, int namewidth, HistoryItem *item) {
+		    auto availableWidth = namewidth;
+		    auto texttop = st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip;
+		    auto hadOneBadge = false;
+		    auto displayUnreadCounter = (unreadCount != 0);
+		    auto displayMentionBadge = history->hasUnreadMentions();
+		    auto displayPinnedIcon = !displayUnreadCounter && history->isPinnedDialog();
+		    if (displayMentionBadge && unreadCount == 1 && item && item->isMediaUnread() && item->mentionsMe()) {
+			    displayUnreadCounter = false;
+		    }
+		    if (displayUnreadCounter) {
+			    auto counter = QString::number(unreadCount);
+			    auto mutedCounter = history->mute();
+			    auto unreadRight = fullWidth - st::dialogsPadding.x();
+			    auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent -
+			                     (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
+			    auto unreadWidth = 0;
 
-			UnreadBadgeStyle st;
-			st.active = active;
-			st.muted = history->mute();
-			paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
-			availableWidth -= unreadWidth + st.padding;
+			    UnreadBadgeStyle st;
+			    st.active = active;
+			    st.muted = history->mute();
+			    paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
+			    availableWidth -= unreadWidth + st.padding;
 
-			hadOneBadge = true;
-		} else if (displayPinnedIcon) {
-			auto &icon = (active ? st::dialogsPinnedIconActive : (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
-			icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
-			availableWidth -= icon.width() + st::dialogsUnreadPadding;
+			    hadOneBadge = true;
+		    } else if (displayPinnedIcon) {
+			    auto &icon = (active ? st::dialogsPinnedIconActive :
+			                           (selected ? st::dialogsPinnedIconOver : st::dialogsPinnedIcon));
+			    icon.paint(p, fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
+			    availableWidth -= icon.width() + st::dialogsUnreadPadding;
 
-			hadOneBadge = true;
-		}
-		if (displayMentionBadge) {
-			auto counter = qsl("@");
-			auto unreadRight = fullWidth - st::dialogsPadding.x() - (namewidth - availableWidth);
-			auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent - (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
-			auto unreadWidth = 0;
+			    hadOneBadge = true;
+		    }
+		    if (displayMentionBadge) {
+			    auto counter = qsl("@");
+			    auto unreadRight = fullWidth - st::dialogsPadding.x() - (namewidth - availableWidth);
+			    auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent -
+			                     (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
+			    auto unreadWidth = 0;
 
-			UnreadBadgeStyle st;
-			st.active = active;
-			st.muted = false;
-			st.padding = 0;
-			st.textTop = 0;
-			paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
-			availableWidth -= unreadWidth + st.padding + (hadOneBadge ? st::dialogsUnreadPadding : 0);
-		}
-		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
-		if (!history->paintSendAction(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
-			item->drawInDialog(
-				p,
-				QRect(nameleft, texttop, availableWidth, st::dialogsTextFont->height),
-				active,
-				selected,
-				HistoryItem::DrawInDialog::Normal,
-				history->textCachedFor,
-				history->lastItemTextCache);
-		}
-	}, [&p, fullWidth, active, selected, ms, history, unreadCount] {
-		if (unreadCount) {
-			auto counter = QString::number(unreadCount);
-			if (counter.size() > 4) {
-				counter = qsl("..") + counter.mid(counter.size() - 3);
-			}
-			auto mutedCounter = history->mute();
-			auto unreadRight = st::dialogsPadding.x() + st::dialogsPhotoSize;
-			auto unreadTop = st::dialogsPadding.y() + st::dialogsPhotoSize - st::dialogsUnreadHeight;
-			auto unreadWidth = 0;
+			    UnreadBadgeStyle st;
+			    st.active = active;
+			    st.muted = false;
+			    st.padding = 0;
+			    st.textTop = 0;
+			    paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
+			    availableWidth -= unreadWidth + st.padding + (hadOneBadge ? st::dialogsUnreadPadding : 0);
+		    }
+		    auto &color = active ? st::dialogsTextFgServiceActive :
+		                           (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
+		    if (!history->paintSendAction(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
+			    item->drawInDialog(p, QRect(nameleft, texttop, availableWidth, st::dialogsTextFont->height), active,
+			                       selected, HistoryItem::DrawInDialog::Normal, history->textCachedFor,
+			                       history->lastItemTextCache);
+		    }
+	    },
+	    [&p, fullWidth, active, selected, ms, history, unreadCount] {
+		    if (unreadCount) {
+			    auto counter = QString::number(unreadCount);
+			    if (counter.size() > 4) {
+				    counter = qsl("..") + counter.mid(counter.size() - 3);
+			    }
+			    auto mutedCounter = history->mute();
+			    auto unreadRight = st::dialogsPadding.x() + st::dialogsPhotoSize;
+			    auto unreadTop = st::dialogsPadding.y() + st::dialogsPhotoSize - st::dialogsUnreadHeight;
+			    auto unreadWidth = 0;
 
-			UnreadBadgeStyle st;
-			st.active = active;
-			st.muted = history->mute();
-			paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
-		}
-	});
+			    UnreadBadgeStyle st;
+			    st.active = active;
+			    st.muted = history->mute();
+			    paintUnreadCount(p, counter, unreadRight, unreadTop, st, &unreadWidth);
+		    }
+	    });
 }
 
-void RowPainter::paint(Painter &p, const FakeRow *row, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms) {
+void RowPainter::paint(Painter &p, const FakeRow *row, int fullWidth, bool active, bool selected, bool onlyBackground,
+                       TimeMs ms) {
 	auto item = row->item();
 	auto history = item->history();
 	auto from = [&] {
@@ -382,18 +394,14 @@ void RowPainter::paint(Painter &p, const FakeRow *row, int fullWidth, bool activ
 		}
 		return (history->peer->migrateTo() ? history->peer->migrateTo() : history->peer);
 	}();
-	paintRow(p, row, history, from, item, nullptr, item->date, fullWidth, active, selected, onlyBackground, ms, [&p, row, active, selected](int nameleft, int namewidth, HistoryItem *item) {
-		int lastWidth = namewidth, texttop = st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip;
-		item->drawInDialog(
-			p,
-			QRect(nameleft, texttop, lastWidth, st::dialogsTextFont->height),
-			active,
-			selected,
-			HistoryItem::DrawInDialog::WithoutSender,
-			row->_cacheFor,
-			row->_cache);
-	}, [] {
-	});
+	paintRow(p, row, history, from, item, nullptr, item->date, fullWidth, active, selected, onlyBackground, ms,
+	         [&p, row, active, selected](int nameleft, int namewidth, HistoryItem *item) {
+		         int lastWidth = namewidth,
+		             texttop = st::dialogsPadding.y() + st::msgNameFont->height + st::dialogsSkip;
+		         item->drawInDialog(p, QRect(nameleft, texttop, lastWidth, st::dialogsTextFont->height), active,
+		                            selected, HistoryItem::DrawInDialog::WithoutSender, row->_cacheFor, row->_cache);
+	         },
+	         [] {});
 }
 
 QRect RowPainter::sendActionAnimationRect(int animationWidth, int animationHeight, int fullWidth, bool textUpdated) {
@@ -415,7 +423,8 @@ void paintImportantSwitch(Painter &p, Mode current, int fullWidth, bool selected
 	int unreadTop = (st::dialogsImportantBarHeight - st::dialogsUnreadHeight) / 2;
 	bool mutedHidden = (current == Dialogs::Mode::Important);
 	QString text = lang(mutedHidden ? lng_dialogs_show_all_chats : lng_dialogs_hide_muted_chats);
-	int textBaseline = unreadTop + (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2 + st::dialogsUnreadFont->ascent;
+	int textBaseline =
+	    unreadTop + (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2 + st::dialogsUnreadFont->ascent;
 	p.drawText(st::dialogsPadding.x(), textBaseline, text);
 
 	if (mutedHidden) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.h b/Telegram/SourceFiles/dialogs/dialogs_layout.h
index 4db0bd8d0..5129b86f4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "dialogs/dialogs_common.h"
+#include "ui/twidget.h"
 
 namespace Dialogs {
 
@@ -34,10 +34,11 @@ const style::icon *ChatTypeIcon(PeerData *peer, bool active, bool selected);
 
 class RowPainter {
 public:
-	static void paint(Painter &p, const Row *row, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms);
-	static void paint(Painter &p, const FakeRow *row, int fullWidth, bool active, bool selected, bool onlyBackground, TimeMs ms);
+	static void paint(Painter &p, const Row *row, int fullWidth, bool active, bool selected, bool onlyBackground,
+	                  TimeMs ms);
+	static void paint(Painter &p, const FakeRow *row, int fullWidth, bool active, bool selected, bool onlyBackground,
+	                  TimeMs ms);
 	static QRect sendActionAnimationRect(int animationWidth, int animationHeight, int fullWidth, bool textUpdated);
-
 };
 
 void paintImportantSwitch(Painter &p, Mode current, int fullWidth, bool selected, bool onlyBackground);
@@ -63,7 +64,8 @@ struct UnreadBadgeStyle {
 	UnreadBadgeSize sizeId;
 	style::font font;
 };
-void paintUnreadCount(Painter &p, const QString &text, int x, int y, const UnreadBadgeStyle &st, int *outUnreadWidth = nullptr);
+void paintUnreadCount(Painter &p, const QString &text, int x, int y, const UnreadBadgeStyle &st,
+                      int *outUnreadWidth = nullptr);
 
 void clearUnreadBadgesCache();
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_list.cpp
index bb449de28..ce4493a41 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_list.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_list.cpp
@@ -21,18 +21,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "dialogs/dialogs_list.h"
 
 #include "dialogs/dialogs_layout.h"
-#include "styles/style_dialogs.h"
 #include "mainwidget.h"
+#include "styles/style_dialogs.h"
 
 namespace Dialogs {
 
 List::List(SortMode sortMode)
-: _last(std::make_unique<Row>(nullptr, nullptr, nullptr, 0))
-, _begin(_last.get())
-, _end(_last.get())
-, _sortMode(sortMode)
-, _current(_last.get()) {
-}
+    : _last(std::make_unique<Row>(nullptr, nullptr, nullptr, 0))
+    , _begin(_last.get())
+    , _end(_last.get())
+    , _sortMode(sortMode)
+    , _current(_last.get()) {}
 
 void List::adjustCurrent(qint32 y, qint32 h) const {
 	if (isEmpty()) return;
@@ -143,7 +142,8 @@ Row *List::addByName(History *history) {
 		change = change->_prev;
 	}
 	if (!insertBefore(row, change)) {
-		while (change->_next != _end && change->_next->history()->peer->name.compare(peerName, Qt::CaseInsensitive) < 0) {
+		while (change->_next != _end &&
+		       change->_next->history()->peer->name.compare(peerName, Qt::CaseInsensitive) < 0) {
 			change = change->_next;
 		}
 		insertAfter(row, change);
@@ -163,10 +163,12 @@ void List::adjustByPos(Row *row) {
 		}
 	}
 	if (!insertBefore(row, change)) {
-		if (change->_next != _end && _end->_prev->history()->sortKeyInChatList() > row->history()->sortKeyInChatList()) {
+		if (change->_next != _end &&
+		    _end->_prev->history()->sortKeyInChatList() > row->history()->sortKeyInChatList()) {
 			change = _end->_prev;
 		} else {
-			while (change->_next != _end && change->_next->history()->sortKeyInChatList() > row->history()->sortKeyInChatList()) {
+			while (change->_next != _end &&
+			       change->_next->history()->sortKeyInChatList() > row->history()->sortKeyInChatList()) {
 				change = change->_next;
 			}
 		}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_list.h b/Telegram/SourceFiles/dialogs/dialogs_list.h
index 577ad737c..5103dcf1e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_list.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_list.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "structs.h"
 #include "dialogs/dialogs_common.h"
 #include "dialogs/dialogs_row.h"
+#include "structs.h"
 
 class PeerData;
 namespace Dialogs {
@@ -64,47 +64,102 @@ public:
 
 	class const_iterator {
 	public:
-		using value_type = Row*;
-		using pointer = Row**;
-		using reference = Row*&;
+		using value_type = Row *;
+		using pointer = Row **;
+		using reference = Row *&;
 
-		explicit const_iterator(Row *p) : _p(p) {
+		explicit const_iterator(Row *p)
+		    : _p(p) {}
+		inline Row *operator*() const {
+			return _p;
+		}
+		inline Row *const *operator->() const {
+			return &_p;
+		}
+		inline bool operator==(const const_iterator &other) const {
+			return _p == other._p;
+		}
+		inline bool operator!=(const const_iterator &other) const {
+			return !(*this == other);
+		}
+		inline const_iterator &operator++() {
+			_p = next(_p);
+			return *this;
+		}
+		inline const_iterator operator++(int) {
+			const_iterator result(*this);
+			++(*this);
+			return result;
+		}
+		inline const_iterator &operator--() {
+			_p = prev(_p);
+			return *this;
+		}
+		inline const_iterator operator--(int) {
+			const_iterator result(*this);
+			--(*this);
+			return result;
+		}
+		inline const_iterator operator+(int j) const {
+			const_iterator result = *this;
+			return result += j;
+		}
+		inline const_iterator operator-(int j) const {
+			const_iterator result = *this;
+			return result -= j;
+		}
+		inline const_iterator &operator+=(int j) {
+			if (j < 0) return (*this -= (-j));
+			while (j--) ++*this;
+			return *this;
+		}
+		inline const_iterator &operator-=(int j) {
+			if (j < 0) return (*this += (-j));
+			while (j--) --*this;
+			return *this;
 		}
-		inline Row* operator*() const { return _p; }
-		inline Row* const* operator->() const { return &_p; }
-		inline bool operator==(const const_iterator &other) const { return _p == other._p; }
-		inline bool operator!=(const const_iterator &other) const { return !(*this == other); }
-		inline const_iterator &operator++() { _p = next(_p); return *this; }
-		inline const_iterator operator++(int) { const_iterator result(*this); ++(*this); return result; }
-		inline const_iterator &operator--() { _p = prev(_p); return *this; }
-		inline const_iterator operator--(int) { const_iterator result(*this); --(*this); return result; }
-		inline const_iterator operator+(int j) const { const_iterator result = *this; return result += j; }
-		inline const_iterator operator-(int j) const { const_iterator result = *this; return result -= j; }
-		inline const_iterator &operator+=(int j) { if (j < 0) return (*this -= (-j)); while (j--) ++*this; return *this; }
-		inline const_iterator &operator-=(int j) { if (j < 0) return (*this += (-j)); while (j--) --*this; return *this; }
 
 	private:
 		Row *_p;
 		friend class List;
-
 	};
 	friend class const_iterator;
 	using iterator = const_iterator;
 
-	const_iterator cbegin() const { return const_iterator(_begin); }
-	const_iterator cend() const { return const_iterator(_end); }
-	const_iterator begin() const { return cbegin(); }
-	const_iterator end() const { return cend(); }
-	iterator begin() { return iterator(_begin); }
-	iterator end() { return iterator(_end); }
-	const_iterator cfind(Row *value) const { return value ? const_iterator(value) : cend(); }
-	const_iterator find(Row *value) const { return cfind(value); }
-	iterator find(Row *value) { return value ? iterator(value) : end(); }
+	const_iterator cbegin() const {
+		return const_iterator(_begin);
+	}
+	const_iterator cend() const {
+		return const_iterator(_end);
+	}
+	const_iterator begin() const {
+		return cbegin();
+	}
+	const_iterator end() const {
+		return cend();
+	}
+	iterator begin() {
+		return iterator(_begin);
+	}
+	iterator end() {
+		return iterator(_end);
+	}
+	const_iterator cfind(Row *value) const {
+		return value ? const_iterator(value) : cend();
+	}
+	const_iterator find(Row *value) const {
+		return cfind(value);
+	}
+	iterator find(Row *value) {
+		return value ? iterator(value) : end();
+	}
 	const_iterator cfind(int y, int h) const {
 		adjustCurrent(y, h);
 		return iterator(_current);
 	}
-	const_iterator find(int y, int h) const { return cfind(y, h); }
+	const_iterator find(int y, int h) const {
+		return cfind(y, h);
+	}
 	iterator find(int y, int h) {
 		adjustCurrent(y, h);
 		return iterator(_current);
@@ -129,7 +184,7 @@ private:
 	SortMode _sortMode;
 	int _count = 0;
 
-	typedef QHash<PeerId, Row*> RowByPeer;
+	typedef QHash<PeerId, Row *> RowByPeer;
 	RowByPeer _rowByPeer;
 
 	mutable Row *_current; // cache
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 3678fa627..c0f1e9c4e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "dialogs/dialogs_row.h"
 
+#include "mainwidget.h"
 #include "styles/style_dialogs.h"
 #include "ui/effects/ripple_animation.h"
-#include "mainwidget.h"
 
 namespace Dialogs {
 
@@ -52,10 +52,9 @@ void RippleRow::paintRipple(Painter &p, int x, int y, int outerWidth, TimeMs ms,
 	}
 }
 
-FakeRow::FakeRow(PeerData *searchInPeer, not_null<HistoryItem*> item)
-: _searchInPeer(searchInPeer)
-, _item(item)
-, _cache(st::dialogsTextWidthMin) {
-}
+FakeRow::FakeRow(PeerData *searchInPeer, not_null<HistoryItem *> item)
+    : _searchInPeer(searchInPeer)
+    , _item(item)
+    , _cache(st::dialogsTextWidthMin) {}
 
 } // namespace Dialogs
\ No newline at end of file
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index 7e1e06d3b..f0fd8731d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -46,18 +46,16 @@ public:
 
 private:
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
-
 };
 
 class List;
 class Row : public RippleRow {
 public:
 	Row(History *history, Row *prev, Row *next, int pos)
-		: _history(history)
-		, _prev(prev)
-		, _next(next)
-		, _pos(pos) {
-	}
+	    : _history(history)
+	    , _prev(prev)
+	    , _next(next)
+	    , _pos(pos) {}
 	void *attached = nullptr; // for any attached data, for example View in contacts list
 
 	History *history() const {
@@ -73,17 +71,16 @@ private:
 	History *_history;
 	Row *_prev, *_next;
 	int _pos;
-
 };
 
 class FakeRow : public RippleRow {
 public:
-	FakeRow(PeerData *searchInPeer, not_null<HistoryItem*> item);
+	FakeRow(PeerData *searchInPeer, not_null<HistoryItem *> item);
 
 	PeerData *searchInPeer() const {
 		return _searchInPeer;
 	}
-	not_null<HistoryItem*> item() const {
+	not_null<HistoryItem *> item() const {
 		return _item;
 	}
 
@@ -91,10 +88,9 @@ private:
 	friend class Layout::RowPainter;
 
 	PeerData *_searchInPeer = nullptr;
-	not_null<HistoryItem*> _item;
+	not_null<HistoryItem *> _item;
 	mutable const HistoryItem *_cacheFor = nullptr;
 	mutable Text _cache;
-
 };
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
index ad3914f44..fd9a0647f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
@@ -20,15 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "dialogs/dialogs_search_from_controllers.h"
 
-#include "lang/lang_keys.h"
-#include "observer_peer.h"
-#include "auth_session.h"
 #include "apiwrap.h"
 #include "app.h"
+#include "auth_session.h"
+#include "lang/lang_keys.h"
+#include "observer_peer.h"
 
 namespace Dialogs {
 
-void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData*>)> callback, base::lambda<void()> closedCallback) {
+void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData *>)> callback,
+                       base::lambda<void()> closedCallback) {
 	auto createController = [peer, callback = std::move(callback)]() -> std::unique_ptr<PeerListController> {
 		if (peer) {
 			if (auto chat = peer->asChat()) {
@@ -41,17 +42,21 @@ void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData*>)> c
 	};
 	if (auto controller = createController()) {
 		auto subscription = std::make_shared<base::Subscription>();
-		auto box = Ui::show(Box<PeerListBox>(std::move(controller), [subscription](not_null<PeerListBox*> box) {
-			box->addButton(langFactory(lng_cancel), [box, subscription] { box->closeBox(); });
-		}), KeepOtherLayers);
+		auto box = Ui::show(Box<PeerListBox>(std::move(controller),
+		                                     [subscription](not_null<PeerListBox *> box) {
+			                                     box->addButton(langFactory(lng_cancel),
+			                                                    [box, subscription] { box->closeBox(); });
+		                                     }),
+		                    KeepOtherLayers);
 		*subscription = box->boxClosing.add_subscription(std::move(closedCallback));
 	}
 }
 
-ChatSearchFromController::ChatSearchFromController(not_null<ChatData*> chat, base::lambda<void(not_null<UserData*>)> callback) : PeerListController()
-, _chat(chat)
-, _callback(std::move(callback)) {
-}
+ChatSearchFromController::ChatSearchFromController(not_null<ChatData *> chat,
+                                                   base::lambda<void(not_null<UserData *>)> callback)
+    : PeerListController()
+    , _chat(chat)
+    , _callback(std::move(callback)) {}
 
 void ChatSearchFromController::prepare() {
 	setSearchNoResultsText(lang(lng_blocked_list_not_found));
@@ -60,14 +65,15 @@ void ChatSearchFromController::prepare() {
 
 	rebuildRows();
 
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::MembersChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _chat) {
-			rebuildRows();
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::MembersChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _chat) {
+			                                                            rebuildRows();
+		                                                            }
+	                                                            }));
 }
 
-void ChatSearchFromController::rowClicked(not_null<PeerListRow*> row) {
+void ChatSearchFromController::rowClicked(not_null<PeerListRow *> row) {
 	Expects(row->peer()->isUser());
 	_callback(row->peer()->asUser());
 }
@@ -77,7 +83,7 @@ void ChatSearchFromController::rebuildRows() {
 	auto wasEmpty = !delegate()->peerListFullRowsCount();
 
 	auto now = unixtime();
-	QMultiMap<qint32, UserData*> ordered;
+	QMultiMap<qint32, UserData *> ordered;
 	if (_chat->noParticipantInfo()) {
 		Auth().api().requestFullPeer(_chat);
 	} else if (!_chat->participants.isEmpty()) {
@@ -110,27 +116,28 @@ void ChatSearchFromController::checkForEmptyRows() {
 	}
 }
 
-void ChatSearchFromController::appendRow(not_null<UserData*> user) {
+void ChatSearchFromController::appendRow(not_null<UserData *> user) {
 	if (!delegate()->peerListFindRow(user->id)) {
 		delegate()->peerListAppendRow(std::make_unique<PeerListRow>(user));
 	}
 }
 
-ChannelSearchFromController::ChannelSearchFromController(not_null<ChannelData*> channel, base::lambda<void(not_null<UserData*>)> callback) : ParticipantsBoxController(channel, ParticipantsBoxController::Role::Members)
-, _callback(std::move(callback)) {
-}
+ChannelSearchFromController::ChannelSearchFromController(not_null<ChannelData *> channel,
+                                                         base::lambda<void(not_null<UserData *>)> callback)
+    : ParticipantsBoxController(channel, ParticipantsBoxController::Role::Members)
+    , _callback(std::move(callback)) {}
 
 void ChannelSearchFromController::prepare() {
 	ParticipantsBoxController::prepare();
 	delegate()->peerListSetTitle(langFactory(lng_search_messages_from));
 }
 
-void ChannelSearchFromController::rowClicked(not_null<PeerListRow*> row) {
+void ChannelSearchFromController::rowClicked(not_null<PeerListRow *> row) {
 	Expects(row->peer()->isUser());
 	_callback(row->peer()->asUser());
 }
 
-std::unique_ptr<PeerListRow> ChannelSearchFromController::createRow(not_null<UserData*> user) const {
+std::unique_ptr<PeerListRow> ChannelSearchFromController::createRow(not_null<UserData *> user) const {
 	return std::make_unique<PeerListRow>(user);
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
index bebccb5e0..8ca25fdaf 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
@@ -25,38 +25,37 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Dialogs {
 
-void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData*>)> callback, base::lambda<void()> closedCallback);
+void ShowSearchFromBox(PeerData *peer, base::lambda<void(not_null<UserData *>)> callback,
+                       base::lambda<void()> closedCallback);
 
 class ChatSearchFromController : public PeerListController, protected base::Subscriber {
 public:
-	ChatSearchFromController(not_null<ChatData*> chat, base::lambda<void(not_null<UserData*>)> callback);
+	ChatSearchFromController(not_null<ChatData *> chat, base::lambda<void(not_null<UserData *>)> callback);
 
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
 private:
 	void rebuildRows();
 	void checkForEmptyRows();
-	void appendRow(not_null<UserData*> user);
-
-	not_null<ChatData*> _chat;
-	base::lambda<void(not_null<UserData*>)> _callback;
+	void appendRow(not_null<UserData *> user);
 
+	not_null<ChatData *> _chat;
+	base::lambda<void(not_null<UserData *>)> _callback;
 };
 
 class ChannelSearchFromController : public Profile::ParticipantsBoxController {
 public:
-	ChannelSearchFromController(not_null<ChannelData*> channel, base::lambda<void(not_null<UserData*>)> callback);
+	ChannelSearchFromController(not_null<ChannelData *> channel, base::lambda<void(not_null<UserData *>)> callback);
 
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
 protected:
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const override;
+	std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user) const override;
 
 private:
-	base::lambda<void(not_null<UserData*>)> _callback;
-
+	base::lambda<void(not_null<UserData *>)> _callback;
 };
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a052212bd..08e7efbab 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -18,23 +18,23 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QMimeData>
 #include "dialogs/dialogs_widget.h"
+#include "application.h"
+#include "auth_session.h"
+#include "boxes/peer_list_box.h"
 #include "dialogs/dialogs_inner_widget.h"
 #include "dialogs/dialogs_search_from_controllers.h"
-#include "styles/style_dialogs.h"
-#include "ui/widgets/buttons.h"
 #include "lang/lang_keys.h"
-#include "application.h"
-#include "mainwindow.h"
 #include "mainwidget.h"
-#include "ui/widgets/input_fields.h"
-#include "auth_session.h"
+#include "mainwindow.h"
 #include "messenger.h"
-#include "ui/effects/widget_fade_wrap.h"
-#include "boxes/peer_list_box.h"
-#include "window/window_controller.h"
 #include "profile/profile_channel_controllers.h"
+#include "styles/style_dialogs.h"
+#include "ui/effects/widget_fade_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/input_fields.h"
+#include "window/window_controller.h"
+#include <QMimeData>
 
 namespace {
 
@@ -56,12 +56,12 @@ protected:
 private:
 	QString _text;
 	const style::FlatButton &_st;
-
 };
 
-DialogsWidget::UpdateButton::UpdateButton(QWidget *parent) : RippleButton(parent, st::dialogsUpdateButton.ripple)
-, _text(lang(lng_update_telegram).toUpper())
-, _st(st::dialogsUpdateButton) {
+DialogsWidget::UpdateButton::UpdateButton(QWidget *parent)
+    : RippleButton(parent, st::dialogsUpdateButton.ripple)
+    , _text(lang(lng_update_telegram).toUpper())
+    , _st(st::dialogsUpdateButton) {
 	resize(st::dialogsWidthMin, _st.height);
 }
 
@@ -90,18 +90,19 @@ void DialogsWidget::UpdateButton::paintEvent(QPaintEvent *e) {
 	}
 }
 
-DialogsWidget::DialogsWidget(QWidget *parent, not_null<Window::Controller*> controller) : Window::AbstractSectionWidget(parent, controller)
-, _mainMenuToggle(this, st::dialogsMenuToggle)
-, _filter(this, st::dialogsFilter, langFactory(lng_dlg_filter))
-, _chooseFromUser(this, object_ptr<Ui::IconButton>(this, st::dialogsSearchFrom))
-, _jumpToDate(this, object_ptr<Ui::IconButton>(this, st::dialogsCalendar))
-, _cancelSearch(this, st::dialogsCancelSearch)
-, _lockUnlock(this, st::dialogsLock)
-, _scroll(this, st::dialogsScroll) {
+DialogsWidget::DialogsWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : Window::AbstractSectionWidget(parent, controller)
+    , _mainMenuToggle(this, st::dialogsMenuToggle)
+    , _filter(this, st::dialogsFilter, langFactory(lng_dlg_filter))
+    , _chooseFromUser(this, object_ptr<Ui::IconButton>(this, st::dialogsSearchFrom))
+    , _jumpToDate(this, object_ptr<Ui::IconButton>(this, st::dialogsCalendar))
+    , _cancelSearch(this, st::dialogsCancelSearch)
+    , _lockUnlock(this, st::dialogsLock)
+    , _scroll(this, st::dialogsScroll) {
 	_inner = _scroll->setOwnedWidget(object_ptr<DialogsInner>(this, controller, parent));
 	connect(_inner, SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int)));
-	connect(_inner, SIGNAL(mustScrollTo(int,int)), _scroll, SLOT(scrollToY(int,int)));
-	connect(_inner, SIGNAL(dialogMoved(int,int)), this, SLOT(onDialogMoved(int,int)));
+	connect(_inner, SIGNAL(mustScrollTo(int, int)), _scroll, SLOT(scrollToY(int, int)));
+	connect(_inner, SIGNAL(dialogMoved(int, int)), this, SLOT(onDialogMoved(int, int)));
 	connect(_inner, SIGNAL(searchMessages()), this, SLOT(onNeedSearchMessages()));
 	connect(_inner, SIGNAL(searchResultChosen()), this, SLOT(onCancel()));
 	connect(_inner, SIGNAL(completeHashtag(QString)), this, SLOT(onCompleteHashtag(QString)));
@@ -115,12 +116,14 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null<Window::Controller*> cont
 	connect(_scroll, SIGNAL(scrolled()), this, SLOT(onListScroll()));
 	connect(_filter, SIGNAL(cancelled()), this, SLOT(onCancel()));
 	connect(_filter, SIGNAL(changed()), this, SLOT(onFilterUpdate()));
-	connect(_filter, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onFilterCursorMoved(int,int)));
+	connect(_filter, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(onFilterCursorMoved(int, int)));
 
 	subscribe(Adaptive::Changed(), [this] { updateForwardBar(); });
 
 	_cancelSearch->setClickedCallback([this] { onCancelSearch(); });
-	_jumpToDate->entity()->setClickedCallback([this] { if (_searchInPeer) this->controller()->showJumpToDate(_searchInPeer, QDate()); });
+	_jumpToDate->entity()->setClickedCallback([this] {
+		if (_searchInPeer) this->controller()->showJumpToDate(_searchInPeer, QDate());
+	});
 	_chooseFromUser->entity()->setClickedCallback([this] { showSearchFrom(); });
 	_lockUnlock->setVisible(Global::LocalPasscode());
 	subscribe(Global::RefLocalPasscodeChanged(), [this] { updateLockUnlockVisibility(); });
@@ -140,7 +143,9 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null<Window::Controller*> cont
 	connect(&_searchTimer, SIGNAL(timeout()), this, SLOT(onSearchMessages()));
 
 	_inner->setLoadMoreCallback([this] {
-		if (_inner->state() == DialogsInner::SearchedState || (_inner->state() == DialogsInner::FilteredState && _searchInMigrated && _searchFull && !_searchFullMigrated)) {
+		if (_inner->state() == DialogsInner::SearchedState ||
+		    (_inner->state() == DialogsInner::FilteredState && _searchInMigrated && _searchFull &&
+		     !_searchFullMigrated)) {
 			onSearchMore();
 		} else {
 			loadDialogs();
@@ -196,7 +201,8 @@ void DialogsWidget::startWidthAnimation() {
 	auto image = QImage(grabGeometry.size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	image.setDevicePixelRatio(cRetinaFactor());
 	image.fill(Qt::transparent);
-	_scroll->render(&image, QPoint(0, 0), QRect(QPoint(0, 0), grabGeometry.size()), QWidget::DrawChildren | QWidget::IgnoreMask);
+	_scroll->render(&image, QPoint(0, 0), QRect(QPoint(0, 0), grabGeometry.size()),
+	                QWidget::DrawChildren | QWidget::IgnoreMask);
 	_widthAnimationCache = App::pixmapFromImageInPlace(std::move(image));
 	_scroll->setGeometry(scrollGeometry);
 	_scroll->hide();
@@ -286,8 +292,7 @@ void DialogsWidget::notify_historyMuteUpdated(History *history) {
 	_inner->notify_historyMuteUpdated(history);
 }
 
-void DialogsWidget::unreadCountsReceived(const QVector<MTPDialog> &dialogs) {
-}
+void DialogsWidget::unreadCountsReceived(const QVector<MTPDialog> &dialogs) {}
 
 void DialogsWidget::dialogsReceived(const MTPmessages_Dialogs &dialogs, mtpRequestId requestId) {
 	if (_dialogsRequestId != requestId) return;
@@ -313,7 +318,8 @@ void DialogsWidget::dialogsReceived(const MTPmessages_Dialogs &dialogs, mtpReque
 	}
 
 	if (!Auth().data().contactsLoaded().value() && !_contactsRequestId) {
-		_contactsRequestId = MTP::send(MTPcontacts_GetContacts(MTP_int(0)), rpcDone(&DialogsWidget::contactsReceived), rpcFail(&DialogsWidget::contactsFailed));
+		_contactsRequestId = MTP::send(MTPcontacts_GetContacts(MTP_int(0)), rpcDone(&DialogsWidget::contactsReceived),
+		                               rpcFail(&DialogsWidget::contactsFailed));
 	}
 
 	if (dialogsList) {
@@ -436,7 +442,8 @@ void DialogsWidget::onDraggingScrollDelta(int delta) {
 }
 
 void DialogsWidget::onDraggingScrollTimer() {
-	auto delta = (_draggingScrollDelta > 0) ? std::min(_draggingScrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) : std::max(_draggingScrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
+	auto delta = (_draggingScrollDelta > 0) ? std::min(_draggingScrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) :
+	                                          std::max(_draggingScrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + delta);
 }
 
@@ -464,9 +471,19 @@ bool DialogsWidget::onSearchMessages(bool searchCache) {
 		MTP::cancel(base::take(_searchRequest));
 		if (_searchInPeer) {
 			auto flags = _searchQueryFrom ? MTP_flags(MTPmessages_Search::Flag::f_from_id) : MTP_flags(0);
-			_searchRequest = MTP::send(MTPmessages_Search(flags, _searchInPeer->input, MTP_string(_searchQuery), _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(), MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&DialogsWidget::searchReceived, DialogsSearchPeerFromStart), rpcFail(&DialogsWidget::searchFailed, DialogsSearchPeerFromStart));
+			_searchRequest =
+			    MTP::send(MTPmessages_Search(flags, _searchInPeer->input, MTP_string(_searchQuery),
+			                                 _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(),
+			                                 MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(0),
+			                                 MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)),
+			              rpcDone(&DialogsWidget::searchReceived, DialogsSearchPeerFromStart),
+			              rpcFail(&DialogsWidget::searchFailed, DialogsSearchPeerFromStart));
 		} else {
-			_searchRequest = MTP::send(MTPmessages_SearchGlobal(MTP_string(_searchQuery), MTP_int(0), MTP_inputPeerEmpty(), MTP_int(0), MTP_int(SearchPerPage)), rpcDone(&DialogsWidget::searchReceived, DialogsSearchFromStart), rpcFail(&DialogsWidget::searchFailed, DialogsSearchFromStart));
+			_searchRequest =
+			    MTP::send(MTPmessages_SearchGlobal(MTP_string(_searchQuery), MTP_int(0), MTP_inputPeerEmpty(),
+			                                       MTP_int(0), MTP_int(SearchPerPage)),
+			              rpcDone(&DialogsWidget::searchReceived, DialogsSearchFromStart),
+			              rpcFail(&DialogsWidget::searchFailed, DialogsSearchFromStart));
 		}
 		_searchQueries.insert(_searchRequest, _searchQuery);
 	}
@@ -482,7 +499,9 @@ bool DialogsWidget::onSearchMessages(bool searchCache) {
 		} else if (_peerSearchQuery != q) {
 			_peerSearchQuery = q;
 			_peerSearchFull = false;
-			_peerSearchRequest = MTP::send(MTPcontacts_Search(MTP_string(_peerSearchQuery), MTP_int(SearchPeopleLimit)), rpcDone(&DialogsWidget::peerSearchReceived), rpcFail(&DialogsWidget::peopleFailed));
+			_peerSearchRequest =
+			    MTP::send(MTPcontacts_Search(MTP_string(_peerSearchQuery), MTP_int(SearchPeopleLimit)),
+			              rpcDone(&DialogsWidget::peerSearchReceived), rpcFail(&DialogsWidget::peopleFailed));
 			_peerSearchQueries.insert(_peerSearchRequest, _peerSearchQuery);
 		}
 	}
@@ -504,7 +523,8 @@ void DialogsWidget::showMainMenu() {
 }
 
 void DialogsWidget::searchMessages(const QString &query, PeerData *inPeer) {
-	if ((_filter->getLastText() != query) || (inPeer && inPeer != _searchInPeer && inPeer->migrateTo() != _searchInPeer)) {
+	if ((_filter->getLastText() != query) ||
+	    (inPeer && inPeer != _searchInPeer && inPeer->migrateTo() != _searchInPeer)) {
 		if (inPeer) {
 			onCancelSearch();
 			setSearchInPeer(inPeer);
@@ -527,9 +547,23 @@ void DialogsWidget::onSearchMore() {
 			auto offsetId = _inner->lastSearchId();
 			if (_searchInPeer) {
 				auto flags = _searchQueryFrom ? MTP_flags(MTPmessages_Search::Flag::f_from_id) : MTP_flags(0);
-				_searchRequest = MTP::send(MTPmessages_Search(flags, _searchInPeer->input, MTP_string(_searchQuery), _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(), MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(offsetId), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&DialogsWidget::searchReceived, offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart), rpcFail(&DialogsWidget::searchFailed, offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart));
+				_searchRequest = MTP::send(
+				    MTPmessages_Search(flags, _searchInPeer->input, MTP_string(_searchQuery),
+				                       _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(),
+				                       MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(offsetId),
+				                       MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)),
+				    rpcDone(&DialogsWidget::searchReceived,
+				            offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart),
+				    rpcFail(&DialogsWidget::searchFailed,
+				            offsetId ? DialogsSearchPeerFromOffset : DialogsSearchPeerFromStart));
 			} else {
-				_searchRequest = MTP::send(MTPmessages_SearchGlobal(MTP_string(_searchQuery), MTP_int(offsetDate), offsetPeer ? offsetPeer->input : MTP_inputPeerEmpty(), MTP_int(offsetId), MTP_int(SearchPerPage)), rpcDone(&DialogsWidget::searchReceived, offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart), rpcFail(&DialogsWidget::searchFailed, offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart));
+				_searchRequest = MTP::send(
+				    MTPmessages_SearchGlobal(MTP_string(_searchQuery), MTP_int(offsetDate),
+				                             offsetPeer ? offsetPeer->input : MTP_inputPeerEmpty(), MTP_int(offsetId),
+				                             MTP_int(SearchPerPage)),
+				    rpcDone(&DialogsWidget::searchReceived,
+				            offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart),
+				    rpcFail(&DialogsWidget::searchFailed, offsetId ? DialogsSearchFromOffset : DialogsSearchFromStart));
 			}
 			if (!offsetId) {
 				_searchQueries.insert(_searchRequest, _searchQuery);
@@ -537,7 +571,15 @@ void DialogsWidget::onSearchMore() {
 		} else if (_searchInMigrated && !_searchFullMigrated) {
 			auto offsetMigratedId = _inner->lastSearchMigratedId();
 			auto flags = _searchQueryFrom ? MTP_flags(MTPmessages_Search::Flag::f_from_id) : MTP_flags(0);
-			_searchRequest = MTP::send(MTPmessages_Search(flags, _searchInMigrated->input, MTP_string(_searchQuery), _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(), MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(offsetMigratedId), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&DialogsWidget::searchReceived, offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart), rpcFail(&DialogsWidget::searchFailed, offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart));
+			_searchRequest = MTP::send(
+			    MTPmessages_Search(flags, _searchInMigrated->input, MTP_string(_searchQuery),
+			                       _searchQueryFrom ? _searchQueryFrom->inputUser : MTP_inputUserEmpty(),
+			                       MTP_inputMessagesFilterEmpty(), MTP_int(0), MTP_int(0), MTP_int(offsetMigratedId),
+			                       MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)),
+			    rpcDone(&DialogsWidget::searchReceived,
+			            offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart),
+			    rpcFail(&DialogsWidget::searchFailed,
+			            offsetMigratedId ? DialogsSearchMigratedFromOffset : DialogsSearchMigratedFromStart));
 		}
 	}
 }
@@ -552,7 +594,11 @@ void DialogsWidget::loadDialogs() {
 	auto firstLoad = !_dialogsOffsetDate;
 	auto loadCount = firstLoad ? DialogsFirstLoad : DialogsPerPage;
 	auto flags = MTPmessages_GetDialogs::Flag::f_exclude_pinned;
-	_dialogsRequestId = MTP::send(MTPmessages_GetDialogs(MTP_flags(flags), MTP_int(_dialogsOffsetDate), MTP_int(_dialogsOffsetId), _dialogsOffsetPeer ? _dialogsOffsetPeer->input : MTP_inputPeerEmpty(), MTP_int(loadCount)), rpcDone(&DialogsWidget::dialogsReceived), rpcFail(&DialogsWidget::dialogsFailed));
+	_dialogsRequestId =
+	    MTP::send(MTPmessages_GetDialogs(MTP_flags(flags), MTP_int(_dialogsOffsetDate), MTP_int(_dialogsOffsetId),
+	                                     _dialogsOffsetPeer ? _dialogsOffsetPeer->input : MTP_inputPeerEmpty(),
+	                                     MTP_int(loadCount)),
+	              rpcDone(&DialogsWidget::dialogsReceived), rpcFail(&DialogsWidget::dialogsFailed));
 	if (!_pinnedDialogsReceived) {
 		loadPinnedDialogs();
 	}
@@ -562,7 +608,8 @@ void DialogsWidget::loadPinnedDialogs() {
 	if (_pinnedDialogsRequestId) return;
 
 	_pinnedDialogsReceived = false;
-	_pinnedDialogsRequestId = MTP::send(MTPmessages_GetPinnedDialogs(), rpcDone(&DialogsWidget::pinnedDialogsReceived), rpcFail(&DialogsWidget::dialogsFailed));
+	_pinnedDialogsRequestId = MTP::send(MTPmessages_GetPinnedDialogs(), rpcDone(&DialogsWidget::pinnedDialogsReceived),
+	                                    rpcFail(&DialogsWidget::dialogsFailed));
 }
 
 void DialogsWidget::contactsReceived(const MTPcontacts_Contacts &result) {
@@ -581,7 +628,8 @@ bool DialogsWidget::contactsFailed(const RPCError &error) {
 	return true;
 }
 
-void DialogsWidget::searchReceived(DialogsSearchRequestType type, const MTPmessages_Messages &result, mtpRequestId req) {
+void DialogsWidget::searchReceived(DialogsSearchRequestType type, const MTPmessages_Messages &result,
+                                   mtpRequestId req) {
 	if (_inner->state() == DialogsInner::FilteredState || _inner->state() == DialogsInner::SearchedState) {
 		if (type == DialogsSearchFromStart || type == DialogsSearchPeerFromStart) {
 			auto i = _searchQueries.find(req);
@@ -627,7 +675,9 @@ void DialogsWidget::searchReceived(DialogsSearchRequestType type, const MTPmessa
 			if (_searchInPeer && _searchInPeer->isChannel()) {
 				_searchInPeer->asChannel()->ptsReceived(d.vpts.v);
 			} else {
-				LOG(("API Error: received messages.channelMessages when no channel was passed! (DialogsWidget::searchReceived)"));
+				LOG(
+				    ("API Error: received messages.channelMessages when no channel was passed! "
+				     "(DialogsWidget::searchReceived)"));
 			}
 			App::feedUsers(d.vusers);
 			App::feedChats(d.vchats);
@@ -794,9 +844,8 @@ void DialogsWidget::onFilterUpdate(bool force) {
 
 	if (!_chooseFromUser->isHiddenOrHiding() || _searchFromUser) {
 		auto switchToChooseFrom = SwitchToChooseFromQuery();
-		if (_lastFilterText != switchToChooseFrom
-			&& switchToChooseFrom.startsWith(_lastFilterText)
-			&& filterText == switchToChooseFrom) {
+		if (_lastFilterText != switchToChooseFrom && switchToChooseFrom.startsWith(_lastFilterText) &&
+		    filterText == switchToChooseFrom) {
 			showSearchFrom();
 		}
 	}
@@ -844,11 +893,14 @@ void DialogsWidget::clearSearchCache() {
 
 void DialogsWidget::showSearchFrom() {
 	auto peer = _searchInPeer;
-	Dialogs::ShowSearchFromBox(peer, base::lambda_guarded(this, [this, peer](not_null<UserData*> user) {
-		Ui::hideLayer();
-		setSearchInPeer(peer, user);
-		onFilterUpdate(true);
-	}), base::lambda_guarded(this, [this] { _filter->setFocus(); }));
+	Dialogs::ShowSearchFromBox(peer,
+	                           base::lambda_guarded(this,
+	                                                [this, peer](not_null<UserData *> user) {
+		                                                Ui::hideLayer();
+		                                                setSearchInPeer(peer, user);
+		                                                onFilterUpdate(true);
+	                                                }),
+	                           base::lambda_guarded(this, [this] { _filter->setFocus(); }));
 }
 
 void DialogsWidget::onFilterCursorMoved(int from, int to) {
@@ -940,21 +992,28 @@ void DialogsWidget::updateControlsGeometry() {
 		filterAreaTop += st::dialogsForwardHeight;
 	}
 	auto smallLayoutWidth = (st::dialogsPadding.x() + st::dialogsPhotoSize + st::dialogsPadding.x());
-	auto smallLayoutRatio = (width() < st::dialogsWidthMin) ? (st::dialogsWidthMin - width()) / double(st::dialogsWidthMin - smallLayoutWidth) : 0.;
+	auto smallLayoutRatio = (width() < st::dialogsWidthMin) ?
+	                            (st::dialogsWidthMin - width()) / double(st::dialogsWidthMin - smallLayoutWidth) :
+	                            0.;
 	auto filterLeft = st::dialogsFilterPadding.x() + _mainMenuToggle->width() + st::dialogsFilterPadding.x();
-	auto filterRight = (Global::LocalPasscode() ? (st::dialogsFilterPadding.x() + _lockUnlock->width()) : st::dialogsFilterSkip) + st::dialogsFilterPadding.x();
+	auto filterRight =
+	    (Global::LocalPasscode() ? (st::dialogsFilterPadding.x() + _lockUnlock->width()) : st::dialogsFilterSkip) +
+	    st::dialogsFilterPadding.x();
 	auto filterWidth = std::max(width(), st::dialogsWidthMin) - filterLeft - filterRight;
 	auto filterAreaHeight = st::dialogsFilterPadding.y() + _mainMenuToggle->height() + st::dialogsFilterPadding.y();
 	auto filterTop = filterAreaTop + (filterAreaHeight - _filter->height()) / 2;
 	filterLeft = anim::interpolate(filterLeft, smallLayoutWidth, smallLayoutRatio);
 	_filter->setGeometryToLeft(filterLeft, filterTop, filterWidth, _filter->height());
-	auto mainMenuLeft = anim::interpolate(st::dialogsFilterPadding.x(), (smallLayoutWidth - _mainMenuToggle->width()) / 2, smallLayoutRatio);
+	auto mainMenuLeft = anim::interpolate(st::dialogsFilterPadding.x(),
+	                                      (smallLayoutWidth - _mainMenuToggle->width()) / 2, smallLayoutRatio);
 	_mainMenuToggle->moveToLeft(mainMenuLeft, filterAreaTop + st::dialogsFilterPadding.y());
 	auto right = filterLeft + filterWidth;
 	_lockUnlock->moveToLeft(right + st::dialogsFilterPadding.x(), filterAreaTop + st::dialogsFilterPadding.y());
 	_cancelSearch->moveToLeft(right - _cancelSearch->width(), _filter->y());
-	right -= _jumpToDate->width(); _jumpToDate->moveToLeft(right, _filter->y());
-	right -= _chooseFromUser->width(); _chooseFromUser->moveToLeft(right, _filter->y());
+	right -= _jumpToDate->width();
+	_jumpToDate->moveToLeft(right, _filter->y());
+	right -= _chooseFromUser->width();
+	_chooseFromUser->moveToLeft(right, _filter->y());
 
 	auto scrollTop = filterAreaTop + filterAreaHeight;
 	auto addToScroll = App::main() ? App::main()->contentScrollAddToY() : 0;
@@ -999,7 +1058,8 @@ void DialogsWidget::keyPressEvent(QKeyEvent *e) {
 		e->ignore();
 	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
 		if (!_inner->choosePeer()) {
-			if (_inner->state() == DialogsInner::DefaultState || _inner->state() == DialogsInner::SearchedState || (_inner->state() == DialogsInner::FilteredState && _inner->hasFilteredResults())) {
+			if (_inner->state() == DialogsInner::DefaultState || _inner->state() == DialogsInner::SearchedState ||
+			    (_inner->state() == DialogsInner::FilteredState && _inner->hasFilteredResults())) {
 				_inner->selectSkip(1);
 				_inner->choosePeer();
 			} else {
@@ -1035,18 +1095,22 @@ void DialogsWidget::paintEvent(QPaintEvent *e) {
 	if (_a_show.animating()) {
 		auto retina = cIntRetinaFactor();
 		auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);
-		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
+		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) :
+		                             anim::interpolate(0, -st::slideShift, progress);
 		auto coordOver = fromLeft ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
 		auto shadow = fromLeft ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, _cacheUnder.height() / retina), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, _cacheUnder.height()));
+			p.drawPixmap(QRect(0, 0, coordOver, _cacheUnder.height() / retina), _cacheUnder,
+			             QRect(-coordUnder * retina, 0, coordOver * retina, _cacheUnder.height()));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, _cacheUnder.height() / retina, st::slideFadeOutBg);
 			p.setOpacity(1);
 		}
-		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver, QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
+		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver,
+		             QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
 		p.setOpacity(shadow);
-		st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), _cacheOver.height() / retina));
+		st::slideShadow.fill(
+		    p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), _cacheOver.height() / retina));
 		return;
 	}
 	auto aboveTop = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index fd2bc52b1..1dbddef5a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/section_widget.h"
-#include "ui/widgets/scroll_area.h"
-#include "structs.h"
 #include "dialogs/dialogs_common.h"
+#include "structs.h"
+#include "ui/widgets/scroll_area.h"
+#include "window/section_widget.h"
 
 class DialogsInner;
 
@@ -40,8 +40,7 @@ class DropdownMenu;
 class FlatButton;
 class FlatInput;
 class CrossButton;
-template <typename Widget>
-class WidgetScaledFadeWrap;
+template <typename Widget> class WidgetScaledFadeWrap;
 } // namespace Ui
 
 namespace Window {
@@ -63,7 +62,7 @@ class DialogsWidget : public Window::AbstractSectionWidget, public RPCSender {
 	Q_OBJECT
 
 public:
-	DialogsWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	DialogsWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void updateDragInScroll(bool inScroll);
 
@@ -179,7 +178,7 @@ private:
 	mtpRequestId _contactsRequestId = 0;
 	bool _pinnedDialogsReceived = false;
 
-	object_ptr<Ui::IconButton> _forwardCancel = { nullptr };
+	object_ptr<Ui::IconButton> _forwardCancel = {nullptr};
 	object_ptr<Ui::IconButton> _mainMenuToggle;
 	object_ptr<Ui::FlatInput> _filter;
 	object_ptr<Ui::WidgetScaledFadeWrap<Ui::IconButton>> _chooseFromUser;
@@ -189,7 +188,7 @@ private:
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<DialogsInner> _inner;
 	class UpdateButton;
-	object_ptr<UpdateButton> _updateTelegram = { nullptr };
+	object_ptr<UpdateButton> _updateTelegram = {nullptr};
 
 	Animation _a_show;
 	Window::SlideDirection _showDirection;
@@ -226,7 +225,6 @@ private:
 
 	QPixmap _widthAnimationCache;
 
-	object_ptr<QTimer> _draggingScrollTimer = { nullptr };
+	object_ptr<QTimer> _draggingScrollTimer = {nullptr};
 	int _draggingScrollDelta = 0;
-
 };
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index 91d53f286..8d2568c92 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -18,20 +18,20 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "profile/profile_section_memento.h"
-#include "core/click_handler_types.h"
-#include "media/media_clip_reader.h"
-#include "observer_peer.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "messenger.h"
 #include "auth_session.h"
-#include "boxes/confirm_box.h"
-#include "layerwidget.h"
-#include "lang/lang_keys.h"
 #include "base/observer.h"
 #include "base/task_queue.h"
+#include "boxes/confirm_box.h"
+#include "core/click_handler_types.h"
 #include "history/history_media.h"
+#include "lang/lang_keys.h"
+#include "layerwidget.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_clip_reader.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "profile/profile_section_memento.h"
 
 Q_DECLARE_METATYPE(ClickHandlerPtr);
 Q_DECLARE_METATYPE(Qt::MouseButton);
@@ -121,11 +121,12 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) {
 
 	case ButtonType::RequestPhone: {
 		hideSingleUseKeyboard(msg);
-		Ui::show(Box<ConfirmBox>(lang(lng_bot_share_phone), lang(lng_bot_share_phone_confirm), [peerId = msg->history()->peer->id] {
-			if (auto m = App::main()) {
-				m->onShareContact(peerId, App::self());
-			}
-		}));
+		Ui::show(Box<ConfirmBox>(lang(lng_bot_share_phone), lang(lng_bot_share_phone_confirm),
+		                         [peerId = msg->history()->peer->id] {
+			                         if (auto m = App::main()) {
+				                         m->onShareContact(peerId, App::self());
+			                         }
+		                         }));
 	} break;
 
 	case ButtonType::SwitchInlineSame:
@@ -154,7 +155,8 @@ void activateBotCommand(const HistoryItem *msg, int row, int col) {
 }
 
 void searchByHashtag(const QString &tag, PeerData *inPeer) {
-	if (MainWidget *m = main()) m->searchMessages(tag + ' ', (inPeer && inPeer->isChannel() && !inPeer->isMegagroup()) ? inPeer : 0);
+	if (MainWidget *m = main())
+		m->searchMessages(tag + ' ', (inPeer && inPeer->isChannel() && !inPeer->isMegagroup()) ? inPeer : 0);
 }
 
 void openPeerByName(const QString &username, MsgId msgId, const QString &startToken) {
@@ -185,14 +187,13 @@ void activateClickHandler(ClickHandlerPtr handler, Qt::MouseButton button) {
 	if (auto w = wnd()) {
 		qRegisterMetaType<ClickHandlerPtr>();
 		qRegisterMetaType<Qt::MouseButton>();
-		QMetaObject::invokeMethod(w, "app_activateClickHandler", Qt::QueuedConnection, Q_ARG(ClickHandlerPtr, handler), Q_ARG(Qt::MouseButton, button));
+		QMetaObject::invokeMethod(w, "app_activateClickHandler", Qt::QueuedConnection, Q_ARG(ClickHandlerPtr, handler),
+		                          Q_ARG(Qt::MouseButton, button));
 	}
 }
 
 void logOutDelayed() {
-	InvokeQueued(QCoreApplication::instance(), [] {
-		App::logOut();
-	});
+	InvokeQueued(QCoreApplication::instance(), [] { App::logOut(); });
 }
 
 } // namespace App
@@ -228,7 +229,7 @@ void hideMediaPreview() {
 
 void hideLayer(bool fast) {
 	if (auto w = App::wnd()) {
-		w->ui_showBox({ nullptr }, CloseOtherLayers | (fast ? ForceFastShowLayer : AnimatedShowLayer));
+		w->ui_showBox({nullptr}, CloseOtherLayers | (fast ? ForceFastShowLayer : AnimatedShowLayer));
 	}
 }
 
@@ -243,7 +244,7 @@ bool isLayerShown() {
 	return false;
 }
 
-void repaintHistoryItem(not_null<const HistoryItem*> item) {
+void repaintHistoryItem(not_null<const HistoryItem *> item) {
 	if (auto main = App::main()) {
 		main->ui_repaintHistoryItem(item);
 	}
@@ -251,7 +252,8 @@ void repaintHistoryItem(not_null<const HistoryItem*> item) {
 
 void autoplayMediaInlineAsync(const FullMsgId &msgId) {
 	if (auto main = App::main()) {
-		QMetaObject::invokeMethod(main, "ui_autoplayMediaInlineAsync", Qt::QueuedConnection, Q_ARG(qint32, msgId.channel), Q_ARG(qint32, msgId.msg));
+		QMetaObject::invokeMethod(main, "ui_autoplayMediaInlineAsync", Qt::QueuedConnection,
+		                          Q_ARG(qint32, msgId.channel), Q_ARG(qint32, msgId.msg));
 	}
 }
 
@@ -300,7 +302,8 @@ void showPeerHistoryAtItem(const HistoryItem *item, ShowWay way) {
 void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way) {
 	if (MainWidget *m = App::main()) {
 		qRegisterMetaType<Ui::ShowWay>();
-		QMetaObject::invokeMethod(m, "ui_showPeerHistoryAsync", Qt::QueuedConnection, Q_ARG(quint64, peer), Q_ARG(qint32, msgId), Q_ARG(Ui::ShowWay, way));
+		QMetaObject::invokeMethod(m, "ui_showPeerHistoryAsync", Qt::QueuedConnection, Q_ARG(quint64, peer),
+		                          Q_ARG(qint32, msgId), Q_ARG(Ui::ShowWay, way));
 	}
 }
 
@@ -407,20 +410,21 @@ void unreadCounterUpdated() {
 
 } // namespace Notify
 
-#define DefineReadOnlyVar(Namespace, Type, Name) const Type &Name() { \
-	AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::" #Name); \
-	return Namespace##Data->Name; \
-}
-#define DefineRefVar(Namespace, Type, Name) DefineReadOnlyVar(Namespace, Type, Name) \
-Type &Ref##Name() { \
-	AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::Ref" #Name); \
-	return Namespace##Data->Name; \
-}
-#define DefineVar(Namespace, Type, Name) DefineRefVar(Namespace, Type, Name) \
-void Set##Name(const Type &Name) { \
-	AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::Set" #Name); \
-	Namespace##Data->Name = Name; \
-}
+#define DefineReadOnlyVar(Namespace, Type, Name)                                                                       \
+	const Type &Name() {                                                                                               \
+		AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::" #Name);              \
+		return Namespace##Data->Name;                                                                                  \
+	}
+#define DefineRefVar(Namespace, Type, Name)                                                                            \
+	DefineReadOnlyVar(Namespace, Type, Name) Type &Ref##Name() {                                                       \
+		AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::Ref" #Name);           \
+		return Namespace##Data->Name;                                                                                  \
+	}
+#define DefineVar(Namespace, Type, Name)                                                                               \
+	DefineRefVar(Namespace, Type, Name) void Set##Name(const Type &Name) {                                             \
+		AssertCustom(Namespace##Data != nullptr, #Namespace "Data != nullptr in " #Namespace "::Set" #Name);           \
+		Namespace##Data->Name = Name;                                                                                  \
+	}
 
 namespace Sandbox {
 namespace internal {
@@ -502,7 +506,7 @@ void WorkingDirReady() {
 	SandboxUserTag = 0;
 	QFile usertag(cWorkingDir() + qsl("tdata/usertag"));
 	if (usertag.open(QIODevice::ReadOnly)) {
-		if (usertag.read(reinterpret_cast<char*>(&SandboxUserTag), sizeof(quint64)) != sizeof(quint64)) {
+		if (usertag.read(reinterpret_cast<char *>(&SandboxUserTag), sizeof(quint64)) != sizeof(quint64)) {
 			SandboxUserTag = 0;
 		}
 		usertag.close();
@@ -513,13 +517,13 @@ void WorkingDirReady() {
 		} while (!SandboxUserTag);
 
 		if (usertag.open(QIODevice::WriteOnly)) {
-			usertag.write(reinterpret_cast<char*>(&SandboxUserTag), sizeof(quint64));
+			usertag.write(reinterpret_cast<char *>(&SandboxUserTag), sizeof(quint64));
 			usertag.close();
 		}
 	}
 }
 
-object_ptr<SingleQueuedInvokation> MainThreadTaskHandler = { nullptr };
+object_ptr<SingleQueuedInvokation> MainThreadTaskHandler = {nullptr};
 
 void MainThreadTaskAdded() {
 	if (!started()) {
@@ -530,9 +534,7 @@ void MainThreadTaskAdded() {
 }
 
 void start() {
-	MainThreadTaskHandler.create([] {
-		base::TaskQueue::ProcessMainTasks();
-	});
+	MainThreadTaskHandler.create([] { base::TaskQueue::ProcessMainTasks(); });
 	SandboxData = std::make_unique<internal::Data>();
 }
 
@@ -558,10 +560,10 @@ namespace Global {
 namespace internal {
 
 struct Data {
-	SingleQueuedInvokation HandleHistoryUpdate = { [] { Messenger::Instance().call_handleHistoryUpdate(); } };
-	SingleQueuedInvokation HandleUnreadCounterUpdate = { [] { Messenger::Instance().call_handleUnreadCounterUpdate(); } };
-	SingleQueuedInvokation HandleDelayedPeerUpdates = { [] { Messenger::Instance().call_handleDelayedPeerUpdates(); } };
-	SingleQueuedInvokation HandleObservables = { [] { Messenger::Instance().call_handleObservables(); } };
+	SingleQueuedInvokation HandleHistoryUpdate = {[] { Messenger::Instance().call_handleHistoryUpdate(); }};
+	SingleQueuedInvokation HandleUnreadCounterUpdate = {[] { Messenger::Instance().call_handleUnreadCounterUpdate(); }};
+	SingleQueuedInvokation HandleDelayedPeerUpdates = {[] { Messenger::Instance().call_handleDelayedPeerUpdates(); }};
+	SingleQueuedInvokation HandleObservables = {[] { Messenger::Instance().call_handleObservables(); }};
 
 	Adaptive::WindowLayout AdaptiveWindowLayout = Adaptive::WindowLayout::Normal;
 	Adaptive::ChatLayout AdaptiveChatLayout = Adaptive::ChatLayout::Normal;
@@ -653,12 +655,11 @@ struct Data {
 	bool LocalPasscode = false;
 	base::Observable<void> LocalPasscodeChanged;
 
-	base::Variable<DBIWorkMode> WorkMode = { dbiwmWindowAndTray };
+	base::Variable<DBIWorkMode> WorkMode = {dbiwmWindowAndTray};
 
-	base::Observable<HistoryItem*> ItemRemoved;
+	base::Observable<HistoryItem *> ItemRemoved;
 	base::Observable<void> UnreadCounterUpdate;
 	base::Observable<void> PeerChooseCancel;
-
 };
 
 } // namespace internal
@@ -778,7 +779,7 @@ DefineRefVar(Global, base::Observable<void>, LocalPasscodeChanged);
 
 DefineRefVar(Global, base::Variable<DBIWorkMode>, WorkMode);
 
-DefineRefVar(Global, base::Observable<HistoryItem*>, ItemRemoved);
+DefineRefVar(Global, base::Observable<HistoryItem *>, ItemRemoved);
 DefineRefVar(Global, base::Observable<void>, UnreadCounterUpdate);
 DefineRefVar(Global, base::Observable<void>, PeerChooseCancel);
 
diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h
index b44d78ab7..f319e9f50 100644
--- a/Telegram/SourceFiles/facades.h
+++ b/Telegram/SourceFiles/facades.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/lambda_guard.h"
-#include "structs.h"
 #include "history/history.h" // For MediaOverviewType ffs..
+#include "structs.h"
 
 class PeerData;
 class LayerWidget;
@@ -49,22 +49,21 @@ inline void CallDelayed(int duration, base::lambda_internal::guard<N, Lambda> &&
 	return internal::CallDelayed(duration, [guarded = std::move(guarded)] { guarded(); });
 }
 
-template <typename Pointer, typename ...PointersAndLambda>
-inline void CallDelayed(int duration, Pointer &&qobject, PointersAndLambda&&... qobjectsAndLambda) {
-	auto guarded = base::lambda_guarded(std::forward<Pointer>(qobject), std::forward<PointersAndLambda>(qobjectsAndLambda)...);
+template <typename Pointer, typename... PointersAndLambda>
+inline void CallDelayed(int duration, Pointer &&qobject, PointersAndLambda &&... qobjectsAndLambda) {
+	auto guarded =
+	    base::lambda_guarded(std::forward<Pointer>(qobject), std::forward<PointersAndLambda>(qobjectsAndLambda)...);
 	return CallDelayed(duration, std::move(guarded));
 }
 
-template <typename ...PointersAndLambda>
-inline base::lambda<void()> LambdaDelayed(int duration, PointersAndLambda&&... qobjectsAndLambda) {
+template <typename... PointersAndLambda>
+inline base::lambda<void()> LambdaDelayed(int duration, PointersAndLambda &&... qobjectsAndLambda) {
 	auto guarded = base::lambda_guarded(std::forward<PointersAndLambda>(qobjectsAndLambda)...);
-	return [guarded = std::move(guarded), duration] {
-		internal::CallDelayed(duration, [guarded] { guarded(); });
-	};
+	return [guarded = std::move(guarded), duration] { internal::CallDelayed(duration, [guarded] { guarded(); }); };
 }
 
-template <typename ...PointersAndLambda>
-inline base::lambda_once<void()> LambdaDelayedOnce(int duration, PointersAndLambda&&... qobjectsAndLambda) {
+template <typename... PointersAndLambda>
+inline base::lambda_once<void()> LambdaDelayedOnce(int duration, PointersAndLambda &&... qobjectsAndLambda) {
 	auto guarded = base::lambda_guarded(std::forward<PointersAndLambda>(qobjectsAndLambda)...);
 	return [guarded = std::move(guarded), duration]() mutable {
 		internal::CallDelayed(duration, [guarded = std::move(guarded)] { guarded(); });
@@ -109,7 +108,7 @@ void hideLayer(bool fast = false);
 void hideSettingsAndLayer(bool fast = false);
 bool isLayerShown();
 
-void repaintHistoryItem(not_null<const HistoryItem*> item);
+void repaintHistoryItem(not_null<const HistoryItem *> item);
 void autoplayMediaInlineAsync(const FullMsgId &msgId);
 
 void showPeerProfile(const PeerId &peer);
@@ -165,10 +164,10 @@ void unreadCounterUpdated();
 
 
 enum class ScreenCorner {
-	TopLeft     = 0,
-	TopRight    = 1,
+	TopLeft = 0,
+	TopRight = 1,
 	BottomRight = 2,
-	BottomLeft  = 3,
+	BottomLeft = 3,
 };
 
 inline bool IsLeftCorner(ScreenCorner corner) {
@@ -182,10 +181,8 @@ inline bool IsTopCorner(ScreenCorner corner) {
 } // namespace Notify
 
 #define DeclareReadOnlyVar(Type, Name) const Type &Name();
-#define DeclareRefVar(Type, Name) DeclareReadOnlyVar(Type, Name) \
-	Type &Ref##Name();
-#define DeclareVar(Type, Name) DeclareRefVar(Type, Name) \
-	void Set##Name(const Type &Name);
+#define DeclareRefVar(Type, Name) DeclareReadOnlyVar(Type, Name) Type &Ref##Name();
+#define DeclareVar(Type, Name) DeclareRefVar(Type, Name) void Set##Name(const Type &Name);
 
 namespace Sandbox {
 
@@ -237,15 +234,15 @@ constexpr auto FeaturedSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFB); // for emoji/stic
 constexpr auto FavedSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFFA); // for cloud-stored faved stickers
 constexpr auto MegagroupSetId = Q_UINT64_C(0xFFFFFFFFFFFFFFEF); // for setting up megagroup sticker set
 struct Set {
-	Set(quint64 id, quint64 access, const QString &title, const QString &shortName, qint32 count, qint32 hash, MTPDstickerSet::Flags flags)
-		: id(id)
-		, access(access)
-		, title(title)
-		, shortName(shortName)
-		, count(count)
-		, hash(hash)
-		, flags(flags) {
-	}
+	Set(quint64 id, quint64 access, const QString &title, const QString &shortName, qint32 count, qint32 hash,
+	    MTPDstickerSet::Flags flags)
+	    : id(id)
+	    , access(access)
+	    , title(title)
+	    , shortName(shortName)
+	    , count(count)
+	    , hash(hash)
+	    , flags(flags) {}
 	quint64 id, access;
 	QString title, shortName;
 	qint32 count, hash;
@@ -327,7 +324,7 @@ DeclareRefVar(base::Observable<void>, PhoneCallsEnabledChanged);
 typedef QMap<PeerId, MsgId> HiddenPinnedMessagesMap;
 DeclareVar(HiddenPinnedMessagesMap, HiddenPinnedMessages);
 
-typedef OrderedSet<HistoryItem*> PendingItemsMap;
+typedef OrderedSet<HistoryItem *> PendingItemsMap;
 DeclareRefVar(PendingItemsMap, PendingRepaintItems);
 
 DeclareVar(Stickers::Sets, StickerSets);
@@ -373,7 +370,7 @@ DeclareRefVar(base::Observable<void>, LocalPasscodeChanged);
 
 DeclareRefVar(base::Variable<DBIWorkMode>, WorkMode);
 
-DeclareRefVar(base::Observable<HistoryItem*>, ItemRemoved);
+DeclareRefVar(base::Observable<HistoryItem *>, ItemRemoved);
 DeclareRefVar(base::Observable<void>, UnreadCounterUpdate);
 DeclareRefVar(base::Observable<void>, PeerChooseCancel);
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 946e45305..260be7a47 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -19,24 +19,24 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history.h"
-#include "lang_auto.h"
-#include "layout.h"
-#include "history_message.h"
-#include "history_media_types.h"
-#include "facades.h"
-#include "auth_session.h"
-#include "data/data_drafts.h"
-#include "app.h"
-#include "mainwidget.h"
-#include "styles/style_dialogs.h"
 #include "apiwrap.h"
-#include "history_service.h"
-#include "observer_peer.h"
+#include "app.h"
+#include "auth_session.h"
 #include "calls/calls_instance.h"
-#include "messenger.h"
+#include "data/data_drafts.h"
 #include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_row.h"
+#include "facades.h"
+#include "history_media_types.h"
+#include "history_message.h"
+#include "history_service.h"
+#include "lang_auto.h"
+#include "layout.h"
+#include "mainwidget.h"
+#include "messenger.h"
+#include "observer_peer.h"
 #include "storage/localstorage.h"
+#include "styles/style_dialogs.h"
 
 namespace {
 
@@ -57,8 +57,9 @@ constexpr auto kNewBlockEachMessage = 50;
 
 auto GlobalPinnedIndex = 0;
 
-HistoryItem *createUnsupportedMessage(History *history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, qint32 viaBotId, QDateTime date, qint32 from) {
-	auto text = TextWithEntities { lng_message_unsupported(lt_link, qsl("https://desktop.telegram.org")) };
+HistoryItem *createUnsupportedMessage(History *history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo,
+                                      qint32 viaBotId, QDateTime date, qint32 from) {
+	auto text = TextWithEntities{lng_message_unsupported(lt_link, qsl("https://desktop.telegram.org"))};
 	TextUtilities::ParseEntities(text, _historyTextNoMonoOptions.flags);
 	text.entities.push_front(EntityInText(EntityInTextItalic, 0, text.text.size()));
 	flags &= ~MTPDmessage::Flag::f_post_author;
@@ -73,11 +74,11 @@ void HistoryInit() {
 }
 
 History::History(const PeerId &peerId)
-: peer(App::peer(peerId))
-, lastItemTextCache(st::dialogsTextWidthMin)
-, cloudDraftTextCache(st::dialogsTextWidthMin)
-, _mute(isNotifyMuted(peer->notify))
-, _sendActionText(st::dialogsTextWidthMin) {
+    : peer(App::peer(peerId))
+    , lastItemTextCache(st::dialogsTextWidthMin)
+    , cloudDraftTextCache(st::dialogsTextWidthMin)
+    , _mute(isNotifyMuted(peer->notify))
+    , _sendActionText(st::dialogsTextWidthMin) {
 	if (peer->isUser() && peer->asUser()->botInfo) {
 		outboxReadBefore = INT_MAX;
 	}
@@ -139,7 +140,8 @@ void History::createLocalDraftFromCloud() {
 	auto existing = localDraft();
 	if (Data::draftIsNull(existing) || !existing->date.isValid() || draft->date >= existing->date) {
 		if (!existing) {
-			setLocalDraft(std::make_unique<Data::Draft>(draft->textWithTags, draft->msgId, draft->cursor, draft->previewCancelled));
+			setLocalDraft(std::make_unique<Data::Draft>(draft->textWithTags, draft->msgId, draft->cursor,
+			                                            draft->previewCancelled));
 			existing = localDraft();
 		} else if (existing != draft) {
 			existing->textWithTags = draft->textWithTags;
@@ -163,7 +165,8 @@ Data::Draft *History::createCloudDraft(Data::Draft *fromDraft) {
 	} else {
 		auto existing = cloudDraft();
 		if (!existing) {
-			setCloudDraft(std::make_unique<Data::Draft>(fromDraft->textWithTags, fromDraft->msgId, fromDraft->cursor, fromDraft->previewCancelled));
+			setCloudDraft(std::make_unique<Data::Draft>(fromDraft->textWithTags, fromDraft->msgId, fromDraft->cursor,
+			                                            fromDraft->previewCancelled));
 			existing = cloudDraft();
 		} else if (existing != fromDraft) {
 			existing->textWithTags = fromDraft->textWithTags;
@@ -222,9 +225,7 @@ SelectedItemSet History::validateForwardDraft() {
 void History::setForwardDraft(const SelectedItemSet &items) {
 	_forwardDraft.clear();
 	_forwardDraft.reserve(items.size());
-	for_const (auto item, items) {
-		_forwardDraft.push_back(item->fullId());
-	}
+	for_const (auto item, items) { _forwardDraft.push_back(item->fullId()); }
 }
 
 bool History::updateSendActionNeedsAnimating(UserData *user, const MTPSendMessageAction &action) {
@@ -237,20 +238,44 @@ bool History::updateSendActionNeedsAnimating(UserData *user, const MTPSendMessag
 	auto ms = getms();
 	switch (action.type()) {
 	case mtpc_sendMessageTypingAction: _typing.insert(user, ms + kStatusShowClientsideTyping); break;
-	case mtpc_sendMessageRecordVideoAction: _sendActions.insert(user, { Type::RecordVideo, ms + kStatusShowClientsideRecordVideo }); break;
-	case mtpc_sendMessageUploadVideoAction: _sendActions.insert(user, { Type::UploadVideo, ms + kStatusShowClientsideUploadVideo, action.c_sendMessageUploadVideoAction().vprogress.v }); break;
-	case mtpc_sendMessageRecordAudioAction: _sendActions.insert(user, { Type::RecordVoice, ms + kStatusShowClientsideRecordVoice }); break;
-	case mtpc_sendMessageUploadAudioAction: _sendActions.insert(user, { Type::UploadVoice, ms + kStatusShowClientsideUploadVoice, action.c_sendMessageUploadAudioAction().vprogress.v }); break;
-	case mtpc_sendMessageRecordRoundAction: _sendActions.insert(user, { Type::RecordRound, ms + kStatusShowClientsideRecordRound }); break;
-	case mtpc_sendMessageUploadRoundAction: _sendActions.insert(user, { Type::UploadRound, ms + kStatusShowClientsideUploadRound }); break;
-	case mtpc_sendMessageUploadPhotoAction: _sendActions.insert(user, { Type::UploadPhoto, ms + kStatusShowClientsideUploadPhoto, action.c_sendMessageUploadPhotoAction().vprogress.v }); break;
-	case mtpc_sendMessageUploadDocumentAction: _sendActions.insert(user, { Type::UploadFile, ms + kStatusShowClientsideUploadFile, action.c_sendMessageUploadDocumentAction().vprogress.v }); break;
-	case mtpc_sendMessageGeoLocationAction: _sendActions.insert(user, { Type::ChooseLocation, ms + kStatusShowClientsideChooseLocation }); break;
-	case mtpc_sendMessageChooseContactAction: _sendActions.insert(user, { Type::ChooseContact, ms + kStatusShowClientsideChooseContact }); break;
+	case mtpc_sendMessageRecordVideoAction:
+		_sendActions.insert(user, {Type::RecordVideo, ms + kStatusShowClientsideRecordVideo});
+		break;
+	case mtpc_sendMessageUploadVideoAction:
+		_sendActions.insert(user, {Type::UploadVideo, ms + kStatusShowClientsideUploadVideo,
+		                           action.c_sendMessageUploadVideoAction().vprogress.v});
+		break;
+	case mtpc_sendMessageRecordAudioAction:
+		_sendActions.insert(user, {Type::RecordVoice, ms + kStatusShowClientsideRecordVoice});
+		break;
+	case mtpc_sendMessageUploadAudioAction:
+		_sendActions.insert(user, {Type::UploadVoice, ms + kStatusShowClientsideUploadVoice,
+		                           action.c_sendMessageUploadAudioAction().vprogress.v});
+		break;
+	case mtpc_sendMessageRecordRoundAction:
+		_sendActions.insert(user, {Type::RecordRound, ms + kStatusShowClientsideRecordRound});
+		break;
+	case mtpc_sendMessageUploadRoundAction:
+		_sendActions.insert(user, {Type::UploadRound, ms + kStatusShowClientsideUploadRound});
+		break;
+	case mtpc_sendMessageUploadPhotoAction:
+		_sendActions.insert(user, {Type::UploadPhoto, ms + kStatusShowClientsideUploadPhoto,
+		                           action.c_sendMessageUploadPhotoAction().vprogress.v});
+		break;
+	case mtpc_sendMessageUploadDocumentAction:
+		_sendActions.insert(user, {Type::UploadFile, ms + kStatusShowClientsideUploadFile,
+		                           action.c_sendMessageUploadDocumentAction().vprogress.v});
+		break;
+	case mtpc_sendMessageGeoLocationAction:
+		_sendActions.insert(user, {Type::ChooseLocation, ms + kStatusShowClientsideChooseLocation});
+		break;
+	case mtpc_sendMessageChooseContactAction:
+		_sendActions.insert(user, {Type::ChooseContact, ms + kStatusShowClientsideChooseContact});
+		break;
 	case mtpc_sendMessageGamePlayAction: {
 		auto it = _sendActions.find(user);
 		if (it == _sendActions.end() || it->type == Type::PlayGame || it->until <= ms) {
-			_sendActions.insert(user, { Type::PlayGame, ms + kStatusShowClientsidePlayGame });
+			_sendActions.insert(user, {Type::PlayGame, ms + kStatusShowClientsidePlayGame});
 		}
 	} break;
 	default: return false;
@@ -281,7 +306,8 @@ bool History::mySendActionUpdated(SendAction::Type type, bool doing) {
 	return true;
 }
 
-bool History::paintSendAction(Painter &p, int x, int y, int availableWidth, int outerWidth, style::color color, TimeMs ms) {
+bool History::paintSendAction(Painter &p, int x, int y, int availableWidth, int outerWidth, style::color color,
+                              TimeMs ms) {
 	if (_sendActionAnimation) {
 		_sendActionAnimation.paint(p, color, x, y + st::normalFont->ascent, outerWidth, ms);
 		auto animationWidth = _sendActionAnimation.width();
@@ -318,24 +344,46 @@ bool History::updateSendActionNeedsAnimating(TimeMs ms, bool force) {
 		if (typingCount > 2) {
 			newTypingString = lng_many_typing(lt_count, typingCount);
 		} else if (typingCount > 1) {
-			newTypingString = lng_users_typing(lt_user, _typing.begin().key()->firstName, lt_second_user, (_typing.end() - 1).key()->firstName);
+			newTypingString = lng_users_typing(lt_user, _typing.begin().key()->firstName, lt_second_user,
+			                                   (_typing.end() - 1).key()->firstName);
 		} else if (typingCount) {
-			newTypingString = peer->isUser() ? lang(lng_typing) : lng_user_typing(lt_user, _typing.begin().key()->firstName);
+			newTypingString =
+			    peer->isUser() ? lang(lng_typing) : lng_user_typing(lt_user, _typing.begin().key()->firstName);
 		} else if (!_sendActions.isEmpty()) {
 			// Handles all actions except game playing.
 			using Type = SendAction::Type;
 			auto sendActionString = [](Type type, const QString &name) -> QString {
 				switch (type) {
-				case Type::RecordVideo: return name.isEmpty() ? lang(lng_send_action_record_video) : lng_user_action_record_video(lt_user, name);
-				case Type::UploadVideo: return name.isEmpty() ? lang(lng_send_action_upload_video) : lng_user_action_upload_video(lt_user, name);
-				case Type::RecordVoice: return name.isEmpty() ? lang(lng_send_action_record_audio) : lng_user_action_record_audio(lt_user, name);
-				case Type::UploadVoice: return name.isEmpty() ? lang(lng_send_action_upload_audio) : lng_user_action_upload_audio(lt_user, name);
-				case Type::RecordRound: return name.isEmpty() ? lang(lng_send_action_record_round) : lng_user_action_record_round(lt_user, name);
-				case Type::UploadRound: return name.isEmpty() ? lang(lng_send_action_upload_round) : lng_user_action_upload_round(lt_user, name);
-				case Type::UploadPhoto: return name.isEmpty() ? lang(lng_send_action_upload_photo) : lng_user_action_upload_photo(lt_user, name);
-				case Type::UploadFile: return name.isEmpty() ? lang(lng_send_action_upload_file) : lng_user_action_upload_file(lt_user, name);
-				case Type::ChooseLocation: return name.isEmpty() ? lang(lng_send_action_geo_location) : lng_user_action_geo_location(lt_user, name);
-				case Type::ChooseContact: return name.isEmpty() ? lang(lng_send_action_choose_contact) : lng_user_action_choose_contact(lt_user, name);
+				case Type::RecordVideo:
+					return name.isEmpty() ? lang(lng_send_action_record_video) :
+					                        lng_user_action_record_video(lt_user, name);
+				case Type::UploadVideo:
+					return name.isEmpty() ? lang(lng_send_action_upload_video) :
+					                        lng_user_action_upload_video(lt_user, name);
+				case Type::RecordVoice:
+					return name.isEmpty() ? lang(lng_send_action_record_audio) :
+					                        lng_user_action_record_audio(lt_user, name);
+				case Type::UploadVoice:
+					return name.isEmpty() ? lang(lng_send_action_upload_audio) :
+					                        lng_user_action_upload_audio(lt_user, name);
+				case Type::RecordRound:
+					return name.isEmpty() ? lang(lng_send_action_record_round) :
+					                        lng_user_action_record_round(lt_user, name);
+				case Type::UploadRound:
+					return name.isEmpty() ? lang(lng_send_action_upload_round) :
+					                        lng_user_action_upload_round(lt_user, name);
+				case Type::UploadPhoto:
+					return name.isEmpty() ? lang(lng_send_action_upload_photo) :
+					                        lng_user_action_upload_photo(lt_user, name);
+				case Type::UploadFile:
+					return name.isEmpty() ? lang(lng_send_action_upload_file) :
+					                        lng_user_action_upload_file(lt_user, name);
+				case Type::ChooseLocation:
+					return name.isEmpty() ? lang(lng_send_action_geo_location) :
+					                        lng_user_action_geo_location(lt_user, name);
+				case Type::ChooseContact:
+					return name.isEmpty() ? lang(lng_send_action_choose_contact) :
+					                        lng_user_action_choose_contact(lt_user, name);
 				default: break;
 				};
 				return QString();
@@ -354,9 +402,12 @@ bool History::updateSendActionNeedsAnimating(TimeMs ms, bool force) {
 				if (playingCount > 2) {
 					newTypingString = lng_many_playing_game(lt_count, playingCount);
 				} else if (playingCount > 1) {
-					newTypingString = lng_users_playing_game(lt_user, _sendActions.begin().key()->firstName, lt_second_user, (_sendActions.end() - 1).key()->firstName);
+					newTypingString = lng_users_playing_game(lt_user, _sendActions.begin().key()->firstName,
+					                                         lt_second_user, (_sendActions.end() - 1).key()->firstName);
 				} else {
-					newTypingString = peer->isUser() ? lang(lng_playing_game) : lng_user_playing_game(lt_user, _sendActions.begin().key()->firstName);
+					newTypingString = peer->isUser() ?
+					                      lang(lng_playing_game) :
+					                      lng_user_playing_game(lt_user, _sendActions.begin().key()->firstName);
 				}
 				_sendActionAnimation.start(Type::PlayGame);
 			}
@@ -373,12 +424,8 @@ bool History::updateSendActionNeedsAnimating(TimeMs ms, bool force) {
 	}
 	auto result = (!_typing.isEmpty() || !_sendActions.isEmpty());
 	if (changed || result) {
-		App::histories().sendActionAnimationUpdated().notify({
-			this,
-			_sendActionAnimation.width(),
-			st::normalFont->height,
-			changed
-		});
+		App::histories().sendActionAnimationUpdated().notify(
+		    {this, _sendActionAnimation.width(), st::normalFont->height, changed});
 	}
 	return result;
 }
@@ -417,7 +464,10 @@ void ChannelHistory::getRangeDifference() {
 		_rangeDifferenceFromId = fromId;
 		_rangeDifferenceToId = toId;
 
-		MTP_LOG(0, ("getChannelDifference { good - after channelDifferenceTooLong was received, validating history part }%1").arg(cTestMode() ? " TESTMODE" : ""));
+		MTP_LOG(
+		    0,
+		    ("getChannelDifference { good - after channelDifferenceTooLong was received, validating history part }%1")
+		        .arg(cTestMode() ? " TESTMODE" : ""));
 		getRangeDifferenceNext(peer->asChannel()->pts());
 	}
 }
@@ -427,13 +477,19 @@ void ChannelHistory::getRangeDifferenceNext(qint32 pts) {
 
 	int limit = _rangeDifferenceToId + 1 - _rangeDifferenceFromId;
 
-	auto filter = MTP_channelMessagesFilter(MTP_flags(0), MTP_vector<MTPMessageRange>(1, MTP_messageRange(MTP_int(_rangeDifferenceFromId), MTP_int(_rangeDifferenceToId))));
+	auto filter = MTP_channelMessagesFilter(
+	    MTP_flags(0), MTP_vector<MTPMessageRange>(
+	                      1, MTP_messageRange(MTP_int(_rangeDifferenceFromId), MTP_int(_rangeDifferenceToId))));
 	auto flags = MTPupdates_GetChannelDifference::Flag::f_force;
-	_rangeDifferenceRequestId = MTP::send(MTPupdates_GetChannelDifference(MTP_flags(flags), peer->asChannel()->inputChannel, filter, MTP_int(pts), MTP_int(limit)), App::main()->rpcDone(&MainWidget::gotRangeDifference, peer->asChannel()));
+	_rangeDifferenceRequestId =
+	    MTP::send(MTPupdates_GetChannelDifference(MTP_flags(flags), peer->asChannel()->inputChannel, filter,
+	                                              MTP_int(pts), MTP_int(limit)),
+	              App::main()->rpcDone(&MainWidget::gotRangeDifference, peer->asChannel()));
 }
 
 HistoryJoined *ChannelHistory::insertJoinedMessage(bool unread) {
-	if (_joinedMessage || !peer->asChannel()->amIn() || (peer->isMegagroup() && peer->asChannel()->mgInfo->joinedMessageFound)) {
+	if (_joinedMessage || !peer->asChannel()->amIn() ||
+	    (peer->isMegagroup() && peer->asChannel()->mgInfo->joinedMessageFound)) {
 		return _joinedMessage;
 	}
 
@@ -443,8 +499,8 @@ HistoryJoined *ChannelHistory::insertJoinedMessage(bool unread) {
 	MTPDmessage::Flags flags = 0;
 	if (inviter->id == Auth().userPeerId()) {
 		unread = false;
-	//} else if (unread) {
-	//	flags |= MTPDmessage::Flag::f_unread;
+		//} else if (unread) {
+		//	flags |= MTPDmessage::Flag::f_unread;
 	}
 
 	QDateTime inviteDate = peer->asChannel()->inviteDate;
@@ -513,7 +569,8 @@ void ChannelHistory::checkJoinedMessage(bool createUnread) {
 		firstDate = blocks.front()->items.front()->date;
 		lastDate = blocks.back()->items.back()->date;
 	}
-	if (!firstDate.isNull() && !lastDate.isNull() && (firstDate <= inviteDate || loadedAtTop()) && (lastDate > inviteDate || loadedAtBottom())) {
+	if (!firstDate.isNull() && !lastDate.isNull() && (firstDate <= inviteDate || loadedAtTop()) &&
+	    (lastDate > inviteDate || loadedAtBottom())) {
 		bool willBeLastMsg = (inviteDate >= lastDate);
 		if (insertJoinedMessage(createUnread && willBeLastMsg) && willBeLastMsg) {
 			if (!_joinedMessage->detached()) {
@@ -590,19 +647,22 @@ History *Histories::find(const PeerId &peerId) {
 	return (i == map.cend()) ? 0 : i.value();
 }
 
-not_null<History*> Histories::findOrInsert(const PeerId &peerId) {
+not_null<History *> Histories::findOrInsert(const PeerId &peerId) {
 	auto i = map.constFind(peerId);
 	if (i == map.cend()) {
-		auto history = peerIsChannel(peerId) ? static_cast<History*>(new ChannelHistory(peerId)) : (new History(peerId));
+		auto history =
+		    peerIsChannel(peerId) ? static_cast<History *>(new ChannelHistory(peerId)) : (new History(peerId));
 		i = map.insert(peerId, history);
 	}
 	return i.value();
 }
 
-not_null<History*> Histories::findOrInsert(const PeerId &peerId, qint32 unreadCount, qint32 maxInboxRead, qint32 maxOutboxRead) {
+not_null<History *> Histories::findOrInsert(const PeerId &peerId, qint32 unreadCount, qint32 maxInboxRead,
+                                            qint32 maxOutboxRead) {
 	auto i = map.constFind(peerId);
 	if (i == map.cend()) {
-		auto history = peerIsChannel(peerId) ? static_cast<History*>(new ChannelHistory(peerId)) : (new History(peerId));
+		auto history =
+		    peerIsChannel(peerId) ? static_cast<History *>(new ChannelHistory(peerId)) : (new History(peerId));
 		i = map.insert(peerId, history);
 		history->setUnreadCount(unreadCount);
 		history->inboxReadBefore = maxInboxRead + 1;
@@ -623,9 +683,7 @@ void Histories::clear() {
 
 	_pinnedDialogs.clear();
 	auto temp = base::take(map);
-	for_const (auto history, temp) {
-		delete history;
-	}
+	for_const (auto history, temp) { delete history; }
 
 	_unreadFull = _unreadMuted = 0;
 	Notify::unreadCounterUpdated();
@@ -716,7 +774,7 @@ void Histories::setIsPinned(History *history, bool isPinned) {
 		_pinnedDialogs.insert(history);
 		if (_pinnedDialogs.size() > Global::PinnedDialogsCountMax()) {
 			auto minIndex = GlobalPinnedIndex + 1;
-			auto minIndexHistory = (History*)nullptr;
+			auto minIndexHistory = (History *)nullptr;
 			for_const (auto pinned, _pinnedDialogs) {
 				if (pinned->getPinnedIndex() < minIndex) {
 					minIndex = pinned->getPinnedIndex();
@@ -741,12 +799,10 @@ int Histories::pinnedCount() const {
 	return _pinnedDialogs.size();
 }
 
-QList<History*> Histories::getPinnedOrder() const {
-	QMap<int, History*> sorter;
-	for_const (auto pinned, _pinnedDialogs) {
-		sorter.insert(pinned->getPinnedIndex(), pinned);
-	}
-	QList<History*> result;
+QList<History *> Histories::getPinnedOrder() const {
+	QMap<int, History *> sorter;
+	for_const (auto pinned, _pinnedDialogs) { sorter.insert(pinned->getPinnedIndex(), pinned); }
+	QList<History *> result;
 	for (auto i = sorter.cend(), e = sorter.cbegin(); i != e;) {
 		--i;
 		result.push_back(i.value());
@@ -758,14 +814,12 @@ void Histories::savePinnedToServer() const {
 	auto order = getPinnedOrder();
 	auto peers = QVector<MTPInputPeer>();
 	peers.reserve(order.size());
-	for_const (auto history, order) {
-		peers.push_back(history->peer->input);
-	}
+	for_const (auto history, order) { peers.push_back(history->peer->input); }
 	auto flags = MTPmessages_ReorderPinnedDialogs::Flag::f_force;
 	MTP::send(MTPmessages_ReorderPinnedDialogs(MTP_flags(flags), MTP_vector(peers)));
 }
 
-void Histories::selfDestructIn(not_null<HistoryItem*> item, TimeMs delay) {
+void Histories::selfDestructIn(not_null<HistoryItem *> item, TimeMs delay) {
 	_selfDestructItems.push_back(item->fullId());
 	if (!_selfDestructTimer.isActive() || _selfDestructTimer.remainingTime() > delay) {
 		_selfDestructTimer.callOnce(delay);
@@ -821,7 +875,7 @@ HistoryItem *History::createItem(const MTPMessage &msg, bool applyServiceAction,
 
 	switch (msg.type()) {
 	case mtpc_messageEmpty: {
-		auto message = HistoryService::PreparedText { lang(lng_message_empty) };
+		auto message = HistoryService::PreparedText{lang(lng_message_empty)};
 		result = HistoryService::create(this, msg.c_messageEmpty().vid.v, date(), message);
 	} break;
 
@@ -835,75 +889,76 @@ HistoryItem *History::createItem(const MTPMessage &msg, bool applyServiceAction,
 		};
 		auto badMedia = MediaCheckResult::Good;
 		if (m.has_media()) switch (m.vmedia.type()) {
-		case mtpc_messageMediaEmpty:
-		case mtpc_messageMediaContact: break;
-		case mtpc_messageMediaGeo:
-			switch (m.vmedia.c_messageMediaGeo().vgeo.type()) {
-			case mtpc_geoPoint: break;
-			case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
-			default: badMedia = MediaCheckResult::Unsupported; break;
-			}
-			break;
-		case mtpc_messageMediaVenue:
-			switch (m.vmedia.c_messageMediaVenue().vgeo.type()) {
-			case mtpc_geoPoint: break;
-			case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
-			default: badMedia = MediaCheckResult::Unsupported; break;
-			}
-			break;
-		case mtpc_messageMediaPhoto: {
-			auto &photo = m.vmedia.c_messageMediaPhoto();
-			if (photo.has_ttl_seconds()) {
-				badMedia = MediaCheckResult::HasTimeToLive;
-			} else if (!photo.has_photo()) {
-				badMedia = MediaCheckResult::Empty;
-			} else {
-				switch (photo.vphoto.type()) {
-				case mtpc_photo: break;
-				case mtpc_photoEmpty: badMedia = MediaCheckResult::Empty; break;
+			case mtpc_messageMediaEmpty:
+			case mtpc_messageMediaContact: break;
+			case mtpc_messageMediaGeo:
+				switch (m.vmedia.c_messageMediaGeo().vgeo.type()) {
+				case mtpc_geoPoint: break;
+				case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
 				default: badMedia = MediaCheckResult::Unsupported; break;
 				}
-			}
-		} break;
-		case mtpc_messageMediaDocument: {
-			auto &document = m.vmedia.c_messageMediaDocument();
-			if (document.has_ttl_seconds()) {
-				badMedia = MediaCheckResult::HasTimeToLive;
-			} else if (!document.has_document()) {
-				badMedia = MediaCheckResult::Empty;
-			} else {
-				switch (document.vdocument.type()) {
-				case mtpc_document: break;
-				case mtpc_documentEmpty: badMedia = MediaCheckResult::Empty; break;
+				break;
+			case mtpc_messageMediaVenue:
+				switch (m.vmedia.c_messageMediaVenue().vgeo.type()) {
+				case mtpc_geoPoint: break;
+				case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
 				default: badMedia = MediaCheckResult::Unsupported; break;
 				}
-			}
-		} break;
-		case mtpc_messageMediaWebPage:
-			switch (m.vmedia.c_messageMediaWebPage().vwebpage.type()) {
-			case mtpc_webPage:
-			case mtpc_webPageEmpty:
-			case mtpc_webPagePending: break;
-			case mtpc_webPageNotModified:
+				break;
+			case mtpc_messageMediaPhoto: {
+				auto &photo = m.vmedia.c_messageMediaPhoto();
+				if (photo.has_ttl_seconds()) {
+					badMedia = MediaCheckResult::HasTimeToLive;
+				} else if (!photo.has_photo()) {
+					badMedia = MediaCheckResult::Empty;
+				} else {
+					switch (photo.vphoto.type()) {
+					case mtpc_photo: break;
+					case mtpc_photoEmpty: badMedia = MediaCheckResult::Empty; break;
+					default: badMedia = MediaCheckResult::Unsupported; break;
+					}
+				}
+			} break;
+			case mtpc_messageMediaDocument: {
+				auto &document = m.vmedia.c_messageMediaDocument();
+				if (document.has_ttl_seconds()) {
+					badMedia = MediaCheckResult::HasTimeToLive;
+				} else if (!document.has_document()) {
+					badMedia = MediaCheckResult::Empty;
+				} else {
+					switch (document.vdocument.type()) {
+					case mtpc_document: break;
+					case mtpc_documentEmpty: badMedia = MediaCheckResult::Empty; break;
+					default: badMedia = MediaCheckResult::Unsupported; break;
+					}
+				}
+			} break;
+			case mtpc_messageMediaWebPage:
+				switch (m.vmedia.c_messageMediaWebPage().vwebpage.type()) {
+				case mtpc_webPage:
+				case mtpc_webPageEmpty:
+				case mtpc_webPagePending: break;
+				case mtpc_webPageNotModified:
+				default: badMedia = MediaCheckResult::Unsupported; break;
+				}
+				break;
+			case mtpc_messageMediaGame:
+				switch (m.vmedia.c_messageMediaGame().vgame.type()) {
+				case mtpc_game: break;
+				default: badMedia = MediaCheckResult::Unsupported; break;
+				}
+				break;
+			case mtpc_messageMediaInvoice: break;
+			case mtpc_messageMediaUnsupported:
 			default: badMedia = MediaCheckResult::Unsupported; break;
 			}
-			break;
-		case mtpc_messageMediaGame:
-		switch (m.vmedia.c_messageMediaGame().vgame.type()) {
-			case mtpc_game: break;
-			default: badMedia = MediaCheckResult::Unsupported; break;
-			}
-			break;
-		case mtpc_messageMediaInvoice:
-			break;
-		case mtpc_messageMediaUnsupported:
-		default: badMedia = MediaCheckResult::Unsupported; break;
-		}
 		if (badMedia == MediaCheckResult::Unsupported) {
-			result = createUnsupportedMessage(this, m.vid.v, m.vflags.v, m.vreply_to_msg_id.v, m.vvia_bot_id.v, date(m.vdate), m.vfrom_id.v);
+			result = createUnsupportedMessage(this, m.vid.v, m.vflags.v, m.vreply_to_msg_id.v, m.vvia_bot_id.v,
+			                                  date(m.vdate), m.vfrom_id.v);
 		} else if (badMedia == MediaCheckResult::Empty) {
-			auto message = HistoryService::PreparedText { lang(lng_message_empty) };
-			result = HistoryService::create(this, m.vid.v, date(m.vdate), message, m.vflags.v, m.has_from_id() ? m.vfrom_id.v : 0);
+			auto message = HistoryService::PreparedText{lang(lng_message_empty)};
+			result = HistoryService::create(this, m.vid.v, date(m.vdate), message, m.vflags.v,
+			                                m.has_from_id() ? m.vfrom_id.v : 0);
 		} else if (badMedia == MediaCheckResult::HasTimeToLive) {
 			result = HistoryService::create(this, m);
 		} else {
@@ -930,12 +985,14 @@ HistoryItem *History::createItem(const MTPMessage &msg, bool applyServiceAction,
 						if (auto user = App::userLoaded(peerFromUser(v[i]))) {
 							if (peer->asChannel()->mgInfo->lastParticipants.indexOf(user) < 0) {
 								peer->asChannel()->mgInfo->lastParticipants.push_front(user);
-								peer->asChannel()->mgInfo->lastParticipantsStatus |= MegagroupInfo::LastParticipantsAdminsOutdated;
+								peer->asChannel()->mgInfo->lastParticipantsStatus |=
+								    MegagroupInfo::LastParticipantsAdminsOutdated;
 								Notify::peerUpdatedDelayed(peer, Notify::PeerUpdate::Flag::MembersChanged);
 							}
 							if (user->botInfo) {
 								peer->asChannel()->mgInfo->bots.insert(user);
-								if (peer->asChannel()->mgInfo->botStatus != 0 && peer->asChannel()->mgInfo->botStatus < 2) {
+								if (peer->asChannel()->mgInfo->botStatus != 0 &&
+								    peer->asChannel()->mgInfo->botStatus < 2) {
 									peer->asChannel()->mgInfo->botStatus = 2;
 								}
 							}
@@ -1044,13 +1101,13 @@ HistoryItem *History::createItem(const MTPMessage &msg, bool applyServiceAction,
 			case mtpc_messageActionChatMigrateTo: {
 				peer->asChat()->flags |= MTPDchat::Flag::f_deactivated;
 
-				//auto &d = action.c_messageActionChatMigrateTo();
-				//auto channel = App::channelLoaded(d.vchannel_id.v);
+				// auto &d = action.c_messageActionChatMigrateTo();
+				// auto channel = App::channelLoaded(d.vchannel_id.v);
 			} break;
 
 			case mtpc_messageActionChannelMigrateFrom: {
-				//auto &d = action.c_messageActionChannelMigrateFrom();
-				//auto chat = App::chatLoaded(d.vchat_id.v);
+				// auto &d = action.c_messageActionChannelMigrateFrom();
+				// auto chat = App::chatLoaded(d.vchat_id.v);
 			} break;
 
 			case mtpc_messageActionPinMessage: {
@@ -1075,24 +1132,32 @@ HistoryItem *History::createItem(const MTPMessage &msg, bool applyServiceAction,
 	return result;
 }
 
-HistoryItem *History::createItemForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, HistoryMessage *msg) {
+HistoryItem *History::createItemForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from,
+                                          const QString &postAuthor, HistoryMessage *msg) {
 	return HistoryMessage::create(this, id, flags, date, from, postAuthor, msg);
 }
 
-HistoryItem *History::createItemDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup) {
+HistoryItem *History::createItemDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo,
+                                         QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc,
+                                         const QString &caption, const MTPReplyMarkup &markup) {
 	return HistoryMessage::create(this, id, flags, replyTo, viaBotId, date, from, postAuthor, doc, caption, markup);
 }
 
-HistoryItem *History::createItemPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup) {
+HistoryItem *History::createItemPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo,
+                                      QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo,
+                                      const QString &caption, const MTPReplyMarkup &markup) {
 	return HistoryMessage::create(this, id, flags, replyTo, viaBotId, date, from, postAuthor, photo, caption, markup);
 }
 
-HistoryItem *History::createItemGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup) {
+HistoryItem *History::createItemGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+                                     UserId from, const QString &postAuthor, GameData *game,
+                                     const MTPReplyMarkup &markup) {
 	return HistoryMessage::create(this, id, flags, replyTo, viaBotId, date, from, postAuthor, game, markup);
 }
 
-HistoryItem *History::addNewService(MsgId msgId, QDateTime date, const QString &text, MTPDmessage::Flags flags, bool newMsg) {
-	auto message = HistoryService::PreparedText { text };
+HistoryItem *History::addNewService(MsgId msgId, QDateTime date, const QString &text, MTPDmessage::Flags flags,
+                                    bool newMsg) {
+	auto message = HistoryService::PreparedText{text};
 	return addNewItem(HistoryService::create(this, msgId, date, message, flags), newMsg);
 }
 
@@ -1128,19 +1193,27 @@ HistoryItem *History::addToHistory(const MTPMessage &msg) {
 	return createItem(msg, false, false);
 }
 
-HistoryItem *History::addNewForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, HistoryMessage *item) {
+HistoryItem *History::addNewForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from,
+                                      const QString &postAuthor, HistoryMessage *item) {
 	return addNewItem(createItemForwarded(id, flags, date, from, postAuthor, item), true);
 }
 
-HistoryItem *History::addNewDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup) {
-	return addNewItem(createItemDocument(id, flags, viaBotId, replyTo, date, from, postAuthor, doc, caption, markup), true);
+HistoryItem *History::addNewDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+                                     UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption,
+                                     const MTPReplyMarkup &markup) {
+	return addNewItem(createItemDocument(id, flags, viaBotId, replyTo, date, from, postAuthor, doc, caption, markup),
+	                  true);
 }
 
-HistoryItem *History::addNewPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup) {
-	return addNewItem(createItemPhoto(id, flags, viaBotId, replyTo, date, from, postAuthor, photo, caption, markup), true);
+HistoryItem *History::addNewPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+                                  UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption,
+                                  const MTPReplyMarkup &markup) {
+	return addNewItem(createItemPhoto(id, flags, viaBotId, replyTo, date, from, postAuthor, photo, caption, markup),
+	                  true);
 }
 
-HistoryItem *History::addNewGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup) {
+HistoryItem *History::addNewGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+                                 UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup) {
 	return addNewItem(createItemGame(id, flags, viaBotId, replyTo, date, from, postAuthor, game, markup), true);
 }
 
@@ -1201,7 +1274,7 @@ void History::eraseFromUnreadMentions(MsgId msgId) {
 
 void History::addUnreadMentionsSlice(const MTPmessages_Messages &result) {
 	auto count = 0;
-	auto messages = (const QVector<MTPMessage>*)nullptr;
+	auto messages = (const QVector<MTPMessage> *)nullptr;
 	auto getMessages = [](auto &list) {
 		App::feedUsers(list.vusers);
 		App::feedChats(list.vchats);
@@ -1258,7 +1331,7 @@ HistoryItem *History::addNewItem(HistoryItem *adding, bool newMsg) {
 	adding->addToOverview(AddToOverviewNew);
 	if (adding->from()->id) {
 		if (auto user = adding->from()->asUser()) {
-			auto getLastAuthors = [this]() -> QList<not_null<UserData*>>* {
+			auto getLastAuthors = [this]() -> QList<not_null<UserData *>> * {
 				if (auto chat = peer->asChat()) {
 					return &chat->lastAuthors;
 				} else if (auto channel = peer->asMegagroup()) {
@@ -1292,7 +1365,7 @@ HistoryItem *History::addNewItem(HistoryItem *adding, bool newMsg) {
 		if (adding->definesReplyKeyboard()) {
 			auto markupFlags = adding->replyKeyboardFlags();
 			if (!(markupFlags & MTPDreplyKeyboardMarkup::Flag::f_selective) || adding->mentionsMe()) {
-				auto getMarkupSenders = [this]() -> OrderedSet<not_null<PeerData*>>* {
+				auto getMarkupSenders = [this]() -> OrderedSet<not_null<PeerData *>> * {
 					if (auto chat = peer->asChat()) {
 						return &chat->markupSenders;
 					} else if (auto channel = peer->asMegagroup()) {
@@ -1304,15 +1377,20 @@ HistoryItem *History::addNewItem(HistoryItem *adding, bool newMsg) {
 					markupSenders->insert(adding->from());
 				}
 				if (markupFlags & MTPDreplyKeyboardMarkup_ClientFlag::f_zero) { // zero markup means replyKeyboardHide
-					if (lastKeyboardFrom == adding->from()->id || (!lastKeyboardInited && !peer->isChat() && !peer->isMegagroup() && !adding->out())) {
+					if (lastKeyboardFrom == adding->from()->id ||
+					    (!lastKeyboardInited && !peer->isChat() && !peer->isMegagroup() && !adding->out())) {
 						clearLastKeyboard();
 					}
 				} else {
 					bool botNotInChat = false;
 					if (peer->isChat()) {
-						botNotInChat = adding->from()->isUser() && (!peer->canWrite() || !peer->asChat()->participants.isEmpty()) && !peer->asChat()->participants.contains(adding->from()->asUser());
+						botNotInChat = adding->from()->isUser() &&
+						               (!peer->canWrite() || !peer->asChat()->participants.isEmpty()) &&
+						               !peer->asChat()->participants.contains(adding->from()->asUser());
 					} else if (peer->isMegagroup()) {
-						botNotInChat = adding->from()->isUser() && (!peer->canWrite() || peer->asChannel()->mgInfo->botStatus != 0) && !peer->asChannel()->mgInfo->bots.contains(adding->from()->asUser());
+						botNotInChat = adding->from()->isUser() &&
+						               (!peer->canWrite() || peer->asChannel()->mgInfo->botStatus != 0) &&
+						               !peer->asChannel()->mgInfo->bots.contains(adding->from()->asUser());
 					}
 					if (botNotInChat) {
 						clearLastKeyboard();
@@ -1445,8 +1523,8 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice) {
 	} else if (loadedAtBottom()) { // add photos to overview and authors to lastAuthors
 		bool channel = isChannel();
 		qint32 mask = 0;
-		QList<not_null<UserData*>> *lastAuthors = nullptr;
-		OrderedSet<not_null<PeerData*>> *markupSenders = nullptr;
+		QList<not_null<UserData *>> *lastAuthors = nullptr;
+		OrderedSet<not_null<PeerData *>> *markupSenders = nullptr;
 		if (peer->isChat()) {
 			lastAuthors = &peer->asChat()->lastAuthors;
 			markupSenders = &peer->asChat()->markupSenders;
@@ -1468,7 +1546,8 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice) {
 						if (!lastAuthors->contains(user)) {
 							lastAuthors->push_back(user);
 							if (peer->isMegagroup()) {
-								peer->asChannel()->mgInfo->lastParticipantsStatus |= MegagroupInfo::LastParticipantsAdminsOutdated;
+								peer->asChannel()->mgInfo->lastParticipantsStatus |=
+								    MegagroupInfo::LastParticipantsAdminsOutdated;
 								Notify::peerUpdatedDelayed(peer, Notify::PeerUpdate::Flag::MembersChanged);
 							}
 						}
@@ -1488,9 +1567,14 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice) {
 								if (!lastKeyboardInited) {
 									bool botNotInChat = false;
 									if (peer->isChat()) {
-										botNotInChat = (!peer->canWrite() || !peer->asChat()->participants.isEmpty()) && item->author()->isUser() && !peer->asChat()->participants.contains(item->author()->asUser());
+										botNotInChat = (!peer->canWrite() || !peer->asChat()->participants.isEmpty()) &&
+										               item->author()->isUser() &&
+										               !peer->asChat()->participants.contains(item->author()->asUser());
 									} else if (peer->isMegagroup()) {
-										botNotInChat = (!peer->canWrite() || peer->asChannel()->mgInfo->botStatus != 0) && item->author()->isUser() && !peer->asChannel()->mgInfo->bots.contains(item->author()->asUser());
+										botNotInChat =
+										    (!peer->canWrite() || peer->asChannel()->mgInfo->botStatus != 0) &&
+										    item->author()->isUser() &&
+										    !peer->asChannel()->mgInfo->bots.contains(item->author()->asUser());
 									}
 									if (wasKeyboardHide || botNotInChat) {
 										clearLastKeyboard();
@@ -1504,7 +1588,8 @@ void History::addOlderSlice(const QVector<MTPMessage> &slice) {
 							}
 						}
 					}
-				} else if (!lastKeyboardInited && item->definesReplyKeyboard() && !item->out()) { // conversations with bots
+				} else if (!lastKeyboardInited && item->definesReplyKeyboard() &&
+				           !item->out()) { // conversations with bots
 					MTPDreplyKeyboardMarkup::Flags markupFlags = item->replyKeyboardFlags();
 					if (!(markupFlags & MTPDreplyKeyboardMarkup::Flag::f_selective) || item->mentionsMe()) {
 						if (markupFlags & MTPDreplyKeyboardMarkup_ClientFlag::f_zero) {
@@ -1588,9 +1673,7 @@ void History::checkAddAllToOverview() {
 
 	qint32 mask = 0;
 	for_const (auto block, blocks) {
-		for_const (auto item, block->items) {
-			mask |= item->addToOverview(AddToOverviewBack);
-		}
+		for_const (auto item, block->items) { mask |= item->addToOverview(AddToOverviewBack); }
 	}
 	if (mask) {
 		Notify::PeerUpdate update(peer);
@@ -1714,7 +1797,7 @@ void History::setUnreadCount(int newUnreadCount) {
 	}
 }
 
- void History::setMute(bool newMute) {
+void History::setMute(bool newMute) {
 	if (_mute != newMute) {
 		_mute = newMute;
 		if (inChatList(Dialogs::Mode::All)) {
@@ -1931,7 +2014,8 @@ bool History::isReadyFor(MsgId msgId) {
 		}
 		if (unreadCount()) {
 			if (!isEmpty()) {
-				return (loadedAtTop() || minMsgId() <= inboxReadBefore) && (loadedAtBottom() || maxMsgId() >= inboxReadBefore);
+				return (loadedAtTop() || minMsgId() <= inboxReadBefore) &&
+				       (loadedAtBottom() || maxMsgId() >= inboxReadBefore);
 			}
 			return false;
 		}
@@ -1973,7 +2057,7 @@ void History::setNotLoadedAtBottom() {
 }
 
 namespace {
-	quint32 _dialogsPosToTopShift = 0x80000000UL;
+quint32 _dialogsPosToTopShift = 0x80000000UL;
 }
 
 inline quint64 dialogPosFromDate(const QDateTime &date) {
@@ -2093,19 +2177,19 @@ int History::resizeGetHeight(int newWidth) {
 }
 
 ChannelHistory *History::asChannelHistory() {
-	return isChannel() ? static_cast<ChannelHistory*>(this) : 0;
+	return isChannel() ? static_cast<ChannelHistory *>(this) : 0;
 }
 
 const ChannelHistory *History::asChannelHistory() const {
-	return isChannel() ? static_cast<const ChannelHistory*>(this) : 0;
+	return isChannel() ? static_cast<const ChannelHistory *>(this) : 0;
 }
 
-not_null<History*> History::migrateToOrMe() const {
+not_null<History *> History::migrateToOrMe() const {
 	if (auto to = peer->migrateTo()) {
 		return App::history(to);
 	}
 	// We could get it by App::history(peer), but we optimize.
-	return const_cast<History*>(this);
+	return const_cast<History *>(this);
 }
 
 History *History::migrateFrom() const {
@@ -2116,7 +2200,8 @@ History *History::migrateFrom() const {
 }
 
 bool History::isDisplayedEmpty() const {
-	return isEmpty() || ((blocks.size() == 1) && blocks.front()->items.size() == 1 && blocks.front()->items.front()->isEmpty());
+	return isEmpty() ||
+	       ((blocks.size() == 1) && blocks.front()->items.size() == 1 && blocks.front()->items.front()->isEmpty());
 }
 
 void History::clear(bool leaveItems) {
@@ -2205,7 +2290,7 @@ History::PositionInChatListChange History::adjustByPosInChatList(Dialogs::Mode l
 	qint32 movedFrom = lnk->pos();
 	indexed->adjustByPos(chatListLinks(list));
 	qint32 movedTo = lnk->pos();
-	return { movedFrom, movedTo };
+	return {movedFrom, movedTo};
 }
 
 int History::posInChatList(Dialogs::Mode list) const {
@@ -2302,7 +2387,9 @@ void History::overviewSliceDone(qint32 overviewIndex, const MTPmessages_Messages
 		if (peer->isChannel()) {
 			peer->asChannel()->ptsReceived(d.vpts.v);
 		} else {
-			LOG(("API Error: received messages.channelMessages when no channel was passed! (History::overviewSliceDone, onlyCounts %1)").arg(Logs::b(onlyCounts)));
+			LOG(("API Error: received messages.channelMessages when no channel was passed! "
+			     "(History::overviewSliceDone, onlyCounts %1)")
+			        .arg(Logs::b(onlyCounts)));
 		}
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
@@ -2375,13 +2462,9 @@ void HistoryBlock::clear(bool leaveItems) {
 	auto itemsList = base::take(items);
 
 	if (leaveItems) {
-		for_const (auto item, itemsList) {
-			item->detachFast();
-		}
+		for_const (auto item, itemsList) { item->detachFast(); }
 	} else {
-		for_const (auto item, itemsList) {
-			delete item;
-		}
+		for_const (auto item, itemsList) { delete item; }
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 04bb75117..c28275ee5 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/flat_set.h"
+#include "base/optional.h"
+#include "base/timer.h"
+#include "dialogs/dialogs_common.h" // For Dialogs::Mode
 #include "ui/animation.h" // For BasicAnimation
 #include "ui/effects/send_action_animations.h" // For SendActionAnimation
-#include "dialogs/dialogs_common.h" // For Dialogs::Mode
-#include "base/timer.h"
-#include "base/optional.h"
-#include "base/flat_set.h"
 
 void HistoryInit();
 
 class HistoryItem;
-using SelectedItemSet = QMap<int, not_null<HistoryItem*>>;
+using SelectedItemSet = QMap<int, not_null<HistoryItem *>>;
 
 enum NewMessageType {
 	NewMessageUnread,
@@ -41,10 +41,11 @@ enum NewMessageType {
 class History;
 class Histories {
 public:
-	using Map = QHash<PeerId, History*>;
+	using Map = QHash<PeerId, History *>;
 	Map map;
 
-	Histories() : _a_typings(animation(this, &Histories::step_typings)) {
+	Histories()
+	    : _a_typings(animation(this, &Histories::step_typings)) {
 		_selfDestructTimer.setCallback([this] { checkSelfDestructItems(); });
 	}
 
@@ -52,15 +53,16 @@ public:
 	void step_typings(TimeMs ms, bool timer);
 
 	History *find(const PeerId &peerId);
-	not_null<History*> findOrInsert(const PeerId &peerId);
-	not_null<History*> findOrInsert(const PeerId &peerId, qint32 unreadCount, qint32 maxInboxRead, qint32 maxOutboxRead);
+	not_null<History *> findOrInsert(const PeerId &peerId);
+	not_null<History *> findOrInsert(const PeerId &peerId, qint32 unreadCount, qint32 maxInboxRead,
+	                                 qint32 maxOutboxRead);
 
 	void clear();
 	void remove(const PeerId &peer);
 
 	HistoryItem *addNewMessage(const MTPMessage &msg, NewMessageType type);
 
-	typedef QMap<History*, TimeMs> TypingHistories; // when typing in this history started
+	typedef QMap<History *, TimeMs> TypingHistories; // when typing in this history started
 	TypingHistories typing;
 	BasicAnimation _a_typings;
 
@@ -86,7 +88,7 @@ public:
 	void setIsPinned(History *history, bool isPinned);
 	void clearPinned();
 	int pinnedCount() const;
-	QList<History*> getPinnedOrder() const;
+	QList<History *> getPinnedOrder() const;
 	void savePinnedToServer() const;
 
 	struct SendActionAnimationUpdate {
@@ -98,7 +100,7 @@ public:
 	base::Observable<SendActionAnimationUpdate> &sendActionAnimationUpdated() {
 		return _sendActionAnimationUpdated;
 	}
-	void selfDestructIn(not_null<HistoryItem*> item, TimeMs delay);
+	void selfDestructIn(not_null<HistoryItem *> item, TimeMs delay);
 
 private:
 	void checkSelfDestructItems();
@@ -106,11 +108,10 @@ private:
 	int _unreadFull = 0;
 	int _unreadMuted = 0;
 	base::Observable<SendActionAnimationUpdate> _sendActionAnimationUpdated;
-	OrderedSet<History*> _pinnedDialogs;
+	OrderedSet<History *> _pinnedDialogs;
 
 	base::Timer _selfDestructTimer;
 	std::vector<FullMsgId> _selfDestructItems;
-
 };
 
 class HistoryBlock;
@@ -134,15 +135,15 @@ enum HistoryMediaType {
 };
 
 enum MediaOverviewType {
-	OverviewPhotos          = 0,
-	OverviewVideos          = 1,
-	OverviewMusicFiles      = 2,
-	OverviewFiles           = 3,
-	OverviewVoiceFiles      = 4,
-	OverviewLinks           = 5,
-	OverviewChatPhotos      = 6,
+	OverviewPhotos = 0,
+	OverviewVideos = 1,
+	OverviewMusicFiles = 2,
+	OverviewFiles = 3,
+	OverviewVoiceFiles = 4,
+	OverviewLinks = 5,
+	OverviewChatPhotos = 6,
 	OverviewRoundVoiceFiles = 7,
-	OverviewGIFs            = 8,
+	OverviewGIFs = 8,
 
 	OverviewCount
 };
@@ -209,7 +210,7 @@ public:
 	ChannelHistory *asChannelHistory();
 	const ChannelHistory *asChannelHistory() const;
 
-	not_null<History*> migrateToOrMe() const;
+	not_null<History *> migrateToOrMe() const;
 	History *migrateFrom() const;
 
 	bool isEmpty() const {
@@ -221,13 +222,20 @@ public:
 
 	virtual ~History();
 
-	HistoryItem *addNewService(MsgId msgId, QDateTime date, const QString &text, MTPDmessage::Flags flags = 0, bool newMsg = true);
+	HistoryItem *addNewService(MsgId msgId, QDateTime date, const QString &text, MTPDmessage::Flags flags = 0,
+	                           bool newMsg = true);
 	HistoryItem *addNewMessage(const MTPMessage &msg, NewMessageType type);
 	HistoryItem *addToHistory(const MTPMessage &msg);
-	HistoryItem *addNewForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, HistoryMessage *item);
-	HistoryItem *addNewDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup);
-	HistoryItem *addNewPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup);
-	HistoryItem *addNewGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup);
+	HistoryItem *addNewForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from,
+	                             const QString &postAuthor, HistoryMessage *item);
+	HistoryItem *addNewDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                            UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption,
+	                            const MTPReplyMarkup &markup);
+	HistoryItem *addNewPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                         UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption,
+	                         const MTPReplyMarkup &markup);
+	HistoryItem *addNewGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                        UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup);
 
 	// Used only internally and for channel admin log.
 	HistoryItem *createItem(const MTPMessage &msg, bool applyServiceAction, bool detachExistingItem);
@@ -373,7 +381,7 @@ public:
 	void eraseFromUnreadMentions(MsgId msgId);
 	void addUnreadMentionsSlice(const MTPmessages_Messages &result);
 
-	using Blocks = QList<HistoryBlock*>;
+	using Blocks = QList<HistoryBlock *>;
 	Blocks blocks;
 
 	int width = 0;
@@ -391,7 +399,7 @@ public:
 	HistoryItem *lastSentMsg = nullptr;
 	QDateTime lastMsgDate;
 
-	typedef QList<HistoryItem*> NotifyQueue;
+	typedef QList<HistoryItem *> NotifyQueue;
 	NotifyQueue notifies;
 
 	Data::Draft *localDraft() {
@@ -477,7 +485,7 @@ public:
 		if (result < 0) return defaultValue;
 		if (result < loaded) {
 			if (result > 0) {
-				const_cast<History*>(this)->_overviewCountData[overviewIndex] = 0;
+				const_cast<History *>(this)->_overviewCountData[overviewIndex] = 0;
 			}
 			return loaded;
 		}
@@ -511,10 +519,16 @@ protected:
 
 	void clearBlocks(bool leaveItems);
 
-	HistoryItem *createItemForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, HistoryMessage *msg);
-	HistoryItem *createItemDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup);
-	HistoryItem *createItemPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup);
-	HistoryItem *createItemGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup);
+	HistoryItem *createItemForwarded(MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from,
+	                                 const QString &postAuthor, HistoryMessage *msg);
+	HistoryItem *createItemDocument(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                                UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption,
+	                                const MTPReplyMarkup &markup);
+	HistoryItem *createItemPhoto(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                             UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption,
+	                             const MTPReplyMarkup &markup);
+	HistoryItem *createItemGame(MsgId id, MTPDmessage::Flags flags, UserId viaBotId, MsgId replyTo, QDateTime date,
+	                            UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup);
 
 	HistoryItem *addNewItem(HistoryItem *adding, bool newMsg);
 	HistoryItem *addNewInTheMiddle(HistoryItem *newItem, qint32 blockIndex, qint32 itemIndex);
@@ -545,10 +559,12 @@ private:
 
 	enum class Flag {
 		f_has_pending_resized_items = (1 << 0),
-		f_pending_resize            = (1 << 1),
+		f_pending_resize = (1 << 1),
 	};
 	using Flags = base::flags<Flag>;
-	friend inline constexpr auto is_flag_type(Flag) { return true; };
+	friend inline constexpr auto is_flag_type(Flag) {
+		return true;
+	};
 
 	Flags _flags = 0;
 	bool _mute = false;
@@ -591,9 +607,9 @@ private:
 	std::unique_ptr<Data::Draft> _editDraft;
 	QVector<FullMsgId> _forwardDraft;
 
-	using TypingUsers = QMap<UserData*, TimeMs>;
+	using TypingUsers = QMap<UserData *, TimeMs>;
 	TypingUsers _typing;
-	using SendActionUsers = QMap<UserData*, SendAction>;
+	using SendActionUsers = QMap<UserData *, SendAction>;
 	SendActionUsers _sendActions;
 	QString _sendActionString;
 	Text _sendActionText;
@@ -601,8 +617,7 @@ private:
 	QMap<SendAction::Type, TimeMs> _mySendActions;
 
 	int _pinnedIndex = 0; // > 0 for pinned dialogs
-
- };
+};
 
 class HistoryJoined;
 class ChannelHistory : public History {
@@ -622,7 +637,7 @@ public:
 
 private:
 	friend class History;
-	HistoryItem* addNewChannelMessage(const MTPMessage &msg, NewMessageType type);
+	HistoryItem *addNewChannelMessage(const MTPMessage &msg, NewMessageType type);
 	HistoryItem *addNewToBlocks(const MTPMessage &msg, NewMessageType type);
 
 	void checkMaxReadMessageDate();
@@ -636,18 +651,17 @@ private:
 	MsgId _rangeDifferenceFromId, _rangeDifferenceToId;
 	qint32 _rangeDifferencePts;
 	mtpRequestId _rangeDifferenceRequestId;
-
 };
 
 class HistoryBlock {
 public:
-	HistoryBlock(not_null<History*> history) : _history(history) {
-	}
+	HistoryBlock(not_null<History *> history)
+	    : _history(history) {}
 
 	HistoryBlock(const HistoryBlock &) = delete;
 	HistoryBlock &operator=(const HistoryBlock &) = delete;
 
-	QVector<HistoryItem*> items;
+	QVector<HistoryItem *> items;
 
 	void clear(bool leaveItems = false);
 	~HistoryBlock() {
@@ -665,7 +679,7 @@ public:
 	int height() const {
 		return _height;
 	}
-	not_null<History*> history() const {
+	not_null<History *> history() const {
 		return _history;
 	}
 
@@ -691,10 +705,9 @@ public:
 	}
 
 protected:
-	const not_null<History*> _history;
+	const not_null<History *> _history;
 
 	int _y = 0;
 	int _height = 0;
 	int _indexInHistory = -1;
-
 };
diff --git a/Telegram/SourceFiles/history/history_admin_log_filter.cpp b/Telegram/SourceFiles/history/history_admin_log_filter.cpp
index 9386d0539..4ba77a24a 100644
--- a/Telegram/SourceFiles/history/history_admin_log_filter.cpp
+++ b/Telegram/SourceFiles/history/history_admin_log_filter.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_admin_log_filter.h"
 
-#include "styles/style_boxes.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/effects/ripple_animation.h"
-#include "lang/lang_keys.h"
 #include "app.h"
+#include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/checkbox.h"
 
 namespace AdminLog {
 namespace {
 
 class UserCheckbox : public Ui::RippleButton {
 public:
-	UserCheckbox(QWidget *parent, not_null<UserData*> user, bool checked);
+	UserCheckbox(QWidget *parent, not_null<UserData *> user, bool checked);
 
 	bool checked() const {
 		return _check->checked();
@@ -64,16 +64,16 @@ private:
 
 	QRect _checkRect;
 
-	not_null<UserData*> _user;
+	not_null<UserData *> _user;
 	QString _statusText;
 	bool _statusOnline = false;
-
 };
 
-UserCheckbox::UserCheckbox(QWidget *parent, not_null<UserData*> user, bool checked) : Ui::RippleButton(parent, st::defaultBoxCheckbox.ripple)
-, _st(st::adminLogFilterUserCheckbox)
-, _check(std::make_unique<Ui::CheckView>(st::defaultCheck, checked, [this] { rtlupdate(_checkRect); }))
-, _user(user) {
+UserCheckbox::UserCheckbox(QWidget *parent, not_null<UserData *> user, bool checked)
+    : Ui::RippleButton(parent, st::defaultBoxCheckbox.ripple)
+    , _st(st::adminLogFilterUserCheckbox)
+    , _check(std::make_unique<Ui::CheckView>(st::defaultCheck, checked, [this] { rtlupdate(_checkRect); }))
+    , _user(user) {
 	setCursor(style::cur_pointer);
 	setClickedCallback([this] {
 		if (isDisabled()) return;
@@ -81,9 +81,9 @@ UserCheckbox::UserCheckbox(QWidget *parent, not_null<UserData*> user, bool check
 	});
 	auto now = unixtime();
 	_statusText = App::onlineText(_user, now);
-		_statusOnline = App::onlineColorUse(_user, now);
+	_statusOnline = App::onlineColorUse(_user, now);
 	auto checkSize = _check->getSize();
-	_checkRect = { QPoint(_st.margin.left(), (st::contactsPhotoSize - checkSize.height()) / 2), checkSize };
+	_checkRect = {QPoint(_st.margin.left(), (st::contactsPhotoSize - checkSize.height()) / 2), checkSize};
 }
 
 void UserCheckbox::setChecked(bool checked, NotifyAboutChange notify) {
@@ -101,7 +101,8 @@ void UserCheckbox::paintEvent(QPaintEvent *e) {
 	auto ms = getms();
 	auto active = _check->currentAnimationValue(ms);
 	auto color = anim::color(_st.rippleBg, _st.rippleBgActive, active);
-	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y() + (_checkRect.y() - st::defaultBoxCheckbox.margin.top()), ms, &color);
+	paintRipple(p, _st.rippleAreaPosition.x(),
+	            _st.rippleAreaPosition.y() + (_checkRect.y() - st::defaultBoxCheckbox.margin.top()), ms, &color);
 
 	auto realCheckRect = myrtlrect(_checkRect);
 	if (realCheckRect.intersects(e->rect())) {
@@ -139,7 +140,8 @@ QImage UserCheckbox::prepareRippleMask() const {
 }
 
 QPoint UserCheckbox::prepareRippleStartPosition() const {
-	auto position = mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition - QPoint(0, _checkRect.y() - st::defaultBoxCheckbox.margin.top());
+	auto position = mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition -
+	                QPoint(0, _checkRect.y() - st::defaultBoxCheckbox.margin.top());
 	return _check->checkRippleStartPosition(position) ? position : DisabledRippleStartPosition();
 }
 
@@ -147,17 +149,17 @@ QPoint UserCheckbox::prepareRippleStartPosition() const {
 
 class FilterBox::Inner : public TWidget, private base::Subscriber {
 public:
-	Inner(QWidget *parent, not_null<ChannelData*> channel, const std::vector<not_null<UserData*>> &admins, const FilterValue &filter, base::lambda<void()> changedCallback);
+	Inner(QWidget *parent, not_null<ChannelData *> channel, const std::vector<not_null<UserData *>> &admins,
+	      const FilterValue &filter, base::lambda<void()> changedCallback);
 
-	template <typename Widget>
-	QPointer<Widget> addRow(object_ptr<Widget> widget, int marginTop) {
+	template <typename Widget> QPointer<Widget> addRow(object_ptr<Widget> widget, int marginTop) {
 		widget->setParent(this);
 		widget->show();
 		auto row = Row();
 		row.widget = std::move(widget);
 		row.marginTop = marginTop;
 		_rows.push_back(std::move(row));
-		return static_cast<Widget*>(_rows.back().widget.data());
+		return static_cast<Widget *>(_rows.back().widget.data());
 	}
 
 	bool canSave() const;
@@ -168,38 +170,40 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	void createControls(const std::vector<not_null<UserData*>> &admins, const FilterValue &filter);
+	void createControls(const std::vector<not_null<UserData *>> &admins, const FilterValue &filter);
 	void createAllActionsCheckbox(const FilterValue &filter);
 	void createActionsCheckboxes(const FilterValue &filter);
 	void createAllUsersCheckbox(const FilterValue &filter);
-	void createAdminsCheckboxes(const std::vector<not_null<UserData*>> &admins, const FilterValue &filter);
+	void createAdminsCheckboxes(const std::vector<not_null<UserData *>> &admins, const FilterValue &filter);
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 
 	QPointer<Ui::Checkbox> _allFlags;
 	QMap<MTPDchannelAdminLogEventsFilter::Flags, QPointer<Ui::Checkbox>> _filterFlags;
 
 	QPointer<Ui::Checkbox> _allUsers;
-	QMap<not_null<UserData*>, QPointer<UserCheckbox>> _admins;
+	QMap<not_null<UserData *>, QPointer<UserCheckbox>> _admins;
 	bool _restoringInvariant = false;
 
 	struct Row {
-		object_ptr<TWidget> widget = { nullptr };
+		object_ptr<TWidget> widget = {nullptr};
 		int marginTop = 0;
 	};
 	std::vector<Row> _rows;
 
 	base::lambda<void()> _changedCallback;
-
 };
 
-FilterBox::Inner::Inner(QWidget *parent, not_null<ChannelData*> channel, const std::vector<not_null<UserData*>> &admins, const FilterValue &filter, base::lambda<void()> changedCallback) : TWidget(parent)
-, _channel(channel)
-, _changedCallback(std::move(changedCallback)) {
+FilterBox::Inner::Inner(QWidget *parent, not_null<ChannelData *> channel,
+                        const std::vector<not_null<UserData *>> &admins, const FilterValue &filter,
+                        base::lambda<void()> changedCallback)
+    : TWidget(parent)
+    , _channel(channel)
+    , _changedCallback(std::move(changedCallback)) {
 	createControls(admins, filter);
 }
 
-void FilterBox::Inner::createControls(const std::vector<not_null<UserData*>> &admins, const FilterValue &filter) {
+void FilterBox::Inner::createControls(const std::vector<not_null<UserData *>> &admins, const FilterValue &filter) {
 	createAllActionsCheckbox(filter);
 	createActionsCheckboxes(filter);
 	createAllUsersCheckbox(filter);
@@ -208,13 +212,13 @@ void FilterBox::Inner::createControls(const std::vector<not_null<UserData*>> &ad
 
 void FilterBox::Inner::createAllActionsCheckbox(const FilterValue &filter) {
 	auto checked = (filter.flags == 0);
-	_allFlags = addRow(object_ptr<Ui::Checkbox>(this, lang(lng_admin_log_filter_all_actions), checked, st::adminLogFilterCheckbox), st::adminLogFilterCheckbox.margin.top());
+	_allFlags = addRow(
+	    object_ptr<Ui::Checkbox>(this, lang(lng_admin_log_filter_all_actions), checked, st::adminLogFilterCheckbox),
+	    st::adminLogFilterCheckbox.margin.top());
 	subscribe(_allFlags->checkedChanged, [this](bool checked) {
 		if (!std::exchange(_restoringInvariant, true)) {
 			auto allChecked = _allFlags->checked();
-			for_const (auto &&checkbox, _filterFlags) {
-				checkbox->setChecked(allChecked);
-			}
+			for_const (auto &&checkbox, _filterFlags) { checkbox->setChecked(allChecked); }
 			_restoringInvariant = false;
 			if (_changedCallback) {
 				_changedCallback();
@@ -228,7 +232,8 @@ void FilterBox::Inner::createActionsCheckboxes(const FilterValue &filter) {
 	using Flags = MTPDchannelAdminLogEventsFilter::Flags;
 	auto addFlag = [this, &filter](Flags flag, QString &&text) {
 		auto checked = (filter.flags == 0) || (filter.flags & flag);
-		auto checkbox = addRow(object_ptr<Ui::Checkbox>(this, std::move(text), checked, st::defaultBoxCheckbox), st::adminLogFilterLittleSkip);
+		auto checkbox = addRow(object_ptr<Ui::Checkbox>(this, std::move(text), checked, st::defaultBoxCheckbox),
+		                       st::adminLogFilterLittleSkip);
 		_filterFlags.insert(flag, checkbox);
 		subscribe(checkbox->checkedChanged, [this](bool checked) {
 			if (!std::exchange(_restoringInvariant, true)) {
@@ -253,7 +258,8 @@ void FilterBox::Inner::createActionsCheckboxes(const FilterValue &filter) {
 	}
 	addFlag(Flag::f_promote | Flag::f_demote, lang(lng_admin_log_filter_admins_new));
 	addFlag(Flag::f_join | Flag::f_invite, lang(lng_admin_log_filter_members_new));
-	addFlag(Flag::f_info | Flag::f_settings, lang(_channel->isMegagroup() ? lng_admin_log_filter_info_group : lng_admin_log_filter_info_channel));
+	addFlag(Flag::f_info | Flag::f_settings,
+	        lang(_channel->isMegagroup() ? lng_admin_log_filter_info_group : lng_admin_log_filter_info_channel));
 	addFlag(Flag::f_delete, lang(lng_admin_log_filter_messages_deleted));
 	addFlag(Flag::f_edit, lang(lng_admin_log_filter_messages_edited));
 	if (isGroup) {
@@ -263,12 +269,12 @@ void FilterBox::Inner::createActionsCheckboxes(const FilterValue &filter) {
 }
 
 void FilterBox::Inner::createAllUsersCheckbox(const FilterValue &filter) {
-	_allUsers = addRow(object_ptr<Ui::Checkbox>(this, lang(lng_admin_log_filter_all_admins), filter.allUsers, st::adminLogFilterCheckbox), st::adminLogFilterSkip);
+	_allUsers = addRow(object_ptr<Ui::Checkbox>(this, lang(lng_admin_log_filter_all_admins), filter.allUsers,
+	                                            st::adminLogFilterCheckbox),
+	                   st::adminLogFilterSkip);
 	subscribe(_allUsers->checkedChanged, [this](bool checked) {
 		if (checked && !std::exchange(_restoringInvariant, true)) {
-			for_const (auto &&checkbox, _admins) {
-				checkbox->setChecked(true);
-			}
+			for_const (auto &&checkbox, _admins) { checkbox->setChecked(true); }
 			_restoringInvariant = false;
 			if (_changedCallback) {
 				_changedCallback();
@@ -277,7 +283,8 @@ void FilterBox::Inner::createAllUsersCheckbox(const FilterValue &filter) {
 	});
 }
 
-void FilterBox::Inner::createAdminsCheckboxes(const std::vector<not_null<UserData*>> &admins, const FilterValue &filter) {
+void FilterBox::Inner::createAdminsCheckboxes(const std::vector<not_null<UserData *>> &admins,
+                                              const FilterValue &filter) {
 	for (auto user : admins) {
 		auto checked = filter.allUsers || base::contains(filter.admins, user);
 		auto checkbox = addRow(object_ptr<UserCheckbox>(this, user, checked), st::adminLogFilterLittleSkip);
@@ -357,12 +364,13 @@ void FilterBox::Inner::resizeEvent(QResizeEvent *e) {
 	}
 }
 
-FilterBox::FilterBox(QWidget*, not_null<ChannelData*> channel, const std::vector<not_null<UserData*>> &admins, const FilterValue &filter, base::lambda<void(FilterValue &&filter)> saveCallback) : BoxContent()
-, _channel(channel)
-, _admins(admins)
-, _initialFilter(filter)
-, _saveCallback(std::move(saveCallback)) {
-}
+FilterBox::FilterBox(QWidget *, not_null<ChannelData *> channel, const std::vector<not_null<UserData *>> &admins,
+                     const FilterValue &filter, base::lambda<void(FilterValue &&filter)> saveCallback)
+    : BoxContent()
+    , _channel(channel)
+    , _admins(admins)
+    , _initialFilter(filter)
+    , _saveCallback(std::move(saveCallback)) {}
 
 void FilterBox::prepare() {
 	setTitle(langFactory(lng_admin_log_filter_title));
diff --git a/Telegram/SourceFiles/history/history_admin_log_filter.h b/Telegram/SourceFiles/history/history_admin_log_filter.h
index b79a0d839..24ba5e256 100644
--- a/Telegram/SourceFiles/history/history_admin_log_filter.h
+++ b/Telegram/SourceFiles/history/history_admin_log_filter.h
@@ -27,7 +27,8 @@ namespace AdminLog {
 
 class FilterBox : public BoxContent {
 public:
-	FilterBox(QWidget*, not_null<ChannelData*> channel, const std::vector<not_null<UserData*>> &admins, const FilterValue &filter, base::lambda<void(FilterValue &&filter)> saveCallback);
+	FilterBox(QWidget *, not_null<ChannelData *> channel, const std::vector<not_null<UserData *>> &admins,
+	          const FilterValue &filter, base::lambda<void(FilterValue &&filter)> saveCallback);
 
 protected:
 	void prepare() override;
@@ -36,14 +37,13 @@ private:
 	void resizeToContent();
 	void refreshButtons();
 
-	not_null<ChannelData*> _channel;
-	std::vector<not_null<UserData*>> _admins;
+	not_null<ChannelData *> _channel;
+	std::vector<not_null<UserData *>> _admins;
 	FilterValue _initialFilter;
 	base::lambda<void(FilterValue &&filter)> _saveCallback;
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/history_admin_log_inner.cpp
index 713f3d4a7..b9f4233f5 100644
--- a/Telegram/SourceFiles/history/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/history_admin_log_inner.cpp
@@ -18,25 +18,25 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "history/history_admin_log_item.h"
 #include "history/history_admin_log_inner.h"
-#include "styles/style_history.h"
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/edit_participant_box.h"
+#include "chat_helpers/message_field.h"
+#include "core/file_utilities.h"
+#include "history/history_admin_log_filter.h"
+#include "history/history_admin_log_item.h"
+#include "history/history_admin_log_section.h"
 #include "history/history_media_types.h"
 #include "history/history_message.h"
 #include "history/history_service_layout.h"
-#include "history/history_admin_log_section.h"
-#include "history/history_admin_log_filter.h"
-#include "chat_helpers/message_field.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "messenger.h"
-#include "apiwrap.h"
-#include "window/window_controller.h"
-#include "auth_session.h"
-#include "ui/widgets/popup_menu.h"
-#include "core/file_utilities.h"
 #include "lang/lang_keys.h"
-#include "boxes/edit_participant_box.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "styles/style_history.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_controller.h"
 
 #include <QAction>
 #include <QApplication>
@@ -52,8 +52,7 @@ constexpr auto kEventsPerPage = 50;
 
 } // namespace
 
-template <InnerWidget::EnumItemsDirection direction, typename Method>
-void InnerWidget::enumerateItems(Method method) {
+template <InnerWidget::EnumItemsDirection direction, typename Method> void InnerWidget::enumerateItems(Method method) {
 	constexpr auto TopToBottom = (direction == EnumItemsDirection::TopToBottom);
 
 	// No displayed messages in this history.
@@ -65,11 +64,12 @@ void InnerWidget::enumerateItems(Method method) {
 	}
 
 	auto begin = std::rbegin(_items), end = std::rend(_items);
-	auto from = TopToBottom ? std::lower_bound(begin, end, _visibleTop, [this](auto &elem, int top) {
-		return this->itemTop(elem) + elem->height() <= top;
-	}) : std::upper_bound(begin, end, _visibleBottom, [this](int bottom, auto &elem) {
-		return this->itemTop(elem) + elem->height() >= bottom;
-	});
+	auto from =
+	    TopToBottom ?
+	        std::lower_bound(begin, end, _visibleTop,
+	                         [this](auto &elem, int top) { return this->itemTop(elem) + elem->height() <= top; }) :
+	        std::upper_bound(begin, end, _visibleBottom,
+	                         [this](int bottom, auto &elem) { return this->itemTop(elem) + elem->height() >= bottom; });
 	auto wasEnd = (from == end);
 	if (wasEnd) {
 		--from;
@@ -120,8 +120,7 @@ void InnerWidget::enumerateItems(Method method) {
 	}
 }
 
-template <typename Method>
-void InnerWidget::enumerateUserpics(Method method) {
+template <typename Method> void InnerWidget::enumerateUserpics(Method method) {
 	// Find and remember the top of an attached messages pack
 	// -1 means we didn't find an attached to next message yet.
 	int lowestAttachedItemTop = -1;
@@ -166,8 +165,7 @@ void InnerWidget::enumerateUserpics(Method method) {
 	enumerateItems<EnumItemsDirection::TopToBottom>(userpicCallback);
 }
 
-template <typename Method>
-void InnerWidget::enumerateDates(Method method) {
+template <typename Method> void InnerWidget::enumerateDates(Method method) {
 	// Find and remember the bottom of an single-day messages pack
 	// -1 means we didn't find a same-day with previous message yet.
 	auto lowestInOneDayItemBottom = -1;
@@ -208,15 +206,17 @@ void InnerWidget::enumerateDates(Method method) {
 	enumerateItems<EnumItemsDirection::BottomToTop>(dateCallback);
 }
 
-InnerWidget::InnerWidget(QWidget *parent, not_null<Window::Controller*> controller, not_null<ChannelData*> channel) : TWidget(parent)
-, _controller(controller)
-, _channel(channel)
-, _history(App::history(channel))
-, _scrollDateCheck([this] { scrollDateCheck(); })
-, _emptyText(st::historyAdminLogEmptyWidth - st::historyAdminLogEmptyPadding.left() - st::historyAdminLogEmptyPadding.left()) {
+InnerWidget::InnerWidget(QWidget *parent, not_null<Window::Controller *> controller, not_null<ChannelData *> channel)
+    : TWidget(parent)
+    , _controller(controller)
+    , _channel(channel)
+    , _history(App::history(channel))
+    , _scrollDateCheck([this] { scrollDateCheck(); })
+    , _emptyText(st::historyAdminLogEmptyWidth - st::historyAdminLogEmptyPadding.left() -
+                 st::historyAdminLogEmptyPadding.left()) {
 	setMouseTracking(true);
 	_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
-	subscribe(Auth().data().repaintLogEntry(), [this](not_null<const HistoryItem*> historyItem) {
+	subscribe(Auth().data().repaintLogEntry(), [this](not_null<const HistoryItem *> historyItem) {
 		if (_history == historyItem->history()) {
 			repaintItem(historyItem);
 		}
@@ -309,7 +309,8 @@ void InnerWidget::toggleScrollDateShown() {
 
 void InnerWidget::repaintScrollDateCallback() {
 	auto updateTop = _visibleTop;
-	auto updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
+	auto updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height +
+	                    st::msgServicePadding.bottom();
 	update(0, updateTop, width(), updateHeight);
 }
 
@@ -338,36 +339,40 @@ void InnerWidget::applySearch(const QString &query) {
 }
 
 void InnerWidget::requestAdmins() {
-	request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsAdmins(), MTP_int(0), MTP_int(kMaxChannelAdmins))).done([this](const MTPchannels_ChannelParticipants &result) {
-		Expects(result.type() == mtpc_channels_channelParticipants);
-		auto &participants = result.c_channels_channelParticipants();
-		App::feedUsers(participants.vusers);
-		for (auto &participant : participants.vparticipants.v) {
-			auto getUserId = [&participant] {
-				switch (participant.type()) {
-				case mtpc_channelParticipant: return participant.c_channelParticipant().vuser_id.v;
-				case mtpc_channelParticipantSelf: return participant.c_channelParticipantSelf().vuser_id.v;
-				case mtpc_channelParticipantAdmin: return participant.c_channelParticipantAdmin().vuser_id.v;
-				case mtpc_channelParticipantCreator: return participant.c_channelParticipantCreator().vuser_id.v;
-				case mtpc_channelParticipantBanned: return participant.c_channelParticipantBanned().vuser_id.v;
-				default: Unexpected("Type in AdminLog::Widget::showFilter()");
-				}
-			};
-			if (auto user = App::userLoaded(getUserId())) {
-				_admins.push_back(user);
-				auto canEdit = (participant.type() == mtpc_channelParticipantAdmin) && (participant.c_channelParticipantAdmin().is_can_edit());
-				if (canEdit) {
-					_adminsCanEdit.push_back(user);
-				}
-			}
-		}
-		if (_admins.empty()) {
-			_admins.push_back(App::self());
-		}
-		if (_showFilterCallback) {
-			showFilter(std::move(_showFilterCallback));
-		}
-	}).send();
+	request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsAdmins(), MTP_int(0),
+	                                    MTP_int(kMaxChannelAdmins)))
+	    .done([this](const MTPchannels_ChannelParticipants &result) {
+		    Expects(result.type() == mtpc_channels_channelParticipants);
+		    auto &participants = result.c_channels_channelParticipants();
+		    App::feedUsers(participants.vusers);
+		    for (auto &participant : participants.vparticipants.v) {
+			    auto getUserId = [&participant] {
+				    switch (participant.type()) {
+				    case mtpc_channelParticipant: return participant.c_channelParticipant().vuser_id.v;
+				    case mtpc_channelParticipantSelf: return participant.c_channelParticipantSelf().vuser_id.v;
+				    case mtpc_channelParticipantAdmin: return participant.c_channelParticipantAdmin().vuser_id.v;
+				    case mtpc_channelParticipantCreator: return participant.c_channelParticipantCreator().vuser_id.v;
+				    case mtpc_channelParticipantBanned: return participant.c_channelParticipantBanned().vuser_id.v;
+				    default: Unexpected("Type in AdminLog::Widget::showFilter()");
+				    }
+			    };
+			    if (auto user = App::userLoaded(getUserId())) {
+				    _admins.push_back(user);
+				    auto canEdit = (participant.type() == mtpc_channelParticipantAdmin) &&
+				                   (participant.c_channelParticipantAdmin().is_can_edit());
+				    if (canEdit) {
+					    _adminsCanEdit.push_back(user);
+				    }
+			    }
+		    }
+		    if (_admins.empty()) {
+			    _admins.push_back(App::self());
+		    }
+		    if (_showFilterCallback) {
+			    showFilter(std::move(_showFilterCallback));
+		    }
+	    })
+	    .send();
 }
 
 void InnerWidget::showFilter(base::lambda<void(FilterValue &&filter)> callback) {
@@ -393,11 +398,11 @@ void InnerWidget::updateEmptyText() {
 	options.flags |= TextParseMarkdown;
 	auto hasSearch = !_searchQuery.isEmpty();
 	auto hasFilter = (_filter.flags != 0) || !_filter.allUsers;
-	auto text = TextWithEntities { lang((hasSearch || hasFilter) ? lng_admin_log_no_results_title : lng_admin_log_no_events_title) };
+	auto text = TextWithEntities{
+	    lang((hasSearch || hasFilter) ? lng_admin_log_no_results_title : lng_admin_log_no_events_title)};
 	text.entities.append(EntityInText(EntityInTextBold, 0, text.text.size()));
-	auto description = hasSearch
-		? lng_admin_log_no_results_search_text(lt_query, TextUtilities::Clean(_searchQuery))
-		: lang(hasFilter ? lng_admin_log_no_results_text : lng_admin_log_no_events_text);
+	auto description = hasSearch ? lng_admin_log_no_results_search_text(lt_query, TextUtilities::Clean(_searchQuery)) :
+	                               lang(hasFilter ? lng_admin_log_no_results_text : lng_admin_log_no_events_text);
 	text.text.append(qstr("\n\n") + description);
 	_emptyText.setMarkedText(st::defaultTextStyle, text, options);
 }
@@ -424,7 +429,7 @@ QPoint InnerWidget::tooltipPos() const {
 	return _mousePosition;
 }
 
-void InnerWidget::saveState(not_null<SectionMemento*> memento) {
+void InnerWidget::saveState(not_null<SectionMemento *> memento) {
 	memento->setFilter(std::move(_filter));
 	memento->setAdmins(std::move(_admins));
 	memento->setAdminsCanEdit(std::move(_adminsCanEdit));
@@ -436,7 +441,7 @@ void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 	_upLoaded = _downLoaded = true; // Don't load or handle anything anymore.
 }
 
-void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
+void InnerWidget::restoreState(not_null<SectionMemento *> memento) {
 	_items = memento->takeItems();
 	_itemsByIds = memento->takeItemsByIds();
 	_idManager = memento->takeIdManager();
@@ -476,21 +481,26 @@ void InnerWidget::preloadMore(Direction direction) {
 	auto maxId = (direction == Direction::Up) ? _minId : 0;
 	auto minId = (direction == Direction::Up) ? 0 : _maxId;
 	auto perPage = _items.empty() ? kEventsFirstPage : kEventsPerPage;
-	requestId = request(MTPchannels_GetAdminLog(MTP_flags(flags), _channel->inputChannel, MTP_string(_searchQuery), filter, MTP_vector<MTPInputUser>(admins), MTP_long(maxId), MTP_long(minId), MTP_int(perPage))).done([this, &requestId, &loadedFlag, direction](const MTPchannels_AdminLogResults &result) {
-		Expects(result.type() == mtpc_channels_adminLogResults);
-		requestId = 0;
+	requestId = request(MTPchannels_GetAdminLog(MTP_flags(flags), _channel->inputChannel, MTP_string(_searchQuery),
+	                                            filter, MTP_vector<MTPInputUser>(admins), MTP_long(maxId),
+	                                            MTP_long(minId), MTP_int(perPage)))
+	                .done([this, &requestId, &loadedFlag, direction](const MTPchannels_AdminLogResults &result) {
+		                Expects(result.type() == mtpc_channels_adminLogResults);
+		                requestId = 0;
 
-		auto &results = result.c_channels_adminLogResults();
-		App::feedUsers(results.vusers);
-		App::feedChats(results.vchats);
-		if (!loadedFlag) {
-			addEvents(direction, results.vevents.v);
-		}
-	}).fail([this, &requestId, &loadedFlag](const RPCError &error) {
-		requestId = 0;
-		loadedFlag = true;
-		update();
-	}).send();
+		                auto &results = result.c_channels_adminLogResults();
+		                App::feedUsers(results.vusers);
+		                App::feedChats(results.vchats);
+		                if (!loadedFlag) {
+			                addEvents(direction, results.vevents.v);
+		                }
+	                })
+	                .fail([this, &requestId, &loadedFlag](const RPCError &error) {
+		                requestId = 0;
+		                loadedFlag = true;
+		                update();
+	                })
+	                .send();
 }
 
 void InnerWidget::addEvents(Direction direction, const QVector<MTPChannelAdminLogEvent> &events) {
@@ -562,7 +572,8 @@ void InnerWidget::updateMinMaxIds() {
 
 void InnerWidget::itemsAdded(Direction direction, int addedCount) {
 	Expects(addedCount >= 0);
-	auto checkFrom = (direction == Direction::Up) ? (_items.size() - addedCount) : 1; // Should be ": 0", but zero is skipped anyway.
+	auto checkFrom =
+	    (direction == Direction::Up) ? (_items.size() - addedCount) : 1; // Should be ": 0", but zero is skipped anyway.
 	auto checkTo = (direction == Direction::Up) ? (_items.size() + 1) : (addedCount + 1);
 	for (auto i = checkFrom; i != checkTo; ++i) {
 		if (i > 0) {
@@ -597,7 +608,9 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 		newHeight += item->resizeGetHeight(newWidth);
 	}
 	_itemsHeight = newHeight;
-	_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom) ? (_minHeight - _itemsHeight - st::historyPaddingBottom) : 0;
+	_itemsTop = (_minHeight > _itemsHeight + st::historyPaddingBottom) ?
+	                (_minHeight - _itemsHeight - st::historyPaddingBottom) :
+	                0;
 	return _itemsTop + _itemsHeight + st::historyPaddingBottom;
 }
 
@@ -623,9 +636,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		auto from = std::lower_bound(begin, end, clip.top(), [this](auto &elem, int top) {
 			return this->itemTop(elem) + elem->height() <= top;
 		});
-		auto to = std::lower_bound(begin, end, clip.top() + clip.height(), [this](auto &elem, int bottom) {
-			return this->itemTop(elem) < bottom;
-		});
+		auto to = std::lower_bound(begin, end, clip.top() + clip.height(),
+		                           [this](auto &elem, int bottom) { return this->itemTop(elem) < bottom; });
 		if (from != end) {
 			auto top = itemTop(from->get());
 			p.translate(0, top);
@@ -638,7 +650,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			}
 			p.translate(0, -top);
 
-			enumerateUserpics([&p, &clip](not_null<HistoryMessage*> message, int userpicTop) {
+			enumerateUserpics([&p, &clip](not_null<HistoryMessage *> message, int userpicTop) {
 				// stop the enumeration if the userpic is below the painted rect
 				if (userpicTop >= clip.top() + clip.height()) {
 					return false;
@@ -646,14 +658,16 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 
 				// paint the userpic if it intersects the painted rect
 				if (userpicTop + st::msgPhotoSize > clip.top()) {
-					message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->width(), st::msgPhotoSize);
+					message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->width(),
+					                                  st::msgPhotoSize);
 				}
 				return true;
 			});
 
 			auto dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
 			auto scrollDateOpacity = _scrollDateOpacity.current(ms, _scrollDateShown ? 1. : 0.);
-			enumerateDates([&p, &clip, scrollDateOpacity, dateHeight/*, lastDate, showFloatingBefore*/](not_null<HistoryItem*> item, int itemtop, int dateTop) {
+			enumerateDates([&p, &clip, scrollDateOpacity, dateHeight /*, lastDate, showFloatingBefore*/](
+			                   not_null<HistoryItem *> item, int itemtop, int dateTop) {
 				// stop the enumeration if the date is above the painted rect
 				if (dateTop + dateHeight <= clip.top()) {
 					return false;
@@ -665,8 +679,8 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					int correctDateTop = itemtop + st::msgServiceMargin.top();
 					dateInPlace = (dateTop < correctDateTop + dateHeight);
 				}
-				//bool noFloatingDate = (item->date.date() == lastDate && displayDate);
-				//if (noFloatingDate) {
+				// bool noFloatingDate = (item->date.date() == lastDate && displayDate);
+				// if (noFloatingDate) {
 				//	if (itemtop < showFloatingBefore) {
 				//		noFloatingDate = false;
 				//	}
@@ -674,7 +688,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 
 				// paint the date if it intersects the painted rect
 				if (dateTop < clip.top() + clip.height()) {
-					auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
+					auto opacity = (dateInPlace /* || noFloatingDate*/) ? 1. : scrollDateOpacity;
 					if (opacity > 0.) {
 						p.setOpacity(opacity);
 						int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
@@ -712,12 +726,14 @@ void InnerWidget::paintEmpty(Painter &p) {
 	style::font font(st::msgServiceFont);
 	auto rectWidth = st::historyAdminLogEmptyWidth;
 	auto innerWidth = rectWidth - st::historyAdminLogEmptyPadding.left() - st::historyAdminLogEmptyPadding.right();
-	auto rectHeight = st::historyAdminLogEmptyPadding.top() + _emptyText.countHeight(innerWidth) + st::historyAdminLogEmptyPadding.bottom();
+	auto rectHeight = st::historyAdminLogEmptyPadding.top() + _emptyText.countHeight(innerWidth) +
+	                  st::historyAdminLogEmptyPadding.bottom();
 	auto rect = QRect((width() - rectWidth) / 2, (height() - rectHeight) / 3, rectWidth, rectHeight);
 	HistoryLayout::ServiceMessagePainter::paintBubble(p, rect.x(), rect.y(), rect.width(), rect.height());
 
 	p.setPen(st::msgServiceFg);
-	_emptyText.draw(p, rect.x() + st::historyAdminLogEmptyPadding.left(), rect.y() + st::historyAdminLogEmptyPadding.top(), innerWidth, style::al_top);
+	_emptyText.draw(p, rect.x() + st::historyAdminLogEmptyPadding.left(),
+	                rect.y() + st::historyAdminLogEmptyPadding.top(), innerWidth, style::al_top);
 }
 
 TextWithEntities InnerWidget::getSelectedText() const {
@@ -740,7 +756,8 @@ void InnerWidget::keyPressEvent(QKeyEvent *e) {
 
 void InnerWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 	mouseActionStart(e->globalPos(), e->button());
-	if (((_mouseAction == MouseAction::Selecting && _selectedItem != nullptr) || (_mouseAction == MouseAction::None)) && _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
+	if (((_mouseAction == MouseAction::Selecting && _selectedItem != nullptr) || (_mouseAction == MouseAction::None)) &&
+	    _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
 		HistoryStateRequest request;
 		request.flags |= Text::StateRequest::Flag::LookupSymbol;
 		auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
@@ -749,7 +766,7 @@ void InnerWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 			_mouseSelectType = TextSelectType::Words;
 			if (_mouseAction == MouseAction::None) {
 				_mouseAction = MouseAction::Selecting;
-				auto selection = TextSelection { dragState.symbol, dragState.symbol };
+				auto selection = TextSelection{dragState.symbol, dragState.symbol};
 				repaintItem(std::exchange(_selectedItem, _mouseActionItem));
 				_selectedText = selection;
 			}
@@ -788,7 +805,8 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			HistoryStateRequest request;
 			request.flags |= Text::StateRequest::Flag::LookupSymbol;
 			auto dragState = App::mousedItem()->getState(mousePos, request);
-			if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom && dragState.symbol < selTo) {
+			if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom &&
+			    dragState.symbol < selTo) {
 				isUponSelected = 1;
 			}
 		}
@@ -801,9 +819,9 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 
 	_contextMenuLink = ClickHandler::getActive();
 	auto item = App::hoveredItem() ? App::hoveredItem() : App::hoveredLinkItem();
-	auto lnkPhoto = dynamic_cast<PhotoClickHandler*>(_contextMenuLink.data());
-	auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data());
-	auto lnkPeer = dynamic_cast<PeerClickHandler*>(_contextMenuLink.data());
+	auto lnkPhoto = dynamic_cast<PhotoClickHandler *>(_contextMenuLink.data());
+	auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data());
+	auto lnkPeer = dynamic_cast<PeerClickHandler *>(_contextMenuLink.data());
 	auto lnkIsVideo = lnkDocument ? lnkDocument->document()->isVideo() : false;
 	auto lnkIsAudio = lnkDocument ? (lnkDocument->document()->voice() != nullptr) : false;
 	auto lnkIsSong = lnkDocument ? (lnkDocument->document()->song() != nullptr) : false;
@@ -812,16 +830,20 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_menu->addAction(lang(lng_context_copy_selected), [this] { copySelectedText(); })->setEnabled(true);
 		}
 		if (lnkPhoto) {
-			_menu->addAction(lang(lng_context_save_image), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, photo = lnkPhoto->photo()] {
-				savePhotoToFile(photo);
-			}))->setEnabled(true);
-			_menu->addAction(lang(lng_context_copy_image), [this, photo = lnkPhoto->photo()] {
-				copyContextImage(photo);
-			})->setEnabled(true);
+			_menu
+			    ->addAction(lang(lng_context_save_image),
+			                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+			                                   [this, photo = lnkPhoto->photo()] { savePhotoToFile(photo); }))
+			    ->setEnabled(true);
+			_menu
+			    ->addAction(lang(lng_context_copy_image),
+			                [this, photo = lnkPhoto->photo()] { copyContextImage(photo); })
+			    ->setEnabled(true);
 		} else {
 			auto document = lnkDocument->document();
 			if (document->loading()) {
-				_menu->addAction(lang(lng_context_cancel_download), [this] { cancelContextDownload(); })->setEnabled(true);
+				_menu->addAction(lang(lng_context_cancel_download), [this] { cancelContextDownload(); })
+				    ->setEnabled(true);
 			} else {
 				if (document->loaded() && document->isGifv()) {
 					if (!cAutoPlayGif()) {
@@ -829,11 +851,21 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					}
 				}
 				if (!document->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-					_menu->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), [this] { showContextInFolder(); })->setEnabled(true);
+					_menu
+					    ->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ?
+					                         lng_context_show_in_finder :
+					                         lng_context_show_in_folder),
+					                [this] { showContextInFolder(); })
+					    ->setEnabled(true);
 				}
-				_menu->addAction(lang(lnkIsVideo ? lng_context_save_video : (lnkIsAudio ? lng_context_save_audio : (lnkIsSong ? lng_context_save_audio_file : lng_context_save_file))), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-					saveDocumentToFile(document);
-				}))->setEnabled(true);
+				_menu
+				    ->addAction(lang(lnkIsVideo ? lng_context_save_video :
+				                                  (lnkIsAudio ? lng_context_save_audio :
+				                                                (lnkIsSong ? lng_context_save_audio_file :
+				                                                             lng_context_save_file))),
+				                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+				                                   [this, document] { saveDocumentToFile(document); }))
+				    ->setEnabled(true);
 			}
 		}
 		if (App::hoveredLinkItem()) {
@@ -847,7 +879,7 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		bool canDelete = item && item->canDelete() && (item->id > 0 || !item->serviceMsg());
 		bool canForward = item && item->canForward();
 
-		auto msg = dynamic_cast<HistoryMessage*>(item);
+		auto msg = dynamic_cast<HistoryMessage *>(item);
 		if (isUponSelected > 0) {
 			_menu->addAction(lang(lng_context_copy_selected), [this] { copySelectedText(); })->setEnabled(true);
 		} else {
@@ -855,34 +887,48 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				auto mediaHasTextForCopy = false;
 				if (auto media = (msg ? msg->getMedia() : nullptr)) {
 					mediaHasTextForCopy = media->hasTextForCopy();
-					if (media->type() == MediaTypeWebPage && static_cast<HistoryWebPage*>(media)->attach()) {
-						media = static_cast<HistoryWebPage*>(media)->attach();
+					if (media->type() == MediaTypeWebPage && static_cast<HistoryWebPage *>(media)->attach()) {
+						media = static_cast<HistoryWebPage *>(media)->attach();
 					}
 					if (media->type() == MediaTypeSticker) {
 						if (auto document = media->getDocument()) {
 							if (document->sticker() && document->sticker()->set.type() != mtpc_inputStickerSetEmpty) {
-								_menu->addAction(lang(document->sticker()->setInstalled() ? lng_context_pack_info : lng_context_pack_add), [this] { showStickerPackInfo(); });
+								_menu->addAction(lang(document->sticker()->setInstalled() ? lng_context_pack_info :
+								                                                            lng_context_pack_add),
+								                 [this] { showStickerPackInfo(); });
 							}
-							_menu->addAction(lang(lng_context_save_image), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-								saveDocumentToFile(document);
-							}))->setEnabled(true);
+							_menu
+							    ->addAction(lang(lng_context_save_image),
+							                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+							                                   [this, document] { saveDocumentToFile(document); }))
+							    ->setEnabled(true);
 						}
 					} else if (media->type() == MediaTypeGif && !_contextMenuLink) {
 						if (auto document = media->getDocument()) {
 							if (document->loading()) {
-								_menu->addAction(lang(lng_context_cancel_download), [this] { cancelContextDownload(); })->setEnabled(true);
+								_menu->addAction(lang(lng_context_cancel_download), [this] { cancelContextDownload(); })
+								    ->setEnabled(true);
 							} else {
 								if (document->isGifv()) {
 									if (!cAutoPlayGif()) {
-										_menu->addAction(lang(lng_context_open_gif), [this] { openContextGif(); })->setEnabled(true);
+										_menu->addAction(lang(lng_context_open_gif), [this] { openContextGif(); })
+										    ->setEnabled(true);
 									}
 								}
 								if (!document->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-									_menu->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), [this] { showContextInFolder(); })->setEnabled(true);
+									_menu
+									    ->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ?
+									                         lng_context_show_in_finder :
+									                         lng_context_show_in_folder),
+									                [this] { showContextInFolder(); })
+									    ->setEnabled(true);
 								}
-								_menu->addAction(lang(lng_context_save_file), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-									saveDocumentToFile(document);
-								}))->setEnabled(true);
+								_menu
+								    ->addAction(lang(lng_context_save_file),
+								                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration,
+								                                   this,
+								                                   [this, document] { saveDocumentToFile(document); }))
+								    ->setEnabled(true);
 							}
 						}
 					}
@@ -893,7 +939,8 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}
 		}
 
-		auto linkCopyToClipboardText = _contextMenuLink ? _contextMenuLink->copyToClipboardContextItemText() : QString();
+		auto linkCopyToClipboardText =
+		    _contextMenuLink ? _contextMenuLink->copyToClipboardContextItemText() : QString();
 		if (!linkCopyToClipboardText.isEmpty()) {
 			_menu->addAction(linkCopyToClipboardText, [this] { copyContextUrl(); })->setEnabled(true);
 		}
@@ -917,11 +964,12 @@ void InnerWidget::savePhotoToFile(PhotoData *photo) {
 	if (!photo || !photo->date || !photo->loaded()) return;
 
 	auto filter = qsl("JPEG Image (*.jpg);;") + FileDialog::AllFilesFilter();
-	FileDialog::GetWritePath(lang(lng_save_photo), filter, filedialogDefaultName(qsl("photo"), qsl(".jpg")), base::lambda_guarded(this, [this, photo](const QString &result) {
-		if (!result.isEmpty()) {
-			photo->full->pix().toImage().save(result, "JPG");
-		}
-	}));
+	FileDialog::GetWritePath(lang(lng_save_photo), filter, filedialogDefaultName(qsl("photo"), qsl(".jpg")),
+	                         base::lambda_guarded(this, [this, photo](const QString &result) {
+		                         if (!result.isEmpty()) {
+			                         photo->full->pix().toImage().save(result, "JPG");
+		                         }
+	                         }));
 }
 
 void InnerWidget::saveDocumentToFile(DocumentData *document) {
@@ -959,7 +1007,7 @@ void InnerWidget::showStickerPackInfo() {
 }
 
 void InnerWidget::cancelContextDownload() {
-	if (auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data())) {
+	if (auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data())) {
 		lnkDocument->document()->cancel();
 	} else if (auto item = App::contextItem()) {
 		if (auto media = item->getMedia()) {
@@ -972,7 +1020,7 @@ void InnerWidget::cancelContextDownload() {
 
 void InnerWidget::showContextInFolder() {
 	QString filepath;
-	if (auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data())) {
+	if (auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data())) {
 		filepath = lnkDocument->document()->filepath(DocumentData::FilePathResolveChecked);
 	} else if (auto item = App::contextItem()) {
 		if (auto media = item->getMedia()) {
@@ -1011,7 +1059,7 @@ void InnerWidget::setToClipboard(const TextWithEntities &forClipboard, QClipboar
 	}
 }
 
-void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
+void InnerWidget::suggestRestrictUser(not_null<UserData *> user) {
 	Expects(_menu != nullptr);
 	if (!_channel->isMegagroup() || !_channel->canBanMembers() || _admins.empty()) {
 		return;
@@ -1026,7 +1074,8 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
 			auto weak = QPointer<InnerWidget>(this);
 			auto weakBox = std::make_shared<QPointer<EditRestrictedBox>>();
 			auto box = Box<EditRestrictedBox>(_channel, user, hasAdminRights, currentRights);
-			box->setSaveCallback([user, weak, weakBox](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+			box->setSaveCallback([user, weak, weakBox](const MTPChannelBannedRights &oldRights,
+			                                           const MTPChannelBannedRights &newRights) {
 				if (weak) {
 					weak->restrictUser(user, oldRights, newRights);
 				}
@@ -1039,36 +1088,42 @@ void InnerWidget::suggestRestrictUser(not_null<UserData*> user) {
 		if (base::contains(_admins, user)) {
 			editRestrictions(true, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
 		} else {
-			request(MTPchannels_GetParticipant(_channel->inputChannel, user->inputUser)).done([this, editRestrictions](const MTPchannels_ChannelParticipant &result) {
-				Expects(result.type() == mtpc_channels_channelParticipant);
-				auto &participant = result.c_channels_channelParticipant();
-				App::feedUsers(participant.vusers);
-				auto type = participant.vparticipant.type();
-				if (type == mtpc_channelParticipantBanned) {
-					editRestrictions(false, participant.vparticipant.c_channelParticipantBanned().vbanned_rights);
-				} else {
-					auto hasAdminRights = (type == mtpc_channelParticipantAdmin || type == mtpc_channelParticipantCreator);
-					editRestrictions(hasAdminRights, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
-				}
-			}).fail([this, editRestrictions](const RPCError &error) {
-				editRestrictions(false, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
-			}).send();
+			request(MTPchannels_GetParticipant(_channel->inputChannel, user->inputUser))
+			    .done([this, editRestrictions](const MTPchannels_ChannelParticipant &result) {
+				    Expects(result.type() == mtpc_channels_channelParticipant);
+				    auto &participant = result.c_channels_channelParticipant();
+				    App::feedUsers(participant.vusers);
+				    auto type = participant.vparticipant.type();
+				    if (type == mtpc_channelParticipantBanned) {
+					    editRestrictions(false, participant.vparticipant.c_channelParticipantBanned().vbanned_rights);
+				    } else {
+					    auto hasAdminRights =
+					        (type == mtpc_channelParticipantAdmin || type == mtpc_channelParticipantCreator);
+					    editRestrictions(hasAdminRights, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
+				    }
+			    })
+			    .fail([this, editRestrictions](const RPCError &error) {
+				    editRestrictions(false, MTP_channelBannedRights(MTP_flags(0), MTP_int(0)));
+			    })
+			    .send();
 		}
 	});
 }
 
-void InnerWidget::restrictUser(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+void InnerWidget::restrictUser(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+                               const MTPChannelBannedRights &newRights) {
 	auto weak = QPointer<InnerWidget>(this);
-	MTP::send(MTPchannels_EditBanned(_channel->inputChannel, user->inputUser, newRights), rpcDone([megagroup = _channel.get(), user, weak, oldRights, newRights](const MTPUpdates &result) {
-		Auth().api().applyUpdates(result);
-		megagroup->applyEditBanned(user, oldRights, newRights);
-		if (weak) {
-			weak->restrictUserDone(user, newRights);
-		}
-	}));
+	MTP::send(MTPchannels_EditBanned(_channel->inputChannel, user->inputUser, newRights),
+	          rpcDone([megagroup = _channel.get(), user, weak, oldRights, newRights](const MTPUpdates &result) {
+		          Auth().api().applyUpdates(result);
+		          megagroup->applyEditBanned(user, oldRights, newRights);
+		          if (weak) {
+			          weak->restrictUserDone(user, newRights);
+		          }
+	          }));
 }
 
-void InnerWidget::restrictUserDone(not_null<UserData*> user, const MTPChannelBannedRights &rights) {
+void InnerWidget::restrictUserDone(not_null<UserData *> user, const MTPChannelBannedRights &rights) {
 	Expects(rights.type() == mtpc_channelBannedRights);
 	if (rights.c_channelBannedRights().vflags.v) {
 		_admins.erase(std::remove(_admins.begin(), _admins.end(), user), _admins.end());
@@ -1142,12 +1197,13 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
 	}
 	if (_mouseAction == MouseAction::None && _mouseActionItem) {
 		HistoryTextState dragState;
-		if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
+		if (_trippleClickTimer.isActive() &&
+		    (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
 			HistoryStateRequest request;
 			request.flags = Text::StateRequest::Flag::LookupSymbol;
 			dragState = _mouseActionItem->getState(_dragStartPosition, request);
 			if (dragState.cursor == HistoryInTextCursorState) {
-				auto selection = TextSelection { dragState.symbol, dragState.symbol };
+				auto selection = TextSelection{dragState.symbol, dragState.symbol};
 				repaintItem(std::exchange(_selectedItem, _mouseActionItem));
 				_selectedText = selection;
 				_mouseTextSymbol = dragState.symbol;
@@ -1176,7 +1232,7 @@ void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton butt
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
 					if (dragState.afterSymbol) ++_mouseTextSymbol;
-					auto selection = TextSelection { _mouseTextSymbol, _mouseTextSymbol };
+					auto selection = TextSelection{_mouseTextSymbol, _mouseTextSymbol};
 					repaintItem(std::exchange(_selectedItem, _mouseActionItem));
 					_selectedText = selection;
 					_mouseAction = MouseAction::Selecting;
@@ -1253,9 +1309,11 @@ void InnerWidget::updateSelected() {
 
 	auto itemPoint = QPoint();
 	auto begin = std::rbegin(_items), end = std::rend(_items);
-	auto from = (point.y() >= _itemsTop && point.y() < _itemsTop + _itemsHeight) ? std::lower_bound(begin, end, point.y(), [this](auto &elem, int top) {
-		return this->itemTop(elem) + elem->height() <= top;
-	}) : end;
+	auto from =
+	    (point.y() >= _itemsTop && point.y() < _itemsTop + _itemsHeight) ?
+	        std::lower_bound(begin, end, point.y(),
+	                         [this](auto &elem, int top) { return this->itemTop(elem) + elem->height() <= top; }) :
+	        end;
 	auto item = (from != end) ? from->get() : nullptr;
 	if (item) {
 		App::mousedItem(item);
@@ -1276,7 +1334,8 @@ void InnerWidget::updateSelected() {
 	ClickHandlerHost *lnkhost = nullptr;
 	auto selectingText = (item == _mouseActionItem && item == App::hoveredItem() && _selectedItem);
 	if (item) {
-		if (item != _mouseActionItem || (itemPoint - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
+		if (item != _mouseActionItem ||
+		    (itemPoint - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
 			if (_mouseAction == MouseAction::PrepareDrag) {
 				_mouseAction = MouseAction::Dragging;
 				InvokeQueued(this, [this] { performDrag(); });
@@ -1290,23 +1349,25 @@ void InnerWidget::updateSelected() {
 		}
 		dragState = item->getState(itemPoint, request);
 		lnkhost = item;
-		if (!dragState.link && itemPoint.x() >= st::historyPhotoLeft && itemPoint.x() < st::historyPhotoLeft + st::msgPhotoSize) {
+		if (!dragState.link && itemPoint.x() >= st::historyPhotoLeft &&
+		    itemPoint.x() < st::historyPhotoLeft + st::msgPhotoSize) {
 			if (auto message = item->toHistoryMessage()) {
 				if (message->hasFromPhoto()) {
-					enumerateUserpics([&dragState, &lnkhost, &point](not_null<HistoryMessage*> message, int userpicTop) -> bool {
-						// stop enumeration if the userpic is below our point
-						if (userpicTop > point.y()) {
-							return false;
-						}
+					enumerateUserpics(
+					    [&dragState, &lnkhost, &point](not_null<HistoryMessage *> message, int userpicTop) -> bool {
+						    // stop enumeration if the userpic is below our point
+						    if (userpicTop > point.y()) {
+							    return false;
+						    }
 
-						// stop enumeration if we've found a userpic under the cursor
-						if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
-							dragState.link = message->from()->openLink();
-							lnkhost = message;
-							return false;
-						}
-						return true;
-					});
+						    // stop enumeration if we've found a userpic under the cursor
+						    if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
+							    dragState.link = message->from()->openLink();
+							    lnkhost = message;
+							    return false;
+						    }
+						    return true;
+					    });
 				}
 			}
 		}
@@ -1315,7 +1376,8 @@ void InnerWidget::updateSelected() {
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
-	if (dragState.link || dragState.cursor == HistoryInDateCursorState || dragState.cursor == HistoryInForwardedCursorState) {
+	if (dragState.link || dragState.cursor == HistoryInDateCursorState ||
+	    dragState.cursor == HistoryInForwardedCursorState) {
 		Ui::Tooltip::Show(1000, this);
 	}
 
@@ -1327,7 +1389,7 @@ void InnerWidget::updateSelected() {
 		} else if (_mouseCursorState == HistoryInTextCursorState) {
 			cursor = style::cur_text;
 		} else if (_mouseCursorState == HistoryInDateCursorState) {
-//			cursor = style::cur_cross;
+			//			cursor = style::cur_cross;
 		}
 	} else if (item) {
 		if (_mouseAction == MouseAction::Selecting) {
@@ -1336,7 +1398,7 @@ void InnerWidget::updateSelected() {
 				if (dragState.afterSymbol && _mouseSelectType == TextSelectType::Letters) {
 					++second;
 				}
-				auto selection = TextSelection { std::min(second, _mouseTextSymbol), std::max(second, _mouseTextSymbol) };
+				auto selection = TextSelection{std::min(second, _mouseTextSymbol), std::max(second, _mouseTextSymbol)};
 				if (_mouseSelectType != TextSelectType::Letters) {
 					selection = _mouseActionItem->adjustSelection(selection, _mouseSelectType);
 				}
@@ -1369,7 +1431,7 @@ void InnerWidget::updateSelected() {
 		}
 	}
 
-	//if (_mouseAction == MouseAction::Selecting) {
+	// if (_mouseAction == MouseAction::Selecting) {
 	//	_widget->checkSelectingScroll(mousePos);
 	//} else {
 	//	_widget->noSelectingScroll();
@@ -1384,7 +1446,7 @@ void InnerWidget::performDrag() {
 	if (_mouseAction != MouseAction::Dragging) return;
 
 	auto uponSelected = false;
-	//if (_mouseActionItem) {
+	// if (_mouseActionItem) {
 	//	if (!_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
 	//		uponSelected = _selected.contains(_mouseActionItem);
 	//	} else {
@@ -1407,15 +1469,15 @@ void InnerWidget::performDrag() {
 	//		}
 	//	}
 	//}
-	//auto pressedHandler = ClickHandler::getPressed();
+	// auto pressedHandler = ClickHandler::getPressed();
 
-	//if (dynamic_cast<VoiceSeekClickHandler*>(pressedHandler.data())) {
+	// if (dynamic_cast<VoiceSeekClickHandler*>(pressedHandler.data())) {
 	//	return;
 	//}
 
-	//TextWithEntities sel;
-	//QList<QUrl> urls;
-	//if (uponSelected) {
+	// TextWithEntities sel;
+	// QList<QUrl> urls;
+	// if (uponSelected) {
 	//	sel = getSelectedText();
 	//} else if (pressedHandler) {
 	//	sel = { pressedHandler->dragText(), EntitiesInText() };
@@ -1423,7 +1485,7 @@ void InnerWidget::performDrag() {
 	//	//	urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o
 	//	//}
 	//}
-	//if (auto mimeData = mimeDataFromTextWithEntities(sel)) {
+	// if (auto mimeData = mimeDataFromTextWithEntities(sel)) {
 	//	updateDragSelection(0, 0, false);
 	//	_widget->noSelectingScroll();
 
@@ -1471,7 +1533,7 @@ void InnerWidget::performDrag() {
 	//} // TODO
 }
 
-int InnerWidget::itemTop(not_null<const HistoryItem*> item) const {
+int InnerWidget::itemTop(not_null<const HistoryItem *> item) const {
 	return _itemsTop + item->y();
 }
 
diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.h b/Telegram/SourceFiles/history/history_admin_log_inner.h
index b4bfc29ea..ca59d86df 100644
--- a/Telegram/SourceFiles/history/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/history_admin_log_inner.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QClipboard>
-#include <gsl/gsl>
+#include "base/timer.h"
 #include "history/history_admin_log_item.h"
 #include "history/history_admin_log_section.h"
-#include "ui/widgets/tooltip.h"
 #include "mtproto/sender.h"
-#include "base/timer.h"
+#include "ui/widgets/tooltip.h"
+#include <QClipboard>
+#include <gsl/gsl>
 
 namespace Ui {
 class PopupMenu;
@@ -40,15 +40,18 @@ namespace AdminLog {
 
 class SectionMemento;
 
-class InnerWidget final : public TWidget, public Ui::AbstractTooltipShower, private MTP::Sender, private base::Subscriber {
+class InnerWidget final : public TWidget,
+                          public Ui::AbstractTooltipShower,
+                          private MTP::Sender,
+                          private base::Subscriber {
 public:
-	InnerWidget(QWidget *parent, not_null<Window::Controller*> controller, not_null<ChannelData*> channel);
+	InnerWidget(QWidget *parent, not_null<Window::Controller *> controller, not_null<ChannelData *> channel);
 
 	base::Observable<void> showSearchSignal;
 	base::Observable<int> scrollToSignal;
 	base::Observable<void> cancelledSignal;
 
-	not_null<ChannelData*> channel() const {
+	not_null<ChannelData *> channel() const {
 		return _channel;
 	}
 
@@ -63,8 +66,8 @@ public:
 		return TWidget::resizeToWidth(newWidth);
 	}
 
-	void saveState(not_null<SectionMemento*> memento);
-	void restoreState(not_null<SectionMemento*> memento);
+	void saveState(not_null<SectionMemento *> memento);
+	void restoreState(not_null<SectionMemento *> memento);
 
 	// Empty "flags" means all events.
 	void applyFilter(FilterValue &&value);
@@ -113,7 +116,7 @@ private:
 	void mouseActionCancel();
 	void updateSelected();
 	void performDrag();
-	int itemTop(not_null<const HistoryItem*> item) const;
+	int itemTop(not_null<const HistoryItem *> item) const;
 	void repaintItem(const HistoryItem *item);
 	QPoint mapPointToItem(QPoint point, const HistoryItem *item) const;
 	void handlePendingHistoryResize();
@@ -131,9 +134,10 @@ private:
 	void copySelectedText();
 	TextWithEntities getSelectedText() const;
 	void setToClipboard(const TextWithEntities &forClipboard, QClipboard::Mode mode = QClipboard::Clipboard);
-	void suggestRestrictUser(not_null<UserData*> user);
-	void restrictUser(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights);
-	void restrictUserDone(not_null<UserData*> user, const MTPChannelBannedRights &rights);
+	void suggestRestrictUser(not_null<UserData *> user);
+	void restrictUser(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+	                  const MTPChannelBannedRights &newRights);
+	void restrictUserDone(not_null<UserData *> user, const MTPChannelBannedRights &rights);
 
 	void requestAdmins();
 	void checkPreloadMore();
@@ -160,30 +164,27 @@ private:
 	//
 	// Method has "bool (*Method)(HistoryItem *item, int itemtop, int itembottom)" signature
 	// if it returns false the enumeration stops immidiately.
-	template <EnumItemsDirection direction, typename Method>
-	void enumerateItems(Method method);
+	template <EnumItemsDirection direction, typename Method> void enumerateItems(Method method);
 
 	// This function finds all userpics on the left that are displayed and calls template method
 	// for each found userpic (from the top to the bottom) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<HistoryMessage*> message, int userpicTop)" signature
 	// if it returns false the enumeration stops immidiately.
-	template <typename Method>
-	void enumerateUserpics(Method method);
+	template <typename Method> void enumerateUserpics(Method method);
 
 	// This function finds all date elements that are displayed and calls template method
 	// for each found date element (from the bottom to the top) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<HistoryItem*> item, int itemtop, int dateTop)" signature
 	// if it returns false the enumeration stops immidiately.
-	template <typename Method>
-	void enumerateDates(Method method);
+	template <typename Method> void enumerateDates(Method method);
 
-	not_null<Window::Controller*> _controller;
-	not_null<ChannelData*> _channel;
-	not_null<History*> _history;
+	not_null<Window::Controller *> _controller;
+	not_null<ChannelData *> _channel;
+	not_null<History *> _history;
 	std::vector<HistoryItemOwned> _items;
-	std::map<quint64, HistoryItem*> _itemsByIds;
+	std::map<quint64, HistoryItem *> _itemsByIds;
 	int _itemsTop = 0;
 	int _itemsHeight = 0;
 
@@ -237,10 +238,9 @@ private:
 
 	FilterValue _filter;
 	QString _searchQuery;
-	std::vector<not_null<UserData*>> _admins;
-	std::vector<not_null<UserData*>> _adminsCanEdit;
+	std::vector<not_null<UserData *>> _admins;
+	std::vector<not_null<UserData *>> _adminsCanEdit;
 	base::lambda<void(FilterValue &&filter)> _showFilterCallback;
-
 };
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/history_admin_log_item.cpp b/Telegram/SourceFiles/history/history_admin_log_item.cpp
index 663bc69f7..70ab81129 100644
--- a/Telegram/SourceFiles/history/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/history_admin_log_item.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_admin_log_item.h"
 
-#include "history/history_service.h"
-#include "history/history_message.h"
-#include "history/history_admin_log_inner.h"
-#include "lang/lang_keys.h"
-#include "boxes/sticker_set_box.h"
-#include "messenger.h"
 #include "app.h"
+#include "boxes/sticker_set_box.h"
+#include "history/history_admin_log_inner.h"
+#include "history/history_message.h"
+#include "history/history_service.h"
+#include "lang/lang_keys.h"
+#include "messenger.h"
 
 namespace AdminLog {
 namespace {
 
 TextWithEntities PrepareText(const QString &value, const QString &emptyValue) {
-	auto result = TextWithEntities { TextUtilities::Clean(value) };
+	auto result = TextWithEntities{TextUtilities::Clean(value)};
 	if (result.text.isEmpty()) {
 		result.text = emptyValue;
 		if (!emptyValue.isEmpty()) {
 			result.entities.push_back(EntityInText(EntityInTextItalic, 0, emptyValue.size()));
 		}
 	} else {
-		TextUtilities::ParseEntities(result, TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands);
+		TextUtilities::ParseEntities(result,
+		                             TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands);
 	}
 	return result;
 }
@@ -49,13 +50,19 @@ MTPMessage PrepareLogMessage(const MTPMessage &message, MsgId newId, qint32 newD
 	case mtpc_messageEmpty: return MTP_messageEmpty(MTP_int(newId));
 	case mtpc_messageService: {
 		auto &data = message.c_messageService();
-		auto flags = data.vflags.v & ~(MTPDmessageService::Flag::f_out | MTPDmessageService::Flag::f_post/* | MTPDmessageService::Flag::f_reply_to_msg_id*/);
-		return MTP_messageService(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vreply_to_msg_id, MTP_int(newDate), data.vaction);
+		auto flags =
+		    data.vflags.v & ~(MTPDmessageService::Flag::f_out |
+		                      MTPDmessageService::Flag::f_post /* | MTPDmessageService::Flag::f_reply_to_msg_id*/);
+		return MTP_messageService(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vreply_to_msg_id,
+		                          MTP_int(newDate), data.vaction);
 	} break;
 	case mtpc_message: {
 		auto &data = message.c_message();
-		auto flags = data.vflags.v & ~(MTPDmessage::Flag::f_out | MTPDmessage::Flag::f_post | MTPDmessage::Flag::f_reply_to_msg_id | MTPDmessage::Flag::f_edit_date);
-		return MTP_message(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vfwd_from, data.vvia_bot_id, data.vreply_to_msg_id, MTP_int(newDate), data.vmessage, data.vmedia, data.vreply_markup, data.ventities, data.vviews, data.vedit_date, MTP_string(""));
+		auto flags = data.vflags.v & ~(MTPDmessage::Flag::f_out | MTPDmessage::Flag::f_post |
+		                               MTPDmessage::Flag::f_reply_to_msg_id | MTPDmessage::Flag::f_edit_date);
+		return MTP_message(MTP_flags(flags), MTP_int(newId), data.vfrom_id, data.vto_id, data.vfwd_from,
+		                   data.vvia_bot_id, data.vreply_to_msg_id, MTP_int(newDate), data.vmessage, data.vmedia,
+		                   data.vreply_markup, data.ventities, data.vviews, data.vedit_date, MTP_string(""));
 	} break;
 	}
 	Unexpected("Type in PrepareLogMessage()");
@@ -85,7 +92,7 @@ TextWithEntities ExtractEditedText(const MTPMessage &message) {
 	}
 	auto text = TextUtilities::Clean(qs(data.vmessage));
 	auto entities = data.has_entities() ? TextUtilities::EntitiesFromMTP(data.ventities.v) : EntitiesInText();
-	return { text, entities };
+	return {text, entities};
 }
 
 PhotoData *GenerateChatPhoto(ChannelId channelId, quint64 logEntryId, MTPint date, const MTPDchatPhoto &photo) {
@@ -98,7 +105,8 @@ PhotoData *GenerateChatPhoto(ChannelId channelId, quint64 logEntryId, MTPint dat
 	photoSizes.reserve(2);
 	photoSizes.push_back(MTP_photoSize(MTP_string("a"), photo.vphoto_small, MTP_int(160), MTP_int(160), MTP_int(0)));
 	photoSizes.push_back(MTP_photoSize(MTP_string("c"), photo.vphoto_big, MTP_int(640), MTP_int(640), MTP_int(0)));
-	return App::feedPhoto(MTP_photo(MTP_flags(0), MTP_long(photoId), MTP_long(0), date, MTP_vector<MTPPhotoSize>(photoSizes)));
+	return App::feedPhoto(
+	    MTP_photo(MTP_flags(0), MTP_long(photoId), MTP_long(0), date, MTP_vector<MTPPhotoSize>(photoSizes)));
 }
 
 const auto CollectChanges = [](auto &phraseMap, auto plusFlags, auto minusFlags) {
@@ -115,7 +123,8 @@ const auto CollectChanges = [](auto &phraseMap, auto plusFlags, auto minusFlags)
 	return withPrefix(plusFlags & ~minusFlags, '+') + withPrefix(minusFlags & ~plusFlags, kMinus);
 };
 
-auto GenerateAdminChangeText(not_null<ChannelData*> channel, const TextWithEntities &user, const MTPChannelAdminRights *newRights, const MTPChannelAdminRights *prevRights) {
+auto GenerateAdminChangeText(not_null<ChannelData *> channel, const TextWithEntities &user,
+                             const MTPChannelAdminRights *newRights, const MTPChannelAdminRights *prevRights) {
 	using Flag = MTPDchannelAdminRights::Flag;
 	using Flags = MTPDchannelAdminRights::Flags;
 
@@ -128,15 +137,15 @@ auto GenerateAdminChangeText(not_null<ChannelData*> channel, const TextWithEntit
 	auto inviteKey = Flag::f_invite_users | Flag::f_invite_link;
 	auto useInviteLinkPhrase = channel->isMegagroup() && channel->anyoneCanAddMembers();
 	auto invitePhrase = (useInviteLinkPhrase ? lng_admin_log_admin_invite_link : lng_admin_log_admin_invite_users);
-	static auto phraseMap = std::map<Flags, LangKey> {
-		{ Flag::f_change_info, lng_admin_log_admin_change_info },
-		{ Flag::f_post_messages, lng_admin_log_admin_post_messages },
-		{ Flag::f_edit_messages, lng_admin_log_admin_edit_messages },
-		{ Flag::f_delete_messages, lng_admin_log_admin_delete_messages },
-		{ Flag::f_ban_users, lng_admin_log_admin_ban_users },
-		{ inviteKey, invitePhrase },
-		{ Flag::f_pin_messages, lng_admin_log_admin_pin_messages },
-		{ Flag::f_add_admins, lng_admin_log_admin_add_admins },
+	static auto phraseMap = std::map<Flags, LangKey>{
+	    {Flag::f_change_info, lng_admin_log_admin_change_info},
+	    {Flag::f_post_messages, lng_admin_log_admin_post_messages},
+	    {Flag::f_edit_messages, lng_admin_log_admin_edit_messages},
+	    {Flag::f_delete_messages, lng_admin_log_admin_delete_messages},
+	    {Flag::f_ban_users, lng_admin_log_admin_ban_users},
+	    {inviteKey, invitePhrase},
+	    {Flag::f_pin_messages, lng_admin_log_admin_pin_messages},
+	    {Flag::f_add_admins, lng_admin_log_admin_add_admins},
 	};
 	phraseMap[inviteKey] = invitePhrase;
 
@@ -154,7 +163,8 @@ auto GenerateAdminChangeText(not_null<ChannelData*> channel, const TextWithEntit
 	return result;
 };
 
-auto GenerateBannedChangeText(const TextWithEntities &user, const MTPChannelBannedRights *newRights, const MTPChannelBannedRights *prevRights) {
+auto GenerateBannedChangeText(const TextWithEntities &user, const MTPChannelBannedRights *newRights,
+                              const MTPChannelBannedRights *prevRights) {
 	using Flag = MTPDchannelBannedRights::Flag;
 	using Flags = MTPDchannelBannedRights::Flags;
 
@@ -167,15 +177,17 @@ auto GenerateBannedChangeText(const TextWithEntities &user, const MTPChannelBann
 	if (newFlags & Flag::f_view_messages) {
 		return lng_admin_log_banned__generic(lt_user, user);
 	}
-	auto untilText = indefinitely ? lang(lng_admin_log_restricted_forever) : lng_admin_log_restricted_until(lt_date, langDateTime(::date(newUntil)));
-	auto result = lng_admin_log_restricted__generic(lt_user, user, lt_until, TextWithEntities { untilText });
+	auto untilText = indefinitely ? lang(lng_admin_log_restricted_forever) :
+	                                lng_admin_log_restricted_until(lt_date, langDateTime(::date(newUntil)));
+	auto result = lng_admin_log_restricted__generic(lt_user, user, lt_until, TextWithEntities{untilText});
 
-	static auto phraseMap = std::map<Flags, LangKey> {
-		{ Flag::f_view_messages, lng_admin_log_banned_view_messages },
-		{ Flag::f_send_messages, lng_admin_log_banned_send_messages },
-		{ Flag::f_send_media, lng_admin_log_banned_send_media },
-		{ Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_inline | Flag::f_send_games, lng_admin_log_banned_send_stickers },
-		{ Flag::f_embed_links, lng_admin_log_banned_embed_links },
+	static auto phraseMap = std::map<Flags, LangKey>{
+	    {Flag::f_view_messages, lng_admin_log_banned_view_messages},
+	    {Flag::f_send_messages, lng_admin_log_banned_send_messages},
+	    {Flag::f_send_media, lng_admin_log_banned_send_media},
+	    {Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_inline | Flag::f_send_games,
+	     lng_admin_log_banned_send_stickers},
+	    {Flag::f_embed_links, lng_admin_log_banned_embed_links},
 	};
 	auto changes = CollectChanges(phraseMap, prevFlags, newFlags);
 	if (!changes.isEmpty()) {
@@ -188,26 +200,30 @@ auto GenerateBannedChangeText(const TextWithEntities &user, const MTPChannelBann
 auto GenerateUserString(MTPint userId) {
 	// User name in "User name (@username)" format with entities.
 	auto user = App::user(userId.v);
-	auto name = TextWithEntities { App::peerName(user) };
-	name.entities.push_back(EntityInText(EntityInTextMentionName, 0, name.text.size(), QString::number(user->id) + '.' + QString::number(user->access)));
+	auto name = TextWithEntities{App::peerName(user)};
+	name.entities.push_back(EntityInText(EntityInTextMentionName, 0, name.text.size(),
+	                                     QString::number(user->id) + '.' + QString::number(user->access)));
 	auto username = user->userName();
 	if (username.isEmpty()) {
 		return name;
 	}
-	auto mention = TextWithEntities { '@' + username };
+	auto mention = TextWithEntities{'@' + username};
 	mention.entities.push_back(EntityInText(EntityInTextMention, 0, mention.text.size()));
 	return lng_admin_log_user_with_username__generic(lt_name, name, lt_mention, mention);
 }
 
-auto GenerateParticipantChangeTextInner(not_null<ChannelData*> channel, const MTPChannelParticipant &participant, const MTPChannelParticipant *oldParticipant) {
+auto GenerateParticipantChangeTextInner(not_null<ChannelData *> channel, const MTPChannelParticipant &participant,
+                                        const MTPChannelParticipant *oldParticipant) {
 	auto oldType = oldParticipant ? oldParticipant->type() : 0;
 
 	auto resultForParticipant = [channel, oldParticipant, oldType](auto &&data) {
 		auto user = GenerateUserString(data.vuser_id);
 		if (oldType == mtpc_channelParticipantAdmin) {
-			return GenerateAdminChangeText(channel, user, nullptr, &oldParticipant->c_channelParticipantAdmin().vadmin_rights);
+			return GenerateAdminChangeText(channel, user, nullptr,
+			                               &oldParticipant->c_channelParticipantAdmin().vadmin_rights);
 		} else if (oldType == mtpc_channelParticipantBanned) {
-			return GenerateBannedChangeText(user, nullptr, &oldParticipant->c_channelParticipantBanned().vbanned_rights);
+			return GenerateBannedChangeText(user, nullptr,
+			                                &oldParticipant->c_channelParticipantBanned().vbanned_rights);
 		}
 		return lng_admin_log_invited__generic(lt_user, user);
 	};
@@ -225,20 +241,28 @@ auto GenerateParticipantChangeTextInner(not_null<ChannelData*> channel, const MT
 	case mtpc_channelParticipantAdmin: {
 		auto &data = participant.c_channelParticipantAdmin();
 		auto user = GenerateUserString(data.vuser_id);
-		return GenerateAdminChangeText(channel, user, &data.vadmin_rights, (oldType == mtpc_channelParticipantAdmin) ? &oldParticipant->c_channelParticipantAdmin().vadmin_rights : nullptr);
+		return GenerateAdminChangeText(channel, user, &data.vadmin_rights,
+		                               (oldType == mtpc_channelParticipantAdmin) ?
+		                                   &oldParticipant->c_channelParticipantAdmin().vadmin_rights :
+		                                   nullptr);
 	} break;
 
 	case mtpc_channelParticipantBanned: {
 		auto &data = participant.c_channelParticipantBanned();
 		auto user = GenerateUserString(data.vuser_id);
-		return GenerateBannedChangeText(user, &data.vbanned_rights, (oldType == mtpc_channelParticipantBanned) ? &oldParticipant->c_channelParticipantBanned().vbanned_rights : nullptr);
+		return GenerateBannedChangeText(user, &data.vbanned_rights,
+		                                (oldType == mtpc_channelParticipantBanned) ?
+		                                    &oldParticipant->c_channelParticipantBanned().vbanned_rights :
+		                                    nullptr);
 	} break;
 	}
 
 	Unexpected("Participant type in GenerateParticipantChangeTextInner()");
 }
 
-TextWithEntities GenerateParticipantChangeText(not_null<ChannelData*> channel, const MTPChannelParticipant &participant, const MTPChannelParticipant *oldParticipant = nullptr) {
+TextWithEntities GenerateParticipantChangeText(not_null<ChannelData *> channel,
+                                               const MTPChannelParticipant &participant,
+                                               const MTPChannelParticipant *oldParticipant = nullptr) {
 	auto result = GenerateParticipantChangeTextInner(channel, participant, oldParticipant);
 	result.entities.push_front(EntityInText(EntityInTextItalic, 0, result.text.size()));
 	return result;
@@ -246,7 +270,8 @@ TextWithEntities GenerateParticipantChangeText(not_null<ChannelData*> channel, c
 
 } // namespace
 
-void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const MTPDchannelAdminLogEvent &event, base::lambda<void(HistoryItemOwned item)> callback) {
+void GenerateItems(not_null<History *> history, LocalIdManager &idManager, const MTPDchannelAdminLogEvent &event,
+                   base::lambda<void(HistoryItemOwned item)> callback) {
 	Expects(history->peer->isChannel());
 
 	auto id = event.vid.v;
@@ -254,9 +279,7 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 	auto channel = history->peer->asChannel();
 	auto &action = event.vaction;
 	auto date = event.vdate;
-	auto addPart = [&callback](not_null<HistoryItem*> item) {
-		return callback(HistoryItemOwned(item));
-	};
+	auto addPart = [&callback](not_null<HistoryItem *> item) { return callback(HistoryItemOwned(item)); };
 
 	using Flag = MTPDmessage::Flag;
 	auto fromName = App::peerName(from);
@@ -264,30 +287,34 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 	auto fromLinkText = textcmdLink(1, fromName);
 
 	auto addSimpleServiceMessage = [&](const QString &text, PhotoData *photo = nullptr) {
-		auto message = HistoryService::PreparedText { text };
+		auto message = HistoryService::PreparedText{text};
 		message.links.push_back(fromLink);
-		addPart(HistoryService::create(history, idManager.next(), ::date(date), message, 0, peerToUser(from->id), photo));
+		addPart(
+		    HistoryService::create(history, idManager.next(), ::date(date), message, 0, peerToUser(from->id), photo));
 	};
 
 	auto createChangeTitle = [&](const MTPDchannelAdminLogEventActionChangeTitle &action) {
-		auto text = (channel->isMegagroup() ? lng_action_changed_title : lng_admin_log_changed_title_channel)(lt_from, fromLinkText, lt_title, qs(action.vnew_value));
+		auto text = (channel->isMegagroup() ? lng_action_changed_title : lng_admin_log_changed_title_channel)(
+		    lt_from, fromLinkText, lt_title, qs(action.vnew_value));
 		addSimpleServiceMessage(text);
 	};
 
 	auto createChangeAbout = [&](const MTPDchannelAdminLogEventActionChangeAbout &action) {
 		auto newValue = qs(action.vnew_value);
 		auto oldValue = qs(action.vprev_value);
-		auto text = (channel->isMegagroup()
-			? (newValue.isEmpty() ? lng_admin_log_removed_description_group : lng_admin_log_changed_description_group)
-			: (newValue.isEmpty() ? lng_admin_log_removed_description_channel : lng_admin_log_changed_description_channel)
-			)(lt_from, fromLinkText);
+		auto text = (channel->isMegagroup() ?
+		                 (newValue.isEmpty() ? lng_admin_log_removed_description_group :
+		                                       lng_admin_log_changed_description_group) :
+		                 (newValue.isEmpty() ? lng_admin_log_removed_description_channel :
+		                                       lng_admin_log_changed_description_channel))(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 
 		auto bodyFlags = Flag::f_entities | Flag::f_from_id;
 		auto bodyReplyTo = 0;
 		auto bodyViaBotId = 0;
 		auto newDescription = PrepareText(newValue, QString());
-		auto body = HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(from->id), QString(), newDescription);
+		auto body = HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId,
+		                                   ::date(date), peerToUser(from->id), QString(), newDescription);
 		if (!oldValue.isEmpty()) {
 			auto oldDescription = PrepareText(oldValue, QString());
 			body->addLogEntryOriginal(id, lang(lng_admin_log_previous_description), oldDescription);
@@ -298,17 +325,20 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 	auto createChangeUsername = [&](const MTPDchannelAdminLogEventActionChangeUsername &action) {
 		auto newValue = qs(action.vnew_value);
 		auto oldValue = qs(action.vprev_value);
-		auto text = (channel->isMegagroup()
-			? (newValue.isEmpty() ? lng_admin_log_removed_link_group : lng_admin_log_changed_link_group)
-			: (newValue.isEmpty() ? lng_admin_log_removed_link_channel : lng_admin_log_changed_link_channel)
-			)(lt_from, fromLinkText);
+		auto text = (channel->isMegagroup() ?
+		                 (newValue.isEmpty() ? lng_admin_log_removed_link_group : lng_admin_log_changed_link_group) :
+		                 (newValue.isEmpty() ? lng_admin_log_removed_link_channel :
+		                                       lng_admin_log_changed_link_channel))(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 
 		auto bodyFlags = Flag::f_entities | Flag::f_from_id;
 		auto bodyReplyTo = 0;
 		auto bodyViaBotId = 0;
-		auto newLink = newValue.isEmpty() ? TextWithEntities() : PrepareText(Messenger::Instance().createInternalLinkFull(newValue), QString());
-		auto body = HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(from->id), QString(), newLink);
+		auto newLink = newValue.isEmpty() ?
+		                   TextWithEntities() :
+		                   PrepareText(Messenger::Instance().createInternalLinkFull(newValue), QString());
+		auto body = HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId,
+		                                   ::date(date), peerToUser(from->id), QString(), newLink);
 		if (!oldValue.isEmpty()) {
 			auto oldLink = PrepareText(Messenger::Instance().createInternalLinkFull(oldValue), QString());
 			body->addLogEntryOriginal(id, lang(lng_admin_log_previous_link), oldLink);
@@ -320,11 +350,13 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 		switch (action.vnew_photo.type()) {
 		case mtpc_chatPhoto: {
 			auto photo = GenerateChatPhoto(channel->bareId(), id, date, action.vnew_photo.c_chatPhoto());
-			auto text = (channel->isMegagroup() ? lng_admin_log_changed_photo_group : lng_admin_log_changed_photo_channel)(lt_from, fromLinkText);
+			auto text = (channel->isMegagroup() ? lng_admin_log_changed_photo_group :
+			                                      lng_admin_log_changed_photo_channel)(lt_from, fromLinkText);
 			addSimpleServiceMessage(text, photo);
 		} break;
 		case mtpc_chatPhotoEmpty: {
-			auto text = (channel->isMegagroup() ? lng_admin_log_removed_photo_group : lng_admin_log_removed_photo_channel)(lt_from, fromLinkText);
+			auto text = (channel->isMegagroup() ? lng_admin_log_removed_photo_group :
+			                                      lng_admin_log_removed_photo_channel)(lt_from, fromLinkText);
 			addSimpleServiceMessage(text);
 		} break;
 		default: Unexpected("ChatPhoto type in createChangePhoto()");
@@ -339,7 +371,8 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 
 	auto createToggleSignatures = [&](const MTPDchannelAdminLogEventActionToggleSignatures &action) {
 		auto enabled = (action.vnew_value.type() == mtpc_boolTrue);
-		auto text = (enabled ? lng_admin_log_signatures_enabled : lng_admin_log_signatures_disabled)(lt_from, fromLinkText);
+		auto text =
+		    (enabled ? lng_admin_log_signatures_enabled : lng_admin_log_signatures_disabled)(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 	};
 
@@ -353,27 +386,29 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 
 			auto applyServiceAction = false;
 			auto detachExistingItem = false;
-			addPart(history->createItem(PrepareLogMessage(action.vmessage, idManager.next(), date.v), applyServiceAction, detachExistingItem));
+			addPart(history->createItem(PrepareLogMessage(action.vmessage, idManager.next(), date.v),
+			                            applyServiceAction, detachExistingItem));
 		}
 	};
 
 	auto createEditMessage = [&](const MTPDchannelAdminLogEventActionEditMessage &action) {
 		auto newValue = ExtractEditedText(action.vnew_message);
 		auto canHaveCaption = MediaCanHaveCaption(action.vnew_message);
-		auto text = (canHaveCaption
-			? (newValue.text.isEmpty() ? lng_admin_log_removed_caption : lng_admin_log_edited_caption)
-			: lng_admin_log_edited_message
-			)(lt_from, fromLinkText);
+		auto text =
+		    (canHaveCaption ? (newValue.text.isEmpty() ? lng_admin_log_removed_caption : lng_admin_log_edited_caption) :
+		                      lng_admin_log_edited_message)(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 
 		auto oldValue = ExtractEditedText(action.vprev_message);
 		auto applyServiceAction = false;
 		auto detachExistingItem = false;
-		auto body = history->createItem(PrepareLogMessage(action.vnew_message, idManager.next(), date.v), applyServiceAction, detachExistingItem);
+		auto body = history->createItem(PrepareLogMessage(action.vnew_message, idManager.next(), date.v),
+		                                applyServiceAction, detachExistingItem);
 		if (oldValue.text.isEmpty()) {
 			oldValue = PrepareText(QString(), lang(lng_admin_log_empty_text));
 		}
-		body->addLogEntryOriginal(id, lang(canHaveCaption ? lng_admin_log_previous_caption : lng_admin_log_previous_message), oldValue);
+		body->addLogEntryOriginal(
+		    id, lang(canHaveCaption ? lng_admin_log_previous_caption : lng_admin_log_previous_message), oldValue);
 		addPart(body);
 	};
 
@@ -383,16 +418,19 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 
 		auto applyServiceAction = false;
 		auto detachExistingItem = false;
-		addPart(history->createItem(PrepareLogMessage(action.vmessage, idManager.next(), date.v), applyServiceAction, detachExistingItem));
+		addPart(history->createItem(PrepareLogMessage(action.vmessage, idManager.next(), date.v), applyServiceAction,
+		                            detachExistingItem));
 	};
 
 	auto createParticipantJoin = [&]() {
-		auto text = (channel->isMegagroup() ? lng_admin_log_participant_joined : lng_admin_log_participant_joined_channel)(lt_from, fromLinkText);
+		auto text = (channel->isMegagroup() ? lng_admin_log_participant_joined :
+		                                      lng_admin_log_participant_joined_channel)(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 	};
 
 	auto createParticipantLeave = [&]() {
-		auto text = (channel->isMegagroup() ? lng_admin_log_participant_left : lng_admin_log_participant_left_channel)(lt_from, fromLinkText);
+		auto text = (channel->isMegagroup() ? lng_admin_log_participant_left :
+		                                      lng_admin_log_participant_left_channel)(lt_from, fromLinkText);
 		addSimpleServiceMessage(text);
 	};
 
@@ -401,7 +439,8 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 		auto bodyReplyTo = 0;
 		auto bodyViaBotId = 0;
 		auto bodyText = GenerateParticipantChangeText(channel, action.vparticipant);
-		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(from->id), QString(), bodyText));
+		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date),
+		                               peerToUser(from->id), QString(), bodyText));
 	};
 
 	auto createParticipantToggleBan = [&](const MTPDchannelAdminLogEventActionParticipantToggleBan &action) {
@@ -409,7 +448,8 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 		auto bodyReplyTo = 0;
 		auto bodyViaBotId = 0;
 		auto bodyText = GenerateParticipantChangeText(channel, action.vnew_participant, &action.vprev_participant);
-		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(from->id), QString(), bodyText));
+		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date),
+		                               peerToUser(from->id), QString(), bodyText));
 	};
 
 	auto createParticipantToggleAdmin = [&](const MTPDchannelAdminLogEventActionParticipantToggleAdmin &action) {
@@ -417,7 +457,8 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 		auto bodyReplyTo = 0;
 		auto bodyViaBotId = 0;
 		auto bodyText = GenerateParticipantChangeText(channel, action.vnew_participant, &action.vprev_participant);
-		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date), peerToUser(from->id), QString(), bodyText));
+		addPart(HistoryMessage::create(history, idManager.next(), bodyFlags, bodyReplyTo, bodyViaBotId, ::date(date),
+		                               peerToUser(from->id), QString(), bodyText));
 	};
 
 	auto createChangeStickerSet = [&](const MTPDchannelAdminLogEventActionChangeStickerSet &action) {
@@ -427,15 +468,10 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 			auto text = lng_admin_log_removed_stickers_group(lt_from, fromLinkText);
 			addSimpleServiceMessage(text);
 		} else {
-			auto text = lng_admin_log_changed_stickers_group(
-				lt_from,
-				fromLinkText,
-				lt_sticker_set,
-				textcmdLink(2, lang(lng_admin_log_changed_stickers_set)));
-			auto setLink = MakeShared<LambdaClickHandler>([set] {
-				Ui::show(Box<StickerSetBox>(set));
-			});
-			auto message = HistoryService::PreparedText { text };
+			auto text = lng_admin_log_changed_stickers_group(lt_from, fromLinkText, lt_sticker_set,
+			                                                 textcmdLink(2, lang(lng_admin_log_changed_stickers_set)));
+			auto setLink = MakeShared<LambdaClickHandler>([set] { Ui::show(Box<StickerSetBox>(set)); });
+			auto message = HistoryService::PreparedText{text};
 			message.links.push_back(fromLink);
 			message.links.push_back(setLink);
 			addPart(HistoryService::create(history, idManager.next(), ::date(date), message, 0, peerToUser(from->id)));
@@ -443,21 +479,47 @@ void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const
 	};
 
 	switch (action.type()) {
-	case mtpc_channelAdminLogEventActionChangeTitle: createChangeTitle(action.c_channelAdminLogEventActionChangeTitle()); break;
-	case mtpc_channelAdminLogEventActionChangeAbout: createChangeAbout(action.c_channelAdminLogEventActionChangeAbout()); break;
-	case mtpc_channelAdminLogEventActionChangeUsername: createChangeUsername(action.c_channelAdminLogEventActionChangeUsername()); break;
-	case mtpc_channelAdminLogEventActionChangePhoto: createChangePhoto(action.c_channelAdminLogEventActionChangePhoto()); break;
-	case mtpc_channelAdminLogEventActionToggleInvites: createToggleInvites(action.c_channelAdminLogEventActionToggleInvites()); break;
-	case mtpc_channelAdminLogEventActionToggleSignatures: createToggleSignatures(action.c_channelAdminLogEventActionToggleSignatures()); break;
-	case mtpc_channelAdminLogEventActionUpdatePinned: createUpdatePinned(action.c_channelAdminLogEventActionUpdatePinned()); break;
-	case mtpc_channelAdminLogEventActionEditMessage: createEditMessage(action.c_channelAdminLogEventActionEditMessage()); break;
-	case mtpc_channelAdminLogEventActionDeleteMessage: createDeleteMessage(action.c_channelAdminLogEventActionDeleteMessage()); break;
+	case mtpc_channelAdminLogEventActionChangeTitle:
+		createChangeTitle(action.c_channelAdminLogEventActionChangeTitle());
+		break;
+	case mtpc_channelAdminLogEventActionChangeAbout:
+		createChangeAbout(action.c_channelAdminLogEventActionChangeAbout());
+		break;
+	case mtpc_channelAdminLogEventActionChangeUsername:
+		createChangeUsername(action.c_channelAdminLogEventActionChangeUsername());
+		break;
+	case mtpc_channelAdminLogEventActionChangePhoto:
+		createChangePhoto(action.c_channelAdminLogEventActionChangePhoto());
+		break;
+	case mtpc_channelAdminLogEventActionToggleInvites:
+		createToggleInvites(action.c_channelAdminLogEventActionToggleInvites());
+		break;
+	case mtpc_channelAdminLogEventActionToggleSignatures:
+		createToggleSignatures(action.c_channelAdminLogEventActionToggleSignatures());
+		break;
+	case mtpc_channelAdminLogEventActionUpdatePinned:
+		createUpdatePinned(action.c_channelAdminLogEventActionUpdatePinned());
+		break;
+	case mtpc_channelAdminLogEventActionEditMessage:
+		createEditMessage(action.c_channelAdminLogEventActionEditMessage());
+		break;
+	case mtpc_channelAdminLogEventActionDeleteMessage:
+		createDeleteMessage(action.c_channelAdminLogEventActionDeleteMessage());
+		break;
 	case mtpc_channelAdminLogEventActionParticipantJoin: createParticipantJoin(); break;
 	case mtpc_channelAdminLogEventActionParticipantLeave: createParticipantLeave(); break;
-	case mtpc_channelAdminLogEventActionParticipantInvite: createParticipantInvite(action.c_channelAdminLogEventActionParticipantInvite()); break;
-	case mtpc_channelAdminLogEventActionParticipantToggleBan: createParticipantToggleBan(action.c_channelAdminLogEventActionParticipantToggleBan()); break;
-	case mtpc_channelAdminLogEventActionParticipantToggleAdmin: createParticipantToggleAdmin(action.c_channelAdminLogEventActionParticipantToggleAdmin()); break;
-	case mtpc_channelAdminLogEventActionChangeStickerSet: createChangeStickerSet(action.c_channelAdminLogEventActionChangeStickerSet()); break;
+	case mtpc_channelAdminLogEventActionParticipantInvite:
+		createParticipantInvite(action.c_channelAdminLogEventActionParticipantInvite());
+		break;
+	case mtpc_channelAdminLogEventActionParticipantToggleBan:
+		createParticipantToggleBan(action.c_channelAdminLogEventActionParticipantToggleBan());
+		break;
+	case mtpc_channelAdminLogEventActionParticipantToggleAdmin:
+		createParticipantToggleAdmin(action.c_channelAdminLogEventActionParticipantToggleAdmin());
+		break;
+	case mtpc_channelAdminLogEventActionChangeStickerSet:
+		createChangeStickerSet(action.c_channelAdminLogEventActionChangeStickerSet());
+		break;
 	default: Unexpected("channelAdminLogEventAction type in AdminLog::Item::Item()");
 	}
 }
diff --git a/Telegram/SourceFiles/history/history_admin_log_item.h b/Telegram/SourceFiles/history/history_admin_log_item.h
index ef7c71da9..333b8d218 100644
--- a/Telegram/SourceFiles/history/history_admin_log_item.h
+++ b/Telegram/SourceFiles/history/history_admin_log_item.h
@@ -32,17 +32,18 @@ namespace AdminLog {
 class HistoryItemOwned;
 class LocalIdManager;
 
-void GenerateItems(not_null<History*> history, LocalIdManager &idManager, const MTPDchannelAdminLogEvent &event, base::lambda<void(HistoryItemOwned item)> callback);
+void GenerateItems(not_null<History *> history, LocalIdManager &idManager, const MTPDchannelAdminLogEvent &event,
+                   base::lambda<void(HistoryItemOwned item)> callback);
 
 // Smart pointer wrapper for HistoryItem* that destroys the owned item.
 class HistoryItemOwned {
 public:
-	explicit HistoryItemOwned(not_null<HistoryItem*> data) : _data(data) {
-	}
+	explicit HistoryItemOwned(not_null<HistoryItem *> data)
+	    : _data(data) {}
 	HistoryItemOwned(const HistoryItemOwned &other) = delete;
 	HistoryItemOwned &operator=(const HistoryItemOwned &other) = delete;
-	HistoryItemOwned(HistoryItemOwned &&other) : _data(base::take(other._data)) {
-	}
+	HistoryItemOwned(HistoryItemOwned &&other)
+	    : _data(base::take(other._data)) {}
 	HistoryItemOwned &operator=(HistoryItemOwned &&other) {
 		_data = base::take(other._data);
 		return *this;
@@ -59,13 +60,12 @@ public:
 	HistoryItem *operator->() const {
 		return get();
 	}
-	operator HistoryItem*() const {
+	operator HistoryItem *() const {
 		return get();
 	}
 
 private:
 	HistoryItem *_data = nullptr;
-
 };
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/history_admin_log_section.cpp b/Telegram/SourceFiles/history/history_admin_log_section.cpp
index 1ca4babcb..cc3cef54a 100644
--- a/Telegram/SourceFiles/history/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/history_admin_log_section.cpp
@@ -20,28 +20,28 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_admin_log_section.h"
 
-#include "history/history_admin_log_inner.h"
+#include "apiwrap.h"
+#include "base/timer.h"
+#include "boxes/confirm_box.h"
 #include "history/history_admin_log_filter.h"
+#include "history/history_admin_log_inner.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "profile/profile_back_button.h"
 #include "styles/style_history.h"
 #include "styles/style_window.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "mainwidget.h"
-#include "mainwindow.h"
-#include "apiwrap.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
 #include "window/themes/window_theme.h"
-#include "boxes/confirm_box.h"
-#include "base/timer.h"
-#include "lang/lang_keys.h"
 
 namespace AdminLog {
 
 class FixedBar final : public TWidget, private base::Subscriber {
 public:
-	FixedBar(QWidget *parent, not_null<ChannelData*> channel);
+	FixedBar(QWidget *parent, not_null<ChannelData *> channel);
 
 	base::Observable<void> showFilterSignal;
 	base::Observable<void> searchCancelledSignal;
@@ -74,7 +74,7 @@ private:
 	void applySearch();
 	void searchAnimationCallback();
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 	object_ptr<Ui::FlatInput> _field;
 	object_ptr<Profile::BackButton> _backButton;
 	object_ptr<Ui::IconButton> _search;
@@ -85,22 +85,23 @@ private:
 	bool _searchShown = false;
 	bool _animatingMode = false;
 	base::Timer _searchTimer;
-
 };
 
-object_ptr<Window::SectionWidget> SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller*> controller, const QRect &geometry) {
+object_ptr<Window::SectionWidget>
+SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller *> controller, const QRect &geometry) {
 	auto result = object_ptr<Widget>(parent, controller, _channel);
 	result->setInternalState(geometry, this);
 	return std::move(result);
 }
 
-FixedBar::FixedBar(QWidget *parent, not_null<ChannelData*> channel) : TWidget(parent)
-, _channel(channel)
-, _field(this, st::historyAdminLogSearchField, langFactory(lng_dlg_filter))
-, _backButton(this, lang(lng_admin_log_title_all))
-, _search(this, st::topBarSearch)
-, _cancel(this, st::historyAdminLogCancelSearch)
-, _filter(this, langFactory(lng_admin_log_filter), st::topBarButton) {
+FixedBar::FixedBar(QWidget *parent, not_null<ChannelData *> channel)
+    : TWidget(parent)
+    , _channel(channel)
+    , _field(this, st::historyAdminLogSearchField, langFactory(lng_dlg_filter))
+    , _backButton(this, lang(lng_admin_log_title_all))
+    , _search(this, st::topBarSearch)
+    , _cancel(this, st::historyAdminLogCancelSearch)
+    , _filter(this, langFactory(lng_admin_log_filter), st::topBarButton) {
 	_backButton->moveToLeft(0, 0);
 	_backButton->setClickedCallback([this] { goBack(); });
 	_filter->setClickedCallback([this] { showFilterSignal.notify(); });
@@ -133,7 +134,8 @@ void FixedBar::showSearch() {
 void FixedBar::toggleSearch() {
 	_searchShown = !_searchShown;
 	_cancel->toggleAnimated(_searchShown);
-	_searchShownAnimation.start([this] { searchAnimationCallback(); }, _searchShown ? 0. : 1., _searchShown ? 1. : 0., st::historyAdminLogSearchSlideDuration);
+	_searchShownAnimation.start([this] { searchAnimationCallback(); }, _searchShown ? 0. : 1., _searchShown ? 1. : 0.,
+	                            st::historyAdminLogSearchSlideDuration);
 	_search->setDisabled(_searchShown);
 	if (_searchShown) {
 		_field->show();
@@ -146,7 +148,8 @@ void FixedBar::toggleSearch() {
 void FixedBar::searchAnimationCallback() {
 	if (!_searchShownAnimation.animating()) {
 		_field->setVisible(_searchShown);
-		_search->setIconOverride(_searchShown ? &st::topBarSearch.icon : nullptr, _searchShown ? &st::topBarSearch.icon : nullptr);
+		_search->setIconOverride(_searchShown ? &st::topBarSearch.icon : nullptr,
+		                         _searchShown ? &st::topBarSearch.icon : nullptr);
 		_search->setRippleColorOverride(_searchShown ? &st::topBarBg : nullptr);
 		_search->setCursor(_searchShown ? style::cur_default : style::cur_pointer);
 	}
@@ -232,11 +235,12 @@ void FixedBar::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
-Widget::Widget(QWidget *parent, not_null<Window::Controller*> controller, not_null<ChannelData*> channel) : Window::SectionWidget(parent, controller)
-, _scroll(this, st::historyScroll, false)
-, _fixedBar(this, channel)
-, _fixedBarShadow(this, st::shadowFg)
-, _whatIsThis(this, lang(lng_admin_log_about).toUpper(), st::historyComposeButton) {
+Widget::Widget(QWidget *parent, not_null<Window::Controller *> controller, not_null<ChannelData *> channel)
+    : Window::SectionWidget(parent, controller)
+    , _scroll(this, st::historyScroll, false)
+    , _fixedBar(this, channel)
+    , _fixedBarShadow(this, st::shadowFg)
+    , _whatIsThis(this, lang(lng_admin_log_about).toUpper(), st::historyComposeButton) {
 	_fixedBar->move(0, 0);
 	_fixedBar->resizeToWidth(width());
 	subscribe(_fixedBar->showFilterSignal, [this] { showFilter(); });
@@ -271,7 +275,7 @@ void Widget::updateAdaptiveLayout() {
 	_fixedBarShadow->moveToLeft(Adaptive::OneColumn() ? 0 : st::lineWidth, _fixedBar->height());
 }
 
-not_null<ChannelData*> Widget::channel() const {
+not_null<ChannelData *> Widget::channel() const {
 	return _inner->channel();
 }
 
@@ -288,8 +292,8 @@ void Widget::doSetInnerFocus() {
 	}
 }
 
-bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
-	if (auto logMemento = dynamic_cast<SectionMemento*>(memento.get())) {
+bool Widget::showInternal(not_null<Window::SectionMemento *> memento) {
+	if (auto logMemento = dynamic_cast<SectionMemento *>(memento.get())) {
 		if (logMemento->getChannel() == channel()) {
 			restoreState(logMemento);
 			return true;
@@ -298,7 +302,7 @@ bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
 	return false;
 }
 
-void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento*> memento) {
+void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento *> memento) {
 	setGeometry(geometry);
 	myEnsureResized(this);
 	restoreState(memento);
@@ -318,12 +322,12 @@ std::unique_ptr<Window::SectionMemento> Widget::createMemento() {
 	return std::move(result);
 }
 
-void Widget::saveState(not_null<SectionMemento*> memento) {
+void Widget::saveState(not_null<SectionMemento *> memento) {
 	memento->setScrollTop(_scroll->scrollTop());
 	_inner->saveState(memento);
 }
 
-void Widget::restoreState(not_null<SectionMemento*> memento) {
+void Widget::restoreState(not_null<SectionMemento *> memento) {
 	_inner->restoreState(memento);
 	auto scrollTop = memento->getScrollTop();
 	_scroll->scrollToY(scrollTop);
@@ -369,7 +373,7 @@ void Widget::paintEvent(QPaintEvent *e) {
 	if (Ui::skipPaintEvent(this, e)) {
 		return;
 	}
-	//if (hasPendingResizedItems()) {
+	// if (hasPendingResizedItems()) {
 	//	updateListSize();
 	//}
 
@@ -441,4 +445,3 @@ void Widget::applyFilter(FilterValue &&value) {
 }
 
 } // namespace AdminLog
-
diff --git a/Telegram/SourceFiles/history/history_admin_log_section.h b/Telegram/SourceFiles/history/history_admin_log_section.h
index 35052fb06..0ca9f23a0 100644
--- a/Telegram/SourceFiles/history/history_admin_log_section.h
+++ b/Telegram/SourceFiles/history/history_admin_log_section.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/section_widget.h"
-#include "window/section_memento.h"
 #include "history/history_admin_log_item.h"
 #include "mtproto/sender.h"
+#include "window/section_memento.h"
+#include "window/section_widget.h"
 
 namespace Notify {
 struct PeerUpdate;
@@ -48,7 +48,7 @@ class SectionMemento;
 struct FilterValue {
 	// Empty "flags" means all events.
 	MTPDchannelAdminLogEventsFilter::Flags flags = 0;
-	std::vector<not_null<UserData*>> admins;
+	std::vector<not_null<UserData *>> admins;
 	bool allUsers = true;
 };
 
@@ -65,8 +65,8 @@ public:
 	LocalIdManager() = default;
 	LocalIdManager(const LocalIdManager &other) = delete;
 	LocalIdManager &operator=(const LocalIdManager &other) = delete;
-	LocalIdManager(LocalIdManager &&other) : _counter(std::exchange(other._counter, ServerMaxMsgId)) {
-	}
+	LocalIdManager(LocalIdManager &&other)
+	    : _counter(std::exchange(other._counter, ServerMaxMsgId)) {}
 	LocalIdManager &operator=(LocalIdManager &&other) {
 		_counter = std::exchange(other._counter, ServerMaxMsgId);
 		return *this;
@@ -77,14 +77,13 @@ public:
 
 private:
 	MsgId _counter = ServerMaxMsgId;
-
 };
 
 class Widget final : public Window::SectionWidget {
 public:
-	Widget(QWidget *parent, not_null<Window::Controller*> controller, not_null<ChannelData*> channel);
+	Widget(QWidget *parent, not_null<Window::Controller *> controller, not_null<ChannelData *> channel);
 
-	not_null<ChannelData*> channel() const;
+	not_null<ChannelData *> channel() const;
 	PeerData *peerForDialogs() const override {
 		return channel();
 	}
@@ -95,10 +94,10 @@ public:
 
 	QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
 
-	bool showInternal(not_null<Window::SectionMemento*> memento) override;
+	bool showInternal(not_null<Window::SectionMemento *> memento) override;
 	std::unique_ptr<Window::SectionMemento> createMemento() override;
 
-	void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);
+	void setInternalState(const QRect &geometry, not_null<SectionMemento *> memento);
 
 	// Float player interface.
 	bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) override;
@@ -120,25 +119,25 @@ private:
 	void showFilter();
 	void onScroll();
 	void updateAdaptiveLayout();
-	void saveState(not_null<SectionMemento*> memento);
-	void restoreState(not_null<SectionMemento*> memento);
+	void saveState(not_null<SectionMemento *> memento);
+	void restoreState(not_null<SectionMemento *> memento);
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<InnerWidget> _inner;
 	object_ptr<FixedBar> _fixedBar;
 	object_ptr<Ui::PlainShadow> _fixedBarShadow;
 	object_ptr<Ui::FlatButton> _whatIsThis;
-
 };
 
 class SectionMemento : public Window::SectionMemento {
 public:
-	SectionMemento(not_null<ChannelData*> channel) : _channel(channel) {
-	}
+	SectionMemento(not_null<ChannelData *> channel)
+	    : _channel(channel) {}
 
-	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, not_null<Window::Controller*> controller, const QRect &geometry) override;
+	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, not_null<Window::Controller *> controller,
+	                                               const QRect &geometry) override;
 
-	not_null<ChannelData*> getChannel() const {
+	not_null<ChannelData *> getChannel() const {
 		return _channel;
 	}
 	void setScrollTop(int scrollTop) {
@@ -148,20 +147,21 @@ public:
 		return _scrollTop;
 	}
 
-	void setAdmins(std::vector<not_null<UserData*>> admins) {
+	void setAdmins(std::vector<not_null<UserData *>> admins) {
 		_admins = std::move(admins);
 	}
-	void setAdminsCanEdit(std::vector<not_null<UserData*>> admins) {
+	void setAdminsCanEdit(std::vector<not_null<UserData *>> admins) {
 		_adminsCanEdit = std::move(admins);
 	}
-	std::vector<not_null<UserData*>> takeAdmins() {
+	std::vector<not_null<UserData *>> takeAdmins() {
 		return std::move(_admins);
 	}
-	std::vector<not_null<UserData*>> takeAdminsCanEdit() {
+	std::vector<not_null<UserData *>> takeAdminsCanEdit() {
 		return std::move(_adminsCanEdit);
 	}
 
-	void setItems(std::vector<HistoryItemOwned> &&items, std::map<quint64, HistoryItem*> &&itemsByIds, bool upLoaded, bool downLoaded) {
+	void setItems(std::vector<HistoryItemOwned> &&items, std::map<quint64, HistoryItem *> &&itemsByIds, bool upLoaded,
+	              bool downLoaded) {
 		_items = std::move(items);
 		_itemsByIds = std::move(itemsByIds);
 		_upLoaded = upLoaded;
@@ -179,7 +179,7 @@ public:
 	std::vector<HistoryItemOwned> takeItems() {
 		return std::move(_items);
 	}
-	std::map<quint64, HistoryItem*> takeItemsByIds() {
+	std::map<quint64, HistoryItem *> takeItemsByIds() {
 		return std::move(_itemsByIds);
 	}
 	LocalIdManager takeIdManager() {
@@ -199,18 +199,17 @@ public:
 	}
 
 private:
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 	int _scrollTop = 0;
-	std::vector<not_null<UserData*>> _admins;
-	std::vector<not_null<UserData*>> _adminsCanEdit;
+	std::vector<not_null<UserData *>> _admins;
+	std::vector<not_null<UserData *>> _adminsCanEdit;
 	std::vector<HistoryItemOwned> _items;
-	std::map<quint64, HistoryItem*> _itemsByIds;
+	std::map<quint64, HistoryItem *> _itemsByIds;
 	bool _upLoaded = false;
 	bool _downLoaded = true;
 	LocalIdManager _idManager;
 	FilterValue _filter;
 	QString _searchQuery;
-
 };
 
 } // namespace AdminLog
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 501435505..535e6cc72 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -20,21 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_drag_area.h"
 
-#include "styles/style_chat_helpers.h"
-#include "styles/style_boxes.h"
+#include "apiwrap.h"
 #include "boxes/confirm_box.h"
 #include "boxes/sticker_set_box.h"
-#include "inline_bots/inline_bot_result.h"
-#include "inline_bots/inline_bot_layout_item.h"
 #include "dialogs/dialogs_layout.h"
 #include "history/history_widget.h"
-#include "storage/localstorage.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "apiwrap.h"
 #include "mainwidget.h"
+#include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
 
-DragArea::DragArea(QWidget *parent) : TWidget(parent) {
+DragArea::DragArea(QWidget *parent)
+    : TWidget(parent) {
 	setMouseTracking(true);
 	setAcceptDrops(true);
 }
@@ -46,20 +47,24 @@ bool DragArea::overlaps(const QRect &globalRect) {
 
 	auto inner = innerRect();
 	auto testRect = QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size());
-	return inner.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)).contains(testRect)
-		|| inner.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)).contains(testRect);
+	return inner.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)).contains(testRect) ||
+	       inner.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)).contains(testRect);
 }
 
 
 void DragArea::mouseMoveEvent(QMouseEvent *e) {
 	if (_hiding) return;
 
-	auto in = QRect(st::dragPadding.left(), st::dragPadding.top(), width() - st::dragPadding.left() - st::dragPadding.right(), height() - st::dragPadding.top() - st::dragPadding.bottom()).contains(e->pos());
+	auto in =
+	    QRect(st::dragPadding.left(), st::dragPadding.top(), width() - st::dragPadding.left() - st::dragPadding.right(),
+	          height() - st::dragPadding.top() - st::dragPadding.bottom())
+	        .contains(e->pos());
 	setIn(in);
 }
 
 void DragArea::dragMoveEvent(QDragMoveEvent *e) {
-	QRect r(st::dragPadding.left(), st::dragPadding.top(), width() - st::dragPadding.left() - st::dragPadding.right(), height() - st::dragPadding.top() - st::dragPadding.bottom());
+	QRect r(st::dragPadding.left(), st::dragPadding.top(), width() - st::dragPadding.left() - st::dragPadding.right(),
+	        height() - st::dragPadding.top() - st::dragPadding.bottom());
 	setIn(r.contains(e->pos()));
 	e->setDropAction(_in ? Qt::CopyAction : Qt::IgnoreAction);
 	e->accept();
@@ -90,7 +95,8 @@ void DragArea::paintEvent(QPaintEvent *e) {
 	auto inner = innerRect();
 
 	if (!_cache.isNull()) {
-		p.drawPixmapLeft(inner.x() - st::boxRoundShadow.extend.left(), inner.y() - st::boxRoundShadow.extend.top(), width(), _cache);
+		p.drawPixmapLeft(inner.x() - st::boxRoundShadow.extend.left(), inner.y() - st::boxRoundShadow.extend.top(),
+		                 width(), _cache);
 		return;
 	}
 
@@ -100,25 +106,28 @@ void DragArea::paintEvent(QPaintEvent *e) {
 	p.setPen(anim::pen(st::dragColor, st::dragDropColor, _a_in.current(ms, _in ? 1. : 0.)));
 
 	p.setFont(st::dragFont);
-	p.drawText(QRect(0, (height() - st::dragHeight) / 2, width(), st::dragFont->height), _text, QTextOption(style::al_top));
+	p.drawText(QRect(0, (height() - st::dragHeight) / 2, width(), st::dragFont->height), _text,
+	           QTextOption(style::al_top));
 
 	p.setFont(st::dragSubfont);
-	p.drawText(QRect(0, (height() + st::dragHeight) / 2 - st::dragSubfont->height, width(), st::dragSubfont->height * 2), _subtext, QTextOption(style::al_top));
+	p.drawText(
+	    QRect(0, (height() + st::dragHeight) / 2 - st::dragSubfont->height, width(), st::dragSubfont->height * 2),
+	    _subtext, QTextOption(style::al_top));
 }
 
 void DragArea::dragEnterEvent(QDragEnterEvent *e) {
-	static_cast<HistoryWidget*>(parentWidget())->dragEnterEvent(e);
+	static_cast<HistoryWidget *>(parentWidget())->dragEnterEvent(e);
 	e->setDropAction(Qt::IgnoreAction);
 	e->accept();
 }
 
 void DragArea::dragLeaveEvent(QDragLeaveEvent *e) {
-	static_cast<HistoryWidget*>(parentWidget())->dragLeaveEvent(e);
+	static_cast<HistoryWidget *>(parentWidget())->dragLeaveEvent(e);
 	setIn(false);
 }
 
 void DragArea::dropEvent(QDropEvent *e) {
-	static_cast<HistoryWidget*>(parentWidget())->dropEvent(e);
+	static_cast<HistoryWidget *>(parentWidget())->dropEvent(e);
 	if (e->isAccepted() && _droppedCallback) {
 		_droppedCallback(e->mimeData());
 	}
diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h
index 1637a2297..3fb084167 100644
--- a/Telegram/SourceFiles/history/history_drag_area.h
+++ b/Telegram/SourceFiles/history/history_drag_area.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QMimeData>
 #include "base/lambda.h"
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
+#include <QMimeData>
 
 class DragArea : public TWidget {
 	Q_OBJECT
@@ -62,12 +62,9 @@ private:
 	void setIn(bool in);
 	void opacityAnimationCallback();
 	QRect innerRect() const {
-		return QRect(
-			st::dragPadding.left(),
-			st::dragPadding.top(),
-			width() - st::dragPadding.left() - st::dragPadding.right(),
-			height() - st::dragPadding.top() - st::dragPadding.bottom()
-		);
+		return QRect(st::dragPadding.left(), st::dragPadding.top(),
+		             width() - st::dragPadding.left() - st::dragPadding.right(),
+		             height() - st::dragPadding.top() - st::dragPadding.bottom());
 	}
 
 	bool _hiding = false;
@@ -79,5 +76,4 @@ private:
 	Animation _a_in;
 
 	QString _text, _subtext;
-
 };
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9cbaa86cb..810607fb6 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -18,25 +18,25 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QAction>
-#include <QApplication>
 #include "history/history_inner_widget.h"
-#include "styles/style_history.h"
-#include "core/file_utilities.h"
-#include "history/history_message.h"
-#include "history/history_service_layout.h"
-#include "history/history_media_types.h"
-#include "ui/widgets/popup_menu.h"
-#include "window/window_controller.h"
+#include "apiwrap.h"
+#include "auth_session.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/stickers.h"
+#include "core/file_utilities.h"
+#include "history/history_media_types.h"
+#include "history/history_message.h"
+#include "history/history_service_layout.h"
 #include "history/history_widget.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "auth_session.h"
-#include "messenger.h"
-#include "apiwrap.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "styles/style_history.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_controller.h"
+#include <QAction>
+#include <QApplication>
 
 namespace {
 
@@ -44,8 +44,9 @@ constexpr auto kScrollDateHideTimeout = 1000;
 
 class DateClickHandler : public ClickHandler {
 public:
-	DateClickHandler(PeerData *peer, QDate date) : _peer(peer), _date(date) {
-	}
+	DateClickHandler(PeerData *peer, QDate date)
+	    : _peer(peer)
+	    , _date(date) {}
 
 	void setDate(QDate date) {
 		_date = date;
@@ -58,14 +59,12 @@ public:
 private:
 	PeerData *_peer = nullptr;
 	QDate _date;
-
 };
 
 // Helper binary search for an item in a list that is not completely
 // above the given top of the visible area or below the given bottom of the visible area
 // is applied once for blocks list in a history and once for items list in the found block.
-template <bool TopToBottom, typename T>
-int BinarySearchBlocksOrItems(const T &list, int edge) {
+template <bool TopToBottom, typename T> int BinarySearchBlocksOrItems(const T &list, int edge) {
 	// static_cast to work around GCC bug #78693
 	auto start = 0, end = static_cast<int>(list.size());
 	while (end - start > 1) {
@@ -85,14 +84,16 @@ int BinarySearchBlocksOrItems(const T &list, int edge) {
 
 // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
 
-HistoryInner::HistoryInner(HistoryWidget *historyWidget, not_null<Window::Controller*> controller, Ui::ScrollArea *scroll, History *history) : TWidget(nullptr)
-, _controller(controller)
-, _peer(history->peer)
-, _migrated(history->migrateFrom())
-, _history(history)
-, _widget(historyWidget)
-, _scroll(scroll)
-, _scrollDateCheck([this] { onScrollDateCheck(); }) {
+HistoryInner::HistoryInner(HistoryWidget *historyWidget, not_null<Window::Controller *> controller,
+                           Ui::ScrollArea *scroll, History *history)
+    : TWidget(nullptr)
+    , _controller(controller)
+    , _peer(history->peer)
+    , _migrated(history->migrateFrom())
+    , _history(history)
+    , _widget(historyWidget)
+    , _scroll(scroll)
+    , _scrollDateCheck([this] { onScrollDateCheck(); }) {
 	_touchSelectTimer.setSingleShot(true);
 	connect(&_touchSelectTimer, SIGNAL(timeout()), this, SLOT(onTouchSelect()));
 
@@ -106,18 +107,14 @@ HistoryInner::HistoryInner(HistoryWidget *historyWidget, not_null<Window::Contro
 	notifyIsBotChanged();
 
 	setMouseTracking(true);
-	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) {
-		itemRemoved(item);
-	});
+	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) { itemRemoved(item); });
 	subscribe(_controller->gifPauseLevelChanged(), [this] {
 		if (!_controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any)) {
 			update();
 		}
 	});
-	subscribe(_controller->window()->dragFinished(), [this] {
-		mouseActionUpdate(QCursor::pos());
-	});
-	subscribe(Auth().data().historyCleared(), [this](not_null<History*> history) {
+	subscribe(_controller->window()->dragFinished(), [this] { mouseActionUpdate(QCursor::pos()); });
+	subscribe(Auth().data().historyCleared(), [this](not_null<History *> history) {
 		if (_history == history) {
 			mouseActionCancel();
 		}
@@ -247,8 +244,7 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
 	}
 }
 
-template <typename Method>
-void HistoryInner::enumerateUserpics(Method method) {
+template <typename Method> void HistoryInner::enumerateUserpics(Method method) {
 	if ((!_history || !_history->canHaveFromPhotos()) && (!_migrated || !_migrated->canHaveFromPhotos())) {
 		return;
 	}
@@ -257,7 +253,8 @@ void HistoryInner::enumerateUserpics(Method method) {
 	// -1 means we didn't find an attached to next message yet.
 	int lowestAttachedItemTop = -1;
 
-	auto userpicCallback = [this, &lowestAttachedItemTop, &method](not_null<HistoryItem*> item, int itemtop, int itembottom) {
+	auto userpicCallback = [this, &lowestAttachedItemTop, &method](not_null<HistoryItem *> item, int itemtop,
+	                                                               int itembottom) {
 		// Skip all service messages.
 		auto message = item->toHistoryMessage();
 		if (!message) return true;
@@ -274,7 +271,8 @@ void HistoryInner::enumerateUserpics(Method method) {
 			}
 			// Attach userpic to the bottom of the visible area with the same margin as the last message.
 			auto userpicMinBottomSkip = st::historyPaddingBottom + st::msgMargin.bottom();
-			auto userpicBottom = std::min(itembottom - message->marginBottom(), _visibleAreaBottom - userpicMinBottomSkip);
+			auto userpicBottom =
+			    std::min(itembottom - message->marginBottom(), _visibleAreaBottom - userpicMinBottomSkip);
 
 			// Do not let the userpic go above the attached messages pack top line.
 			userpicBottom = std::max(userpicBottom, lowestAttachedItemTop + st::msgPhotoSize);
@@ -297,15 +295,15 @@ void HistoryInner::enumerateUserpics(Method method) {
 	enumerateItems<EnumItemsDirection::TopToBottom>(userpicCallback);
 }
 
-template <typename Method>
-void HistoryInner::enumerateDates(Method method) {
+template <typename Method> void HistoryInner::enumerateDates(Method method) {
 	auto drawtop = historyDrawTop();
 
 	// Find and remember the bottom of an single-day messages pack
 	// -1 means we didn't find a same-day with previous message yet.
 	auto lowestInOneDayItemBottom = -1;
 
-	auto dateCallback = [this, &lowestInOneDayItemBottom, &method, drawtop](not_null<HistoryItem*> item, int itemtop, int itembottom) {
+	auto dateCallback = [this, &lowestInOneDayItemBottom, &method, drawtop](not_null<HistoryItem *> item, int itemtop,
+	                                                                        int itembottom) {
 		if (lowestInOneDayItemBottom < 0 && item->isInOneDayWithPrevious()) {
 			lowestInOneDayItemBottom = itembottom - item->marginBottom();
 		}
@@ -318,8 +316,8 @@ void HistoryInner::enumerateDates(Method method) {
 				if (itemtop > _visibleAreaTop) {
 					// Previous item (from the _migrated history) is drawing date now.
 					return false;
-				} else if (item == _history->blocks.front()->items.front() && item->isGroupMigrate()
-					&& _migrated->blocks.back()->items.back()->isGroupMigrate()) {
+				} else if (item == _history->blocks.front()->items.front() && item->isGroupMigrate() &&
+				           _migrated->blocks.back()->items.back()->isGroupMigrate()) {
 					// This item is completely invisible and should be completely ignored.
 					return false;
 				}
@@ -368,16 +366,22 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	bool historyDisplayedEmpty = (_history->isDisplayedEmpty() && (!_migrated || _migrated->isDisplayedEmpty()));
 	bool noHistoryDisplayed = _firstLoading || historyDisplayedEmpty;
 	if (!_firstLoading && _botAbout && !_botAbout->info->text.isEmpty() && _botAbout->height > 0) {
-		if (clip.y() < _botAbout->rect.y() + _botAbout->rect.height() && clip.y() + clip.height() > _botAbout->rect.y()) {
+		if (clip.y() < _botAbout->rect.y() + _botAbout->rect.height() &&
+		    clip.y() + clip.height() > _botAbout->rect.y()) {
 			p.setTextPalette(st::inTextPalette);
 			App::roundRect(p, _botAbout->rect, st::msgInBg, MessageInCorners, &st::msgInShadow);
 
 			p.setFont(st::msgNameFont);
 			p.setPen(st::dialogsNameFg);
-			p.drawText(_botAbout->rect.left() + st::msgPadding.left(), _botAbout->rect.top() + st::msgPadding.top() + st::msgNameFont->ascent, lang(lng_bot_description));
+			p.drawText(_botAbout->rect.left() + st::msgPadding.left(),
+			           _botAbout->rect.top() + st::msgPadding.top() + st::msgNameFont->ascent,
+			           lang(lng_bot_description));
 
 			p.setPen(st::historyTextInFg);
-			_botAbout->info->text.draw(p, _botAbout->rect.left() + st::msgPadding.left(), _botAbout->rect.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip, _botAbout->width);
+			_botAbout->info->text.draw(p, _botAbout->rect.left() + st::msgPadding.left(),
+			                           _botAbout->rect.top() + st::msgPadding.top() + st::msgNameFont->height +
+			                               st::botDescSkip,
+			                           _botAbout->width);
 
 			p.restoreTextPalette();
 		}
@@ -414,43 +418,44 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 			auto y = mtop + block->y() + item->y();
 			p.save();
 			p.translate(0, y);
-			if (clip.y() < y + item->height()) while (y < drawToY) {
-				TextSelection sel;
-				if (y >= selfromy && y < seltoy) {
-					if (_dragSelecting && !item->serviceMsg() && item->id > 0) {
-						sel = FullSelection;
+			if (clip.y() < y + item->height())
+				while (y < drawToY) {
+					TextSelection sel;
+					if (y >= selfromy && y < seltoy) {
+						if (_dragSelecting && !item->serviceMsg() && item->id > 0) {
+							sel = FullSelection;
+						}
+					} else if (hasSel) {
+						auto i = _selected.constFind(item);
+						if (i != selEnd) {
+							sel = i.value();
+						}
 					}
-				} else if (hasSel) {
-					auto i = _selected.constFind(item);
-					if (i != selEnd) {
-						sel = i.value();
+					item->draw(p, clip.translated(0, -y), sel, ms);
+
+					if (item->hasViews()) {
+						App::main()->scheduleViewIncrement(item);
 					}
-				}
-				item->draw(p, clip.translated(0, -y), sel, ms);
-
-				if (item->hasViews()) {
-					App::main()->scheduleViewIncrement(item);
-				}
-				if (item->mentionsMe() && item->isMediaUnread()) {
-					readMentions.insert(item);
-					_widget->enqueueMessageHighlight(item);
-				}
-
-				qint32 h = item->height();
-				p.translate(0, h);
-				y += h;
-
-				++iItem;
-				if (iItem == block->items.size()) {
-					iItem = 0;
-					++iBlock;
-					if (iBlock == _migrated->blocks.size()) {
-						break;
+					if (item->mentionsMe() && item->isMediaUnread()) {
+						readMentions.insert(item);
+						_widget->enqueueMessageHighlight(item);
 					}
-					block = _migrated->blocks[iBlock];
+
+					qint32 h = item->height();
+					p.translate(0, h);
+					y += h;
+
+					++iItem;
+					if (iItem == block->items.size()) {
+						iItem = 0;
+						++iBlock;
+						if (iBlock == _migrated->blocks.size()) {
+							break;
+						}
+						block = _migrated->blocks[iBlock];
+					}
+					item = block->items[iItem];
 				}
-				item = block->items[iItem];
-			}
 			p.restore();
 		}
 		if (htop >= 0) {
@@ -509,7 +514,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 		}
 
 		if (mtop >= 0 || htop >= 0) {
-			enumerateUserpics([&p, &clip](not_null<HistoryMessage*> message, int userpicTop) {
+			enumerateUserpics([&p, &clip](not_null<HistoryMessage *> message, int userpicTop) {
 				// stop the enumeration if the userpic is below the painted rect
 				if (userpicTop >= clip.top() + clip.height()) {
 					return false;
@@ -517,22 +522,24 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 
 				// paint the userpic if it intersects the painted rect
 				if (userpicTop + st::msgPhotoSize > clip.top()) {
-					message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->history()->width, st::msgPhotoSize);
+					message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->history()->width,
+					                                  st::msgPhotoSize);
 				}
 				return true;
 			});
 
 			int dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
-			//QDate lastDate;
-			//if (!_history->isEmpty()) {
+			// QDate lastDate;
+			// if (!_history->isEmpty()) {
 			//	lastDate = _history->blocks.back()->items.back()->date.date();
 			//}
 
 			//// if item top is before this value always show date as a floating date
-			//int showFloatingBefore = height() - 2 * (_visibleAreaBottom - _visibleAreaTop) - dateHeight;
+			// int showFloatingBefore = height() - 2 * (_visibleAreaBottom - _visibleAreaTop) - dateHeight;
 
 			auto scrollDateOpacity = _scrollDateOpacity.current(ms, _scrollDateShown ? 1. : 0.);
-			enumerateDates([&p, &clip, scrollDateOpacity, dateHeight/*, lastDate, showFloatingBefore*/](not_null<HistoryItem*> item, int itemtop, int dateTop) {
+			enumerateDates([&p, &clip, scrollDateOpacity, dateHeight /*, lastDate, showFloatingBefore*/](
+			                   not_null<HistoryItem *> item, int itemtop, int dateTop) {
 				// stop the enumeration if the date is above the painted rect
 				if (dateTop + dateHeight <= clip.top()) {
 					return false;
@@ -544,8 +551,8 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 					int correctDateTop = itemtop + st::msgServiceMargin.top();
 					dateInPlace = (dateTop < correctDateTop + dateHeight);
 				}
-				//bool noFloatingDate = (item->date.date() == lastDate && displayDate);
-				//if (noFloatingDate) {
+				// bool noFloatingDate = (item->date.date() == lastDate && displayDate);
+				// if (noFloatingDate) {
 				//	if (itemtop < showFloatingBefore) {
 				//		noFloatingDate = false;
 				//	}
@@ -553,7 +560,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 
 				// paint the date if it intersects the painted rect
 				if (dateTop < clip.top() + clip.height()) {
-					auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
+					auto opacity = (dateInPlace /* || noFloatingDate*/) ? 1. : scrollDateOpacity;
 					if (opacity > 0.) {
 						p.setOpacity(opacity);
 						int dateY = /*noFloatingDate ? itemtop :*/ (dateTop - st::msgServiceMargin.top());
@@ -572,8 +579,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 }
 
 bool HistoryInner::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return true;
@@ -584,10 +592,12 @@ bool HistoryInner::event(QEvent *e) {
 
 void HistoryInner::onTouchScrollTimer() {
 	auto nowTime = getms();
-	if (_touchScrollState == Ui::TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
+	if (_touchScrollState == Ui::TouchScrollState::Acceleration && _touchWaitingAcceleration &&
+	    (nowTime - _touchAccelerationTime) > 40) {
 		_touchScrollState = Ui::TouchScrollState::Manual;
 		touchResetSpeed();
-	} else if (_touchScrollState == Ui::TouchScrollState::Auto || _touchScrollState == Ui::TouchScrollState::Acceleration) {
+	} else if (_touchScrollState == Ui::TouchScrollState::Auto ||
+	           _touchScrollState == Ui::TouchScrollState::Acceleration) {
 		qint32 elapsed = qint32(nowTime - _touchTime);
 		QPoint delta = _touchSpeed * elapsed / 1000;
 		bool hasScrolled = _widget->touchScroll(delta);
@@ -618,8 +628,9 @@ void HistoryInner::touchUpdateSpeed() {
 			if (_touchScrollState == Ui::TouchScrollState::Auto) {
 				const int oldSpeedY = _touchSpeed.y();
 				const int oldSpeedX = _touchSpeed.x();
-				if ((oldSpeedY <= 0 && newSpeedY <= 0) || ((oldSpeedY >= 0 && newSpeedY >= 0)
-					&& (oldSpeedX <= 0 && newSpeedX <= 0)) || (oldSpeedX >= 0 && newSpeedX >= 0)) {
+				if ((oldSpeedY <= 0 && newSpeedY <= 0) ||
+				    ((oldSpeedY >= 0 && newSpeedY >= 0) && (oldSpeedX <= 0 && newSpeedX <= 0)) ||
+				    (oldSpeedX >= 0 && newSpeedX >= 0)) {
 					_touchSpeed.setY(snap((oldSpeedY + (newSpeedY / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 					_touchSpeed.setX(snap((oldSpeedX + (newSpeedX / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 				} else {
@@ -628,8 +639,10 @@ void HistoryInner::touchUpdateSpeed() {
 			} else {
 				// we average the speed to avoid strange effects with the last delta
 				if (!_touchSpeed.isNull()) {
-					_touchSpeed.setX(snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
-					_touchSpeed.setY(snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setX(
+					    snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setY(
+					    snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
 				} else {
 					_touchSpeed = QPoint(newSpeedX, newSpeedY);
 				}
@@ -673,80 +686,80 @@ void HistoryInner::touchEvent(QTouchEvent *e) {
 
 	switch (e->type()) {
 	case QEvent::TouchBegin:
-	if (_menu) {
-		e->accept();
-		return; // ignore mouse press, that was hiding context menu
-	}
-	if (_touchInProgress) return;
-	if (e->touchPoints().isEmpty()) return;
+		if (_menu) {
+			e->accept();
+			return; // ignore mouse press, that was hiding context menu
+		}
+		if (_touchInProgress) return;
+		if (e->touchPoints().isEmpty()) return;
 
-	_touchInProgress = true;
-	if (_touchScrollState == Ui::TouchScrollState::Auto) {
-		_touchScrollState = Ui::TouchScrollState::Acceleration;
-		_touchWaitingAcceleration = true;
-		_touchAccelerationTime = getms();
-		touchUpdateSpeed();
-		_touchStart = _touchPos;
-	} else {
-		_touchScroll = false;
-		_touchSelectTimer.start(QApplication::startDragTime());
-	}
-	_touchSelect = false;
-	_touchStart = _touchPrevPos = _touchPos;
-	break;
+		_touchInProgress = true;
+		if (_touchScrollState == Ui::TouchScrollState::Auto) {
+			_touchScrollState = Ui::TouchScrollState::Acceleration;
+			_touchWaitingAcceleration = true;
+			_touchAccelerationTime = getms();
+			touchUpdateSpeed();
+			_touchStart = _touchPos;
+		} else {
+			_touchScroll = false;
+			_touchSelectTimer.start(QApplication::startDragTime());
+		}
+		_touchSelect = false;
+		_touchStart = _touchPrevPos = _touchPos;
+		break;
 
 	case QEvent::TouchUpdate:
-	if (!_touchInProgress) return;
-	if (_touchSelect) {
-		mouseActionUpdate(_touchPos);
-	} else if (!_touchScroll && (_touchPos - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
-		_touchSelectTimer.stop();
-		_touchScroll = true;
-		touchUpdateSpeed();
-	}
-	if (_touchScroll) {
-		if (_touchScrollState == Ui::TouchScrollState::Manual) {
-			touchScrollUpdated(_touchPos);
-		} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
+		if (!_touchInProgress) return;
+		if (_touchSelect) {
+			mouseActionUpdate(_touchPos);
+		} else if (!_touchScroll && (_touchPos - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+			_touchSelectTimer.stop();
+			_touchScroll = true;
 			touchUpdateSpeed();
-			_touchAccelerationTime = getms();
-			if (_touchSpeed.isNull()) {
-				_touchScrollState = Ui::TouchScrollState::Manual;
+		}
+		if (_touchScroll) {
+			if (_touchScrollState == Ui::TouchScrollState::Manual) {
+				touchScrollUpdated(_touchPos);
+			} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
+				touchUpdateSpeed();
+				_touchAccelerationTime = getms();
+				if (_touchSpeed.isNull()) {
+					_touchScrollState = Ui::TouchScrollState::Manual;
+				}
 			}
 		}
-	}
-	break;
+		break;
 
 	case QEvent::TouchEnd:
-	if (!_touchInProgress) return;
-	_touchInProgress = false;
-	if (_touchSelect) {
-		mouseActionFinish(_touchPos, Qt::RightButton);
-		QContextMenuEvent contextMenu(QContextMenuEvent::Mouse, mapFromGlobal(_touchPos), _touchPos);
-		showContextMenu(&contextMenu, true);
-		_touchScroll = false;
-	} else if (_touchScroll) {
-		if (_touchScrollState == Ui::TouchScrollState::Manual) {
-			_touchScrollState = Ui::TouchScrollState::Auto;
-			_touchPrevPosValid = false;
-			_touchScrollTimer.start(15);
-			_touchTime = getms();
-		} else if (_touchScrollState == Ui::TouchScrollState::Auto) {
-			_touchScrollState = Ui::TouchScrollState::Manual;
+		if (!_touchInProgress) return;
+		_touchInProgress = false;
+		if (_touchSelect) {
+			mouseActionFinish(_touchPos, Qt::RightButton);
+			QContextMenuEvent contextMenu(QContextMenuEvent::Mouse, mapFromGlobal(_touchPos), _touchPos);
+			showContextMenu(&contextMenu, true);
 			_touchScroll = false;
-			touchResetSpeed();
-		} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
-			_touchScrollState = Ui::TouchScrollState::Auto;
-			_touchWaitingAcceleration = false;
-			_touchPrevPosValid = false;
+		} else if (_touchScroll) {
+			if (_touchScrollState == Ui::TouchScrollState::Manual) {
+				_touchScrollState = Ui::TouchScrollState::Auto;
+				_touchPrevPosValid = false;
+				_touchScrollTimer.start(15);
+				_touchTime = getms();
+			} else if (_touchScrollState == Ui::TouchScrollState::Auto) {
+				_touchScrollState = Ui::TouchScrollState::Manual;
+				_touchScroll = false;
+				touchResetSpeed();
+			} else if (_touchScrollState == Ui::TouchScrollState::Acceleration) {
+				_touchScrollState = Ui::TouchScrollState::Auto;
+				_touchWaitingAcceleration = false;
+				_touchPrevPosValid = false;
+			}
+		} else { // One short tap is like left mouse click.
+			mouseActionStart(_touchPos, Qt::LeftButton);
+			mouseActionFinish(_touchPos, Qt::LeftButton);
 		}
-	} else { // One short tap is like left mouse click.
-		mouseActionStart(_touchPos, Qt::LeftButton);
-		mouseActionFinish(_touchPos, Qt::LeftButton);
-	}
-	_touchSelectTimer.stop();
-	_touchSelect = false;
-	break;
+		_touchSelectTimer.stop();
+		_touchSelect = false;
+		break;
 	}
 }
 
@@ -823,13 +836,15 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 	}
 	if (_mouseAction == MouseAction::None && _mouseActionItem) {
 		HistoryTextState dragState;
-		if (_trippleClickTimer.isActive() && (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
+		if (_trippleClickTimer.isActive() &&
+		    (screenPos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
 			HistoryStateRequest request;
 			request.flags = Text::StateRequest::Flag::LookupSymbol;
 			dragState = _mouseActionItem->getState(_dragStartPosition, request);
 			if (dragState.cursor == HistoryInTextCursorState) {
-				TextSelection selStatus = { dragState.symbol, dragState.symbol };
-				if (selStatus != FullSelection && (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
+				TextSelection selStatus = {dragState.symbol, dragState.symbol};
+				if (selStatus != FullSelection &&
+				    (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
 					if (!_selected.isEmpty()) {
 						repaintItem(_selected.cbegin().key());
 						_selected.clear();
@@ -852,10 +867,8 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 				_mouseTextSymbol = dragState.symbol;
 				bool uponSelected = (dragState.cursor == HistoryInTextCursorState);
 				if (uponSelected) {
-					if (_selected.isEmpty() ||
-						_selected.cbegin().value() == FullSelection ||
-						_selected.cbegin().key() != _mouseActionItem
-						) {
+					if (_selected.isEmpty() || _selected.cbegin().value() == FullSelection ||
+					    _selected.cbegin().key() != _mouseActionItem) {
 						uponSelected = false;
 					} else {
 						quint16 selFrom = _selected.cbegin().value().from, selTo = _selected.cbegin().value().to;
@@ -867,12 +880,14 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but
 				if (uponSelected) {
 					_mouseAction = MouseAction::PrepareDrag; // start text drag
 				} else if (!_pressWasInactive) {
-					if (dynamic_cast<HistorySticker*>(App::pressedItem()->getMedia()) || _mouseCursorState == HistoryInDateCursorState) {
+					if (dynamic_cast<HistorySticker *>(App::pressedItem()->getMedia()) ||
+					    _mouseCursorState == HistoryInDateCursorState) {
 						_mouseAction = MouseAction::PrepareDrag; // start sticker drag or by-date drag
 					} else {
 						if (dragState.afterSymbol) ++_mouseTextSymbol;
-						TextSelection selStatus = { _mouseTextSymbol, _mouseTextSymbol };
-						if (selStatus != FullSelection && (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
+						TextSelection selStatus = {_mouseTextSymbol, _mouseTextSymbol};
+						if (selStatus != FullSelection &&
+						    (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
 							if (!_selected.isEmpty()) {
 								repaintItem(_selected.cbegin().key());
 								_selected.clear();
@@ -920,10 +935,8 @@ void HistoryInner::performDrag() {
 			auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
 			uponSelected = (dragState.cursor == HistoryInTextCursorState);
 			if (uponSelected) {
-				if (_selected.isEmpty() ||
-					_selected.cbegin().value() == FullSelection ||
-					_selected.cbegin().key() != _mouseActionItem
-					) {
+				if (_selected.isEmpty() || _selected.cbegin().value() == FullSelection ||
+				    _selected.cbegin().key() != _mouseActionItem) {
 					uponSelected = false;
 				} else {
 					quint16 selFrom = _selected.cbegin().value().from, selTo = _selected.cbegin().value().to;
@@ -936,7 +949,7 @@ void HistoryInner::performDrag() {
 	}
 	auto pressedHandler = ClickHandler::getPressed();
 
-	if (dynamic_cast<VoiceSeekClickHandler*>(pressedHandler.data())) {
+	if (dynamic_cast<VoiceSeekClickHandler *>(pressedHandler.data())) {
 		return;
 	}
 
@@ -945,8 +958,8 @@ void HistoryInner::performDrag() {
 	if (uponSelected) {
 		sel = getSelectedText();
 	} else if (pressedHandler) {
-		sel = { pressedHandler->dragText(), EntitiesInText() };
-		//if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
+		sel = {pressedHandler->dragText(), EntitiesInText()};
+		// if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
 		//	urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o
 		//}
 	}
@@ -965,7 +978,7 @@ void HistoryInner::performDrag() {
 		return;
 	} else {
 		auto forwardMimeType = QString();
-		auto pressedMedia = static_cast<HistoryMedia*>(nullptr);
+		auto pressedMedia = static_cast<HistoryMedia *>(nullptr);
 		if (auto pressedItem = App::pressedItem()) {
 			pressedMedia = pressedItem->getMedia();
 			if (_mouseCursorState == HistoryInDateCursorState || (pressedMedia && pressedMedia->dragItem())) {
@@ -1033,7 +1046,8 @@ void HistoryInner::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton bu
 	} else if (auto pressed = App::pressedLinkItem()) {
 		// if we are in selecting items mode perhaps we want to
 		// toggle selection instead of activating the pressed link
-		if (_mouseAction == MouseAction::PrepareDrag && !_pressWasInactive && !_selected.isEmpty() && _selected.cbegin().value() == FullSelection && button != Qt::RightButton) {
+		if (_mouseAction == MouseAction::PrepareDrag && !_pressWasInactive && !_selected.isEmpty() &&
+		    _selected.cbegin().value() == FullSelection && button != Qt::RightButton) {
 			if (auto media = pressed->getMedia()) {
 				if (media->toggleSelectionByHandlerClick(activated)) {
 					activated.clear();
@@ -1053,7 +1067,8 @@ void HistoryInner::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton bu
 		App::activateClickHandler(activated, button);
 		return;
 	}
-	if (_mouseAction == MouseAction::PrepareSelect && !_pressWasInactive && !_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
+	if (_mouseAction == MouseAction::PrepareSelect && !_pressWasInactive && !_selected.isEmpty() &&
+	    _selected.cbegin().value() == FullSelection) {
 		SelectedItems::iterator i = _selected.find(_mouseActionItem);
 		if (i == _selected.cend() && !_mouseActionItem->serviceMsg() && _mouseActionItem->id > 0) {
 			if (_selected.size() < MaxSelectedItems) {
@@ -1071,7 +1086,8 @@ void HistoryInner::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton bu
 		if (i != _selected.cend() && i.value() == FullSelection) {
 			_selected.erase(i);
 			repaintItem(_mouseActionItem);
-		} else if (i == _selected.cend() && !_mouseActionItem->serviceMsg() && _mouseActionItem->id > 0 && !_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
+		} else if (i == _selected.cend() && !_mouseActionItem->serviceMsg() && _mouseActionItem->id > 0 &&
+		           !_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
 			if (_selected.size() < MaxSelectedItems) {
 				_selected.insert(_mouseActionItem, FullSelection);
 				repaintItem(_mouseActionItem);
@@ -1116,7 +1132,10 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
 	if (!_history) return;
 
 	mouseActionStart(e->globalPos(), e->button());
-	if (((_mouseAction == MouseAction::Selecting && !_selected.isEmpty() && _selected.cbegin().value() != FullSelection) || (_mouseAction == MouseAction::None && (_selected.isEmpty() || _selected.cbegin().value() != FullSelection))) && _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
+	if (((_mouseAction == MouseAction::Selecting && !_selected.isEmpty() &&
+	      _selected.cbegin().value() != FullSelection) ||
+	     (_mouseAction == MouseAction::None && (_selected.isEmpty() || _selected.cbegin().value() != FullSelection))) &&
+	    _mouseSelectType == TextSelectType::Letters && _mouseActionItem) {
 		HistoryStateRequest request;
 		request.flags |= Text::StateRequest::Flag::LookupSymbol;
 		auto dragState = _mouseActionItem->getState(_dragStartPosition, request);
@@ -1125,7 +1144,7 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
 			_mouseSelectType = TextSelectType::Words;
 			if (_mouseAction == MouseAction::None) {
 				_mouseAction = MouseAction::Selecting;
-				TextSelection selStatus = { dragState.symbol, dragState.symbol };
+				TextSelection selStatus = {dragState.symbol, dragState.symbol};
 				if (!_selected.isEmpty()) {
 					repaintItem(_selected.cbegin().key());
 					_selected.clear();
@@ -1138,10 +1157,8 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
 			_trippleClickTimer.start(QApplication::doubleClickInterval());
 		}
 	}
-	if (!ClickHandler::getActive()
-		&& !ClickHandler::getPressed()
-		&& (_mouseCursorState == HistoryDefaultCursorState
-		|| _mouseCursorState == HistoryInDateCursorState)) {
+	if (!ClickHandler::getActive() && !ClickHandler::getPressed() &&
+	    (_mouseCursorState == HistoryDefaultCursorState || _mouseCursorState == HistoryInDateCursorState)) {
 		if (const auto item = _mouseActionItem) {
 			mouseActionCancel();
 			App::contextItem(item);
@@ -1166,9 +1183,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	auto selectedState = getSelectionState();
 	auto canSendMessages = _widget->canSendMessages(_peer);
 
-	// -2 - has full selected items, but not over, -1 - has selection, but no over, 0 - no selection, 1 - over text, 2 - over full selected items
+	// -2 - has full selected items, but not over, -1 - has selection, but no over, 0 - no selection, 1 - over text, 2 -
+	// over full selected items
 	auto isUponSelected = 0;
-	auto hasSelected = 0;;
+	auto hasSelected = 0;
+	;
 	if (!_selected.isEmpty()) {
 		isUponSelected = -1;
 		if (_selected.cbegin().value() == FullSelection) {
@@ -1186,7 +1205,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				HistoryStateRequest request;
 				request.flags |= Text::StateRequest::Flag::LookupSymbol;
 				auto dragState = App::mousedItem()->getState(mousePos, request);
-				if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom && dragState.symbol < selTo) {
+				if (dragState.cursor == HistoryInTextCursorState && dragState.symbol >= selFrom &&
+				    dragState.symbol < selTo) {
 					isUponSelected = 1;
 				}
 			}
@@ -1200,14 +1220,17 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 
 	_contextMenuLink = ClickHandler::getActive();
 	HistoryItem *item = App::hoveredItem() ? App::hoveredItem() : App::hoveredLinkItem();
-	PhotoClickHandler *lnkPhoto = dynamic_cast<PhotoClickHandler*>(_contextMenuLink.data());
-	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data());
+	PhotoClickHandler *lnkPhoto = dynamic_cast<PhotoClickHandler *>(_contextMenuLink.data());
+	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data());
 	bool lnkIsVideo = lnkDocument ? lnkDocument->document()->isVideo() : false;
 	bool lnkIsAudio = lnkDocument ? (lnkDocument->document()->voice() != nullptr) : false;
 	bool lnkIsSong = lnkDocument ? (lnkDocument->document()->song() != nullptr) : false;
 	if (lnkPhoto || lnkDocument) {
 		if (isUponSelected > 0) {
-			_menu->addAction(lang((isUponSelected > 1) ? lng_context_copy_selected_items : lng_context_copy_selected), this, SLOT(copySelectedText()))->setEnabled(true);
+			_menu
+			    ->addAction(lang((isUponSelected > 1) ? lng_context_copy_selected_items : lng_context_copy_selected),
+			                this, SLOT(copySelectedText()))
+			    ->setEnabled(true);
 		}
 		if (item && item->id > 0 && isUponSelected != 2 && isUponSelected != -2) {
 			if (canSendMessages) {
@@ -1218,20 +1241,25 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}
 			if (item->canPin()) {
 				bool ispinned = (item->history()->peer->asChannel()->mgInfo->pinnedMsgId == item->id);
-				_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget, ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
+				_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget,
+				                 ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
 			}
 		}
 		if (lnkPhoto) {
-			_menu->addAction(lang(lng_context_save_image), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, photo = lnkPhoto->photo()] {
-				savePhotoToFile(photo);
-			}))->setEnabled(true);
-			_menu->addAction(lang(lng_context_copy_image), [this, photo = lnkPhoto->photo()] {
-				copyContextImage(photo);
-			})->setEnabled(true);
+			_menu
+			    ->addAction(lang(lng_context_save_image),
+			                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+			                                   [this, photo = lnkPhoto->photo()] { savePhotoToFile(photo); }))
+			    ->setEnabled(true);
+			_menu
+			    ->addAction(lang(lng_context_copy_image),
+			                [this, photo = lnkPhoto->photo()] { copyContextImage(photo); })
+			    ->setEnabled(true);
 		} else {
 			auto document = lnkDocument->document();
 			if (document->loading()) {
-				_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))->setEnabled(true);
+				_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))
+				    ->setEnabled(true);
 			} else {
 				if (document->loaded() && document->isGifv()) {
 					if (!cAutoPlayGif()) {
@@ -1240,24 +1268,35 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					_menu->addAction(lang(lng_context_save_gif), this, SLOT(saveContextGif()))->setEnabled(true);
 				}
 				if (!document->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-					_menu->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), this, SLOT(showContextInFolder()))->setEnabled(true);
+					_menu
+					    ->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ?
+					                         lng_context_show_in_finder :
+					                         lng_context_show_in_folder),
+					                this, SLOT(showContextInFolder()))
+					    ->setEnabled(true);
 				}
-				_menu->addAction(lang(lnkIsVideo ? lng_context_save_video : (lnkIsAudio ? lng_context_save_audio : (lnkIsSong ? lng_context_save_audio_file : lng_context_save_file))), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-					saveDocumentToFile(document);
-				}))->setEnabled(true);
+				_menu
+				    ->addAction(lang(lnkIsVideo ? lng_context_save_video :
+				                                  (lnkIsAudio ? lng_context_save_audio :
+				                                                (lnkIsSong ? lng_context_save_audio_file :
+				                                                             lng_context_save_file))),
+				                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+				                                   [this, document] { saveDocumentToFile(document); }))
+				    ->setEnabled(true);
 			}
 		}
 		if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) {
-			_menu->addAction(lang(item->history()->peer->isMegagroup() ? lng_context_copy_link : lng_context_copy_post_link), _widget, SLOT(onCopyPostLink()));
+			_menu->addAction(
+			    lang(item->history()->peer->isMegagroup() ? lng_context_copy_link : lng_context_copy_post_link),
+			    _widget, SLOT(onCopyPostLink()));
 		}
 		if (isUponSelected > 1) {
 			if (selectedState.count > 0 && selectedState.canForwardCount == selectedState.count) {
 				_menu->addAction(lang(lng_context_forward_selected), _widget, SLOT(onForwardSelected()));
 			}
 			if (selectedState.count > 0 && selectedState.canDeleteCount == selectedState.count) {
-				_menu->addAction(lang(lng_context_delete_selected), base::lambda_guarded(this, [this] {
-					_widget->confirmDeleteSelectedItems();
-				}));
+				_menu->addAction(lang(lng_context_delete_selected),
+				                 base::lambda_guarded(this, [this] { _widget->confirmDeleteSelectedItems(); }));
 			}
 			_menu->addAction(lang(lng_context_clear_selection), _widget, SLOT(onClearSelected()));
 		} else if (App::hoveredLinkItem()) {
@@ -1266,9 +1305,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					_menu->addAction(lang(lng_context_forward_msg), _widget, SLOT(forwardMessage()))->setEnabled(true);
 				}
 				if (App::hoveredLinkItem()->canDelete()) {
-					_menu->addAction(lang(lng_context_delete_msg), base::lambda_guarded(this, [this] {
-						_widget->confirmDeleteContextItem();
-					}));
+					_menu->addAction(lang(lng_context_delete_msg),
+					                 base::lambda_guarded(this, [this] { _widget->confirmDeleteContextItem(); }));
 				}
 			}
 			if (App::hoveredLinkItem()->id > 0 && !App::hoveredLinkItem()->serviceMsg()) {
@@ -1280,9 +1318,12 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		bool canDelete = item && item->canDelete() && (item->id > 0 || !item->serviceMsg());
 		bool canForward = item && item->canForward();
 
-		auto msg = dynamic_cast<HistoryMessage*>(item);
+		auto msg = dynamic_cast<HistoryMessage *>(item);
 		if (isUponSelected > 0) {
-			_menu->addAction(lang((isUponSelected > 1) ? lng_context_copy_selected_items : lng_context_copy_selected), this, SLOT(copySelectedText()))->setEnabled(true);
+			_menu
+			    ->addAction(lang((isUponSelected > 1) ? lng_context_copy_selected_items : lng_context_copy_selected),
+			                this, SLOT(copySelectedText()))
+			    ->setEnabled(true);
 			if (item && item->id > 0 && isUponSelected != 2) {
 				if (canSendMessages) {
 					_menu->addAction(lang(lng_context_reply_msg), _widget, SLOT(onReplyToMessage()));
@@ -1292,7 +1333,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}
 				if (item->canPin()) {
 					bool ispinned = (item->history()->peer->asChannel()->mgInfo->pinnedMsgId == item->id);
-					_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget, ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
+					_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget,
+					                 ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
 				}
 			}
 		} else {
@@ -1305,43 +1347,61 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}
 				if (item->canPin()) {
 					bool ispinned = (item->history()->peer->asChannel()->mgInfo->pinnedMsgId == item->id);
-					_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget, ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
+					_menu->addAction(lang(ispinned ? lng_context_unpin_msg : lng_context_pin_msg), _widget,
+					                 ispinned ? SLOT(onUnpinMessage()) : SLOT(onPinMessage()));
 				}
 			}
 			if (item && !isUponSelected) {
 				auto mediaHasTextForCopy = false;
 				if (auto media = (msg ? msg->getMedia() : nullptr)) {
 					mediaHasTextForCopy = media->hasTextForCopy();
-					if (media->type() == MediaTypeWebPage && static_cast<HistoryWebPage*>(media)->attach()) {
-						media = static_cast<HistoryWebPage*>(media)->attach();
+					if (media->type() == MediaTypeWebPage && static_cast<HistoryWebPage *>(media)->attach()) {
+						media = static_cast<HistoryWebPage *>(media)->attach();
 					}
 					if (media->type() == MediaTypeSticker) {
 						if (auto document = media->getDocument()) {
 							if (document->sticker() && document->sticker()->set.type() != mtpc_inputStickerSetEmpty) {
-								_menu->addAction(lang(document->sticker()->setInstalled() ? lng_context_pack_info : lng_context_pack_add), [this, document] { showStickerPackInfo(document); });
-								_menu->addAction(lang(Stickers::IsFaved(document) ? lng_faved_stickers_remove : lng_faved_stickers_add), [this, document] { toggleFavedSticker(document); });
+								_menu->addAction(lang(document->sticker()->setInstalled() ? lng_context_pack_info :
+								                                                            lng_context_pack_add),
+								                 [this, document] { showStickerPackInfo(document); });
+								_menu->addAction(lang(Stickers::IsFaved(document) ? lng_faved_stickers_remove :
+								                                                    lng_faved_stickers_add),
+								                 [this, document] { toggleFavedSticker(document); });
 							}
-							_menu->addAction(lang(lng_context_save_image), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-								saveDocumentToFile(document);
-							}))->setEnabled(true);
+							_menu
+							    ->addAction(lang(lng_context_save_image),
+							                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+							                                   [this, document] { saveDocumentToFile(document); }))
+							    ->setEnabled(true);
 						}
 					} else if (media->type() == MediaTypeGif && !_contextMenuLink) {
 						if (auto document = media->getDocument()) {
 							if (document->loading()) {
-								_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))->setEnabled(true);
+								_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))
+								    ->setEnabled(true);
 							} else {
 								if (document->isGifv()) {
 									if (!cAutoPlayGif()) {
-										_menu->addAction(lang(lng_context_open_gif), this, SLOT(openContextGif()))->setEnabled(true);
+										_menu->addAction(lang(lng_context_open_gif), this, SLOT(openContextGif()))
+										    ->setEnabled(true);
 									}
-									_menu->addAction(lang(lng_context_save_gif), this, SLOT(saveContextGif()))->setEnabled(true);
+									_menu->addAction(lang(lng_context_save_gif), this, SLOT(saveContextGif()))
+									    ->setEnabled(true);
 								}
 								if (!document->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-									_menu->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), this, SLOT(showContextInFolder()))->setEnabled(true);
+									_menu
+									    ->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ?
+									                         lng_context_show_in_finder :
+									                         lng_context_show_in_folder),
+									                this, SLOT(showContextInFolder()))
+									    ->setEnabled(true);
 								}
-								_menu->addAction(lang(lng_context_save_file), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-									saveDocumentToFile(document);
-								}))->setEnabled(true);
+								_menu
+								    ->addAction(lang(lng_context_save_file),
+								                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration,
+								                                   this,
+								                                   [this, document] { saveDocumentToFile(document); }))
+								    ->setEnabled(true);
 							}
 						}
 					}
@@ -1352,13 +1412,16 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}
 		}
 
-		auto linkCopyToClipboardText = _contextMenuLink ? _contextMenuLink->copyToClipboardContextItemText() : QString();
+		auto linkCopyToClipboardText =
+		    _contextMenuLink ? _contextMenuLink->copyToClipboardContextItemText() : QString();
 		if (!linkCopyToClipboardText.isEmpty()) {
 			_menu->addAction(linkCopyToClipboardText, this, SLOT(copyContextUrl()))->setEnabled(true);
 		}
 		if (linkCopyToClipboardText.isEmpty()) {
 			if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) {
-				_menu->addAction(lang(item->history()->peer->isMegagroup() ? lng_context_copy_link : lng_context_copy_post_link), _widget, SLOT(onCopyPostLink()));
+				_menu->addAction(
+				    lang(item->history()->peer->isMegagroup() ? lng_context_copy_link : lng_context_copy_post_link),
+				    _widget, SLOT(onCopyPostLink()));
 			}
 		}
 		if (isUponSelected > 1) {
@@ -1366,9 +1429,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				_menu->addAction(lang(lng_context_forward_selected), _widget, SLOT(onForwardSelected()));
 			}
 			if (selectedState.count > 0 && selectedState.count == selectedState.canDeleteCount) {
-				_menu->addAction(lang(lng_context_delete_selected), base::lambda_guarded(this, [this] {
-					_widget->confirmDeleteSelectedItems();
-				}));
+				_menu->addAction(lang(lng_context_delete_selected),
+				                 base::lambda_guarded(this, [this] { _widget->confirmDeleteSelectedItems(); }));
 			}
 			_menu->addAction(lang(lng_context_clear_selection), _widget, SLOT(onClearSelected()));
 		} else if (item && ((isUponSelected != -2 && (canForward || canDelete)) || item->id > 0)) {
@@ -1378,9 +1440,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				}
 
 				if (canDelete) {
-					_menu->addAction(lang((msg && msg->uploading()) ? lng_context_cancel_upload : lng_context_delete_msg), base::lambda_guarded(this, [this] {
-						_widget->confirmDeleteContextItem();
-					}));
+					_menu->addAction(
+					    lang((msg && msg->uploading()) ? lng_context_cancel_upload : lng_context_delete_msg),
+					    base::lambda_guarded(this, [this] { _widget->confirmDeleteContextItem(); }));
 				}
 			}
 			if (item->id > 0 && !item->serviceMsg()) {
@@ -1399,7 +1461,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		delete _menu;
 		_menu = 0;
 	} else {
-		connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroy(QObject*)));
+		connect(_menu, SIGNAL(destroyed(QObject *)), this, SLOT(onMenuDestroy(QObject *)));
 		_menu->popup(e->globalPos());
 		e->accept();
 	}
@@ -1425,11 +1487,12 @@ void HistoryInner::savePhotoToFile(PhotoData *photo) {
 	if (!photo || !photo->date || !photo->loaded()) return;
 
 	auto filter = qsl("JPEG Image (*.jpg);;") + FileDialog::AllFilesFilter();
-	FileDialog::GetWritePath(lang(lng_save_photo), filter, filedialogDefaultName(qsl("photo"), qsl(".jpg")), base::lambda_guarded(this, [this, photo](const QString &result) {
-		if (!result.isEmpty()) {
-			photo->full->pix().toImage().save(result, "JPG");
-		}
-	}));
+	FileDialog::GetWritePath(lang(lng_save_photo), filter, filedialogDefaultName(qsl("photo"), qsl(".jpg")),
+	                         base::lambda_guarded(this, [this, photo](const QString &result) {
+		                         if (!result.isEmpty()) {
+			                         photo->full->pix().toImage().save(result, "JPG");
+		                         }
+	                         }));
 }
 
 void HistoryInner::copyContextImage(PhotoData *photo) {
@@ -1448,13 +1511,12 @@ void HistoryInner::showStickerPackInfo(DocumentData *document) {
 
 void HistoryInner::toggleFavedSticker(DocumentData *document) {
 	auto unfave = Stickers::IsFaved(document);
-	MTP::send(MTPmessages_FaveSticker(document->mtpInput(), MTP_bool(unfave)), rpcDone([document, unfave](const MTPBool &result) {
-		Stickers::SetFaved(document, !unfave);
-	}));
+	MTP::send(MTPmessages_FaveSticker(document->mtpInput(), MTP_bool(unfave)),
+	          rpcDone([document, unfave](const MTPBool &result) { Stickers::SetFaved(document, !unfave); }));
 }
 
 void HistoryInner::cancelContextDownload() {
-	if (auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data())) {
+	if (auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data())) {
 		lnkDocument->document()->cancel();
 	} else if (auto item = App::contextItem()) {
 		if (auto media = item->getMedia()) {
@@ -1467,7 +1529,7 @@ void HistoryInner::cancelContextDownload() {
 
 void HistoryInner::showContextInFolder() {
 	QString filepath;
-	if (auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLink.data())) {
+	if (auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLink.data())) {
 		filepath = lnkDocument->document()->filepath(DocumentData::FilePathResolveChecked);
 	} else if (auto item = App::contextItem()) {
 		if (auto media = item->getMedia()) {
@@ -1594,7 +1656,9 @@ void HistoryInner::recountHeight() {
 	int visibleHeight = _scroll->height();
 	int oldHistoryPaddingTop = std::max(visibleHeight - historyHeight() - st::historyPaddingBottom, 0);
 	if (_botAbout && !_botAbout->info->text.isEmpty()) {
-		accumulate_max(oldHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() + st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip + _botAbout->height);
+		accumulate_max(oldHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() +
+		                                         st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip +
+		                                         _botAbout->height);
 	}
 
 	_history->resizeGetHeight(_scroll->width());
@@ -1608,8 +1672,10 @@ void HistoryInner::recountHeight() {
 	_historySkipHeight = 0;
 	if (_migrated) {
 		if (!_migrated->isEmpty() && !_history->isEmpty() && _migrated->loadedAtBottom() && _history->loadedAtTop()) {
-			if (_migrated->blocks.back()->items.back()->date.date() == _history->blocks.front()->items.front()->date.date()) {
-				if (_migrated->blocks.back()->items.back()->isGroupMigrate() && _history->blocks.front()->items.front()->isGroupMigrate()) {
+			if (_migrated->blocks.back()->items.back()->date.date() ==
+			    _history->blocks.front()->items.front()->date.date()) {
+				if (_migrated->blocks.back()->items.back()->isGroupMigrate() &&
+				    _history->blocks.front()->items.front()->isGroupMigrate()) {
 					_historySkipHeight += _history->blocks.front()->items.front()->height();
 				} else {
 					_historySkipHeight += _history->blocks.front()->items.front()->displayedDateHeight();
@@ -1629,15 +1695,19 @@ void HistoryInner::recountHeight() {
 		_botAbout->width = tw;
 		_botAbout->height = _botAbout->info->text.countHeight(_botAbout->width);
 
-		qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip + _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
+		qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip +
+		               _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
 		qint32 descMaxWidth = _scroll->width();
 		if (Adaptive::ChatWide()) {
-			descMaxWidth = std::min(descMaxWidth, qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
+			descMaxWidth =
+			    std::min(descMaxWidth, qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
 		}
 		qint32 descAtX = (descMaxWidth - _botAbout->width) / 2 - st::msgPadding.left();
-		qint32 descAtY = std::min(_historyPaddingTop - descH, std::max(0, (_scroll->height() - descH) / 2)) + st::msgMargin.top();
+		qint32 descAtY =
+		    std::min(_historyPaddingTop - descH, std::max(0, (_scroll->height() - descH) / 2)) + st::msgMargin.top();
 
-		_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(), descH - st::msgMargin.top() - st::msgMargin.bottom());
+		_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(),
+		                        descH - st::msgMargin.top() - st::msgMargin.bottom());
 	} else if (_botAbout) {
 		_botAbout->width = _botAbout->height = 0;
 		_botAbout->rect = QRect();
@@ -1645,7 +1715,9 @@ void HistoryInner::recountHeight() {
 
 	int newHistoryPaddingTop = std::max(visibleHeight - historyHeight() - st::historyPaddingBottom, 0);
 	if (_botAbout && !_botAbout->info->text.isEmpty()) {
-		accumulate_max(newHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() + st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip + _botAbout->height);
+		accumulate_max(newHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() +
+		                                         st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip +
+		                                         _botAbout->height);
 	}
 
 	auto historyPaddingTopDelta = (newHistoryPaddingTop - oldHistoryPaddingTop);
@@ -1667,7 +1739,8 @@ void HistoryInner::updateBotInfo(bool recount) {
 				qint32 tw = _scroll->width() - st::msgMargin.left() - st::msgMargin.right();
 				if (tw > st::msgMaxWidth) tw = st::msgMaxWidth;
 				tw -= st::msgPadding.left() + st::msgPadding.right();
-				qint32 mw = std::max(_botAbout->info->text.maxWidth(), st::msgNameFont->width(lang(lng_bot_description)));
+				qint32 mw =
+				    std::max(_botAbout->info->text.maxWidth(), st::msgNameFont->width(lang(lng_bot_description)));
 				if (tw > mw) tw = mw;
 
 				_botAbout->width = tw;
@@ -1683,11 +1756,14 @@ void HistoryInner::updateBotInfo(bool recount) {
 			updateSize();
 		}
 		if (_botAbout->height > 0) {
-			qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip + _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
+			qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip +
+			               _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
 			qint32 descAtX = (_scroll->width() - _botAbout->width) / 2 - st::msgPadding.left();
-			qint32 descAtY = std::min(_historyPaddingTop - descH, (_scroll->height() - descH) / 2) + st::msgMargin.top();
+			qint32 descAtY =
+			    std::min(_historyPaddingTop - descH, (_scroll->height() - descH) / 2) + st::msgMargin.top();
 
-			_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(), descH - st::msgMargin.top() - st::msgMargin.bottom());
+			_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(),
+			                        descH - st::msgMargin.top() - st::msgMargin.bottom());
 		} else {
 			_botAbout->width = 0;
 			_botAbout->rect = QRect();
@@ -1750,11 +1826,13 @@ bool HistoryInner::displayScrollDate() const {
 void HistoryInner::onScrollDateCheck() {
 	if (!_history) return;
 
-	auto newScrollDateItem = _history->scrollTopItem ? _history->scrollTopItem : (_migrated ? _migrated->scrollTopItem : nullptr);
-	auto newScrollDateItemTop = _history->scrollTopItem ? _history->scrollTopOffset : (_migrated ? _migrated->scrollTopOffset : 0);
-	//if (newScrollDateItem && !displayScrollDate()) {
-	//	if (!_history->isEmpty() && newScrollDateItem->date.date() == _history->blocks.back()->items.back()->date.date()) {
-	//		newScrollDateItem = nullptr;
+	auto newScrollDateItem =
+	    _history->scrollTopItem ? _history->scrollTopItem : (_migrated ? _migrated->scrollTopItem : nullptr);
+	auto newScrollDateItemTop =
+	    _history->scrollTopItem ? _history->scrollTopOffset : (_migrated ? _migrated->scrollTopOffset : 0);
+	// if (newScrollDateItem && !displayScrollDate()) {
+	//	if (!_history->isEmpty() && newScrollDateItem->date.date() ==
+	//_history->blocks.back()->items.back()->date.date()) { 		newScrollDateItem = nullptr;
 	//	}
 	//}
 	if (!newScrollDateItem) {
@@ -1801,7 +1879,8 @@ void HistoryInner::toggleScrollDateShown() {
 
 void HistoryInner::repaintScrollDateCallback() {
 	int updateTop = _visibleAreaTop;
-	int updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
+	int updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height +
+	                   st::msgServicePadding.bottom();
 	update(0, updateTop, width(), updateHeight);
 }
 
@@ -1809,19 +1888,25 @@ void HistoryInner::updateSize() {
 	int visibleHeight = _scroll->height();
 	int newHistoryPaddingTop = std::max(visibleHeight - historyHeight() - st::historyPaddingBottom, 0);
 	if (_botAbout && !_botAbout->info->text.isEmpty()) {
-		accumulate_max(newHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() + st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip + _botAbout->height);
+		accumulate_max(newHistoryPaddingTop, st::msgMargin.top() + st::msgMargin.bottom() + st::msgPadding.top() +
+		                                         st::msgPadding.bottom() + st::msgNameFont->height + st::botDescSkip +
+		                                         _botAbout->height);
 	}
 
 	if (_botAbout && _botAbout->height > 0) {
-		qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip + _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
+		qint32 descH = st::msgMargin.top() + st::msgPadding.top() + st::msgNameFont->height + st::botDescSkip +
+		               _botAbout->height + st::msgPadding.bottom() + st::msgMargin.bottom();
 		qint32 descMaxWidth = _scroll->width();
 		if (Adaptive::ChatWide()) {
-			descMaxWidth = std::min(descMaxWidth, qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
+			descMaxWidth =
+			    std::min(descMaxWidth, qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
 		}
 		qint32 descAtX = (descMaxWidth - _botAbout->width) / 2 - st::msgPadding.left();
-		qint32 descAtY = std::min(newHistoryPaddingTop - descH, std::max(0, (_scroll->height() - descH) / 2)) + st::msgMargin.top();
+		qint32 descAtY =
+		    std::min(newHistoryPaddingTop - descH, std::max(0, (_scroll->height() - descH) / 2)) + st::msgMargin.top();
 
-		_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(), descH - st::msgMargin.top() - st::msgMargin.bottom());
+		_botAbout->rect = QRect(descAtX, descAtY, _botAbout->width + st::msgPadding.left() + st::msgPadding.right(),
+		                        descH - st::msgMargin.top() - st::msgMargin.bottom());
 	}
 
 	_historyPaddingTop = newHistoryPaddingTop;
@@ -1891,7 +1976,8 @@ void HistoryInner::adjustCurrent(qint32 y, History *history) const {
 		--_curBlock;
 		_curItem = 0;
 	}
-	while (history->blocks[_curBlock]->y() + history->blocks[_curBlock]->height() <= y && _curBlock + 1 < history->blocks.size()) {
+	while (history->blocks[_curBlock]->y() + history->blocks[_curBlock]->height() <= y &&
+	       _curBlock + 1 < history->blocks.size()) {
 		++_curBlock;
 		_curItem = 0;
 	}
@@ -1903,7 +1989,8 @@ void HistoryInner::adjustCurrent(qint32 y, History *history) const {
 	while (block->items[_curItem]->y() + by > y && _curItem > 0) {
 		--_curItem;
 	}
-	while (block->items[_curItem]->y() + block->items[_curItem]->height() + by <= y && _curItem + 1 < block->items.size()) {
+	while (block->items[_curItem]->y() + block->items[_curItem]->height() + by <= y &&
+	       _curItem + 1 < block->items.size()) {
 		++_curItem;
 	}
 }
@@ -1919,7 +2006,8 @@ HistoryItem *HistoryInner::prevItem(HistoryItem *item) {
 	if (blockIndex > 0) {
 		return item->history()->blocks.at(blockIndex - 1)->items.back();
 	}
-	if (item->history() == _history && _migrated && _history->loadedAtTop() && !_migrated->isEmpty() && _migrated->loadedAtBottom()) {
+	if (item->history() == _history && _migrated && _history->loadedAtTop() && !_migrated->isEmpty() &&
+	    _migrated->loadedAtBottom()) {
 		return _migrated->blocks.back()->items.back();
 	}
 	return nullptr;
@@ -1936,7 +2024,8 @@ HistoryItem *HistoryInner::nextItem(HistoryItem *item) {
 	if (blockIndex + 1 < item->history()->blocks.size()) {
 		return item->history()->blocks.at(blockIndex + 1)->items.front();
 	}
-	if (item->history() == _migrated && _history && _migrated->loadedAtBottom() && _history->loadedAtTop() && !_history->isEmpty()) {
+	if (item->history() == _migrated && _history && _migrated->loadedAtBottom() && _history->loadedAtTop() &&
+	    !_history->isEmpty()) {
 		return _history->blocks.front()->items.front();
 	}
 	return nullptr;
@@ -1952,7 +2041,7 @@ bool HistoryInner::canDeleteSelected() const {
 }
 
 Window::TopBarWidget::SelectedState HistoryInner::getSelectionState() const {
-	auto result = Window::TopBarWidget::SelectedState {};
+	auto result = Window::TopBarWidget::SelectedState{};
 	for (auto i = _selected.cbegin(), e = _selected.cend(); i != e; ++i) {
 		if (i.value() == FullSelection) {
 			++result.count;
@@ -2048,14 +2137,19 @@ void HistoryInner::onUpdateSelected() {
 
 	HistoryTextState dragState;
 	ClickHandlerHost *lnkhost = nullptr;
-	bool selectingText = (item == _mouseActionItem && item == App::hoveredItem() && !_selected.isEmpty() && _selected.cbegin().value() != FullSelection);
+	bool selectingText = (item == _mouseActionItem && item == App::hoveredItem() && !_selected.isEmpty() &&
+	                      _selected.cbegin().value() != FullSelection);
 	if (point.y() < _historyPaddingTop) {
 		if (_botAbout && !_botAbout->info->text.isEmpty() && _botAbout->height > 0) {
-			dragState = _botAbout->info->text.getState(point - _botAbout->rect.topLeft() - QPoint(st::msgPadding.left(), st::msgPadding.top() + st::botDescSkip + st::msgNameFont->height), _botAbout->width);
+			dragState = _botAbout->info->text.getState(
+			    point - _botAbout->rect.topLeft() -
+			        QPoint(st::msgPadding.left(), st::msgPadding.top() + st::botDescSkip + st::msgNameFont->height),
+			    _botAbout->width);
 			lnkhost = _botAbout.get();
 		}
 	} else if (item) {
-		if (item != _mouseActionItem || (m - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
+		if (item != _mouseActionItem ||
+		    (m - _dragStartPosition).manhattanLength() >= QApplication::startDragDistance()) {
 			if (_mouseAction == MouseAction::PrepareDrag) {
 				_mouseAction = MouseAction::Dragging;
 				InvokeQueued(this, [this] { performDrag(); });
@@ -2066,7 +2160,9 @@ void HistoryInner::onUpdateSelected() {
 
 		auto dateHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
 		auto scrollDateOpacity = _scrollDateOpacity.current(_scrollDateShown ? 1. : 0.);
-		enumerateDates([this, &dragState, &lnkhost, &point, scrollDateOpacity, dateHeight/*, lastDate, showFloatingBefore*/](not_null<HistoryItem*> item, int itemtop, int dateTop) {
+		enumerateDates([this, &dragState, &lnkhost, &point, scrollDateOpacity,
+		                dateHeight /*, lastDate, showFloatingBefore*/](not_null<HistoryItem *> item, int itemtop,
+		                                                               int dateTop) {
 			// stop enumeration if the date is above our point
 			if (dateTop + dateHeight <= point.y()) {
 				return false;
@@ -2081,7 +2177,7 @@ void HistoryInner::onUpdateSelected() {
 
 			// stop enumeration if we've found a date under the cursor
 			if (dateTop <= point.y()) {
-				auto opacity = (dateInPlace/* || noFloatingDate*/) ? 1. : scrollDateOpacity;
+				auto opacity = (dateInPlace /* || noFloatingDate*/) ? 1. : scrollDateOpacity;
 				if (opacity > 0.) {
 					auto dateWidth = 0;
 					if (auto date = item->Get<HistoryMessageDate>()) {
@@ -2093,7 +2189,8 @@ void HistoryInner::onUpdateSelected() {
 					auto dateLeft = st::msgServiceMargin.left();
 					auto maxwidth = item->history()->width;
 					if (Adaptive::ChatWide()) {
-						maxwidth = std::min(maxwidth, qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
+						maxwidth = std::min(maxwidth,
+						                    qint32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
 					}
 					auto widthForDate = maxwidth - st::msgServiceMargin.left() - st::msgServiceMargin.left();
 
@@ -2103,7 +2200,7 @@ void HistoryInner::onUpdateSelected() {
 						if (!_scrollDateLink) {
 							_scrollDateLink = MakeShared<DateClickHandler>(item->history()->peer, item->date.date());
 						} else {
-							static_cast<DateClickHandler*>(_scrollDateLink.data())->setDate(item->date.date());
+							static_cast<DateClickHandler *>(_scrollDateLink.data())->setDate(item->date.date());
 						}
 						dragState.link = _scrollDateLink;
 						lnkhost = item;
@@ -2125,20 +2222,21 @@ void HistoryInner::onUpdateSelected() {
 			if (!dragState.link && m.x() >= st::historyPhotoLeft && m.x() < st::historyPhotoLeft + st::msgPhotoSize) {
 				if (auto msg = item->toHistoryMessage()) {
 					if (msg->hasFromPhoto()) {
-						enumerateUserpics([&dragState, &lnkhost, &point](not_null<HistoryMessage*> message, int userpicTop) -> bool {
-							// stop enumeration if the userpic is below our point
-							if (userpicTop > point.y()) {
-								return false;
-							}
+						enumerateUserpics(
+						    [&dragState, &lnkhost, &point](not_null<HistoryMessage *> message, int userpicTop) -> bool {
+							    // stop enumeration if the userpic is below our point
+							    if (userpicTop > point.y()) {
+								    return false;
+							    }
 
-							// stop enumeration if we've found a userpic under the cursor
-							if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
-								dragState.link = message->from()->openLink();
-								lnkhost = message;
-								return false;
-							}
-							return true;
-						});
+							    // stop enumeration if we've found a userpic under the cursor
+							    if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
+								    dragState.link = message->from()->openLink();
+								    lnkhost = message;
+								    return false;
+							    }
+							    return true;
+						    });
 					}
 				}
 			}
@@ -2148,7 +2246,8 @@ void HistoryInner::onUpdateSelected() {
 	if (lnkChanged || dragState.cursor != _mouseCursorState) {
 		Ui::Tooltip::Hide();
 	}
-	if (dragState.link || dragState.cursor == HistoryInDateCursorState || dragState.cursor == HistoryInForwardedCursorState) {
+	if (dragState.link || dragState.cursor == HistoryInDateCursorState ||
+	    dragState.cursor == HistoryInForwardedCursorState) {
 		Ui::Tooltip::Show(1000, this);
 	}
 
@@ -2157,7 +2256,8 @@ void HistoryInner::onUpdateSelected() {
 		_mouseCursorState = dragState.cursor;
 		if (dragState.link) {
 			cur = style::cur_pointer;
-		} else if (_mouseCursorState == HistoryInTextCursorState && (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
+		} else if (_mouseCursorState == HistoryInTextCursorState &&
+		           (_selected.isEmpty() || _selected.cbegin().value() != FullSelection)) {
 			cur = style::cur_text;
 		} else if (_mouseCursorState == HistoryInDateCursorState) {
 			//			cur = style::cur_cross;
@@ -2170,7 +2270,7 @@ void HistoryInner::onUpdateSelected() {
 				if (dragState.afterSymbol && _mouseSelectType == TextSelectType::Letters) {
 					++second;
 				}
-				auto selState = TextSelection { std::min(second, _mouseTextSymbol), std::max(second, _mouseTextSymbol) };
+				auto selState = TextSelection{std::min(second, _mouseTextSymbol), std::max(second, _mouseTextSymbol)};
 				if (_mouseSelectType != TextSelectType::Letters) {
 					selState = _mouseActionItem->adjustSelection(selState, _mouseSelectType);
 				}
@@ -2184,15 +2284,22 @@ void HistoryInner::onUpdateSelected() {
 				}
 				updateDragSelection(0, 0, false);
 			} else if (canSelectMany) {
-				auto selectingDown = (itemTop(_mouseActionItem) < itemTop(item)) || (_mouseActionItem == item && _dragStartPosition.y() < m.y());
+				auto selectingDown = (itemTop(_mouseActionItem) < itemTop(item)) ||
+				                     (_mouseActionItem == item && _dragStartPosition.y() < m.y());
 				auto dragSelFrom = _mouseActionItem, dragSelTo = item;
 				if (!dragSelFrom->hasPoint(_dragStartPosition)) { // maybe exclude dragSelFrom
 					if (selectingDown) {
-						if (_dragStartPosition.y() >= dragSelFrom->height() - dragSelFrom->marginBottom() || ((item == dragSelFrom) && (m.y() < _dragStartPosition.y() + QApplication::startDragDistance() || m.y() < dragSelFrom->marginTop()))) {
+						if (_dragStartPosition.y() >= dragSelFrom->height() - dragSelFrom->marginBottom() ||
+						    ((item == dragSelFrom) &&
+						     (m.y() < _dragStartPosition.y() + QApplication::startDragDistance() ||
+						      m.y() < dragSelFrom->marginTop()))) {
 							dragSelFrom = (dragSelFrom == dragSelTo) ? 0 : nextItem(dragSelFrom);
 						}
 					} else {
-						if (_dragStartPosition.y() < dragSelFrom->marginTop() || ((item == dragSelFrom) && (m.y() >= _dragStartPosition.y() - QApplication::startDragDistance() || m.y() >= dragSelFrom->height() - dragSelFrom->marginBottom()))) {
+						if (_dragStartPosition.y() < dragSelFrom->marginTop() ||
+						    ((item == dragSelFrom) &&
+						     (m.y() >= _dragStartPosition.y() - QApplication::startDragDistance() ||
+						      m.y() >= dragSelFrom->height() - dragSelFrom->marginBottom()))) {
 							dragSelFrom = (dragSelFrom == dragSelTo) ? 0 : prevItem(dragSelFrom);
 						}
 					}
@@ -2211,7 +2318,9 @@ void HistoryInner::onUpdateSelected() {
 				auto dragSelecting = false;
 				auto dragFirstAffected = dragSelFrom;
 				while (dragFirstAffected && (dragFirstAffected->id < 0 || dragFirstAffected->serviceMsg())) {
-					dragFirstAffected = (dragFirstAffected == dragSelTo) ? 0 : (selectingDown ? nextItem(dragFirstAffected) : prevItem(dragFirstAffected));
+					dragFirstAffected = (dragFirstAffected == dragSelTo) ?
+					                        0 :
+					                        (selectingDown ? nextItem(dragFirstAffected) : prevItem(dragFirstAffected));
 				}
 				if (dragFirstAffected) {
 					auto i = _selected.constFind(dragFirstAffected);
@@ -2224,7 +2333,8 @@ void HistoryInner::onUpdateSelected() {
 
 		if (ClickHandler::getPressed()) {
 			cur = style::cur_pointer;
-		} else if (_mouseAction == MouseAction::Selecting && !_selected.isEmpty() && _selected.cbegin().value() != FullSelection) {
+		} else if (_mouseAction == MouseAction::Selecting && !_selected.isEmpty() &&
+		           _selected.cbegin().value() != FullSelection) {
 			if (!_dragSelFrom || !_dragSelTo) {
 				cur = style::cur_text;
 			}
@@ -2253,7 +2363,8 @@ void HistoryInner::onUpdateSelected() {
 	}
 }
 
-void HistoryInner::updateDragSelection(HistoryItem *dragSelFrom, HistoryItem *dragSelTo, bool dragSelecting, bool force) {
+void HistoryInner::updateDragSelection(HistoryItem *dragSelFrom, HistoryItem *dragSelTo, bool dragSelecting,
+                                       bool force) {
 	if (_dragSelFrom != dragSelFrom || _dragSelTo != dragSelTo || _dragSelecting != dragSelecting) {
 		_dragSelFrom = dragSelFrom;
 		_dragSelTo = dragSelTo;
@@ -2300,7 +2411,8 @@ int HistoryInner::historyScrollTop() const {
 	}
 	if (mtop >= 0 && _migrated->scrollTopItem) {
 		Assert(!_migrated->scrollTopItem->detached());
-		return mtop + _migrated->scrollTopItem->block()->y() + _migrated->scrollTopItem->y() + _migrated->scrollTopOffset;
+		return mtop + _migrated->scrollTopItem->block()->y() + _migrated->scrollTopItem->y() +
+		       _migrated->scrollTopOffset;
 	}
 	return ScrollMax;
 }
@@ -2311,7 +2423,9 @@ int HistoryInner::migratedTop() const {
 
 int HistoryInner::historyTop() const {
 	int mig = migratedTop();
-	return (_history && !_history->isEmpty()) ? (mig >= 0 ? (mig + _migrated->height - _historySkipHeight) : _historyPaddingTop) : -1;
+	return (_history && !_history->isEmpty()) ?
+	           (mig >= 0 ? (mig + _migrated->height - _historySkipHeight) : _historyPaddingTop) :
+	           -1;
 }
 
 int HistoryInner::historyDrawTop() const {
@@ -2361,7 +2475,8 @@ void HistoryInner::applyDragSelection() {
 	applyDragSelection(&_selected);
 }
 
-void HistoryInner::addSelectionRange(SelectedItems *toItems, qint32 fromblock, qint32 fromitem, qint32 toblock, qint32 toitem, History *h) const {
+void HistoryInner::addSelectionRange(SelectedItems *toItems, qint32 fromblock, qint32 fromitem, qint32 toblock,
+                                     qint32 toitem, History *h) const {
 	if (fromblock >= 0 && fromitem >= 0 && toblock >= 0 && toitem >= 0) {
 		for (; fromblock <= toblock; ++fromblock) {
 			HistoryBlock *block = h->blocks[fromblock];
@@ -2407,7 +2522,8 @@ void HistoryInner::applyDragSelection(SelectedItems *toItems) const {
 					toblock = -1;
 					toitem = -1;
 				} else {
-					addSelectionRange(toItems, fromblock, fromitem, _migrated->blocks.size() - 1, _migrated->blocks.back()->items.size() - 1, _migrated);
+					addSelectionRange(toItems, fromblock, fromitem, _migrated->blocks.size() - 1,
+					                  _migrated->blocks.back()->items.size() - 1, _migrated);
 				}
 				fromblock = 0;
 				fromitem = 0;
@@ -2438,10 +2554,13 @@ QString HistoryInner::tooltipText() const {
 		if (App::hoveredItem()) {
 			auto dateText = App::hoveredItem()->date.toString(QLocale::system().dateTimeFormat(QLocale::LongFormat));
 			if (auto edited = App::hoveredItem()->Get<HistoryMessageEdited>()) {
-				dateText += '\n' + lng_edited_date(lt_date, edited->_editDate.toString(QLocale::system().dateTimeFormat(QLocale::LongFormat)));
+				dateText += '\n' + lng_edited_date(lt_date, edited->_editDate.toString(
+				                                                QLocale::system().dateTimeFormat(QLocale::LongFormat)));
 			}
 			if (auto forwarded = App::hoveredItem()->Get<HistoryMessageForwarded>()) {
-				dateText += '\n' + lng_forwarded_date(lt_date, forwarded->_originalDate.toString(QLocale::system().dateTimeFormat(QLocale::LongFormat)));
+				dateText +=
+				    '\n' + lng_forwarded_date(lt_date, forwarded->_originalDate.toString(
+				                                           QLocale::system().dateTimeFormat(QLocale::LongFormat)));
 			}
 			return dateText;
 		}
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index 52dab754d..f4bcddf2d 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QClipboard>
-#include "ui/widgets/tooltip.h"
-#include "ui/widgets/scroll_area.h"
-#include "window/top_bar_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/tooltip.h"
+#include "window/top_bar_widget.h"
+#include <QClipboard>
 
 namespace Window {
 class Controller;
@@ -40,7 +40,8 @@ class HistoryInner : public TWidget, public Ui::AbstractTooltipShower, private b
 	Q_OBJECT
 
 public:
-	HistoryInner(HistoryWidget *historyWidget, not_null<Window::Controller*> controller, Ui::ScrollArea *scroll, History *history);
+	HistoryInner(HistoryWidget *historyWidget, not_null<Window::Controller *> controller, Ui::ScrollArea *scroll,
+	             History *history);
 
 	void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages);
 	void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages);
@@ -169,7 +170,7 @@ private:
 	void scrollDateHide();
 	void keepScrollDateForNow();
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	PeerData *_peer = nullptr;
 	History *_migrated = nullptr;
@@ -183,8 +184,9 @@ private:
 
 	class BotAbout : public ClickHandlerHost {
 	public:
-		BotAbout(HistoryInner *parent, BotInfo *info) : info(info), _parent(parent) {
-		}
+		BotAbout(HistoryInner *parent, BotInfo *info)
+		    : info(info)
+		    , _parent(parent) {}
 		BotInfo *info = nullptr;
 		int width = 0;
 		int height = 0;
@@ -196,7 +198,6 @@ private:
 
 	private:
 		HistoryInner *_parent;
-
 	};
 	std::unique_ptr<BotAbout> _botAbout;
 
@@ -209,11 +210,12 @@ private:
 	bool _firstLoading = false;
 
 	style::cursor _cursor = style::cur_default;
-	using SelectedItems = QMap<HistoryItem*, TextSelection>;
+	using SelectedItems = QMap<HistoryItem *, TextSelection>;
 	SelectedItems _selected;
 	void applyDragSelection();
 	void applyDragSelection(SelectedItems *toItems) const;
-	void addSelectionRange(SelectedItems *toItems, qint32 fromblock, qint32 fromitem, qint32 toblock, qint32 toitem, History *h) const;
+	void addSelectionRange(SelectedItems *toItems, qint32 fromblock, qint32 fromitem, qint32 toblock, qint32 toitem,
+	                       History *h) const;
 
 	// Does any of the shown histories has this flag set.
 	bool hasPendingResizedItems() const {
@@ -282,8 +284,7 @@ private:
 	template <bool TopToBottom, typename Method>
 	void enumerateItemsInHistory(History *history, int historytop, Method method);
 
-	template <EnumItemsDirection direction, typename Method>
-	void enumerateItems(Method method) {
+	template <EnumItemsDirection direction, typename Method> void enumerateItems(Method method) {
 		constexpr auto TopToBottom = (direction == EnumItemsDirection::TopToBottom);
 		if (TopToBottom && _migrated) {
 			enumerateItemsInHistory<TopToBottom>(_migrated, migratedTop(), method);
@@ -299,15 +300,12 @@ private:
 	//
 	// Method has "bool (*Method)(not_null<HistoryMessage*> message, int userpicTop)" signature
 	// if it returns false the enumeration stops immidiately.
-	template <typename Method>
-	void enumerateUserpics(Method method);
+	template <typename Method> void enumerateUserpics(Method method);
 
 	// This function finds all date elements that are displayed and calls template method
 	// for each found date element (from the bottom to the top) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<HistoryItem*> item, int itemtop, int dateTop)" signature
 	// if it returns false the enumeration stops immidiately.
-	template <typename Method>
-	void enumerateDates(Method method);
-
+	template <typename Method> void enumerateDates(Method method);
 };
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 007f33a43..b605cbce7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -18,22 +18,22 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QApplication>
-#include <QClipboard>
 #include "history/history_item.h"
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
-#include "history/history_service_layout.h"
+#include "auth_session.h"
 #include "history/history_media_types.h"
 #include "history/history_message.h"
+#include "history/history_service_layout.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "media/media_audio.h"
 #include "media/media_clip_reader.h"
+#include "messenger.h"
+#include "storage/file_upload.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_history.h"
 #include "ui/effects/ripple_animation.h"
-#include "storage/file_upload.h"
-#include "auth_session.h"
-#include "media/media_audio.h"
-#include "messenger.h"
+#include <QApplication>
+#include <QClipboard>
 
 namespace {
 
@@ -43,10 +43,9 @@ constexpr int kAttachMessageToPreviousSecondsDelta = 900;
 } // namespace
 
 ReplyMarkupClickHandler::ReplyMarkupClickHandler(const HistoryItem *item, int row, int col)
-: _itemId(item->fullId())
-, _row(row)
-, _col(col) {
-}
+    : _itemId(item->fullId())
+    , _row(row)
+    , _col(col) {}
 
 // Copy to clipboard support.
 void ReplyMarkupClickHandler::copyToClipboard() const {
@@ -102,9 +101,9 @@ QString ReplyMarkupClickHandler::buttonText() const {
 }
 
 ReplyKeyboard::ReplyKeyboard(const HistoryItem *item, StylePtr &&s)
-	: _item(item)
-	, _a_selected(animation(this, &ReplyKeyboard::step_selected))
-	, _st(std::move(s)) {
+    : _item(item)
+    , _a_selected(animation(this, &ReplyKeyboard::step_selected))
+    , _st(std::move(s)) {
 	if (auto markup = item->Get<HistoryMessageReplyMarkup>()) {
 		_rows.reserve(markup->rows.size());
 		for (int i = 0, l = markup->rows.size(); i != l; ++i) {
@@ -127,18 +126,16 @@ ReplyKeyboard::ReplyKeyboard(const HistoryItem *item, StylePtr &&s)
 void ReplyKeyboard::updateMessageId() {
 	auto msgId = _item->fullId();
 	for_const (auto &row, _rows) {
-		for_const (auto &button, row) {
-			button.link->setMessageId(msgId);
-		}
+		for_const (auto &button, row) { button.link->setMessageId(msgId); }
 	}
-
 }
 
 void ReplyKeyboard::resize(int width, int height) {
 	_width = width;
 
 	auto markup = _item->Get<HistoryMessageReplyMarkup>();
-	double y = 0, buttonHeight = _rows.isEmpty() ? _st->buttonHeight() : (double(height + _st->buttonSkip()) / _rows.size());
+	double y = 0,
+	       buttonHeight = _rows.isEmpty() ? _st->buttonHeight() : (double(height + _st->buttonSkip()) / _rows.size());
 	for (auto &row : _rows) {
 		int s = row.size();
 
@@ -209,9 +206,7 @@ int ReplyKeyboard::naturalWidth() const {
 	auto result = 0;
 	for_const (auto &row, _rows) {
 		auto maxMinButtonWidth = 0;
-		for_const (auto &button, row) {
-			accumulate_max(maxMinButtonWidth, _st->minButtonWidth(button.type));
-		}
+		for_const (auto &button, row) { accumulate_max(maxMinButtonWidth, _st->minButtonWidth(button.type)); }
 		auto rowMaxButtonWidth = 0;
 		for_const (auto &button, row) {
 			accumulate_max(rowMaxButtonWidth, std::max(button.text.maxWidth(), 1) + maxMinButtonWidth);
@@ -280,11 +275,11 @@ ReplyKeyboard::ButtonCoords ReplyKeyboard::findButtonCoordsByClickHandler(const
 		auto &row = _rows[i];
 		for (int j = 0, cols = row.size(); j != cols; ++j) {
 			if (row[j].link == p) {
-				return { i, j };
+				return {i, j};
 			}
 		}
 	}
-	return { -1, -1 };
+	return {-1, -1};
 }
 
 void ReplyKeyboard::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
@@ -297,7 +292,8 @@ void ReplyKeyboard::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pr
 		if (pressed) {
 			if (!button.ripple) {
 				auto mask = Ui::RippleAnimation::roundRectMask(button.rect.size(), _st->buttonRadius());
-				button.ripple = MakeShared<Ui::RippleAnimation>(_st->_st->ripple, std::move(mask), [this] { _st->repaint(_item); });
+				button.ripple =
+				    MakeShared<Ui::RippleAnimation>(_st->_st->ripple, std::move(mask), [this] { _st->repaint(_item); });
 			}
 			button.ripple->add(_savedCoords - button.rect.topLeft());
 		} else {
@@ -365,7 +361,8 @@ int ReplyKeyboard::Style::buttonHeight() const {
 	return _st->height;
 }
 
-void ReplyKeyboard::Style::paintButton(Painter &p, int outerWidth, const ReplyKeyboard::Button &button, TimeMs ms) const {
+void ReplyKeyboard::Style::paintButton(Painter &p, int outerWidth, const ReplyKeyboard::Button &button,
+                                       TimeMs ms) const {
 	const QRect &rect = button.rect;
 	paintButtonBg(p, rect, button.howMuchOver);
 	if (button.ripple) {
@@ -375,8 +372,8 @@ void ReplyKeyboard::Style::paintButton(Painter &p, int outerWidth, const ReplyKe
 		}
 	}
 	paintButtonIcon(p, rect, outerWidth, button.type);
-	if (button.type == HistoryMessageReplyMarkup::Button::Type::Callback
-		|| button.type == HistoryMessageReplyMarkup::Button::Type::Game) {
+	if (button.type == HistoryMessageReplyMarkup::Button::Type::Callback ||
+	    button.type == HistoryMessageReplyMarkup::Button::Type::Game) {
 		if (auto data = button.link->getButton()) {
 			if (data->requestId) {
 				paintButtonLoading(p, rect);
@@ -413,26 +410,30 @@ void HistoryMessageReplyMarkup::createFromButtonRows(const QVector<MTPKeyboardBu
 				for_const (auto &button, b) {
 					switch (button.type()) {
 					case mtpc_keyboardButton: {
-						buttonRow.push_back({ Button::Type::Default, qs(button.c_keyboardButton().vtext), QByteArray(), 0 });
+						buttonRow.push_back(
+						    {Button::Type::Default, qs(button.c_keyboardButton().vtext), QByteArray(), 0});
 					} break;
 					case mtpc_keyboardButtonCallback: {
 						auto &buttonData = button.c_keyboardButtonCallback();
-						buttonRow.push_back({ Button::Type::Callback, qs(buttonData.vtext), qba(buttonData.vdata), 0 });
+						buttonRow.push_back({Button::Type::Callback, qs(buttonData.vtext), qba(buttonData.vdata), 0});
 					} break;
 					case mtpc_keyboardButtonRequestGeoLocation: {
-						buttonRow.push_back({ Button::Type::RequestLocation, qs(button.c_keyboardButtonRequestGeoLocation().vtext), QByteArray(), 0 });
+						buttonRow.push_back({Button::Type::RequestLocation,
+						                     qs(button.c_keyboardButtonRequestGeoLocation().vtext), QByteArray(), 0});
 					} break;
 					case mtpc_keyboardButtonRequestPhone: {
-						buttonRow.push_back({ Button::Type::RequestPhone, qs(button.c_keyboardButtonRequestPhone().vtext), QByteArray(), 0 });
+						buttonRow.push_back({Button::Type::RequestPhone,
+						                     qs(button.c_keyboardButtonRequestPhone().vtext), QByteArray(), 0});
 					} break;
 					case mtpc_keyboardButtonUrl: {
 						auto &buttonData = button.c_keyboardButtonUrl();
-						buttonRow.push_back({ Button::Type::Url, qs(buttonData.vtext), qba(buttonData.vurl), 0 });
+						buttonRow.push_back({Button::Type::Url, qs(buttonData.vtext), qba(buttonData.vurl), 0});
 					} break;
 					case mtpc_keyboardButtonSwitchInline: {
 						auto &buttonData = button.c_keyboardButtonSwitchInline();
-						auto buttonType = buttonData.is_same_peer() ? Button::Type::SwitchInlineSame : Button::Type::SwitchInline;
-						buttonRow.push_back({ buttonType, qs(buttonData.vtext), qba(buttonData.vquery), 0 });
+						auto buttonType =
+						    buttonData.is_same_peer() ? Button::Type::SwitchInlineSame : Button::Type::SwitchInline;
+						buttonRow.push_back({buttonType, qs(buttonData.vtext), qba(buttonData.vquery), 0});
 						if (buttonType == Button::Type::SwitchInline) {
 							// Optimization flag.
 							// Fast check on all new messages if there is a switch button to auto-click it.
@@ -441,11 +442,11 @@ void HistoryMessageReplyMarkup::createFromButtonRows(const QVector<MTPKeyboardBu
 					} break;
 					case mtpc_keyboardButtonGame: {
 						auto &buttonData = button.c_keyboardButtonGame();
-						buttonRow.push_back({ Button::Type::Game, qs(buttonData.vtext), QByteArray(), 0 });
+						buttonRow.push_back({Button::Type::Game, qs(buttonData.vtext), QByteArray(), 0});
 					} break;
 					case mtpc_keyboardButtonBuy: {
 						auto &buttonData = button.c_keyboardButtonBuy();
-						buttonRow.push_back({ Button::Type::Buy, qs(buttonData.vtext), QByteArray(), 0 });
+						buttonRow.push_back({Button::Type::Buy, qs(buttonData.vtext), QByteArray(), 0});
 					}
 					}
 				}
@@ -496,9 +497,7 @@ void HistoryMessageReplyMarkup::create(const HistoryMessageReplyMarkup &markup)
 	for_const (auto &row, markup.rows) {
 		ButtonRow buttonRow;
 		buttonRow.reserve(row.size());
-		for_const (auto &button, row) {
-			buttonRow.push_back({ button.type, button.text, button.data, 0 });
-		}
+		for_const (auto &button, row) { buttonRow.push_back({button.type, button.text, button.data, 0}); }
 		if (!buttonRow.isEmpty()) rows.push_back(buttonRow);
 	}
 }
@@ -530,7 +529,11 @@ void HistoryMessageUnreadBar::paint(Painter &p, int y, int w) const {
 	}
 	w = maxwidth;
 
-	p.drawText((w - _width) / 2, y + marginTop() + (st::historyUnreadBarHeight - 2 * st::lineWidth - st::historyUnreadBarFont->height) / 2 + st::historyUnreadBarFont->ascent, _text);
+	p.drawText((w - _width) / 2,
+	           y + marginTop() +
+	               (st::historyUnreadBarHeight - 2 * st::lineWidth - st::historyUnreadBarFont->height) / 2 +
+	               st::historyUnreadBarFont->ascent,
+	           _text);
 }
 
 void HistoryMessageDate::init(const QDateTime &date) {
@@ -539,7 +542,8 @@ void HistoryMessageDate::init(const QDateTime &date) {
 }
 
 int HistoryMessageDate::height() const {
-	return st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom() + st::msgServiceMargin.bottom();
+	return st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height +
+	       st::msgServicePadding.bottom() + st::msgServiceMargin.bottom();
 }
 
 void HistoryMessageDate::paint(Painter &p, int y, int w) const {
@@ -548,8 +552,8 @@ void HistoryMessageDate::paint(Painter &p, int y, int w) const {
 
 HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal() = default;
 
-HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal(HistoryMessageLogEntryOriginal &&other) : _page(std::move(other._page)) {
-}
+HistoryMessageLogEntryOriginal::HistoryMessageLogEntryOriginal(HistoryMessageLogEntryOriginal &&other)
+    : _page(std::move(other._page)) {}
 
 HistoryMessageLogEntryOriginal &HistoryMessageLogEntryOriginal::operator=(HistoryMessageLogEntryOriginal &&other) {
 	_page = std::move(other._page);
@@ -560,7 +564,8 @@ HistoryMessageLogEntryOriginal::~HistoryMessageLogEntryOriginal() = default;
 
 HistoryMediaPtr::HistoryMediaPtr() = default;
 
-HistoryMediaPtr::HistoryMediaPtr(std::unique_ptr<HistoryMedia> pointer) : _pointer(std::move(pointer)) {
+HistoryMediaPtr::HistoryMediaPtr(std::unique_ptr<HistoryMedia> pointer)
+    : _pointer(std::move(pointer)) {
 	if (_pointer) {
 		_pointer->attachToParent();
 	}
@@ -603,19 +608,14 @@ TextSelection shiftSelection(TextSelection selection, quint16 byLength) {
 
 } // namespace internal
 
-HistoryItem::HistoryItem(
-	not_null<History*> history,
-	MsgId id,
-	MTPDmessage::Flags flags,
-	QDateTime date,
-	UserId from) : HistoryElement()
-, id(id)
-, date(date)
-, _history(history)
-, _from(from ? App::user(from) : history->peer)
-, _flags(flags | MTPDmessage_ClientFlag::f_pending_init_dimensions | MTPDmessage_ClientFlag::f_pending_resize)
-, _authorNameVersion(author()->nameVersion) {
-}
+HistoryItem::HistoryItem(not_null<History *> history, MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from)
+    : HistoryElement()
+    , id(id)
+    , date(date)
+    , _history(history)
+    , _from(from ? App::user(from) : history->peer)
+    , _flags(flags | MTPDmessage_ClientFlag::f_pending_init_dimensions | MTPDmessage_ClientFlag::f_pending_resize)
+    , _authorNameVersion(author()->nameVersion) {}
 
 void HistoryItem::finishCreate() {
 	App::historyRegItem(this);
@@ -761,13 +761,11 @@ void HistoryItem::nextItemChanged() {
 	setAttachToNext(false);
 }
 
-bool HistoryItem::computeIsAttachToPrevious(not_null<HistoryItem*> previous) {
+bool HistoryItem::computeIsAttachToPrevious(not_null<HistoryItem *> previous) {
 	if (!Has<HistoryMessageDate>() && !Has<HistoryMessageUnreadBar>()) {
-		return !isPost() && !previous->isPost()
-			&& !serviceMsg() && !previous->serviceMsg()
-			&& !isEmpty() && !previous->isEmpty()
-			&& previous->from() == from()
-			&& (qAbs(previous->date.secsTo(date)) < kAttachMessageToPreviousSecondsDelta);
+		return !isPost() && !previous->isPost() && !serviceMsg() && !previous->serviceMsg() && !isEmpty() &&
+		       !previous->isEmpty() && previous->from() == from() &&
+		       (qAbs(previous->date.secsTo(date)) < kAttachMessageToPreviousSecondsDelta);
 	}
 	return false;
 }
@@ -1074,7 +1072,7 @@ void HistoryItem::clipCallback(Media::Clip::Notification notification) {
 		auto stopped = false;
 		if (reader->autoPausedGif()) {
 			auto amVisible = false;
-			Auth().data().queryItemVisibility().notify({ this, &amVisible }, true);
+			Auth().data().queryItemVisibility().notify({this, &amVisible}, true);
 			if (!amVisible) { // stop animation if it is not visible
 				media->stopInline();
 				if (auto document = media->getDocument()) { // forget data from memory
@@ -1082,7 +1080,8 @@ void HistoryItem::clipCallback(Media::Clip::Notification notification) {
 				}
 				stopped = true;
 			}
-		} else if (reader->mode() == Media::Clip::Reader::Mode::Video && reader->state() == Media::Clip::State::Finished) {
+		} else if (reader->mode() == Media::Clip::Reader::Mode::Video &&
+		           reader->state() == Media::Clip::State::Finished) {
 			// Stop finished video message.
 			media->stopInline();
 		}
@@ -1175,10 +1174,7 @@ QString HistoryItem::inDialogsText(DrawInDialog way) const {
 		return TextUtilities::Clean(_text.originalText());
 	};
 	auto plainText = getText();
-	if ((!_history->peer->isUser() || out())
-		&& !isPost()
-		&& !isEmpty()
-		&& (way != DrawInDialog::WithoutSender)) {
+	if ((!_history->peer->isUser() || out()) && !isPost() && !isEmpty() && (way != DrawInDialog::WithoutSender)) {
 		auto fromText = author()->isSelf() ? lang(lng_from_you) : author()->shortName();
 		auto fromWrapped = textcmdLink(1, lng_dialogs_text_from_wrapped(lt_from, TextUtilities::Clean(fromText)));
 		return lng_dialogs_text_with_from(lt_from_part, fromWrapped, lt_message, plainText);
@@ -1186,20 +1182,15 @@ QString HistoryItem::inDialogsText(DrawInDialog way) const {
 	return plainText;
 }
 
-void HistoryItem::drawInDialog(
-		Painter &p,
-		const QRect &r,
-		bool active,
-		bool selected,
-		DrawInDialog way,
-		const HistoryItem *&cacheFor,
-		Text &cache) const {
+void HistoryItem::drawInDialog(Painter &p, const QRect &r, bool active, bool selected, DrawInDialog way,
+                               const HistoryItem *&cacheFor, Text &cache) const {
 	if (cacheFor != this) {
 		cacheFor = this;
 		cache.setText(st::dialogsTextStyle, inDialogsText(way), _textDlgOptions);
 	}
 	if (r.width()) {
-		p.setTextPalette(active ? st::dialogsTextPaletteActive : (selected ? st::dialogsTextPaletteOver : st::dialogsTextPalette));
+		p.setTextPalette(active ? st::dialogsTextPaletteActive :
+		                          (selected ? st::dialogsTextPaletteOver : st::dialogsTextPalette));
 		p.setFont(st::dialogsTextFont);
 		p.setPen(active ? st::dialogsTextFgActive : (selected ? st::dialogsTextFgOver : st::dialogsTextFg));
 		cache.drawElided(p, r.left(), r.top(), r.width(), r.height() / st::dialogsTextFont->height);
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 6ea830a56..0abb75e66 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/flags.h"
+#include "base/runtime_composer.h"
+#include "core/click_handler.h"
 #include "history/history.h"
+#include "structs.h"
 #include "ui/animation.h"
 #include "ui/text/text.h"
-#include "core/click_handler.h"
-#include "base/runtime_composer.h"
-#include "base/flags.h"
-#include "structs.h"
 
 namespace Ui {
 class RippleAnimation;
@@ -61,7 +61,6 @@ protected:
 	mutable int _maxw = 0;
 	mutable int _minh = 0;
 	mutable int _height = 0;
-
 };
 
 class HistoryMessage;
@@ -76,11 +75,10 @@ enum HistoryCursorState {
 struct HistoryTextState {
 	HistoryTextState() = default;
 	HistoryTextState(const Text::StateResult &state)
-		: cursor(state.uponSymbol ? HistoryInTextCursorState : HistoryDefaultCursorState)
-		, link(state.link)
-		, afterSymbol(state.afterSymbol)
-		, symbol(state.symbol) {
-	}
+	    : cursor(state.uponSymbol ? HistoryInTextCursorState : HistoryDefaultCursorState)
+	    , link(state.link)
+	    , afterSymbol(state.afterSymbol)
+	    , symbol(state.symbol) {}
 	HistoryTextState &operator=(const Text::StateResult &state) {
 		cursor = state.uponSymbol ? HistoryInTextCursorState : HistoryDefaultCursorState;
 		link = state.link;
@@ -149,7 +147,7 @@ struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded
 	PeerData *_originalSender = nullptr;
 	QString _originalAuthor;
 	MsgId _originalId = 0;
-	mutable Text _text = { 1 };
+	mutable Text _text = {1};
 };
 
 struct HistoryMessageReply : public RuntimeComponent<HistoryMessageReply> {
@@ -187,7 +185,9 @@ struct HistoryMessageReply : public RuntimeComponent<HistoryMessageReply> {
 		Selected = (1 << 1),
 	};
 	using PaintFlags = base::flags<PaintFlag>;
-	friend inline constexpr auto is_flag_type(PaintFlag) { return true; };
+	friend inline constexpr auto is_flag_type(PaintFlag) {
+		return true;
+	};
 	void paint(Painter &p, const HistoryItem *holder, int x, int y, int w, PaintFlags flags) const;
 
 	MsgId replyToId() const {
@@ -213,8 +213,8 @@ struct HistoryMessageReply : public RuntimeComponent<HistoryMessageReply> {
 class ReplyKeyboard;
 struct HistoryMessageReplyMarkup : public RuntimeComponent<HistoryMessageReplyMarkup> {
 	HistoryMessageReplyMarkup() = default;
-	HistoryMessageReplyMarkup(MTPDreplyKeyboardMarkup::Flags f) : flags(f) {
-	}
+	HistoryMessageReplyMarkup(MTPDreplyKeyboardMarkup::Flags f)
+	    : flags(f) {}
 
 	void create(const MTPReplyMarkup &markup);
 	void create(const HistoryMessageReplyMarkup &markup);
@@ -249,7 +249,6 @@ struct HistoryMessageReplyMarkup : public RuntimeComponent<HistoryMessageReplyMa
 
 private:
 	void createFromButtonRows(const QVector<MTPKeyboardButtonRow> &v);
-
 };
 
 class ReplyMarkupClickHandler : public LeftButtonClickHandler {
@@ -290,7 +289,6 @@ private:
 
 	// Returns the full text of the corresponding button.
 	QString buttonText() const;
-
 };
 
 class ReplyKeyboard {
@@ -300,8 +298,8 @@ private:
 public:
 	class Style {
 	public:
-		Style(const style::BotKeyboardButton &st) : _st(&st) {
-		}
+		Style(const style::BotKeyboardButton &st)
+		    : _st(&st) {}
 
 		virtual void startPaint(Painter &p) const = 0;
 		virtual const style::TextStyle &textStyle() const = 0;
@@ -311,13 +309,13 @@ public:
 		int buttonHeight() const;
 		virtual int buttonRadius() const = 0;
 
-		virtual void repaint(not_null<const HistoryItem*> item) const = 0;
-		virtual ~Style() {
-		}
+		virtual void repaint(not_null<const HistoryItem *> item) const = 0;
+		virtual ~Style() {}
 
 	protected:
 		virtual void paintButtonBg(Painter &p, const QRect &rect, double howMuchOver) const = 0;
-		virtual void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth, HistoryMessageReplyMarkup::Button::Type type) const = 0;
+		virtual void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth,
+		                             HistoryMessageReplyMarkup::Button::Type type) const = 0;
 		virtual void paintButtonLoading(Painter &p, const QRect &rect) const = 0;
 		virtual int minButtonWidth(HistoryMessageReplyMarkup::Button::Type type) const = 0;
 
@@ -326,7 +324,6 @@ public:
 
 		void paintButton(Painter &p, int outerWidth, const ReplyKeyboard::Button &button, TimeMs ms) const;
 		friend class ReplyKeyboard;
-
 	};
 	typedef std::unique_ptr<Style> StylePtr;
 
@@ -357,7 +354,7 @@ private:
 	friend class Style;
 	using ReplyMarkupClickHandlerPtr = QSharedPointer<ReplyMarkupClickHandler>;
 	struct Button {
-		Text text = { 1 };
+		Text text = {1};
 		QRect rect;
 		int characters = 0;
 		double howMuchOver = 0.;
@@ -389,7 +386,6 @@ private:
 	ClickHandlerPtr _savedPressed;
 	ClickHandlerPtr _savedActive;
 	mutable QPoint _savedCoords;
-
 };
 
 // Any HistoryItem can have this Component for
@@ -424,7 +420,6 @@ struct HistoryMessageUnreadBar : public RuntimeComponent<HistoryMessageUnreadBar
 	// we've seen the bar and new messages are marked as read
 	// as soon as they are added to the chat history.
 	bool _freezed = false;
-
 };
 
 class HistoryWebPage;
@@ -437,7 +432,6 @@ struct HistoryMessageLogEntryOriginal : public RuntimeComponent<HistoryMessageLo
 	~HistoryMessageLogEntryOriginal();
 
 	std::unique_ptr<HistoryWebPage> _page;
-
 };
 
 // HistoryMedia has a special owning smart pointer
@@ -473,7 +467,6 @@ public:
 
 private:
 	std::unique_ptr<HistoryMedia> _pointer;
-
 };
 
 namespace internal {
@@ -504,8 +497,7 @@ public:
 	}
 	virtual void draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const = 0;
 
-	virtual void dependencyItemRemoved(HistoryItem *dependency) {
-	}
+	virtual void dependencyItemRemoved(HistoryItem *dependency) {}
 	virtual bool updateDependencyItem() {
 		return true;
 	}
@@ -538,7 +530,7 @@ public:
 	}
 	void addLogEntryOriginal(WebPageId localId, const QString &label, const TextWithEntities &content);
 
-	not_null<History*> history() const {
+	not_null<History *> history() const {
 		return _history;
 	}
 	PeerData *from() const {
@@ -654,8 +646,7 @@ public:
 	}
 
 	virtual HistoryTextState getState(QPoint point, HistoryStateRequest request) const WARN_UNUSED_RESULT = 0;
-	virtual void updatePressed(QPoint point) {
-	}
+	virtual void updatePressed(QPoint point) {}
 
 	virtual TextSelection adjustSelection(TextSelection selection, TextSelectType type) const WARN_UNUSED_RESULT {
 		return selection;
@@ -668,19 +659,14 @@ public:
 	virtual bool serviceMsg() const {
 		return false;
 	}
-	virtual void applyEdition(const MTPDmessage &message) {
-	}
-	virtual void applyEdition(const MTPDmessageService &message) {
-	}
-	virtual void updateMedia(const MTPMessageMedia *media) {
-	}
-	virtual void updateReplyMarkup(const MTPReplyMarkup *markup) {
-	}
+	virtual void applyEdition(const MTPDmessage &message) {}
+	virtual void applyEdition(const MTPDmessageService &message) {}
+	virtual void updateMedia(const MTPMessageMedia *media) {}
+	virtual void updateReplyMarkup(const MTPReplyMarkup *markup) {}
 	virtual qint32 addToOverview(AddToOverviewMethod method) {
 		return 0;
 	}
-	virtual void eraseFromOverview() {
-	}
+	virtual void eraseFromOverview() {}
 	virtual bool hasBubble() const {
 		return false;
 	}
@@ -689,7 +675,7 @@ public:
 	void nextItemChanged();
 
 	virtual TextWithEntities selectedText(TextSelection selection) const {
-		return { qsl("[-]"), EntitiesInText() };
+		return {qsl("[-]"), EntitiesInText()};
 	}
 
 	virtual QString notificationHeader() const {
@@ -709,31 +695,23 @@ public:
 		return notificationText();
 	}
 	virtual TextWithEntities originalText() const {
-		return { QString(), EntitiesInText() };
+		return {QString(), EntitiesInText()};
 	}
 
-	virtual void drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected, InfoDisplayType type) const {
-	}
+	virtual void drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected,
+	                      InfoDisplayType type) const {}
 	virtual ClickHandlerPtr fastShareLink() const {
 		return ClickHandlerPtr();
 	}
 	virtual bool displayFastShare() const {
 		return false;
 	}
-	virtual void drawFastShare(Painter &p, int left, int top, int outerWidth) const {
-	}
-	virtual void setViewsCount(qint32 count) {
-	}
+	virtual void drawFastShare(Painter &p, int left, int top, int outerWidth) const {}
+	virtual void setViewsCount(qint32 count) {}
 	virtual void setId(MsgId newId);
 
-	void drawInDialog(
-		Painter &p,
-		const QRect &r,
-		bool active,
-		bool selected,
-		DrawInDialog way,
-		const HistoryItem *&cacheFor,
-		Text &cache) const;
+	void drawInDialog(Painter &p, const QRect &r, bool active, bool selected, DrawInDialog way,
+	                  const HistoryItem *&cacheFor, Text &cache) const;
 
 	bool emptyText() const {
 		return _text.isEmpty();
@@ -769,8 +747,7 @@ public:
 	HistoryMedia *getMedia() const {
 		return _media.get();
 	}
-	virtual void setText(const TextWithEntities &textWithEntities) {
-	}
+	virtual void setText(const TextWithEntities &textWithEntities) {}
 	virtual bool textHasLinks() const {
 		return false;
 	}
@@ -929,7 +906,7 @@ public:
 	void clipCallback(Media::Clip::Notification notification);
 	void audioTrackUpdated();
 
-	bool computeIsAttachToPrevious(not_null<HistoryItem*> previous);
+	bool computeIsAttachToPrevious(not_null<HistoryItem *> previous);
 	void setLogEntryDisplayDate(bool displayDate) {
 		Expects(isLogEntry());
 		setDisplayDate(displayDate);
@@ -946,12 +923,7 @@ public:
 	~HistoryItem();
 
 protected:
-	HistoryItem(
-		not_null<History*> history,
-		MsgId id,
-		MTPDmessage::Flags flags,
-		QDateTime date,
-		UserId from);
+	HistoryItem(not_null<History *> history, MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from);
 
 	// To completely create history item we need to call
 	// a virtual method, it can not be done from constructor.
@@ -960,16 +932,15 @@ protected:
 	// Called from resizeGetHeight() when MTPDmessage_ClientFlag::f_pending_init_dimensions is set.
 	virtual void initDimensions() = 0;
 
-	virtual void markMediaAsReadHook() {
-	}
+	virtual void markMediaAsReadHook() {}
 
 	virtual int resizeContentGetHeight() = 0;
 
 	void finishEdition(int oldKeyboardTop);
 	void finishEditionToEmpty();
 
-	const not_null<History*> _history;
-	not_null<PeerData*> _from;
+	const not_null<History *> _history;
+	not_null<PeerData *> _from;
 	HistoryBlock *_block = nullptr;
 	int _indexInBlock = -1;
 	MTPDmessage::Flags _flags = 0;
@@ -1025,10 +996,10 @@ protected:
 	void setAttachToNext(bool attachToNext);
 
 	const HistoryMessageReplyMarkup *inlineReplyMarkup() const {
-		return const_cast<HistoryItem*>(this)->inlineReplyMarkup();
+		return const_cast<HistoryItem *>(this)->inlineReplyMarkup();
 	}
 	const ReplyKeyboard *inlineReplyKeyboard() const {
-		return const_cast<HistoryItem*>(this)->inlineReplyKeyboard();
+		return const_cast<HistoryItem *>(this)->inlineReplyKeyboard();
 	}
 	HistoryMessageReplyMarkup *inlineReplyMarkup() {
 		if (auto markup = Get<HistoryMessageReplyMarkup>()) {
@@ -1052,7 +1023,7 @@ protected:
 		return internal::shiftSelection(selection, _text);
 	}
 
-	Text _text = { int(st::msgMinWidth) };
+	Text _text = {int(st::msgMinWidth)};
 	int _textWidth = -1;
 	int _textHeight = 0;
 
@@ -1061,23 +1032,19 @@ protected:
 private:
 	int _y = 0;
 	int _width = 0;
-
 };
 
 // make all the constructors in HistoryItem children protected
 // and wrapped with a static create() call with the same args
 // so that history item can not be created directly, without
 // calling a virtual finishCreate() method
-template <typename T>
-class HistoryItemInstantiated {
+template <typename T> class HistoryItemInstantiated {
 public:
-	template <typename ...Args>
-	static not_null<T*> _create(Args &&... args) {
+	template <typename... Args> static not_null<T *> _create(Args &&... args) {
 		auto result = new T(std::forward<Args>(args)...);
 		result->finishCreate();
 		return result;
 	}
-
 };
 
 ClickHandlerPtr goToMessageClickHandler(PeerData *peer, MsgId msgId);
diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp
index 2e3bf2b52..b4d7eb0a7 100644
--- a/Telegram/SourceFiles/history/history_location_manager.cpp
+++ b/Telegram/SourceFiles/history/history_location_manager.cpp
@@ -18,15 +18,15 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
+#include "history/history_location_manager.h"
+#include <QBuffer>
 #include <QDesktopServices>
+#include <QImageReader>
 #include <QJsonDocument>
 #include <QJsonParseError>
-#include <QBuffer>
-#include <QImageReader>
-#include "history/history_location_manager.h"
 
-#include "mainwidget.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
 #include "platform/platform_specific.h"
 
 namespace {
@@ -81,11 +81,13 @@ void LocationManager::init() {
 	manager = new QNetworkAccessManager();
 	App::setProxySettings(*manager);
 
-	connect(manager, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), this, SLOT(onFailed(QNetworkReply*)));
+	connect(manager, SIGNAL(authenticationRequired(QNetworkReply *, QAuthenticator *)), this,
+	        SLOT(onFailed(QNetworkReply *)));
 #ifndef OS_MAC_OLD
-	connect(manager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), this, SLOT(onFailed(QNetworkReply*)));
+	connect(manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)), this,
+	        SLOT(onFailed(QNetworkReply *)));
 #endif // OS_MAC_OLD
-	connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*)));
+	connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(onFinished(QNetworkReply *)));
 
 	if (notLoadedPlaceholder) {
 		delete notLoadedPlaceholder->v();
@@ -130,7 +132,13 @@ void LocationManager::getData(LocationData *data) {
 		h = convertScale(h);
 	}
 	auto coords = data->coords.latAsString() + ',' + data->coords.lonAsString();
-	QString url = qsl("https://maps.googleapis.com/maps/api/staticmap?center=") + coords + qsl("&zoom=%1&size=%2x%3&maptype=roadmap&scale=%4&markers=color:red|size:big|").arg(zoom).arg(w).arg(h).arg(scale) + coords + qsl("&sensor=false");
+	QString url = qsl("https://maps.googleapis.com/maps/api/staticmap?center=") + coords +
+	              qsl("&zoom=%1&size=%2x%3&maptype=roadmap&scale=%4&markers=color:red|size:big|")
+	                  .arg(zoom)
+	                  .arg(w)
+	                  .arg(h)
+	                  .arg(scale) +
+	              coords + qsl("&sensor=false");
 	QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url)));
 	imageLoadings[reply] = data;
 }
@@ -145,13 +153,14 @@ void LocationManager::onFinished(QNetworkReply *reply) {
 		if (status == 301 || status == 302) {
 			QString loc = reply->header(QNetworkRequest::LocationHeader).toString();
 			if (!loc.isEmpty()) {
-				QMap<QNetworkReply*, LocationData*>::iterator i = dataLoadings.find(reply);
+				QMap<QNetworkReply *, LocationData *>::iterator i = dataLoadings.find(reply);
 				if (i != dataLoadings.cend()) {
 					LocationData *d = i.value();
 					if (serverRedirects.constFind(d) == serverRedirects.cend()) {
 						serverRedirects.insert(d, 1);
 					} else if (++serverRedirects[d] > kMaxHttpRedirects) {
-						DEBUG_LOG(("Network Error: Too many HTTP redirects in onFinished() for image link: %1").arg(loc));
+						DEBUG_LOG(
+						    ("Network Error: Too many HTTP redirects in onFinished() for image link: %1").arg(loc));
 						return onFailed(reply);
 					}
 					dataLoadings.erase(i);
@@ -162,7 +171,8 @@ void LocationManager::onFinished(QNetworkReply *reply) {
 					if (serverRedirects.constFind(d) == serverRedirects.cend()) {
 						serverRedirects.insert(d, 1);
 					} else if (++serverRedirects[d] > kMaxHttpRedirects) {
-						DEBUG_LOG(("Network Error: Too many HTTP redirects in onFinished() for image link: %1").arg(loc));
+						DEBUG_LOG(
+						    ("Network Error: Too many HTTP redirects in onFinished() for image link: %1").arg(loc));
 						return onFailed(reply);
 					}
 					imageLoadings.erase(i);
@@ -178,7 +188,7 @@ void LocationManager::onFinished(QNetworkReply *reply) {
 	}
 
 	LocationData *d = 0;
-	QMap<QNetworkReply*, LocationData*>::iterator i = dataLoadings.find(reply);
+	QMap<QNetworkReply *, LocationData *>::iterator i = dataLoadings.find(reply);
 	if (i != dataLoadings.cend()) {
 		d = i.value();
 		dataLoadings.erase(i);
@@ -224,7 +234,7 @@ void LocationManager::onFailed(QNetworkReply *reply) {
 	if (!manager) return;
 
 	LocationData *d = 0;
-	QMap<QNetworkReply*, LocationData*>::iterator i = dataLoadings.find(reply);
+	QMap<QNetworkReply *, LocationData *>::iterator i = dataLoadings.find(reply);
 	if (i != dataLoadings.cend()) {
 		d = i.value();
 		dataLoadings.erase(i);
@@ -235,7 +245,10 @@ void LocationManager::onFailed(QNetworkReply *reply) {
 			imageLoadings.erase(i);
 		}
 	}
-	DEBUG_LOG(("Network Error: failed to get data for image link %1,%2 error %3").arg(d ? d->coords.latAsString() : QString()).arg(d ? d->coords.lonAsString() : QString()).arg(reply->errorString()));
+	DEBUG_LOG(("Network Error: failed to get data for image link %1,%2 error %3")
+	              .arg(d ? d->coords.latAsString() : QString())
+	              .arg(d ? d->coords.lonAsString() : QString())
+	              .arg(reply->errorString()));
 	if (d) {
 		failed(d);
 	}
diff --git a/Telegram/SourceFiles/history/history_location_manager.h b/Telegram/SourceFiles/history/history_location_manager.h
index 6e630188f..5c35d0dd3 100644
--- a/Telegram/SourceFiles/history/history_location_manager.h
+++ b/Telegram/SourceFiles/history/history_location_manager.h
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
+#include "core/click_handler.h"
+#include "scheme.h"
+#include "ui/images.h"
 #include <QApplication>
+#include <QClipboard>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QClipboard>
-#include "scheme.h"
-#include "core/click_handler.h"
-#include "ui/images.h"
+#include <QString>
 
 void initLocationManager();
 void reinitLocationManager();
@@ -36,10 +36,12 @@ void deinitLocationManager();
 class LocationCoords {
 public:
 	LocationCoords() = default;
-	LocationCoords(double lat, double lon) : _lat(lat), _lon(lon) {
-	}
-	LocationCoords(const MTPDgeoPoint &point) : _lat(point.vlat.v), _lon(point.vlong.v) {
-	}
+	LocationCoords(double lat, double lon)
+	    : _lat(lat)
+	    , _lon(lon) {}
+	LocationCoords(const MTPDgeoPoint &point)
+	    : _lat(point.vlat.v)
+	    , _lon(point.vlong.v) {}
 
 	QString latAsString() const {
 		return asString(_lat);
@@ -77,12 +79,12 @@ private:
 
 	double _lat = 0;
 	double _lon = 0;
-
 };
 
 struct LocationData {
-	LocationData(const LocationCoords &coords) : coords(coords), loading(false) {
-	}
+	LocationData(const LocationCoords &coords)
+	    : coords(coords)
+	    , loading(false) {}
 
 	LocationCoords coords;
 	ImagePtr thumb;
@@ -93,7 +95,8 @@ struct LocationData {
 
 class LocationClickHandler : public ClickHandler {
 public:
-	LocationClickHandler(const LocationCoords &coords) : _coords(coords) {
+	LocationClickHandler(const LocationCoords &coords)
+	    : _coords(coords) {
 		setup();
 	}
 
@@ -115,11 +118,9 @@ public:
 	QString copyToClipboardContextItemText() const override;
 
 private:
-
 	void setup();
 	LocationCoords _coords;
 	QString _text;
-
 };
 
 class LocationManager : public QObject {
@@ -144,8 +145,7 @@ private:
 	void failed(LocationData *data);
 
 	QNetworkAccessManager *manager = nullptr;
-	QMap<QNetworkReply*, LocationData*> dataLoadings, imageLoadings;
-	QMap<LocationData*, qint32> serverRedirects;
+	QMap<QNetworkReply *, LocationData *> dataLoadings, imageLoadings;
+	QMap<LocationData *, qint32> serverRedirects;
 	ImagePtr *notLoadedPlaceholder = nullptr;
-
 };
diff --git a/Telegram/SourceFiles/history/history_media.h b/Telegram/SourceFiles/history/history_media.h
index 684f19d5b..db6926890 100644
--- a/Telegram/SourceFiles/history/history_media.h
+++ b/Telegram/SourceFiles/history/history_media.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
 #include "history/history.h"
 #include "history/history_item.h"
+#include <QString>
 
 enum class MediaInBubbleState {
 	None,
@@ -33,8 +33,8 @@ enum class MediaInBubbleState {
 
 class HistoryMedia : public HistoryElement {
 public:
-	HistoryMedia(not_null<HistoryItem*> parent) : _parent(parent) {
-	}
+	HistoryMedia(not_null<HistoryItem *> parent)
+	    : _parent(parent) {}
 
 	virtual HistoryMediaType type() const = 0;
 
@@ -67,22 +67,19 @@ public:
 		return false;
 	}
 	virtual void initDimensions() = 0;
-	virtual void updateMessageId() {
-	}
+	virtual void updateMessageId() {}
 	virtual int resizeGetHeight(int width) {
 		_width = qMin(width, _maxw);
 		return _height;
 	}
 	virtual void draw(Painter &p, const QRect &r, TextSelection selection, TimeMs ms) const = 0;
 	virtual HistoryTextState getState(QPoint point, HistoryStateRequest request) const = 0;
-	virtual void updatePressed(QPoint point) {
-	}
+	virtual void updatePressed(QPoint point) {}
 
 	virtual qint32 addToOverview(AddToOverviewMethod method) {
 		return 0;
 	}
-	virtual void eraseFromOverview() {
-	}
+	virtual void eraseFromOverview() {}
 
 	// if we are in selecting items mode perhaps we want to
 	// toggle selection instead of activating the pressed link
@@ -112,10 +109,8 @@ public:
 	// if we press and drag this link should we drag the item
 	virtual bool dragItemByHandler(const ClickHandlerPtr &p) const = 0;
 
-	virtual void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
-	}
-	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {
-	}
+	virtual void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {}
+	virtual void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) {}
 
 	virtual bool uploading() const {
 		return false;
@@ -135,20 +130,16 @@ public:
 	virtual bool playInline(bool autoplay) {
 		return false;
 	}
-	virtual void stopInline() {
-	}
+	virtual void stopInline() {}
 	virtual bool isRoundVideoPlaying() const {
 		return false;
 	}
 
-	virtual void attachToParent() {
-	}
+	virtual void attachToParent() {}
 
-	virtual void detachFromParent() {
-	}
+	virtual void detachFromParent() {}
 
-	virtual void updateSentMedia(const MTPMessageMedia &media) {
-	}
+	virtual void updateSentMedia(const MTPMessageMedia &media) {}
 
 	// After sending an inline result we may want to completely recreate
 	// the media (all media that was generated on client side, for example)
@@ -229,9 +220,7 @@ protected:
 		_parent->history()->eraseFromOverview(type, _parent->id);
 	}
 
-	not_null<HistoryItem*> _parent;
+	not_null<HistoryItem *> _parent;
 	int _width = 0;
 	MediaInBubbleState _inBubbleState = MediaInBubbleState::None;
-
-
 };
diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index f0c478d95..276975180 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -20,22 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_media_types.h"
 
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
+#include "calls/calls_instance.h"
+#include "core/click_handler_types.h"
+#include "history/history_location_manager.h"
+#include "history/history_message.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "storage/localstorage.h"
 #include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
 #include "media/view/media_clip_playback.h"
-#include "boxes/confirm_box.h"
-#include "boxes/add_contact_box.h"
-#include "core/click_handler_types.h"
-#include "history/history_location_manager.h"
-#include "history/history_message.h"
-#include "window/window_controller.h"
+#include "storage/localstorage.h"
 #include "styles/style_history.h"
-#include "calls/calls_instance.h"
+#include "window/window_controller.h"
 #include <algorithm>
 
 namespace {
@@ -44,34 +44,38 @@ constexpr auto kMaxGifForwardedBarLines = 4;
 constexpr auto kMaxOriginalEntryLines = 8192;
 
 TextParseOptions _webpageTitleOptions = {
-	TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _webpageDescriptionOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText | TextParseMarkdown, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText |
+        TextParseMarkdown, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _twitterDescriptionOptions = {
-	TextParseLinks | TextParseMentions | TextTwitterMentions | TextParseHashtags | TextTwitterHashtags | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextTwitterMentions | TextParseHashtags | TextTwitterHashtags |
+        TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _instagramDescriptionOptions = {
-	TextParseLinks | TextParseMentions | TextInstagramMentions | TextParseHashtags | TextInstagramHashtags | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextInstagramMentions | TextParseHashtags | TextInstagramHashtags |
+        TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 inline void initTextOptions() {
 	_webpageTitleOptions.maxw = st::msgMaxWidth - st::msgPadding.left() - st::msgPadding.right() - st::webPageLeft;
 	_webpageTitleOptions.maxh = st::webPageTitleFont->height * 2;
-	_webpageDescriptionOptions.maxw = st::msgMaxWidth - st::msgPadding.left() - st::msgPadding.right() - st::webPageLeft;
+	_webpageDescriptionOptions.maxw =
+	    st::msgMaxWidth - st::msgPadding.left() - st::msgPadding.right() - st::webPageLeft;
 	_webpageDescriptionOptions.maxh = st::webPageDescriptionFont->height * 3;
 }
 
@@ -87,7 +91,9 @@ bool needReSetInlineResultDocument(const MTPMessageMedia &media, DocumentData *e
 				}
 			}
 		} else {
-			LOG(("API Error: Got MTPMessageMediaDocument without document or with ttl_seconds in needReSetInlineResultDocument()"));
+			LOG(
+			    ("API Error: Got MTPMessageMediaDocument without document or with ttl_seconds in "
+			     "needReSetInlineResultDocument()"));
 		}
 	}
 	return true;
@@ -110,7 +116,8 @@ qint32 documentMaxStatusWidth(DocumentData *document) {
 		result = std::max(result, st::normalFont->width(formatPlayedText(voice->duration, voice->duration)));
 		result = std::max(result, st::normalFont->width(formatDurationAndSizeText(voice->duration, document->size)));
 	} else if (document->isVideo()) {
-		result = std::max(result, st::normalFont->width(formatDurationAndSizeText(document->duration(), document->size)));
+		result =
+		    std::max(result, st::normalFont->width(formatDurationAndSizeText(document->duration(), document->size)));
 	} else {
 		result = std::max(result, st::normalFont->width(formatSizeText(document->size)));
 	}
@@ -191,9 +198,11 @@ void HistoryFileMedia::setLinks(ClickHandlerPtr &&openl, ClickHandlerPtr &&savel
 void HistoryFileMedia::setStatusSize(qint32 newSize, qint32 fullSize, qint32 duration, qint64 realDuration) const {
 	_statusSize = newSize;
 	if (_statusSize == FileStatusSizeReady) {
-		_statusText = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) : (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
+		_statusText = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) :
+		                                (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
 	} else if (_statusSize == FileStatusSizeLoaded) {
-		_statusText = (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
+		_statusText =
+		    (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
 	} else if (_statusSize == FileStatusSizeFailed) {
 		_statusText = lang(lng_attach_failed);
 	} else if (_statusSize >= 0) {
@@ -216,7 +225,8 @@ void HistoryFileMedia::step_radial(TimeMs ms, bool timer) {
 
 void HistoryFileMedia::ensureAnimation() const {
 	if (!_animation) {
-		_animation = std::make_unique<AnimationData>(animation(const_cast<HistoryFileMedia*>(this), &HistoryFileMedia::step_radial));
+		_animation = std::make_unique<AnimationData>(
+		    animation(const_cast<HistoryFileMedia *>(this), &HistoryFileMedia::step_radial));
 	}
 }
 
@@ -230,33 +240,41 @@ void HistoryFileMedia::checkAnimationFinished() const {
 
 HistoryFileMedia::~HistoryFileMedia() = default;
 
-HistoryPhoto::HistoryPhoto(not_null<HistoryItem*> parent, not_null<PhotoData*> photo, const QString &caption) : HistoryFileMedia(parent)
-, _data(photo)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
-	setLinks(MakeShared<PhotoOpenClickHandler>(_data), MakeShared<PhotoSaveClickHandler>(_data), MakeShared<PhotoCancelClickHandler>(_data));
+HistoryPhoto::HistoryPhoto(not_null<HistoryItem *> parent, not_null<PhotoData *> photo, const QString &caption)
+    : HistoryFileMedia(parent)
+    , _data(photo)
+    , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+	setLinks(MakeShared<PhotoOpenClickHandler>(_data), MakeShared<PhotoSaveClickHandler>(_data),
+	         MakeShared<PhotoCancelClickHandler>(_data));
 	if (!caption.isEmpty()) {
 		_caption.setText(st::messageTextStyle, caption + _parent->skipBlock(), itemTextNoMonoOptions(_parent));
 	}
 	init();
 }
 
-HistoryPhoto::HistoryPhoto(not_null<HistoryItem*> parent, not_null<PeerData*> chat, not_null<PhotoData*> photo, qint32 width) : HistoryFileMedia(parent)
-, _data(photo) {
-	setLinks(MakeShared<PhotoOpenClickHandler>(_data, chat), MakeShared<PhotoSaveClickHandler>(_data, chat), MakeShared<PhotoCancelClickHandler>(_data, chat));
+HistoryPhoto::HistoryPhoto(not_null<HistoryItem *> parent, not_null<PeerData *> chat, not_null<PhotoData *> photo,
+                           qint32 width)
+    : HistoryFileMedia(parent)
+    , _data(photo) {
+	setLinks(MakeShared<PhotoOpenClickHandler>(_data, chat), MakeShared<PhotoSaveClickHandler>(_data, chat),
+	         MakeShared<PhotoCancelClickHandler>(_data, chat));
 
 	_width = width;
 	init();
 }
 
-HistoryPhoto::HistoryPhoto(not_null<HistoryItem*> parent, not_null<PeerData*> chat, const MTPDphoto &photo, qint32 width) : HistoryPhoto(parent, chat, App::feedPhoto(photo), width) {
-}
+HistoryPhoto::HistoryPhoto(not_null<HistoryItem *> parent, not_null<PeerData *> chat, const MTPDphoto &photo,
+                           qint32 width)
+    : HistoryPhoto(parent, chat, App::feedPhoto(photo), width) {}
 
-HistoryPhoto::HistoryPhoto(not_null<HistoryItem*> parent, const HistoryPhoto &other) : HistoryFileMedia(parent)
-, _data(other._data)
-, _pixw(other._pixw)
-, _pixh(other._pixh)
-, _caption(other._caption) {
-	setLinks(MakeShared<PhotoOpenClickHandler>(_data), MakeShared<PhotoSaveClickHandler>(_data), MakeShared<PhotoCancelClickHandler>(_data));
+HistoryPhoto::HistoryPhoto(not_null<HistoryItem *> parent, const HistoryPhoto &other)
+    : HistoryFileMedia(parent)
+    , _data(other._data)
+    , _pixw(other._pixw)
+    , _pixh(other._pixh)
+    , _caption(other._caption) {
+	setLinks(MakeShared<PhotoOpenClickHandler>(_data), MakeShared<PhotoSaveClickHandler>(_data),
+	         MakeShared<PhotoCancelClickHandler>(_data));
 
 	init();
 }
@@ -286,7 +304,8 @@ void HistoryPhoto::initDimensions() {
 	if (_parent->toHistoryMessage()) {
 		bool bubble = _parent->hasBubble();
 
-		qint32 minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+		qint32 minWidth =
+		    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
 		qint32 maxActualWidth = std::max(tw, minWidth);
 		_maxw = std::max(maxActualWidth, th);
 		_minh = std::max(th, qint32(st::minPhotoSize));
@@ -337,7 +356,8 @@ int HistoryPhoto::resizeGetHeight(int width) {
 	if (_pixw < 1) _pixw = 1;
 	if (_pixh < 1) _pixh = 1;
 
-	int minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	int minWidth =
+	    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	_width = std::max(_pixw, qint16(minWidth));
 	_height = std::max(_pixh, qint16(st::minPhotoSize));
 	if (bubble) {
@@ -393,12 +413,18 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 			}
 			rthumb = rtlrect(skipx, skipy, width, height, _width);
 		} else {
-			App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+			App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow,
+			                 selected ? InSelectedShadowCorners : InShadowCorners);
 		}
 		auto inWebPage = (_parent->getMedia() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-		auto roundCorners = inWebPage ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
-			| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
+		auto roundCorners =
+		    inWebPage ?
+		        ImageRoundCorner::All :
+		        ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None) |
+		         ((isBubbleBottom() && _caption.isEmpty()) ?
+		              (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) :
+		              ImageRoundCorner::None));
 		if (loaded) {
 			pix = _data->full->pixSingle(_pixw, _pixh, width, height, roundRadius, roundCorners);
 		} else {
@@ -418,7 +444,8 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 	}
 	if (radial || (!loaded && !_data->loading())) {
 		double radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
-		QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2,
+		            rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
@@ -438,7 +465,7 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 		}
 
 		p.setOpacity(radialOpacity);
-		auto icon = ([radial, this, selected]() -> const style::icon* {
+		auto icon = ([radial, this, selected]() -> const style::icon * {
 			if (radial || _data->loading()) {
 				auto delayed = _data->full->toDelayedStorageImage();
 				if (!delayed || !delayed->location().isNull()) {
@@ -453,15 +480,19 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 		}
 		p.setOpacity(1);
 		if (radial) {
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-			_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			_animation->radial.draw(p, rinner, st::msgFileRadialLine,
+			                        selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 		}
 	}
 
 	// date
 	if (!_caption.isEmpty()) {
-		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
-		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip, captionw, style::al_left, 0, -1, selection);
+		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+		                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip,
+		              captionw, style::al_left, 0, -1, selection);
 	} else if (notChild) {
 		auto fullRight = skipx + width;
 		auto fullBottom = skipy + height;
@@ -524,7 +555,8 @@ HistoryTextState HistoryPhoto::getState(QPoint point, HistoryStateRequest reques
 		if (!bubble && _parent->displayFastShare()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = _parent->fastShareLink();
 			}
 		}
@@ -597,7 +629,9 @@ bool HistoryPhoto::needReSetInlineResultMedia(const MTPMessageMedia &media) {
 				}
 			}
 		} else {
-			LOG(("API Error: Got MTPMessageMediaPhoto without photo or with ttl_seconds in needReSetInlineResultMedia()"));
+			LOG(
+			    ("API Error: Got MTPMessageMediaPhoto without photo or with ttl_seconds in "
+			     "needReSetInlineResultMedia()"));
 		}
 	}
 	return false;
@@ -628,10 +662,8 @@ bool HistoryPhoto::needsBubble() const {
 		return true;
 	}
 	if (auto message = _parent->toHistoryMessage()) {
-		return message->viaBot()
-			|| message->Has<HistoryMessageForwarded>()
-			|| message->Has<HistoryMessageReply>()
-			|| message->displayFromName();
+		return message->viaBot() || message->Has<HistoryMessageForwarded>() || message->Has<HistoryMessageReply>() ||
+		       message->displayFromName();
 	}
 	return false;
 }
@@ -658,10 +690,11 @@ ImagePtr HistoryPhoto::replyPreview() {
 	return _data->makeReplyPreview();
 }
 
-HistoryVideo::HistoryVideo(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption) : HistoryFileMedia(parent)
-, _data(document)
-, _thumbw(1)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+HistoryVideo::HistoryVideo(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption)
+    : HistoryFileMedia(parent)
+    , _data(document)
+    , _thumbw(1)
+    , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
 	if (!caption.isEmpty()) {
 		_caption.setText(st::messageTextStyle, caption + _parent->skipBlock(), itemTextNoMonoOptions(_parent));
 	}
@@ -673,10 +706,11 @@ HistoryVideo::HistoryVideo(not_null<HistoryItem*> parent, DocumentData *document
 	_data->thumb->load();
 }
 
-HistoryVideo::HistoryVideo(not_null<HistoryItem*> parent, const HistoryVideo &other) : HistoryFileMedia(parent)
-, _data(other._data)
-, _thumbw(other._thumbw)
-, _caption(other._caption) {
+HistoryVideo::HistoryVideo(not_null<HistoryItem *> parent, const HistoryVideo &other)
+    : HistoryFileMedia(parent)
+    , _data(other._data)
+    , _thumbw(other._thumbw)
+    , _caption(other._caption) {
 	setDocumentLinks(_data);
 
 	setStatusSize(other._statusSize);
@@ -702,8 +736,10 @@ void HistoryVideo::initDimensions() {
 	}
 
 	_thumbw = std::max(tw, 1);
-	qint32 minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
-	minWidth = std::max(minWidth, documentMaxStatusWidth(_data) + 2 * qint32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	qint32 minWidth =
+	    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	minWidth =
+	    std::max(minWidth, documentMaxStatusWidth(_data) + 2 * qint32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	_maxw = std::max(_thumbw, qint32(minWidth));
 	_minh = std::max(th, qint32(st::minPhotoSize));
 	if (bubble) {
@@ -743,8 +779,10 @@ int HistoryVideo::resizeGetHeight(int width) {
 	}
 
 	_thumbw = std::max(tw, 1);
-	int minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
-	minWidth = std::max(minWidth, documentMaxStatusWidth(_data) + 2 * int(st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	int minWidth =
+	    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	minWidth =
+	    std::max(minWidth, documentMaxStatusWidth(_data) + 2 * int(st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	_width = std::max(_thumbw, int(minWidth));
 	_height = std::max(th, int(st::minPhotoSize));
 	if (bubble) {
@@ -796,20 +834,28 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 			}
 		}
 	} else {
-		App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+		App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow,
+		                 selected ? InSelectedShadowCorners : InShadowCorners);
 	}
 
 	auto inWebPage = (_parent->getMedia() != this);
 	auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-	auto roundCorners = inWebPage ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
-		| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
+	auto roundCorners =
+	    inWebPage ?
+	        ImageRoundCorner::All :
+	        ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None) |
+	         ((isBubbleBottom() && _caption.isEmpty()) ?
+	              (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) :
+	              ImageRoundCorner::None));
 	QRect rthumb(rtlrect(skipx, skipy, width, height, _width));
-	p.drawPixmap(rthumb.topLeft(), _data->thumb->pixBlurredSingle(_thumbw, 0, width, height, roundRadius, roundCorners));
+	p.drawPixmap(rthumb.topLeft(),
+	             _data->thumb->pixBlurredSingle(_thumbw, 0, width, height, roundRadius, roundCorners));
 	if (selected) {
 		App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
 	}
 
-	QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+	QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2,
+	            rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 	p.setPen(Qt::NoPen);
 	if (selected) {
 		p.setBrush(st::msgDateImgBgSelected);
@@ -845,22 +891,29 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 		icon->paintInCenter(p, inner);
 	}
 	if (radial) {
-		QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-		_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+		QRect rinner(inner.marginsRemoved(
+		    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+		_animation->radial.draw(p, rinner, st::msgFileRadialLine,
+		                        selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 	}
 
-	auto statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x(), statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
+	auto statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x(),
+	     statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
 	auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
 	auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-	App::roundRect(p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+	App::roundRect(
+	    p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width),
+	    selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
 	p.setFont(st::normalFont);
 	p.setPen(st::msgDateImgFg);
 	p.drawTextLeft(statusX, statusY, _width, _statusText, statusW - 2 * st::msgDateImgPadding.x());
 
 	// date
 	if (!_caption.isEmpty()) {
-		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
-		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip, captionw, style::al_left, 0, -1, selection);
+		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+		                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip,
+		              captionw, style::al_left, 0, -1, selection);
 	} else if (_parent->getMedia() == this) {
 		auto fullRight = skipx + width, fullBottom = skipy + height;
 		_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, InfoDisplayOverImage);
@@ -915,7 +968,8 @@ HistoryTextState HistoryVideo::getState(QPoint point, HistoryStateRequest reques
 		if (!bubble && _parent->displayFastShare()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = _parent->fastShareLink();
 			}
 		}
@@ -944,10 +998,8 @@ bool HistoryVideo::needsBubble() const {
 		return true;
 	}
 	if (auto message = _parent->toHistoryMessage()) {
-		return message->viaBot()
-			|| message->Has<HistoryMessageForwarded>()
-			|| message->Has<HistoryMessageReply>()
-			|| message->displayFromName();
+		return message->viaBot() || message->Has<HistoryMessageForwarded>() || message->Has<HistoryMessageReply>() ||
+		       message->displayFromName();
 	}
 	return false;
 }
@@ -991,7 +1043,9 @@ void HistoryVideo::updateSentMedia(const MTPMessageMedia &media) {
 	if (media.type() == mtpc_messageMediaDocument) {
 		auto &mediaDocument = media.c_messageMediaDocument();
 		if (!mediaDocument.has_document() || mediaDocument.has_ttl_seconds()) {
-			LOG(("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in HistoryVideo::updateSentMedia()"));
+			LOG(
+			    ("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in "
+			     "HistoryVideo::updateSentMedia()"));
 			return;
 		}
 		App::feedDocument(mediaDocument.vdocument, _data);
@@ -1008,7 +1062,10 @@ ImagePtr HistoryVideo::replyPreview() {
 			int w = convertScale(_data->thumb->width()), h = convertScale(_data->thumb->height());
 			if (w <= 0) w = 1;
 			if (h <= 0) h = 1;
-			_data->replyPreview = ImagePtr(w > h ? _data->thumb->pix(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : _data->thumb->pix(st::msgReplyBarSize.height()), "PNG");
+			_data->replyPreview =
+			    ImagePtr(w > h ? _data->thumb->pix(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) :
+			                     _data->thumb->pix(st::msgReplyBarSize.height()),
+			             "PNG");
 		} else {
 			_data->thumb->load();
 		}
@@ -1017,14 +1074,12 @@ ImagePtr HistoryVideo::replyPreview() {
 }
 
 HistoryDocumentCaptioned::HistoryDocumentCaptioned()
-: _caption(st::msgFileMinWidth - st::msgPadding.left() - st::msgPadding.right()) {
-}
+    : _caption(st::msgFileMinWidth - st::msgPadding.left() - st::msgPadding.right()) {}
 
 
 HistoryDocumentVoicePlayback::HistoryDocumentVoicePlayback(const HistoryDocument *that)
-: a_progress(0., 0.)
-, _a_progress(animation(const_cast<HistoryDocument*>(that), &HistoryDocument::step_voiceProgress)) {
-}
+    : a_progress(0., 0.)
+    , _a_progress(animation(const_cast<HistoryDocument *>(that), &HistoryDocument::step_voiceProgress)) {}
 
 void HistoryDocumentVoice::ensurePlayback(const HistoryDocument *that) const {
 	if (!_playback) {
@@ -1049,8 +1104,9 @@ void HistoryDocumentVoice::stopSeeking() {
 	Media::Player::instance()->stopSeeking(AudioMsgId::Type::Voice);
 }
 
-HistoryDocument::HistoryDocument(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption) : HistoryFileMedia(parent)
-, _data(document) {
+HistoryDocument::HistoryDocument(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption)
+    : HistoryFileMedia(parent)
+    , _data(document) {
 	createComponents(!caption.isEmpty());
 	if (auto named = Get<HistoryDocumentNamed>()) {
 		fillNamedFromData(named);
@@ -1061,13 +1117,15 @@ HistoryDocument::HistoryDocument(not_null<HistoryItem*> parent, DocumentData *do
 	setStatusSize(FileStatusSizeReady);
 
 	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
-		captioned->_caption.setText(st::messageTextStyle, caption + _parent->skipBlock(), itemTextNoMonoOptions(_parent));
+		captioned->_caption.setText(st::messageTextStyle, caption + _parent->skipBlock(),
+		                            itemTextNoMonoOptions(_parent));
 	}
 }
 
-HistoryDocument::HistoryDocument(not_null<HistoryItem*> parent, const HistoryDocument &other) : HistoryFileMedia(parent)
-, RuntimeComposer()
-, _data(other._data) {
+HistoryDocument::HistoryDocument(not_null<HistoryItem *> parent, const HistoryDocument &other)
+    : HistoryFileMedia(parent)
+    , RuntimeComposer()
+    , _data(other._data) {
 	auto captioned = other.Get<HistoryDocumentCaptioned>();
 	createComponents(captioned != 0);
 	if (auto named = Get<HistoryDocumentNamed>()) {
@@ -1094,11 +1152,8 @@ void HistoryDocument::createComponents(bool caption) {
 		mask |= HistoryDocumentVoice::Bit();
 	} else {
 		mask |= HistoryDocumentNamed::Bit();
-		if (!_data->song()
-			&& !documentIsExecutableName(_data->name)
-			&& !_data->thumb->isNull()
-			&& _data->thumb->width()
-			&& _data->thumb->height()) {
+		if (!_data->song() && !documentIsExecutableName(_data->name) && !_data->thumb->isNull() &&
+		    _data->thumb->width() && _data->thumb->height()) {
 			mask |= HistoryDocumentThumbed::Bit();
 		}
 	}
@@ -1148,7 +1203,8 @@ void HistoryDocument::initDimensions() {
 		tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
 		tright = st::msgFileThumbPadding.left();
 		auto unread = _data->voice() ? (st::mediaUnreadSkip + st::mediaUnreadSize) : 0;
-		_maxw = std::max(_maxw, tleft + documentMaxStatusWidth(_data) + unread + _parent->skipBlockWidth() + st::msgPadding.right());
+		_maxw = std::max(_maxw, tleft + documentMaxStatusWidth(_data) + unread + _parent->skipBlockWidth() +
+		                            st::msgPadding.right());
 	}
 
 	if (auto named = Get<HistoryDocumentNamed>()) {
@@ -1235,12 +1291,15 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 
 		auto inWebPage = (_parent->getMedia() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, _width));
+		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus,
+		                     st::msgFileThumbSize, st::msgFileThumbSize, _width));
 		QPixmap thumb;
 		if (loaded) {
-			thumb = _data->thumb->pixSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
+			thumb =
+			    _data->thumb->pixSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
 		} else {
-			thumb = _data->thumb->pixBlurredSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
+			thumb = _data->thumb->pixBlurredSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize,
+			                                       roundRadius);
 		}
 		p.drawPixmap(rthumb.topLeft(), thumb);
 		if (selected) {
@@ -1250,7 +1309,8 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 
 		if (radial || (!loaded && !_data->loading())) {
 			double radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
-			QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+			QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2,
+			            rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 			p.setPen(Qt::NoPen);
 			if (selected) {
 				p.setBrush(st::msgDateImgBgSelected);
@@ -1280,16 +1340,20 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 			if (radial) {
 				p.setOpacity(1);
 
-				QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-				_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+				QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine,
+				                                           st::msgFileRadialLine, st::msgFileRadialLine)));
+				_animation->radial.draw(p, rinner, st::msgFileRadialLine,
+				                        selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 			}
 		}
 
 		if (_data->status != FileUploadFailed) {
-			const ClickHandlerPtr &lnk((_data->loading() || _data->status == FileUploading) ? thumbed->_linkcancell : thumbed->_linksavel);
+			const ClickHandlerPtr &lnk((_data->loading() || _data->status == FileUploading) ? thumbed->_linkcancell :
+			                                                                                  thumbed->_linksavel);
 			bool over = ClickHandler::showAsActive(lnk);
 			p.setFont(over ? st::semiboldFont->underline() : st::semiboldFont);
-			p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) : (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
+			p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) :
+			                 (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
 			p.drawTextLeft(nameleft, linktop, _width, thumbed->_link, thumbed->_linkw);
 		}
 	} else {
@@ -1299,16 +1363,19 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 		statustop = st::msgFileStatusTop - topMinus;
 		bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
 
-		QRect inner(rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, _width));
+		QRect inner(rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize,
+		                    st::msgFileSize, _width));
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(outbg ? st::msgFileOutBgSelected : st::msgFileInBgSelected);
 		} else if (isThumbAnimation(ms)) {
 			auto over = _animation->a_thumbOver.current();
-			p.setBrush(anim::brush(outbg ? st::msgFileOutBg : st::msgFileInBg, outbg ? st::msgFileOutBgOver : st::msgFileInBgOver, over));
+			p.setBrush(anim::brush(outbg ? st::msgFileOutBg : st::msgFileInBg,
+			                       outbg ? st::msgFileOutBgOver : st::msgFileInBgOver, over));
 		} else {
 			auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
-			p.setBrush(outbg ? (over ? st::msgFileOutBgOver : st::msgFileOutBg) : (over ? st::msgFileInBgOver : st::msgFileInBg));
+			p.setBrush(outbg ? (over ? st::msgFileOutBgOver : st::msgFileOutBg) :
+			                   (over ? st::msgFileInBgOver : st::msgFileInBg));
 		}
 
 		{
@@ -1317,25 +1384,33 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 		}
 
 		if (radial) {
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-			auto fg = outbg ? (selected ? st::historyFileOutRadialFgSelected : st::historyFileOutRadialFg) : (selected ? st::historyFileInRadialFgSelected : st::historyFileInRadialFg);
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			auto fg = outbg ? (selected ? st::historyFileOutRadialFgSelected : st::historyFileOutRadialFg) :
+			                  (selected ? st::historyFileInRadialFgSelected : st::historyFileInRadialFg);
 			_animation->radial.draw(p, rinner, st::msgFileRadialLine, fg);
 		}
 
 		auto icon = ([showPause, radial, this, loaded, outbg, selected] {
 			if (showPause) {
-				return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
+				return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) :
+				                 (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
 			} else if (radial || _data->loading()) {
-				return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
+				return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) :
+				                 (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
 			} else if (loaded) {
 				if (_data->song() || _data->voice()) {
-					return &(outbg ? (selected ? st::historyFileOutPlaySelected : st::historyFileOutPlay) : (selected ? st::historyFileInPlaySelected : st::historyFileInPlay));
+					return &(outbg ? (selected ? st::historyFileOutPlaySelected : st::historyFileOutPlay) :
+					                 (selected ? st::historyFileInPlaySelected : st::historyFileInPlay));
 				} else if (_data->isImage()) {
-					return &(outbg ? (selected ? st::historyFileOutImageSelected : st::historyFileOutImage) : (selected ? st::historyFileInImageSelected : st::historyFileInImage));
+					return &(outbg ? (selected ? st::historyFileOutImageSelected : st::historyFileOutImage) :
+					                 (selected ? st::historyFileInImageSelected : st::historyFileInImage));
 				}
-				return &(outbg ? (selected ? st::historyFileOutDocumentSelected : st::historyFileOutDocument) : (selected ? st::historyFileInDocumentSelected : st::historyFileInDocument));
+				return &(outbg ? (selected ? st::historyFileOutDocumentSelected : st::historyFileOutDocument) :
+				                 (selected ? st::historyFileInDocumentSelected : st::historyFileInDocument));
 			}
-			return &(outbg ? (selected ? st::historyFileOutDownloadSelected : st::historyFileOutDownload) : (selected ? st::historyFileInDownloadSelected : st::historyFileInDownload));
+			return &(outbg ? (selected ? st::historyFileOutDownloadSelected : st::historyFileOutDownload) :
+			                 (selected ? st::historyFileInDownloadSelected : st::historyFileInDownload));
 		})();
 		icon->paintInCenter(p, inner);
 	}
@@ -1368,12 +1443,15 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 			return 0.;
 		})();
 		if (voice->seeking()) {
-			voiceStatusOverride = formatPlayedText(std::round(progress * voice->_lastDurationMs) / 1000, voice->_lastDurationMs / 1000);
+			voiceStatusOverride =
+			    formatPlayedText(std::round(progress * voice->_lastDurationMs) / 1000, voice->_lastDurationMs / 1000);
 		}
 
 		// rescale waveform by going in waveform.size * bar_count 1D grid
-		auto active = outbg ? (selected ? st::msgWaveformOutActiveSelected : st::msgWaveformOutActive) : (selected ? st::msgWaveformInActiveSelected : st::msgWaveformInActive);
-		auto inactive = outbg ? (selected ? st::msgWaveformOutInactiveSelected : st::msgWaveformOutInactive) : (selected ? st::msgWaveformInInactiveSelected : st::msgWaveformInInactive);
+		auto active = outbg ? (selected ? st::msgWaveformOutActiveSelected : st::msgWaveformOutActive) :
+		                      (selected ? st::msgWaveformInActiveSelected : st::msgWaveformInActive);
+		auto inactive = outbg ? (selected ? st::msgWaveformOutInactiveSelected : st::msgWaveformOutInactive) :
+		                        (selected ? st::msgWaveformInInactiveSelected : st::msgWaveformInInactive);
 		auto wf_size = wf ? wf->size() : Media::Player::kWaveformSamplesCount;
 		auto availw = namewidth + st::msgWaveformSkip;
 		auto activew = std::round(availw * progress);
@@ -1395,12 +1473,16 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 				auto bar_value = ((max_value * max_delta) + ((norm_value + 1) / 2)) / (norm_value + 1);
 
 				if (bar_x >= activew) {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, inactive);
+					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value,
+					           inactive);
 				} else if (bar_x + st::msgWaveformBar <= activew) {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, active);
+					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value,
+					           active);
 				} else {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, activew - bar_x, st::msgWaveformMin + bar_value, active);
-					p.fillRect(nameleft + activew, bottom - bar_value, st::msgWaveformBar - (activew - bar_x), st::msgWaveformMin + bar_value, inactive);
+					p.fillRect(nameleft + bar_x, bottom - bar_value, activew - bar_x, st::msgWaveformMin + bar_value,
+					           active);
+					p.fillRect(nameleft + activew, bottom - bar_value, st::msgWaveformBar - (activew - bar_x),
+					           st::msgWaveformMin + bar_value, inactive);
 				}
 				bar_x += st::msgWaveformBar + st::msgWaveformSkip;
 
@@ -1417,16 +1499,19 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 		}
 	} else if (auto named = Get<HistoryDocumentNamed>()) {
 		p.setFont(st::semiboldFont);
-		p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
+		p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) :
+		                 (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
 		if (namewidth < named->_namew) {
-			p.drawTextLeft(nameleft, nametop, _width, st::semiboldFont->elided(named->_name, namewidth, Qt::ElideMiddle));
+			p.drawTextLeft(nameleft, nametop, _width,
+			               st::semiboldFont->elided(named->_name, namewidth, Qt::ElideMiddle));
 		} else {
 			p.drawTextLeft(nameleft, nametop, _width, named->_name, named->_namew);
 		}
 	}
 
 	auto statusText = voiceStatusOverride.isEmpty() ? _statusText : voiceStatusOverride;
-	auto status = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) : (selected ? st::mediaInFgSelected : st::mediaInFg);
+	auto status = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) :
+	                      (selected ? st::mediaInFgSelected : st::mediaInFg);
 	p.setFont(st::normalFont);
 	p.setPen(status);
 	p.drawTextLeft(nameleft, statustop, _width, statusText);
@@ -1435,17 +1520,20 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 		auto w = st::normalFont->width(statusText);
 		if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= statuswidth) {
 			p.setPen(Qt::NoPen);
-			p.setBrush(outbg ? (selected ? st::msgFileOutBgSelected : st::msgFileOutBg) : (selected ? st::msgFileInBgSelected : st::msgFileInBg));
+			p.setBrush(outbg ? (selected ? st::msgFileOutBgSelected : st::msgFileOutBg) :
+			                   (selected ? st::msgFileInBgSelected : st::msgFileInBg));
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(rtlrect(nameleft + w + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
+				p.drawEllipse(rtlrect(nameleft + w + st::mediaUnreadSkip, statustop + st::mediaUnreadTop,
+				                      st::mediaUnreadSize, st::mediaUnreadSize, _width));
 			}
 		}
 	}
 
 	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
-		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+		                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 		captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
 	}
 }
@@ -1469,7 +1557,8 @@ HistoryTextState HistoryDocument::getState(QPoint point, HistoryStateRequest req
 		linktop = st::msgFileThumbLinkTop - topMinus;
 		bottom = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom() - topMinus;
 
-		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, _width));
+		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus,
+		                     st::msgFileThumbSize, st::msgFileThumbSize, _width));
 
 		if ((_data->loading() || _data->uploading() || !loaded) && rthumb.contains(point)) {
 			result.link = (_data->loading() || _data->uploading()) ? _cancell : _savel;
@@ -1488,7 +1577,8 @@ HistoryTextState HistoryDocument::getState(QPoint point, HistoryStateRequest req
 		nametop = st::msgFileNameTop - topMinus;
 		bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
 
-		QRect inner(rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, _width));
+		QRect inner(rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize,
+		                    st::msgFileSize, _width));
 		if ((_data->loading() || _data->uploading() || !loaded) && inner.contains(point)) {
 			result.link = (_data->loading() || _data->uploading()) ? _cancell : _savel;
 			return result;
@@ -1513,7 +1603,9 @@ HistoryTextState HistoryDocument::getState(QPoint point, HistoryStateRequest req
 	auto height = _height;
 	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
 		if (point.y() >= bottom) {
-			result = captioned->_caption.getState(point - QPoint(st::msgPadding.left(), bottom), _width - st::msgPadding.left() - st::msgPadding.right(), request.forText());
+			result = captioned->_caption.getState(point - QPoint(st::msgPadding.left(), bottom),
+			                                      _width - st::msgPadding.left() - st::msgPadding.right(),
+			                                      request.forText());
 			return result;
 		}
 		auto captionw = _width - st::msgPadding.left() - st::msgPadding.right();
@@ -1602,8 +1694,7 @@ void HistoryDocument::eraseFromOverview() {
 	}
 }
 
-template <typename Callback>
-void HistoryDocument::buildStringRepresentation(Callback callback) const {
+template <typename Callback> void HistoryDocument::buildStringRepresentation(Callback callback) const {
 	const Text emptyCaption;
 	const Text *caption = &emptyCaption;
 	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
@@ -1677,7 +1768,8 @@ bool HistoryDocument::updateStatusText() const {
 
 				statusSize = -1 - (state.position / state.frequency);
 				realDuration = (state.length / state.frequency);
-				showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+				showPause =
+				    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 			} else {
 				if (auto voice = Get<HistoryDocumentVoice>()) {
 					voice->checkPlaybackFinished();
@@ -1691,7 +1783,8 @@ bool HistoryDocument::updateStatusText() const {
 			if (state.id == AudioMsgId(_data, _parent->fullId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 				statusSize = -1 - (state.position / state.frequency);
 				realDuration = (state.length / state.frequency);
-				showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+				showPause =
+				    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 			} else {
 			}
 			if (!showPause && (state.id == AudioMsgId(_data, _parent->fullId()))) {
@@ -1708,7 +1801,9 @@ bool HistoryDocument::updateStatusText() const {
 }
 
 QMargins HistoryDocument::bubbleMargins() const {
-	return Get<HistoryDocumentThumbed>() ? QMargins(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top(), st::msgFileThumbPadding.left(), st::msgFileThumbPadding.bottom()) : st::msgPadding;
+	return Get<HistoryDocumentThumbed>() ? QMargins(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top(),
+	                                                st::msgFileThumbPadding.left(), st::msgFileThumbPadding.bottom()) :
+	                                       st::msgPadding;
 }
 
 void HistoryDocument::step_voiceProgress(double ms, bool timer) {
@@ -1771,7 +1866,9 @@ void HistoryDocument::updateSentMedia(const MTPMessageMedia &media) {
 	if (media.type() == mtpc_messageMediaDocument) {
 		auto &mediaDocument = media.c_messageMediaDocument();
 		if (!mediaDocument.has_document() || mediaDocument.has_ttl_seconds()) {
-			LOG(("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in HistoryDocument::updateSentMedia()"));
+			LOG(
+			    ("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in "
+			     "HistoryDocument::updateSentMedia()"));
 			return;
 		}
 		App::feedDocument(mediaDocument.vdocument, _data);
@@ -1793,9 +1890,10 @@ ImagePtr HistoryDocument::replyPreview() {
 	return _data->makeReplyPreview();
 }
 
-HistoryGif::HistoryGif(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption) : HistoryFileMedia(parent)
-, _data(document)
-, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
+HistoryGif::HistoryGif(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption)
+    : HistoryFileMedia(parent)
+    , _data(document)
+    , _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
 	setDocumentLinks(_data, true);
 
 	setStatusSize(FileStatusSizeReady);
@@ -1807,11 +1905,12 @@ HistoryGif::HistoryGif(not_null<HistoryItem*> parent, DocumentData *document, co
 	_data->thumb->load();
 }
 
-HistoryGif::HistoryGif(not_null<HistoryItem*> parent, const HistoryGif &other) : HistoryFileMedia(parent)
-, _data(other._data)
-, _thumbw(other._thumbw)
-, _thumbh(other._thumbh)
-, _caption(other._caption) {
+HistoryGif::HistoryGif(not_null<HistoryItem *> parent, const HistoryGif &other)
+    : HistoryFileMedia(parent)
+    , _data(other._data)
+    , _thumbw(other._thumbw)
+    , _thumbh(other._thumbh)
+    , _caption(other._caption) {
 	setDocumentLinks(_data, true);
 
 	setStatusSize(other._statusSize);
@@ -1927,13 +2026,20 @@ int HistoryGif::resizeGetHeight(int width) {
 		if (!_gif->started()) {
 			auto isRound = _data->isRoundVideo();
 			auto inWebPage = (_parent->getMedia() != this);
-			auto roundRadius = isRound ? ImageRoundRadius::Ellipse : inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-			auto roundCorners = (isRound || inWebPage) ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
-				| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
+			auto roundRadius =
+			    isRound ? ImageRoundRadius::Ellipse : inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
+			auto roundCorners = (isRound || inWebPage) ?
+			                        ImageRoundCorner::All :
+			                        ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) :
+			                                          ImageRoundCorner::None) |
+			                         ((isBubbleBottom() && _caption.isEmpty()) ?
+			                              (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) :
+			                              ImageRoundCorner::None));
 			_gif->start(_thumbw, _thumbh, _width, _height, roundRadius, roundCorners);
 		}
 	} else {
-		_width = std::max(_width, gifMaxStatusWidth(_data) + 2 * qint32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
+		_width =
+		    std::max(_width, gifMaxStatusWidth(_data) + 2 * qint32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	}
 	if (bubble) {
 		_width += st::mediaPadding.left() + st::mediaPadding.right();
@@ -1954,7 +2060,8 @@ int HistoryGif::resizeGetHeight(int width) {
 			_width += additional;
 			accumulate_min(_width, width);
 			auto usew = _maxw - additional;
-			auto availw = _width - usew - st::msgReplyPadding.left() - st::msgReplyPadding.left() - st::msgReplyPadding.left();
+			auto availw =
+			    _width - usew - st::msgReplyPadding.left() - st::msgReplyPadding.left() - st::msgReplyPadding.left();
 			if (!forwarded && via) {
 				via->resize(availw);
 			}
@@ -1975,7 +2082,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 	auto displayLoading = (_parent->id < 0) || _data->displayLoading();
 	auto selected = (selection == FullSelection);
 
-	auto videoFinished = _gif && (_gif->mode() == Media::Clip::Reader::Mode::Video) && (_gif->state() == Media::Clip::State::Finished);
+	auto videoFinished =
+	    _gif && (_gif->mode() == Media::Clip::Reader::Mode::Video) && (_gif->state() == Media::Clip::State::Finished);
 	if (loaded && cAutoPlayGif() && ((!_gif && !_gif.isBad()) || videoFinished)) {
 		Ui::autoplayMediaInlineAsync(_parent->fullId());
 	}
@@ -2017,7 +2125,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			}
 		}
 	} else if (!isRound) {
-		App::roundShadow(p, 0, 0, width, _height, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+		App::roundShadow(p, 0, 0, width, _height, selected ? st::msgInShadowSelected : st::msgInShadow,
+		                 selected ? InSelectedShadowCorners : InShadowCorners);
 	}
 
 	auto usex = 0, usew = width;
@@ -2036,9 +2145,15 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 
 	QRect rthumb(rtlrect(usex + skipx, skipy, usew, height, _width));
 
-	auto roundRadius = isRound ? ImageRoundRadius::Ellipse : isChildMedia ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-	auto roundCorners = (isRound || isChildMedia) ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
-		| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
+	auto roundRadius =
+	    isRound ? ImageRoundRadius::Ellipse : isChildMedia ? ImageRoundRadius::Small : ImageRoundRadius::Large;
+	auto roundCorners =
+	    (isRound || isChildMedia) ?
+	        ImageRoundCorner::All :
+	        ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None) |
+	         ((isBubbleBottom() && _caption.isEmpty()) ?
+	              (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) :
+	              ImageRoundCorner::None));
 	if (animating) {
 		auto paused = App::wnd()->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
 		if (isRound) {
@@ -2048,7 +2163,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 				displayMute = true;
 			}
 		}
-		p.drawPixmap(rthumb.topLeft(), _gif->current(_thumbw, _thumbh, usew, height, roundRadius, roundCorners, paused ? 0 : ms));
+		p.drawPixmap(rthumb.topLeft(),
+		             _gif->current(_thumbw, _thumbh, usew, height, roundRadius, roundCorners, paused ? 0 : ms));
 
 		if (displayMute) {
 			_roundPlayback.reset();
@@ -2067,7 +2183,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 				auto stepInside = st::radialLine / 2;
 				{
 					PainterHighQualityEnabler hq(p);
-					p.drawArc(rthumb.marginsRemoved(QMargins(stepInside, stepInside, stepInside, stepInside)), from, len);
+					p.drawArc(rthumb.marginsRemoved(QMargins(stepInside, stepInside, stepInside, stepInside)), from,
+					          len);
 				}
 
 				p.setPen(was);
@@ -2075,7 +2192,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			}
 		}
 	} else {
-		p.drawPixmap(rthumb.topLeft(), _data->thumb->pixBlurredSingle(_thumbw, _thumbh, usew, height, roundRadius, roundCorners));
+		p.drawPixmap(rthumb.topLeft(),
+		             _data->thumb->pixBlurredSingle(_thumbw, _thumbh, usew, height, roundRadius, roundCorners));
 	}
 
 	if (selected) {
@@ -2084,7 +2202,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 
 	if (radial || _gif.isBad() || (!_gif && ((!loaded && !_data->loading()) || !cAutoPlayGif()))) {
 		auto radialOpacity = (radial && loaded && _parent->id > 0) ? _animation->radial.opacity() : 1.;
-		auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2,
+		                   rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
@@ -2119,8 +2238,10 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		}
 		if (radial) {
 			p.setOpacity(1);
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-			_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			_animation->radial.draw(p, rinner, st::msgFileRadialLine,
+			                        selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 		}
 
 		if (!isRound && (!animating || _parent->id < 0)) {
@@ -2128,14 +2249,20 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			auto statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
 			auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
 			auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-			App::roundRect(p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+			App::roundRect(p,
+			               rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW,
+			                       statusH, _width),
+			               selected ? st::msgDateImgBgSelected : st::msgDateImgBg,
+			               selected ? DateSelectedCorners : DateCorners);
 			p.setFont(st::normalFont);
 			p.setPen(st::msgDateImgFg);
 			p.drawTextLeft(statusX, statusY, _width, _statusText, statusW - 2 * st::msgDateImgPadding.x());
 		}
 	}
 	if (displayMute) {
-		auto muteRect = rtlrect(rthumb.x() + (rthumb.width() - st::historyVideoMessageMuteSize) / 2, rthumb.y() + st::msgDateImgDelta, st::historyVideoMessageMuteSize, st::historyVideoMessageMuteSize, _width);
+		auto muteRect = rtlrect(rthumb.x() + (rthumb.width() - st::historyVideoMessageMuteSize) / 2,
+		                        rthumb.y() + st::msgDateImgDelta, st::historyVideoMessageMuteSize,
+		                        st::historyVideoMessageMuteSize, _width);
 		p.setPen(Qt::NoPen);
 		p.setBrush(selected ? st::msgDateImgBgSelected : st::msgDateImgBg);
 		PainterHighQualityEnabler hq(p);
@@ -2152,7 +2279,10 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		if (_parent->isMediaUnread()) {
 			statusW += st::mediaUnreadSkip + st::mediaUnreadSize;
 		}
-		App::roundRect(p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		App::roundRect(
+		    p,
+		    rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width),
+		    selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
 		p.setFont(st::normalFont);
 		p.setPen(st::msgServiceFg);
 		p.drawTextLeft(statusX, statusY, _width, _statusText, statusW - 2 * st::msgDateImgPadding.x());
@@ -2162,7 +2292,9 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(rtlrect(statusX - st::msgDateImgPadding.x() + statusW - st::msgDateImgPadding.x() - st::mediaUnreadSize, statusY + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
+				p.drawEllipse(rtlrect(statusX - st::msgDateImgPadding.x() + statusW - st::msgDateImgPadding.x() -
+				                          st::mediaUnreadSize,
+				                      statusY + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
 			}
 		}
 		if (via || reply || forwarded) {
@@ -2170,7 +2302,8 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			auto innerw = rectw - (st::msgReplyPadding.left() + st::msgReplyPadding.right());
 			auto recth = st::msgReplyPadding.top() + st::msgReplyPadding.bottom();
 			auto forwardedHeightReal = forwarded ? forwarded->_text.countHeight(innerw) : 0;
-			auto forwardedHeight = std::min(forwardedHeightReal, kMaxGifForwardedBarLines * st::msgServiceNameFont->height);
+			auto forwardedHeight =
+			    std::min(forwardedHeightReal, kMaxGifForwardedBarLines * st::msgServiceNameFont->height);
 			if (forwarded) {
 				recth += forwardedHeight;
 			} else if (via) {
@@ -2183,14 +2316,16 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			int recty = skipy;
 			if (rtl()) rectx = _width - rectx - rectw;
 
-			App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+			App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg,
+			               selected ? StickerSelectedCorners : StickerCorners);
 			p.setPen(st::msgServiceFg);
 			rectx += st::msgReplyPadding.left();
 			rectw = innerw;
 			if (forwarded) {
 				p.setTextPalette(st::serviceTextPalette);
 				auto breakEverywhere = (forwardedHeightReal > forwardedHeight);
-				forwarded->_text.drawElided(p, rectx, recty + st::msgReplyPadding.top(), rectw, kMaxGifForwardedBarLines, style::al_left, 0, -1, 0, breakEverywhere);
+				forwarded->_text.drawElided(p, rectx, recty + st::msgReplyPadding.top(), rectw,
+				                            kMaxGifForwardedBarLines, style::al_left, 0, -1, 0, breakEverywhere);
 				p.restoreTextPalette();
 			} else if (via) {
 				p.setFont(st::msgDateFont);
@@ -2208,8 +2343,10 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		}
 	}
 	if (!isRound && !_caption.isEmpty()) {
-		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
-		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip, captionw, style::al_left, 0, -1, selection);
+		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+		                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip,
+		              captionw, style::al_left, 0, -1, selection);
 	} else if (!isChildMedia) {
 		auto fullRight = skipx + usex + usew;
 		auto fullBottom = skipy + height;
@@ -2230,14 +2367,16 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			}
 		}
 		if (isRound || _data->uploading() || App::hoveredItem() == _parent) {
-			_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, isRound ? InfoDisplayOverBackground : InfoDisplayOverImage);
+			_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected,
+			                  isRound ? InfoDisplayOverBackground : InfoDisplayOverImage);
 		}
 		if (!bubble && _parent->displayFastShare()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (fastShareLeft + st::historyFastShareSize > maxRight) {
 				fastShareLeft = (fullRight - st::historyFastShareSize - st::msgDateImgDelta);
-				fastShareTop -= (st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height + st::msgDateImgPadding.y());
+				fastShareTop -= (st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height +
+				                 st::msgDateImgPadding.y());
 			}
 			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * skipx + width);
 		}
@@ -2311,7 +2450,9 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 				if (breakEverywhere) {
 					textRequest.flags |= Text::StateRequest::Flag::BreakEverywhere;
 				}
-				result = forwarded->_text.getState(point - QPoint(rectx + st::msgReplyPadding.left(), recty + st::msgReplyPadding.top()), innerw, textRequest);
+				result = forwarded->_text.getState(
+				    point - QPoint(rectx + st::msgReplyPadding.left(), recty + st::msgReplyPadding.top()), innerw,
+				    textRequest);
 				result.symbol = 0;
 				result.afterSymbol = false;
 				if (breakEverywhere) {
@@ -2324,7 +2465,8 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 			recty += forwardedHeight;
 			recth -= forwardedHeight;
 		} else if (via) {
-			auto viah = st::msgReplyPadding.top() + st::msgServiceNameFont->height + (reply ? 0 : st::msgReplyPadding.bottom());
+			auto viah =
+			    st::msgReplyPadding.top() + st::msgServiceNameFont->height + (reply ? 0 : st::msgReplyPadding.bottom());
 			if (QRect(rectx, recty, rectw, viah).contains(point)) {
 				result.link = via->_lnk;
 				return result;
@@ -2369,7 +2511,8 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 			}
 		}
 		if (!isChildMedia) {
-			if (_parent->pointInTime(fullRight, fullBottom, point, isRound ? InfoDisplayOverBackground : InfoDisplayOverImage)) {
+			if (_parent->pointInTime(fullRight, fullBottom, point,
+			                         isRound ? InfoDisplayOverBackground : InfoDisplayOverImage)) {
 				result.cursor = HistoryInDateCursorState;
 			}
 		}
@@ -2378,9 +2521,11 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (fastShareLeft + st::historyFastShareSize > maxRight) {
 				fastShareLeft = (fullRight - st::historyFastShareSize - st::msgDateImgDelta);
-				fastShareTop -= st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height + st::msgDateImgPadding.y();
+				fastShareTop -= st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height +
+				                st::msgDateImgPadding.y();
 			}
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = _parent->fastShareLink();
 			}
 		}
@@ -2408,10 +2553,8 @@ bool HistoryGif::needsBubble() const {
 		return true;
 	}
 	if (auto message = _parent->toHistoryMessage()) {
-		return message->viaBot()
-			|| message->Has<HistoryMessageForwarded>()
-			|| message->Has<HistoryMessageReply>()
-			|| message->displayFromName();
+		return message->viaBot() || message->Has<HistoryMessageForwarded>() || message->Has<HistoryMessageReply>() ||
+		       message->displayFromName();
 	}
 	return false;
 }
@@ -2517,7 +2660,9 @@ void HistoryGif::updateSentMedia(const MTPMessageMedia &media) {
 	if (media.type() == mtpc_messageMediaDocument) {
 		auto &mediaDocument = media.c_messageMediaDocument();
 		if (!mediaDocument.has_document() || mediaDocument.has_ttl_seconds()) {
-			LOG(("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in HistoryGif::updateSentMedia()"));
+			LOG(
+			    ("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in "
+			     "HistoryGif::updateSentMedia()"));
 			return;
 		}
 		App::feedDocument(mediaDocument.vdocument, _data);
@@ -2532,12 +2677,15 @@ ImagePtr HistoryGif::replyPreview() {
 	return _data->makeReplyPreview();
 }
 
-int HistoryGif::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply, const HistoryMessageForwarded *forwarded) const {
+int HistoryGif::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply,
+                                const HistoryMessageForwarded *forwarded) const {
 	int result = 0;
 	if (forwarded) {
-		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + forwarded->_text.maxWidth() + st::msgReplyPadding.right());
+		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + forwarded->_text.maxWidth() +
+		                           st::msgReplyPadding.right());
 	} else if (via) {
-		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + via->_maxWidth + st::msgReplyPadding.left());
+		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + via->_maxWidth +
+		                           st::msgReplyPadding.left());
 	}
 	if (reply) {
 		accumulate_max(result, st::msgReplyPadding.left() + reply->replyToWidth());
@@ -2568,14 +2716,12 @@ bool HistoryGif::playInline(bool autoplay) {
 			App::stopGifItems();
 		}
 		auto mode = (!autoplay && _data->isRoundVideo()) ? Mode::Video : Mode::Gif;
-		setClipReader(Media::Clip::MakeReader(_data, _parent->fullId(), [this](Media::Clip::Notification notification) {
-			_parent->clipCallback(notification);
-		}, mode));
+		setClipReader(Media::Clip::MakeReader(
+		    _data, _parent->fullId(),
+		    [this](Media::Clip::Notification notification) { _parent->clipCallback(notification); }, mode));
 		if (mode == Mode::Video) {
 			_roundPlayback = std::make_unique<Media::Clip::Playback>();
-			_roundPlayback->setValueChangedCallback([this](double value) {
-				Ui::repaintHistoryItem(_parent);
-			});
+			_roundPlayback->setValueChangedCallback([this](double value) { Ui::repaintHistoryItem(_parent); });
 			if (App::main()) {
 				App::main()->mediaMarkRead(_data);
 			}
@@ -2628,9 +2774,10 @@ bool HistoryGif::dataLoaded() const {
 	return (!_parent || _parent->id > 0) ? _data->loaded() : false;
 }
 
-HistorySticker::HistorySticker(not_null<HistoryItem*> parent, DocumentData *document) : HistoryMedia(parent)
-, _data(document)
-, _emoji(_data->sticker()->alt) {
+HistorySticker::HistorySticker(not_null<HistoryItem *> parent, DocumentData *document)
+    : HistoryMedia(parent)
+    , _data(document)
+    , _emoji(_data->sticker()->alt) {
 	_data->thumb->load();
 	if (auto emoji = Ui::Emoji::Find(_emoji)) {
 		_emoji = emoji->text();
@@ -2677,7 +2824,8 @@ int HistorySticker::resizeGetHeight(int width) { // return new height
 		auto reply = _parent->Get<HistoryMessageReply>();
 		if (via || reply) {
 			int usew = _maxw - additionalWidth(via, reply);
-			int availw = _width - usew - st::msgReplyPadding.left() - st::msgReplyPadding.left() - st::msgReplyPadding.left();
+			int availw =
+			    _width - usew - st::msgReplyPadding.left() - st::msgReplyPadding.left() - st::msgReplyPadding.left();
 			if (via) {
 				via->resize(availw);
 			}
@@ -2715,13 +2863,16 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 
 	if (selected) {
 		if (sticker->img->isNull()) {
-			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2), _data->thumb->pixBlurredColored(st::msgStickerOverlay, _pixw, _pixh));
+			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2),
+			             _data->thumb->pixBlurredColored(st::msgStickerOverlay, _pixw, _pixh));
 		} else {
-			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2), sticker->img->pixColored(st::msgStickerOverlay, _pixw, _pixh));
+			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2),
+			             sticker->img->pixColored(st::msgStickerOverlay, _pixw, _pixh));
 		}
 	} else {
 		if (sticker->img->isNull()) {
-			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2), _data->thumb->pixBlurred(_pixw, _pixh));
+			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2),
+			             _data->thumb->pixBlurred(_pixw, _pixh));
 		} else {
 			p.drawPixmap(QPoint(usex + (usew - _pixw) / 2, (_minh - _pixh) / 2), sticker->img->pix(_pixw, _pixh));
 		}
@@ -2744,7 +2895,8 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 			int recty = st::msgDateImgDelta;
 			if (rtl()) rectx = _width - rectx - rectw;
 
-			App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+			App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg,
+			               selected ? StickerSelectedCorners : StickerCorners);
 			p.setPen(st::msgServiceFg);
 			rectx += st::msgReplyPadding.left();
 			rectw -= st::msgReplyPadding.left() + st::msgReplyPadding.right();
@@ -2802,7 +2954,8 @@ HistoryTextState HistorySticker::getState(QPoint point, HistoryStateRequest requ
 		if (rtl()) rectx = _width - rectx - rectw;
 
 		if (via) {
-			int viah = st::msgReplyPadding.top() + st::msgServiceNameFont->height + (reply ? 0 : st::msgReplyPadding.bottom());
+			int viah =
+			    st::msgReplyPadding.top() + st::msgServiceNameFont->height + (reply ? 0 : st::msgReplyPadding.bottom());
 			if (QRect(rectx, recty, rectw, viah).contains(point)) {
 				result.link = via->_lnk;
 				return result;
@@ -2827,7 +2980,8 @@ HistoryTextState HistorySticker::getState(QPoint point, HistoryStateRequest requ
 		if (_parent->displayFastShare()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = _parent->fastShareLink();
 			}
 		}
@@ -2854,7 +3008,7 @@ TextWithEntities HistorySticker::selectedText(TextSelection selection) const {
 	if (selection != FullSelection) {
 		return TextWithEntities();
 	}
-	return { qsl("[ ") + toString() + qsl(" ]"), EntitiesInText() };
+	return {qsl("[ ") + toString() + qsl(" ]"), EntitiesInText()};
 }
 
 void HistorySticker::attachToParent() {
@@ -2869,7 +3023,9 @@ void HistorySticker::updateSentMedia(const MTPMessageMedia &media) {
 	if (media.type() == mtpc_messageMediaDocument) {
 		auto &mediaDocument = media.c_messageMediaDocument();
 		if (!mediaDocument.has_document() || mediaDocument.has_ttl_seconds()) {
-			LOG(("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in HistorySticker::updateSentMedia()"));
+			LOG(
+			    ("Api Error: Got MTPMessageMediaDocument without document or with ttl_seconds in "
+			     "HistorySticker::updateSentMedia()"));
 			return;
 		}
 		App::feedDocument(mediaDocument.vdocument, _data);
@@ -2890,7 +3046,8 @@ ImagePtr HistorySticker::replyPreview() {
 int HistorySticker::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply) const {
 	int result = 0;
 	if (via) {
-		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + via->_maxWidth + st::msgReplyPadding.left());
+		accumulate_max(result, st::msgReplyPadding.left() + st::msgReplyPadding.left() + via->_maxWidth +
+		                           st::msgReplyPadding.left());
 	}
 	if (reply) {
 		accumulate_max(result, st::msgReplyPadding.left() + reply->replyToWidth());
@@ -2901,9 +3058,8 @@ int HistorySticker::additionalWidth(const HistoryMessageVia *via, const HistoryM
 namespace {
 
 ClickHandlerPtr sendMessageClickHandler(PeerData *peer) {
-	return MakeShared<LambdaClickHandler>([peer] {
-		Ui::showPeerHistory(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
-	});
+	return MakeShared<LambdaClickHandler>(
+	    [peer] { Ui::showPeerHistory(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward); });
 }
 
 ClickHandlerPtr addContactClickHandler(HistoryItem *item) {
@@ -2911,7 +3067,7 @@ ClickHandlerPtr addContactClickHandler(HistoryItem *item) {
 		if (auto item = App::histItemById(fullId)) {
 			if (auto media = item->getMedia()) {
 				if (media->type() == MediaTypeContact) {
-					auto contact = static_cast<HistoryContact*>(media);
+					auto contact = static_cast<HistoryContact *>(media);
 					auto fname = contact->fname();
 					auto lname = contact->lname();
 					auto phone = contact->phone();
@@ -2924,12 +3080,15 @@ ClickHandlerPtr addContactClickHandler(HistoryItem *item) {
 
 } // namespace
 
-HistoryContact::HistoryContact(not_null<HistoryItem*> parent, qint32 userId, const QString &first, const QString &last, const QString &phone) : HistoryMedia(parent)
-, _userId(userId)
-, _fname(first)
-, _lname(last)
-, _phone(App::formatPhone(phone)) {
-	_name.setText(st::semiboldTextStyle, lng_full_name(lt_first_name, first, lt_last_name, last).trimmed(), _textNameOptions);
+HistoryContact::HistoryContact(not_null<HistoryItem *> parent, qint32 userId, const QString &first, const QString &last,
+                               const QString &phone)
+    : HistoryMedia(parent)
+    , _userId(userId)
+    , _fname(first)
+    , _lname(last)
+    , _phone(App::formatPhone(phone)) {
+	_name.setText(st::semiboldTextStyle, lng_full_name(lt_first_name, first, lt_last_name, last).trimmed(),
+	              _textNameOptions);
 	_phonew = st::normalFont->width(_phone);
 }
 
@@ -2999,11 +3158,13 @@ void HistoryContact::draw(Painter &p, const QRect &r, TextSelection selection, T
 		statustop = st::msgFileThumbStatusTop - topMinus;
 		linktop = st::msgFileThumbLinkTop - topMinus;
 
-		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width));
+		QRect rthumb(rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus,
+		                     st::msgFileThumbSize, st::msgFileThumbSize, width));
 		if (_contact) {
 			_contact->paintUserpic(p, rthumb.x(), rthumb.y(), st::msgFileThumbSize);
 		} else {
-			_photoEmpty.paint(p, st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, width, st::msgFileThumbSize);
+			_photoEmpty.paint(p, st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, width,
+			                  st::msgFileThumbSize);
 		}
 		if (selected) {
 			PainterHighQualityEnabler hq(p);
@@ -3014,7 +3175,8 @@ void HistoryContact::draw(Painter &p, const QRect &r, TextSelection selection, T
 
 		bool over = ClickHandler::showAsActive(_linkl);
 		p.setFont(over ? st::semiboldFont->underline() : st::semiboldFont);
-		p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) : (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
+		p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) :
+		                 (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
 		p.drawTextLeft(nameleft, linktop, width, _link, _linkw);
 	} else {
 		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
@@ -3027,10 +3189,12 @@ void HistoryContact::draw(Painter &p, const QRect &r, TextSelection selection, T
 	qint32 namewidth = width - nameleft - nameright;
 
 	p.setFont(st::semiboldFont);
-	p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
+	p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) :
+	                 (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
 	_name.drawLeftElided(p, nameleft, nametop, namewidth, width);
 
-	auto &status = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) : (selected ? st::mediaInFgSelected : st::mediaInFg);
+	auto &status = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) :
+	                       (selected ? st::mediaInFgSelected : st::mediaInFg);
 	p.setFont(st::normalFont);
 	p.setPen(status);
 	p.drawTextLeft(nameleft, statustop, width, _phone);
@@ -3065,7 +3229,8 @@ TextWithEntities HistoryContact::selectedText(TextSelection selection) const {
 	if (selection != FullSelection) {
 		return TextWithEntities();
 	}
-	return { qsl("[ ") + lang(lng_in_dlg_contact) + qsl(" ]\n") + _name.originalText() + '\n' + _phone, EntitiesInText() };
+	return {qsl("[ ") + lang(lng_in_dlg_contact) + qsl(" ]\n") + _name.originalText() + '\n' + _phone,
+	        EntitiesInText()};
 }
 
 void HistoryContact::attachToParent() {
@@ -3090,8 +3255,9 @@ void HistoryContact::updateSentMedia(const MTPMessageMedia &media) {
 	}
 }
 
-HistoryCall::HistoryCall(not_null<HistoryItem*> parent, const MTPDmessageActionPhoneCall &call) : HistoryMedia(parent)
-, _reason(GetReason(call)) {
+HistoryCall::HistoryCall(not_null<HistoryItem *> parent, const MTPDmessageActionPhoneCall &call)
+    : HistoryMedia(parent)
+    , _reason(GetReason(call)) {
 	if (_parent->out()) {
 		_text = lang(_reason == FinishReason::Missed ? lng_call_cancelled : lng_call_outgoing);
 	} else if (_reason == FinishReason::Missed) {
@@ -3165,22 +3331,28 @@ void HistoryCall::draw(Painter &p, const QRect &r, TextSelection selection, Time
 	auto namewidth = width - nameleft - nameright;
 
 	p.setFont(st::semiboldFont);
-	p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
+	p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) :
+	                 (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
 	p.drawTextLeft(nameleft, nametop, width, _text);
 
 	auto statusleft = nameleft;
 	auto missed = (_reason == FinishReason::Missed || _reason == FinishReason::Busy);
-	auto &arrow = outbg ? (selected ? st::historyCallArrowOutSelected : st::historyCallArrowOut) : missed ? (selected ? st::historyCallArrowMissedInSelected : st::historyCallArrowMissedIn) : (selected ? st::historyCallArrowInSelected : st::historyCallArrowIn);
+	auto &arrow = outbg ? (selected ? st::historyCallArrowOutSelected : st::historyCallArrowOut) :
+	                      missed ? (selected ? st::historyCallArrowMissedInSelected : st::historyCallArrowMissedIn) :
+	                               (selected ? st::historyCallArrowInSelected : st::historyCallArrowIn);
 	arrow.paint(p, statusleft + st::historyCallArrowPosition.x(), statustop + st::historyCallArrowPosition.y(), width);
 	statusleft += arrow.width() + st::historyCallStatusSkip;
 
-	auto &statusFg = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) : (selected ? st::mediaInFgSelected : st::mediaInFg);
+	auto &statusFg = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) :
+	                         (selected ? st::mediaInFgSelected : st::mediaInFg);
 	p.setFont(st::normalFont);
 	p.setPen(statusFg);
 	p.drawTextLeft(statusleft, statustop, width, _status);
 
-	auto &icon = outbg ? (selected ? st::historyCallOutIconSelected : st::historyCallOutIcon) : (selected ? st::historyCallInIconSelected : st::historyCallInIcon);
-	icon.paint(p, width - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus, width);
+	auto &icon = outbg ? (selected ? st::historyCallOutIconSelected : st::historyCallOutIcon) :
+	                     (selected ? st::historyCallInIconSelected : st::historyCallInIcon);
+	icon.paint(p, width - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus,
+	           width);
 }
 
 HistoryTextState HistoryCall::getState(QPoint point, HistoryStateRequest request) const {
@@ -3204,7 +3376,7 @@ TextWithEntities HistoryCall::selectedText(TextSelection selection) const {
 	if (selection != FullSelection) {
 		return TextWithEntities();
 	}
-	return { qsl("[ ") + _text + qsl(" ]"), EntitiesInText() };
+	return {qsl("[ ") + _text + qsl(" ]"), EntitiesInText()};
 }
 
 namespace {
@@ -3239,23 +3411,23 @@ int unitedLineHeight() {
 
 } // namespace
 
-HistoryWebPage::HistoryWebPage(not_null<HistoryItem*> parent, not_null<WebPageData*> data) : HistoryMedia(parent)
-, _data(data)
-, _title(st::msgMinWidth - st::webPageLeft)
-, _description(st::msgMinWidth - st::webPageLeft) {
-}
+HistoryWebPage::HistoryWebPage(not_null<HistoryItem *> parent, not_null<WebPageData *> data)
+    : HistoryMedia(parent)
+    , _data(data)
+    , _title(st::msgMinWidth - st::webPageLeft)
+    , _description(st::msgMinWidth - st::webPageLeft) {}
 
-HistoryWebPage::HistoryWebPage(not_null<HistoryItem*> parent, const HistoryWebPage &other) : HistoryMedia(parent)
-, _data(other._data)
-, _attach(other._attach ? other._attach->clone(parent) : nullptr)
-, _asArticle(other._asArticle)
-, _title(other._title)
-, _description(other._description)
-, _siteNameWidth(other._siteNameWidth)
-, _durationWidth(other._durationWidth)
-, _pixw(other._pixw)
-, _pixh(other._pixh) {
-}
+HistoryWebPage::HistoryWebPage(not_null<HistoryItem *> parent, const HistoryWebPage &other)
+    : HistoryMedia(parent)
+    , _data(other._data)
+    , _attach(other._attach ? other._attach->clone(parent) : nullptr)
+    , _asArticle(other._asArticle)
+    , _title(other._title)
+    , _description(other._description)
+    , _siteNameWidth(other._siteNameWidth)
+    , _durationWidth(other._durationWidth)
+    , _pixw(other._pixw)
+    , _pixh(other._pixh) {}
 
 void HistoryWebPage::initDimensions() {
 	if (_data->pendingTill) {
@@ -3322,10 +3494,7 @@ void HistoryWebPage::initDimensions() {
 		}
 		if (isLogEntryOriginal()) {
 			// Fix layout for small bubbles (narrow media caption edit log entries).
-			_description = Text(st::minPhotoSize
-				- st::msgPadding.left()
-				- st::msgPadding.right()
-				- st::webPageLeft);
+			_description = Text(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right() - st::webPageLeft);
 		}
 		_description.setMarkedText(st::webPageDescriptionStyle, text, *opts);
 	}
@@ -3347,12 +3516,15 @@ void HistoryWebPage::initDimensions() {
 
 	auto siteNameHeight = _data->siteName.isEmpty() ? 0 : lineHeight;
 	auto titleMinHeight = _title.isEmpty() ? 0 : lineHeight;
-	auto descMaxLines = isLogEntryOriginal() ? kMaxOriginalEntryLines : (3 + (siteNameHeight ? 0 : 1) + (titleMinHeight ? 0 : 1));
-	auto descriptionMinHeight = _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
+	auto descMaxLines =
+	    isLogEntryOriginal() ? kMaxOriginalEntryLines : (3 + (siteNameHeight ? 0 : 1) + (titleMinHeight ? 0 : 1));
+	auto descriptionMinHeight =
+	    _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
 	auto articleMinHeight = siteNameHeight + titleMinHeight + descriptionMinHeight;
 	auto articlePhotoMaxWidth = 0;
 	if (_asArticle) {
-		articlePhotoMaxWidth = st::webPagePhotoDelta + std::max(articleThumbWidth(_data->photo, articleMinHeight), lineHeight);
+		articlePhotoMaxWidth =
+		    st::webPagePhotoDelta + std::max(articleThumbWidth(_data->photo, articleMinHeight), lineHeight);
 	}
 
 	if (_siteNameWidth) {
@@ -3407,7 +3579,7 @@ int HistoryWebPage::resizeGetHeight(int width) {
 		return _height;
 	}
 
-	_width = width/* = std::min(width, _maxw)*/;
+	_width = width /* = std::min(width, _maxw)*/;
 	width -= st::msgPadding.left() + st::webPageLeft + st::msgPadding.right();
 
 	auto lineHeight = unitedLineHeight();
@@ -3488,7 +3660,8 @@ int HistoryWebPage::resizeGetHeight(int width) {
 			_height += _attach->height() - bubble.top() - bubble.bottom();
 			if (!_attach->additionalInfoString().isEmpty()) {
 				_height += bottomInfoPadding();
-			} else if (isBubbleBottom() && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+			} else if (isBubbleBottom() && _attach->customInfoLayout() &&
+			           _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 				_height += bottomInfoPadding();
 			}
 		}
@@ -3506,9 +3679,12 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 	bool selected = (selection == FullSelection);
 
-	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
-	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
-	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) : (outbg ? st::msgOutDateFg : st::msgInDateFg);
+	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) :
+	                         (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
+	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+	                            (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
+	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) :
+	                           (outbg ? st::msgOutDateFg : st::msgInDateFg);
 
 	QMargins bubble(_attach ? _attach->bubbleMargins() : QMargins());
 	auto padding = inBubblePadding();
@@ -3520,7 +3696,8 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 		bshift += bottomInfoPadding();
 	} else if (!attachAdditionalInfoText.isEmpty()) {
 		bshift += bottomInfoPadding();
-	} else if (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+	} else if (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	           _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 		bshift += bottomInfoPadding();
 	}
 
@@ -3536,7 +3713,8 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 		qint32 pixw = _pixw, pixh = articleThumbHeight(_data->photo, _pixw);
 		qint32 maxw = convertScale(_data->photo->medium->width()), maxh = convertScale(_data->photo->medium->height());
 		if (pixw * ph != pixh * pw) {
-			double coef = (pixw * ph > pixh * pw) ? std::min(ph / double(pixh), maxh / double(pixh)) : std::min(pw / double(pixw), maxw / double(pixw));
+			double coef = (pixw * ph > pixh * pw) ? std::min(ph / double(pixh), maxh / double(pixh)) :
+			                                        std::min(pw / double(pixw), maxw / double(pixw));
 			pixh = std::round(pixh * coef);
 			pixw = std::round(pixw * coef);
 		}
@@ -3547,14 +3725,17 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 		}
 		p.drawPixmapLeft(padding.left() + width - pw, tshift, _width, pix);
 		if (selected) {
-			App::roundRect(p, rtlrect(padding.left() + width - pw, tshift, pw, _pixh, _width), p.textPalette().selectOverlay, SelectedOverlaySmallCorners);
+			App::roundRect(p, rtlrect(padding.left() + width - pw, tshift, pw, _pixh, _width),
+			               p.textPalette().selectOverlay, SelectedOverlaySmallCorners);
 		}
 		width -= pw + st::webPagePhotoDelta;
 	}
 	if (_siteNameWidth) {
 		p.setFont(st::webPageTitleFont);
 		p.setPen(semibold);
-		p.drawTextLeft(padding.left(), tshift, _width, (width >= _siteNameWidth) ? _data->siteName : st::webPageTitleFont->elided(_data->siteName, width));
+		p.drawTextLeft(padding.left(), tshift, _width,
+		               (width >= _siteNameWidth) ? _data->siteName :
+		                                           st::webPageTitleFont->elided(_data->siteName, width));
 		tshift += lineHeight;
 	}
 	if (_titleLines) {
@@ -3563,7 +3744,8 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 		if (_title.hasSkipBlock()) {
 			endskip = _parent->skipBlockWidth();
 		}
-		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleLines, style::al_left, 0, -1, endskip, false, selection);
+		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleLines, style::al_left, 0, -1, endskip,
+		                      false, selection);
 		tshift += _titleLines * lineHeight;
 	}
 	if (_descriptionLines) {
@@ -3573,10 +3755,12 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 			endskip = _parent->skipBlockWidth();
 		}
 		if (_descriptionLines > 0) {
-			_description.drawLeftElided(p, padding.left(), tshift, width, _width, _descriptionLines, style::al_left, 0, -1, endskip, false, toDescriptionSelection(selection));
+			_description.drawLeftElided(p, padding.left(), tshift, width, _width, _descriptionLines, style::al_left, 0,
+			                            -1, endskip, false, toDescriptionSelection(selection));
 			tshift += _descriptionLines * lineHeight;
 		} else {
-			_description.drawLeft(p, padding.left(), tshift, width, _width, style::al_left, 0, -1, toDescriptionSelection(selection));
+			_description.drawLeft(p, padding.left(), tshift, width, _width, style::al_left, 0, -1,
+			                      toDescriptionSelection(selection));
 			tshift += _description.countHeight(width);
 		}
 	}
@@ -3590,29 +3774,34 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 
 		p.translate(attachLeft, attachTop);
 
-		auto attachSelection = selected ? FullSelection : TextSelection { 0, 0 };
+		auto attachSelection = selected ? FullSelection : TextSelection{0, 0};
 		_attach->draw(p, r.translated(-attachLeft, -attachTop), attachSelection, ms);
 		qint32 pixwidth = _attach->currentWidth(), pixheight = _attach->height();
 
 		if (_data->type == WebPageVideo && _attach->type() == MediaTypePhoto) {
 			if (_attach->isReadyForOpen()) {
 				if (_data->siteName == qstr("YouTube")) {
-					st::youtubeIcon.paint(p, (pixwidth - st::youtubeIcon.width()) / 2, (pixheight - st::youtubeIcon.height()) / 2, _width);
+					st::youtubeIcon.paint(p, (pixwidth - st::youtubeIcon.width()) / 2,
+					                      (pixheight - st::youtubeIcon.height()) / 2, _width);
 				} else {
-					st::videoIcon.paint(p, (pixwidth - st::videoIcon.width()) / 2, (pixheight - st::videoIcon.height()) / 2, _width);
+					st::videoIcon.paint(p, (pixwidth - st::videoIcon.width()) / 2,
+					                    (pixheight - st::videoIcon.height()) / 2, _width);
 				}
 			}
 			if (_durationWidth) {
 				qint32 dateX = pixwidth - _durationWidth - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x();
-				qint32 dateY = pixheight - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta;
+				qint32 dateY =
+				    pixheight - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta;
 				qint32 dateW = pixwidth - dateX - st::msgDateImgDelta;
 				qint32 dateH = pixheight - dateY - st::msgDateImgDelta;
 
-				App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+				App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg,
+				               selected ? DateSelectedCorners : DateCorners);
 
 				p.setFont(st::msgDateFont);
 				p.setPen(st::msgDateImgFg);
-				p.drawTextLeft(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y(), pixwidth, _duration);
+				p.drawTextLeft(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y(), pixwidth,
+				               _duration);
 			}
 		}
 
@@ -3620,8 +3809,10 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 
 		if (!attachAdditionalInfoText.isEmpty()) {
 			p.setFont(st::msgDateFont);
-			p.setPen(selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) : (outbg ? st::msgOutDateFg : st::msgInDateFg));
-			p.drawTextLeft(st::msgPadding.left(), bar.y() + bar.height() + st::mediaInBubbleSkip, _width, attachAdditionalInfoText);
+			p.setPen(selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) :
+			                    (outbg ? st::msgOutDateFg : st::msgInDateFg));
+			p.drawTextLeft(st::msgPadding.left(), bar.y() + bar.height() + st::mediaInBubbleSkip, _width,
+			               attachAdditionalInfoText);
 		}
 	}
 }
@@ -3636,7 +3827,8 @@ HistoryTextState HistoryWebPage::getState(QPoint point, HistoryStateRequest requ
 	auto padding = inBubblePadding();
 	auto tshift = padding.top();
 	auto bshift = padding.bottom();
-	if (_asArticle || (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right())) {
+	if (_asArticle || (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	                   _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right())) {
 		bshift += bottomInfoPadding();
 	}
 	width -= padding.left() + padding.right();
@@ -3665,14 +3857,17 @@ HistoryTextState HistoryWebPage::getState(QPoint point, HistoryStateRequest requ
 		tshift += _titleLines * lineHeight;
 	}
 	if (_descriptionLines) {
-		auto descriptionHeight = (_descriptionLines > 0) ? _descriptionLines * lineHeight : _description.countHeight(width);
+		auto descriptionHeight =
+		    (_descriptionLines > 0) ? _descriptionLines * lineHeight : _description.countHeight(width);
 		if (point.y() >= tshift && point.y() < tshift + descriptionHeight) {
 			if (_descriptionLines > 0) {
 				Text::StateRequestElided descriptionRequest = request.forText();
 				descriptionRequest.lines = _descriptionLines;
-				result = _description.getStateElidedLeft(point - QPoint(padding.left(), tshift), width, _width, descriptionRequest);
+				result = _description.getStateElidedLeft(point - QPoint(padding.left(), tshift), width, _width,
+				                                         descriptionRequest);
 			} else {
-				result = _description.getStateLeft(point - QPoint(padding.left(), tshift), width, _width, request.forText());
+				result =
+				    _description.getStateLeft(point - QPoint(padding.left(), tshift), width, _width, request.forText());
 			}
 		} else if (point.y() >= tshift + descriptionHeight) {
 			symbolAdd += _description.length();
@@ -3694,7 +3889,8 @@ HistoryTextState HistoryWebPage::getState(QPoint point, HistoryStateRequest requ
 			if (result.link && !_data->document && _data->photo && _attach->isReadyForOpen()) {
 				if (_data->type == WebPageProfile || _data->type == WebPageVideo) {
 					result.link = _openl;
-				} else if (_data->type == WebPagePhoto || _data->siteName == qstr("Twitter") || _data->siteName == qstr("Facebook")) {
+				} else if (_data->type == WebPagePhoto || _data->siteName == qstr("Twitter") ||
+				           _data->siteName == qstr("Facebook")) {
 					// leave photo link
 				} else {
 					result.link = _openl;
@@ -3716,7 +3912,7 @@ TextSelection HistoryWebPage::adjustSelection(TextSelection selection, TextSelec
 		return fromDescriptionSelection(descriptionSelection);
 	}
 	auto titleSelection = _title.adjustSelection(selection, type);
-	return { titleSelection.from, fromDescriptionSelection(descriptionSelection).to };
+	return {titleSelection.from, fromDescriptionSelection(descriptionSelection).to};
 }
 
 void HistoryWebPage::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
@@ -3745,8 +3941,10 @@ TextWithEntities HistoryWebPage::selectedText(TextSelection selection) const {
 	if (selection == FullSelection && !isLogEntryOriginal()) {
 		return TextWithEntities();
 	}
-	auto titleResult = _title.originalTextWithEntities((selection == FullSelection) ? AllTextSelection : selection, ExpandLinksAll);
-	auto descriptionResult = _description.originalTextWithEntities(toDescriptionSelection((selection == FullSelection) ? AllTextSelection : selection), ExpandLinksAll);
+	auto titleResult =
+	    _title.originalTextWithEntities((selection == FullSelection) ? AllTextSelection : selection, ExpandLinksAll);
+	auto descriptionResult = _description.originalTextWithEntities(
+	    toDescriptionSelection((selection == FullSelection) ? AllTextSelection : selection), ExpandLinksAll);
 	if (titleResult.text.isEmpty()) {
 		return descriptionResult;
 	} else if (descriptionResult.text.isEmpty()) {
@@ -3792,18 +3990,18 @@ int HistoryWebPage::bottomInfoPadding() const {
 	return result;
 }
 
-HistoryGame::HistoryGame(not_null<HistoryItem*> parent, GameData *data) : HistoryMedia(parent)
-, _data(data)
-, _title(st::msgMinWidth - st::webPageLeft)
-, _description(st::msgMinWidth - st::webPageLeft) {
-}
+HistoryGame::HistoryGame(not_null<HistoryItem *> parent, GameData *data)
+    : HistoryMedia(parent)
+    , _data(data)
+    , _title(st::msgMinWidth - st::webPageLeft)
+    , _description(st::msgMinWidth - st::webPageLeft) {}
 
-HistoryGame::HistoryGame(not_null<HistoryItem*> parent, const HistoryGame &other) : HistoryMedia(parent)
-, _data(other._data)
-, _attach(other._attach ? other._attach->clone(parent) : nullptr)
-, _title(other._title)
-, _description(other._description) {
-}
+HistoryGame::HistoryGame(not_null<HistoryItem *> parent, const HistoryGame &other)
+    : HistoryMedia(parent)
+    , _data(other._data)
+    , _attach(other._attach ? other._attach->clone(parent) : nullptr)
+    , _title(other._title)
+    , _description(other._description) {}
 
 void HistoryGame::initDimensions() {
 	auto lineHeight = unitedLineHeight();
@@ -3838,7 +4036,7 @@ void HistoryGame::initDimensions() {
 			if (!_attach) {
 				text += _parent->skipBlock();
 			}
-			auto marked = TextWithEntities { text };
+			auto marked = TextWithEntities{text};
 			auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
 			TextUtilities::ParseEntities(marked, parseFlags);
 			_description.setMarkedText(st::webPageDescriptionStyle, marked, _webpageDescriptionOptions);
@@ -3857,7 +4055,8 @@ void HistoryGame::initDimensions() {
 	qint32 titleMinHeight = _title.isEmpty() ? 0 : lineHeight;
 	// enable any count of lines in game description / message
 	int descMaxLines = 4096;
-	qint32 descriptionMinHeight = _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
+	qint32 descriptionMinHeight =
+	    _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
 
 	if (!_title.isEmpty()) {
 		accumulate_max(_maxw, _title.maxWidth());
@@ -3934,7 +4133,8 @@ int HistoryGame::resizeGetHeight(int width) {
 
 		_attach->resizeGetHeight(width + bubble.left() + bubble.right());
 		_height += _attach->height() - bubble.top() - bubble.bottom();
-		if (isBubbleBottom() && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+		if (isBubbleBottom() && _attach->customInfoLayout() &&
+		    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 			_height += bottomInfoPadding();
 		}
 	}
@@ -3951,16 +4151,20 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 	bool selected = (selection == FullSelection);
 
-	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
-	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
-	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) : (outbg ? st::msgOutDateFg : st::msgInDateFg);
+	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) :
+	                         (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
+	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+	                            (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
+	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) :
+	                           (outbg ? st::msgOutDateFg : st::msgInDateFg);
 
 	QMargins bubble(_attach ? _attach->bubbleMargins() : QMargins());
 	auto padding = inBubblePadding();
 	auto tshift = padding.top();
 	auto bshift = padding.bottom();
 	width -= padding.left() + padding.right();
-	if (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+	if (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 		bshift += bottomInfoPadding();
 	}
 
@@ -3974,7 +4178,8 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 		if (_title.hasSkipBlock()) {
 			endskip = _parent->skipBlockWidth();
 		}
-		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleLines, style::al_left, 0, -1, endskip, false, selection);
+		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleLines, style::al_left, 0, -1, endskip,
+		                      false, selection);
 		tshift += _titleLines * lineHeight;
 	}
 	if (_descriptionLines) {
@@ -3983,7 +4188,8 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 		if (_description.hasSkipBlock()) {
 			endskip = _parent->skipBlockWidth();
 		}
-		_description.drawLeftElided(p, padding.left(), tshift, width, _width, _descriptionLines, style::al_left, 0, -1, endskip, false, toDescriptionSelection(selection));
+		_description.drawLeftElided(p, padding.left(), tshift, width, _width, _descriptionLines, style::al_left, 0, -1,
+		                            endskip, false, toDescriptionSelection(selection));
 		tshift += _descriptionLines * lineHeight;
 	}
 	if (_attach) {
@@ -3994,7 +4200,7 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 		auto attachTop = tshift - bubble.top();
 		if (rtl()) attachLeft = _width - attachLeft - _attach->currentWidth();
 
-		auto attachSelection = selected ? FullSelection : TextSelection { 0, 0 };
+		auto attachSelection = selected ? FullSelection : TextSelection{0, 0};
 
 		p.translate(attachLeft, attachTop);
 		_attach->draw(p, r.translated(-attachLeft, -attachTop), attachSelection, ms);
@@ -4006,11 +4212,14 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 		auto gameX = pixwidth - st::msgDateImgDelta - gameW;
 		auto gameY = pixheight - st::msgDateImgDelta - gameH;
 
-		App::roundRect(p, rtlrect(gameX, gameY, gameW, gameH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		App::roundRect(p, rtlrect(gameX, gameY, gameW, gameH, pixwidth),
+		               selected ? st::msgDateImgBgSelected : st::msgDateImgBg,
+		               selected ? DateSelectedCorners : DateCorners);
 
 		p.setFont(st::msgDateFont);
 		p.setPen(st::msgDateImgFg);
-		p.drawTextLeft(gameX + st::msgDateImgPadding.x(), gameY + st::msgDateImgPadding.y(), pixwidth, lang(lng_game_tag).toUpper());
+		p.drawTextLeft(gameX + st::msgDateImgPadding.x(), gameY + st::msgDateImgPadding.y(), pixwidth,
+		               lang(lng_game_tag).toUpper());
 
 		p.translate(-attachLeft, -attachTop);
 	}
@@ -4026,7 +4235,8 @@ HistoryTextState HistoryGame::getState(QPoint point, HistoryStateRequest request
 	auto padding = inBubblePadding();
 	auto tshift = padding.top();
 	auto bshift = padding.bottom();
-	if (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+	if (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 		bshift += bottomInfoPadding();
 	}
 	width -= padding.left() + padding.right();
@@ -4048,7 +4258,8 @@ HistoryTextState HistoryGame::getState(QPoint point, HistoryStateRequest request
 		if (point.y() >= tshift && point.y() < tshift + _descriptionLines * lineHeight) {
 			Text::StateRequestElided descriptionRequest = request.forText();
 			descriptionRequest.lines = _descriptionLines;
-			result = _description.getStateElidedLeft(point - QPoint(padding.left(), tshift), width, _width, descriptionRequest);
+			result = _description.getStateElidedLeft(point - QPoint(padding.left(), tshift), width, _width,
+			                                         descriptionRequest);
 		} else if (point.y() >= tshift + _descriptionLines * lineHeight) {
 			symbolAdd += _description.length();
 		}
@@ -4090,7 +4301,7 @@ TextSelection HistoryGame::adjustSelection(TextSelection selection, TextSelectTy
 		return fromDescriptionSelection(descriptionSelection);
 	}
 	auto titleSelection = _title.adjustSelection(selection, type);
-	return { titleSelection.from, fromDescriptionSelection(descriptionSelection).to };
+	return {titleSelection.from, fromDescriptionSelection(descriptionSelection).to};
 }
 
 bool HistoryGame::consumeMessageText(const TextWithEntities &textWithEntities) {
@@ -4184,35 +4395,36 @@ int HistoryGame::bottomInfoPadding() const {
 	return result;
 }
 
-HistoryInvoice::HistoryInvoice(not_null<HistoryItem*> parent, const MTPDmessageMediaInvoice &data) : HistoryMedia(parent)
-, _title(st::msgMinWidth)
-, _description(st::msgMinWidth)
-, _status(st::msgMinWidth) {
+HistoryInvoice::HistoryInvoice(not_null<HistoryItem *> parent, const MTPDmessageMediaInvoice &data)
+    : HistoryMedia(parent)
+    , _title(st::msgMinWidth)
+    , _description(st::msgMinWidth)
+    , _status(st::msgMinWidth) {
 	fillFromData(data);
 }
 
-HistoryInvoice::HistoryInvoice(not_null<HistoryItem*> parent, const HistoryInvoice &other) : HistoryMedia(parent)
-, _attach(other._attach ? other._attach->clone(parent) : nullptr)
-, _titleHeight(other._titleHeight)
-, _descriptionHeight(other._descriptionHeight)
-, _title(other._title)
-, _description(other._description)
-, _status(other._status) {
-}
+HistoryInvoice::HistoryInvoice(not_null<HistoryItem *> parent, const HistoryInvoice &other)
+    : HistoryMedia(parent)
+    , _attach(other._attach ? other._attach->clone(parent) : nullptr)
+    , _titleHeight(other._titleHeight)
+    , _descriptionHeight(other._descriptionHeight)
+    , _title(other._title)
+    , _description(other._description)
+    , _status(other._status) {}
 
 QString HistoryInvoice::fillAmountAndCurrency(int amount, const QString &currency) {
-	static auto shortCurrencyNames = QMap<QString, QString> {
-		{ qsl("USD"), QString::fromUtf8("\x24") },
-		{ qsl("GBP"), QString::fromUtf8("\xC2\xA3") },
-		{ qsl("EUR"), QString::fromUtf8("\xE2\x82\xAC") },
-		{ qsl("JPY"), QString::fromUtf8("\xC2\xA5") },
+	static auto shortCurrencyNames = QMap<QString, QString>{
+	    {qsl("USD"), QString::fromUtf8("\x24")},
+	    {qsl("GBP"), QString::fromUtf8("\xC2\xA3")},
+	    {qsl("EUR"), QString::fromUtf8("\xE2\x82\xAC")},
+	    {qsl("JPY"), QString::fromUtf8("\xC2\xA5")},
 	};
 	auto currencyText = shortCurrencyNames.value(currency, currency);
 	return QLocale::system().toCurrencyString(amount / 100., currencyText);
-	//auto amountBucks = amount / 100;
-	//auto amountCents = amount % 100;
-	//auto amountText = qsl("%1,%2").arg(amountBucks).arg(amountCents, 2, 10, QChar('0'));
-	//return currencyText + amountText;
+	// auto amountBucks = amount / 100;
+	// auto amountCents = amount % 100;
+	// auto amountText = qsl("%1,%2").arg(amountBucks).arg(amountCents, 2, 10, QChar('0'));
+	// return currencyText + amountText;
 }
 
 void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
@@ -4237,7 +4449,9 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
 			// We don't use size from WebDocument, because it is not reliable.
 			// It can be > 0 and different from the real size that we get in upload.WebFile result.
 			auto filesize = 0; // doc.vsize.v;
-			auto full = ImagePtr(WebFileImageLocation(imageSize.width(), imageSize.height(), doc.vdc_id.v, doc.vurl.v, doc.vaccess_hash.v), filesize);
+			auto full = ImagePtr(WebFileImageLocation(imageSize.width(), imageSize.height(), doc.vdc_id.v, doc.vurl.v,
+			                                          doc.vaccess_hash.v),
+			                     filesize);
 			auto photoId = rand_value<PhotoId>();
 			auto photo = App::photoSet(photoId, 0, 0, unixtime(), thumb, medium, full);
 
@@ -4256,7 +4470,8 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
 		}
 		return lang(lng_payments_invoice_label);
 	};
-	auto statusText = TextWithEntities { fillAmountAndCurrency(data.vtotal_amount.v, qs(data.vcurrency)), EntitiesInText() };
+	auto statusText =
+	    TextWithEntities{fillAmountAndCurrency(data.vtotal_amount.v, qs(data.vcurrency)), EntitiesInText()};
 	statusText.entities.push_back(EntityInText(EntityInTextBold, 0, statusText.text.size()));
 	statusText.text += ' ' + labelText().toUpper();
 	_status.setMarkedText(st::defaultTextStyle, statusText, itemTextOptions(_parent));
@@ -4266,7 +4481,7 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
 	// init strings
 	auto description = qs(data.vdescription);
 	if (!description.isEmpty()) {
-		auto marked = TextWithEntities { description };
+		auto marked = TextWithEntities{description};
 		auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
 		TextUtilities::ParseEntities(marked, parseFlags);
 		_description.setMarkedText(st::webPageDescriptionStyle, marked, _webpageDescriptionOptions);
@@ -4297,7 +4512,8 @@ void HistoryInvoice::initDimensions() {
 	qint32 titleMinHeight = _title.isEmpty() ? 0 : lineHeight;
 	// enable any count of lines in game description / message
 	int descMaxLines = 4096;
-	qint32 descriptionMinHeight = _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
+	qint32 descriptionMinHeight =
+	    _description.isEmpty() ? 0 : std::min(_description.minHeight(), descMaxLines * lineHeight);
 
 	if (!_title.isEmpty()) {
 		accumulate_max(_maxw, _title.maxWidth());
@@ -4361,7 +4577,8 @@ int HistoryInvoice::resizeGetHeight(int width) {
 
 		_attach->resizeGetHeight(width + bubble.left() + bubble.right());
 		_height += _attach->height() - bubble.top() - bubble.bottom();
-		if (isBubbleBottom() && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+		if (isBubbleBottom() && _attach->customInfoLayout() &&
+		    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 			_height += bottomInfoPadding();
 		}
 	} else {
@@ -4380,36 +4597,44 @@ void HistoryInvoice::draw(Painter &p, const QRect &r, TextSelection selection, T
 	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 	bool selected = (selection == FullSelection);
 
-	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
-	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
-	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) : (outbg ? st::msgOutDateFg : st::msgInDateFg);
+	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) :
+	                         (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
+	auto &semibold = selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+	                            (outbg ? st::msgOutServiceFg : st::msgInServiceFg);
+	auto &regular = selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) :
+	                           (outbg ? st::msgOutDateFg : st::msgInDateFg);
 
 	QMargins bubble(_attach ? _attach->bubbleMargins() : QMargins());
 	auto padding = inBubblePadding();
 	auto tshift = padding.top();
 	auto bshift = padding.bottom();
 	width -= padding.left() + padding.right();
-	if (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+	if (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 		bshift += bottomInfoPadding();
 	}
 
 	auto lineHeight = unitedLineHeight();
 	if (_titleHeight) {
 		p.setPen(semibold);
-		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) : (outbg ? st::outSemiboldPalette : st::inSemiboldPalette));
+		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) :
+		                            (outbg ? st::outSemiboldPalette : st::inSemiboldPalette));
 
 		qint32 endskip = 0;
 		if (_title.hasSkipBlock()) {
 			endskip = _parent->skipBlockWidth();
 		}
-		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleHeight / lineHeight, style::al_left, 0, -1, endskip, false, selection);
+		_title.drawLeftElided(p, padding.left(), tshift, width, _width, _titleHeight / lineHeight, style::al_left, 0,
+		                      -1, endskip, false, selection);
 		tshift += _titleHeight;
 
-		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) : (outbg ? st::outTextPalette : st::inTextPalette));
+		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) :
+		                            (outbg ? st::outTextPalette : st::inTextPalette));
 	}
 	if (_descriptionHeight) {
 		p.setPen(outbg ? st::webPageDescriptionOutFg : st::webPageDescriptionInFg);
-		_description.drawLeft(p, padding.left(), tshift, width, _width, style::al_left, 0, -1, toDescriptionSelection(selection));
+		_description.drawLeft(p, padding.left(), tshift, width, _width, style::al_left, 0, -1,
+		                      toDescriptionSelection(selection));
 		tshift += _descriptionHeight;
 	}
 	if (_attach) {
@@ -4420,7 +4645,7 @@ void HistoryInvoice::draw(Painter &p, const QRect &r, TextSelection selection, T
 		auto attachTop = tshift - bubble.top();
 		if (rtl()) attachLeft = _width - attachLeft - _attach->currentWidth();
 
-		auto attachSelection = selected ? FullSelection : TextSelection { 0, 0 };
+		auto attachSelection = selected ? FullSelection : TextSelection{0, 0};
 
 		p.translate(attachLeft, attachTop);
 		_attach->draw(p, r.translated(-attachLeft, -attachTop), attachSelection, ms);
@@ -4433,11 +4658,14 @@ void HistoryInvoice::draw(Painter &p, const QRect &r, TextSelection selection, T
 		auto statusX = st::msgDateImgDelta;
 		auto statusY = st::msgDateImgDelta;
 
-		App::roundRect(p, rtlrect(statusX, statusY, statusW, statusH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		App::roundRect(p, rtlrect(statusX, statusY, statusW, statusH, pixwidth),
+		               selected ? st::msgDateImgBgSelected : st::msgDateImgBg,
+		               selected ? DateSelectedCorners : DateCorners);
 
 		p.setFont(st::msgDateFont);
 		p.setPen(st::msgDateImgFg);
-		_status.drawLeftElided(p, statusX + st::msgDateImgPadding.x(), statusY + st::msgDateImgPadding.y(), available, pixwidth);
+		_status.drawLeftElided(p, statusX + st::msgDateImgPadding.x(), statusY + st::msgDateImgPadding.y(), available,
+		                       pixwidth);
 
 		p.translate(-attachLeft, -attachTop);
 	} else {
@@ -4456,7 +4684,8 @@ HistoryTextState HistoryInvoice::getState(QPoint point, HistoryStateRequest requ
 	auto padding = inBubblePadding();
 	auto tshift = padding.top();
 	auto bshift = padding.bottom();
-	if (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
+	if (isBubbleBottom() && _attach && _attach->customInfoLayout() &&
+	    _attach->currentWidth() + _parent->skipBlockWidth() > width + bubble.left() + bubble.right()) {
 		bshift += bottomInfoPadding();
 	}
 	width -= padding.left() + padding.right();
@@ -4475,7 +4704,8 @@ HistoryTextState HistoryInvoice::getState(QPoint point, HistoryStateRequest requ
 	}
 	if (_descriptionHeight) {
 		if (point.y() >= tshift && point.y() < tshift + _descriptionHeight) {
-			result = _description.getStateLeft(point - QPoint(padding.left(), tshift), width, _width, request.forText());
+			result =
+			    _description.getStateLeft(point - QPoint(padding.left(), tshift), width, _width, request.forText());
 		} else if (point.y() >= tshift + _descriptionHeight) {
 			symbolAdd += _description.length();
 		}
@@ -4507,7 +4737,7 @@ TextSelection HistoryInvoice::adjustSelection(TextSelection selection, TextSelec
 		return fromDescriptionSelection(descriptionSelection);
 	}
 	auto titleSelection = _title.adjustSelection(selection, type);
-	return { titleSelection.from, fromDescriptionSelection(descriptionSelection).to };
+	return {titleSelection.from, fromDescriptionSelection(descriptionSelection).to};
 }
 
 void HistoryInvoice::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
@@ -4566,28 +4796,30 @@ int HistoryInvoice::bottomInfoPadding() const {
 	return result;
 }
 
-HistoryLocation::HistoryLocation(not_null<HistoryItem*> parent, const LocationCoords &coords, const QString &title, const QString &description) : HistoryMedia(parent)
-, _data(App::location(coords))
-, _title(st::msgMinWidth)
-, _description(st::msgMinWidth)
-, _link(MakeShared<LocationClickHandler>(coords)) {
+HistoryLocation::HistoryLocation(not_null<HistoryItem *> parent, const LocationCoords &coords, const QString &title,
+                                 const QString &description)
+    : HistoryMedia(parent)
+    , _data(App::location(coords))
+    , _title(st::msgMinWidth)
+    , _description(st::msgMinWidth)
+    , _link(MakeShared<LocationClickHandler>(coords)) {
 	if (!title.isEmpty()) {
 		_title.setText(st::webPageTitleStyle, TextUtilities::Clean(title), _webpageTitleOptions);
 	}
 	if (!description.isEmpty()) {
-		auto marked = TextWithEntities { TextUtilities::Clean(description) };
+		auto marked = TextWithEntities{TextUtilities::Clean(description)};
 		auto parseFlags = TextParseLinks | TextParseMultiline | TextParseRichText;
 		TextUtilities::ParseEntities(marked, parseFlags);
 		_description.setMarkedText(st::webPageDescriptionStyle, marked, _webpageDescriptionOptions);
 	}
 }
 
-HistoryLocation::HistoryLocation(not_null<HistoryItem*> parent, const HistoryLocation &other) : HistoryMedia(parent)
-, _data(other._data)
-, _title(other._title)
-, _description(other._description)
-, _link(MakeShared<LocationClickHandler>(_data->coords)) {
-}
+HistoryLocation::HistoryLocation(not_null<HistoryItem *> parent, const HistoryLocation &other)
+    : HistoryMedia(parent)
+    , _data(other._data)
+    , _title(other._title)
+    , _description(other._description)
+    , _link(MakeShared<LocationClickHandler>(_data->coords)) {}
 
 void HistoryLocation::initDimensions() {
 	bool bubble = _parent->hasBubble();
@@ -4597,17 +4829,20 @@ void HistoryLocation::initDimensions() {
 		th = (st::maxMediaSize * th) / tw;
 		tw = st::maxMediaSize;
 	}
-	qint32 minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	qint32 minWidth =
+	    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	_maxw = std::max(tw, qint32(minWidth));
 	_minh = std::max(th, qint32(st::minPhotoSize));
 
 	if (bubble) {
 		_maxw += st::mediaPadding.left() + st::mediaPadding.right();
 		if (!_title.isEmpty()) {
-			_minh += std::min(_title.countHeight(_maxw - st::msgPadding.left() - st::msgPadding.right()), 2 * st::webPageTitleFont->height);
+			_minh += std::min(_title.countHeight(_maxw - st::msgPadding.left() - st::msgPadding.right()),
+			                  2 * st::webPageTitleFont->height);
 		}
 		if (!_description.isEmpty()) {
-			_minh += std::min(_description.countHeight(_maxw - st::msgPadding.left() - st::msgPadding.right()), 3 * st::webPageDescriptionFont->height);
+			_minh += std::min(_description.countHeight(_maxw - st::msgPadding.left() - st::msgPadding.right()),
+			                  3 * st::webPageDescriptionFont->height);
 		}
 		_minh += st::mediaPadding.top() + st::mediaPadding.bottom();
 		if (!_title.isEmpty() || !_description.isEmpty()) {
@@ -4638,17 +4873,20 @@ int HistoryLocation::resizeGetHeight(int width) {
 	} else {
 		_width = tw;
 	}
-	qint32 minWidth = std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
+	qint32 minWidth =
+	    std::max(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	_width = std::max(_width, qint32(minWidth));
 	_height = std::max(_height, qint32(st::minPhotoSize));
 	if (bubble) {
 		_width += st::mediaPadding.left() + st::mediaPadding.right();
 		_height += st::mediaPadding.top() + st::mediaPadding.bottom();
 		if (!_title.isEmpty()) {
-			_height += std::min(_title.countHeight(_width - st::msgPadding.left() - st::msgPadding.right()), st::webPageTitleFont->height * 2);
+			_height += std::min(_title.countHeight(_width - st::msgPadding.left() - st::msgPadding.right()),
+			                    st::webPageTitleFont->height * 2);
 		}
 		if (!_description.isEmpty()) {
-			_height += std::min(_description.countHeight(_width - st::msgPadding.left() - st::msgPadding.right()), st::webPageDescriptionFont->height * 3);
+			_height += std::min(_description.countHeight(_width - st::msgPadding.left() - st::msgPadding.right()),
+			                    st::webPageDescriptionFont->height * 3);
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
 			_height += st::mediaInBubbleSkip;
@@ -4682,12 +4920,14 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection,
 
 		if (!_title.isEmpty()) {
 			p.setPen(outbg ? st::webPageTitleOutFg : st::webPageTitleInFg);
-			_title.drawLeftElided(p, skipx + st::msgPadding.left(), skipy, textw, _width, 2, style::al_left, 0, -1, 0, false, selection);
+			_title.drawLeftElided(p, skipx + st::msgPadding.left(), skipy, textw, _width, 2, style::al_left, 0, -1, 0,
+			                      false, selection);
 			skipy += std::min(_title.countHeight(textw), 2 * st::webPageTitleFont->height);
 		}
 		if (!_description.isEmpty()) {
 			p.setPen(outbg ? st::webPageDescriptionOutFg : st::webPageDescriptionInFg);
-			_description.drawLeftElided(p, skipx + st::msgPadding.left(), skipy, textw, _width, 3, style::al_left, 0, -1, 0, false, toDescriptionSelection(selection));
+			_description.drawLeftElided(p, skipx + st::msgPadding.left(), skipy, textw, _width, 3, style::al_left, 0,
+			                            -1, 0, false, toDescriptionSelection(selection));
 			skipy += std::min(_description.countHeight(textw), 3 * st::webPageDescriptionFont->height);
 		}
 		if (!_title.isEmpty() || !_description.isEmpty()) {
@@ -4695,13 +4935,17 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection,
 		}
 		height -= skipy + st::mediaPadding.bottom();
 	} else {
-		App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+		App::roundShadow(p, 0, 0, width, height, selected ? st::msgInShadowSelected : st::msgInShadow,
+		                 selected ? InSelectedShadowCorners : InShadowCorners);
 	}
 
 	_data->load();
 	auto roundRadius = ImageRoundRadius::Large;
-	auto roundCorners = ((isBubbleTop() && _title.isEmpty() && _description.isEmpty()) ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
-		| (isBubbleBottom() ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None);
+	auto roundCorners =
+	    ((isBubbleTop() && _title.isEmpty() && _description.isEmpty()) ?
+	         (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) :
+	         ImageRoundCorner::None) |
+	    (isBubbleBottom() ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None);
 	auto rthumb = QRect(skipx, skipy, width, height);
 	if (_data && !_data->thumb->isNull()) {
 		qint32 w = _data->thumb->width(), h = _data->thumb->height();
@@ -4759,7 +5003,8 @@ HistoryTextState HistoryLocation::getState(QPoint point, HistoryStateRequest req
 		if (!_title.isEmpty()) {
 			auto titleh = std::min(_title.countHeight(textw), 2 * st::webPageTitleFont->height);
 			if (point.y() >= skipy && point.y() < skipy + titleh) {
-				result = _title.getStateLeft(point - QPoint(skipx + st::msgPadding.left(), skipy), textw, _width, request.forText());
+				result = _title.getStateLeft(point - QPoint(skipx + st::msgPadding.left(), skipy), textw, _width,
+				                             request.forText());
 				return result;
 			} else if (point.y() >= skipy + titleh) {
 				symbolAdd += _title.length();
@@ -4769,7 +5014,8 @@ HistoryTextState HistoryLocation::getState(QPoint point, HistoryStateRequest req
 		if (!_description.isEmpty()) {
 			auto descriptionh = std::min(_description.countHeight(textw), 3 * st::webPageDescriptionFont->height);
 			if (point.y() >= skipy && point.y() < skipy + descriptionh) {
-				result = _description.getStateLeft(point - QPoint(skipx + st::msgPadding.left(), skipy), textw, _width, request.forText());
+				result = _description.getStateLeft(point - QPoint(skipx + st::msgPadding.left(), skipy), textw, _width,
+				                                   request.forText());
 			} else if (point.y() >= skipy + descriptionh) {
 				symbolAdd += _description.length();
 			}
@@ -4792,7 +5038,8 @@ HistoryTextState HistoryLocation::getState(QPoint point, HistoryStateRequest req
 		if (!bubble && _parent->displayFastShare()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = _parent->fastShareLink();
 			}
 		}
@@ -4810,7 +5057,7 @@ TextSelection HistoryLocation::adjustSelection(TextSelection selection, TextSele
 		return fromDescriptionSelection(descriptionSelection);
 	}
 	auto titleSelection = _title.adjustSelection(selection, type);
-	return { titleSelection.from, fromDescriptionSelection(descriptionSelection).to };
+	return {titleSelection.from, fromDescriptionSelection(descriptionSelection).to};
 }
 
 QString HistoryLocation::notificationText() const {
@@ -4823,7 +5070,7 @@ QString HistoryLocation::inDialogsText() const {
 
 TextWithEntities HistoryLocation::selectedText(TextSelection selection) const {
 	if (selection == FullSelection) {
-		TextWithEntities result = { qsl("[ ") + lang(lng_maps_point) + qsl(" ]\n"), EntitiesInText() };
+		TextWithEntities result = {qsl("[ ") + lang(lng_maps_point) + qsl(" ]\n"), EntitiesInText()};
 		auto info = selectedText(AllTextSelection);
 		if (!info.text.isEmpty()) {
 			TextUtilities::Append(result, std::move(info));
@@ -4850,10 +5097,8 @@ bool HistoryLocation::needsBubble() const {
 		return true;
 	}
 	if (auto message = _parent->toHistoryMessage()) {
-		return message->viaBot()
-			|| message->Has<HistoryMessageForwarded>()
-			|| message->Has<HistoryMessageReply>()
-			|| message->displayFromName();
+		return message->viaBot() || message->Has<HistoryMessageForwarded>() || message->Has<HistoryMessageReply>() ||
+		       message->displayFromName();
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/history/history_media_types.h b/Telegram/SourceFiles/history/history_media_types.h
index 4ae0d5725..5cc9f7f2a 100644
--- a/Telegram/SourceFiles/history/history_media_types.h
+++ b/Telegram/SourceFiles/history/history_media_types.h
@@ -110,21 +110,19 @@ protected:
 
 	struct AnimationData {
 		AnimationData(AnimationCallbacks &&radialCallbacks)
-			: radial(std::move(radialCallbacks)) {
-		}
+		    : radial(std::move(radialCallbacks)) {}
 		Animation a_thumbOver;
 		Ui::RadialAnimation radial;
 	};
 	mutable std::unique_ptr<AnimationData> _animation;
-
 };
 
 class HistoryPhoto : public HistoryFileMedia {
 public:
-	HistoryPhoto(not_null<HistoryItem*> parent, not_null<PhotoData*> photo, const QString &caption);
-	HistoryPhoto(not_null<HistoryItem*> parent, not_null<PeerData*> chat, not_null<PhotoData*> photo, int width);
-	HistoryPhoto(not_null<HistoryItem*> parent, not_null<PeerData*> chat, const MTPDphoto &photo, int width);
-	HistoryPhoto(not_null<HistoryItem*> parent, const HistoryPhoto &other);
+	HistoryPhoto(not_null<HistoryItem *> parent, not_null<PhotoData *> photo, const QString &caption);
+	HistoryPhoto(not_null<HistoryItem *> parent, not_null<PeerData *> chat, not_null<PhotoData *> photo, int width);
+	HistoryPhoto(not_null<HistoryItem *> parent, not_null<PeerData *> chat, const MTPDphoto &photo, int width);
+	HistoryPhoto(not_null<HistoryItem *> parent, const HistoryPhoto &other);
 
 	void init();
 	HistoryMediaType type() const override {
@@ -201,17 +199,16 @@ protected:
 	}
 
 private:
-	not_null<PhotoData*> _data;
+	not_null<PhotoData *> _data;
 	qint16 _pixw = 1;
 	qint16 _pixh = 1;
 	Text _caption;
-
 };
 
 class HistoryVideo : public HistoryFileMedia {
 public:
-	HistoryVideo(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption);
-	HistoryVideo(not_null<HistoryItem*> parent, const HistoryVideo &other);
+	HistoryVideo(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption);
+	HistoryVideo(not_null<HistoryItem *> parent, const HistoryVideo &other);
 	HistoryMediaType type() const override {
 		return MediaTypeVideo;
 	}
@@ -287,13 +284,12 @@ protected:
 	}
 
 private:
-	not_null<DocumentData*> _data;
+	not_null<DocumentData *> _data;
 	qint32 _thumbw;
 	Text _caption;
 
 	void setStatusSize(qint32 newSize) const;
 	void updateStatusText() const;
-
 };
 
 struct HistoryDocumentThumbed : public RuntimeComponent<HistoryDocumentThumbed> {
@@ -355,13 +351,12 @@ private:
 
 	mutable int _seekingStart = 0;
 	mutable int _seekingCurrent = 0;
-
 };
 
 class HistoryDocument : public HistoryFileMedia, public RuntimeComposer {
 public:
-	HistoryDocument(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption);
-	HistoryDocument(not_null<HistoryItem*> parent, const HistoryDocument &other);
+	HistoryDocument(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption);
+	HistoryDocument(not_null<HistoryItem *> parent, const HistoryDocument &other);
 	HistoryMediaType type() const override {
 		return _data->voice() ? MediaTypeVoiceFile : (_data->song() ? MediaTypeMusicFile : MediaTypeFile);
 	}
@@ -462,19 +457,17 @@ private:
 	void setStatusSize(qint32 newSize, qint64 realDuration = 0) const;
 	bool updateStatusText() const; // returns showPause
 
-								   // Callback is a void(const QString &, const QString &, const Text &) functor.
-								   // It will be called as callback(attachType, attachFileName, attachCaption).
-	template <typename Callback>
-	void buildStringRepresentation(Callback callback) const;
-
-	not_null<DocumentData*> _data;
+	// Callback is a void(const QString &, const QString &, const Text &) functor.
+	// It will be called as callback(attachType, attachFileName, attachCaption).
+	template <typename Callback> void buildStringRepresentation(Callback callback) const;
 
+	not_null<DocumentData *> _data;
 };
 
 class HistoryGif : public HistoryFileMedia {
 public:
-	HistoryGif(not_null<HistoryItem*> parent, DocumentData *document, const QString &caption);
-	HistoryGif(not_null<HistoryItem*> parent, const HistoryGif &other);
+	HistoryGif(not_null<HistoryItem *> parent, DocumentData *document, const QString &caption);
+	HistoryGif(not_null<HistoryItem *> parent, const HistoryGif &other);
 	HistoryMediaType type() const override {
 		return MediaTypeGif;
 	}
@@ -563,14 +556,16 @@ protected:
 	}
 
 private:
-	int additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply, const HistoryMessageForwarded *forwarded) const;
+	int additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply *reply,
+	                    const HistoryMessageForwarded *forwarded) const;
 	int additionalWidth() const {
-		return additionalWidth(_parent->Get<HistoryMessageVia>(), _parent->Get<HistoryMessageReply>(), _parent->Get<HistoryMessageForwarded>());
+		return additionalWidth(_parent->Get<HistoryMessageVia>(), _parent->Get<HistoryMessageReply>(),
+		                       _parent->Get<HistoryMessageForwarded>());
 	}
 	QString mediaTypeString() const;
 	bool isSeparateRoundVideo() const;
 
-	not_null<DocumentData*> _data;
+	not_null<DocumentData *> _data;
 	ClickHandlerPtr _openInMediaviewLink;
 	qint32 _thumbw = 1;
 	qint32 _thumbh = 1;
@@ -581,12 +576,11 @@ private:
 
 	void setStatusSize(qint32 newSize) const;
 	void updateStatusText() const;
-
 };
 
 class HistorySticker : public HistoryMedia {
 public:
-	HistorySticker(not_null<HistoryItem*> parent, DocumentData *document);
+	HistorySticker(not_null<HistoryItem *> parent, DocumentData *document);
 	HistoryMediaType type() const override {
 		return MediaTypeSticker;
 	}
@@ -648,14 +642,14 @@ private:
 	qint16 _pixw = 1;
 	qint16 _pixh = 1;
 	ClickHandlerPtr _packLink;
-	not_null<DocumentData*> _data;
+	not_null<DocumentData *> _data;
 	QString _emoji;
-
 };
 
 class HistoryContact : public HistoryMedia {
 public:
-	HistoryContact(not_null<HistoryItem*> parent, qint32 userId, const QString &first, const QString &last, const QString &phone);
+	HistoryContact(not_null<HistoryItem *> parent, qint32 userId, const QString &first, const QString &last,
+	               const QString &phone);
 	HistoryMediaType type() const override {
 		return MediaTypeContact;
 	}
@@ -712,12 +706,11 @@ private:
 	ClickHandlerPtr _linkl;
 	int _linkw = 0;
 	QString _link;
-
 };
 
 class HistoryCall : public HistoryMedia {
 public:
-	HistoryCall(not_null<HistoryItem*> parent, const MTPDmessageActionPhoneCall &call);
+	HistoryCall(not_null<HistoryItem *> parent, const MTPDmessageActionPhoneCall &call);
 	HistoryMediaType type() const override {
 		return MediaTypeCall;
 	}
@@ -767,13 +760,12 @@ private:
 	QString _status;
 
 	ClickHandlerPtr _link;
-
 };
 
 class HistoryWebPage : public HistoryMedia {
 public:
-	HistoryWebPage(not_null<HistoryItem*> parent, not_null<WebPageData*> data);
-	HistoryWebPage(not_null<HistoryItem*> parent, const HistoryWebPage &other);
+	HistoryWebPage(not_null<HistoryItem *> parent, not_null<WebPageData *> data);
+	HistoryWebPage(not_null<HistoryItem *> parent, const HistoryWebPage &other);
 	HistoryMediaType type() const override {
 		return MediaTypeWebPage;
 	}
@@ -829,7 +821,7 @@ public:
 	bool hasReplyPreview() const override;
 	ImagePtr replyPreview() override;
 
-	not_null<WebPageData*> webpage() {
+	not_null<WebPageData *> webpage() {
 		return _data;
 	}
 
@@ -858,7 +850,7 @@ private:
 	int bottomInfoPadding() const;
 	bool isLogEntryOriginal() const;
 
-	not_null<WebPageData*> _data;
+	not_null<WebPageData *> _data;
 	ClickHandlerPtr _openl;
 	std::unique_ptr<HistoryMedia> _attach;
 
@@ -873,13 +865,12 @@ private:
 
 	qint16 _pixw = 0;
 	qint16 _pixh = 0;
-
 };
 
 class HistoryGame : public HistoryMedia {
 public:
-	HistoryGame(not_null<HistoryItem*> parent, GameData *data);
-	HistoryGame(not_null<HistoryItem*> parent, const HistoryGame &other);
+	HistoryGame(not_null<HistoryItem *> parent, GameData *data);
+	HistoryGame(not_null<HistoryItem *> parent, const HistoryGame &other);
 	HistoryMediaType type() const override {
 		return MediaTypeGame;
 	}
@@ -936,7 +927,8 @@ public:
 	void detachFromParent() override;
 
 	bool hasReplyPreview() const override {
-		return (_data->photo && !_data->photo->thumb->isNull()) || (_data->document && !_data->document->thumb->isNull());
+		return (_data->photo && !_data->photo->thumb->isNull()) ||
+		       (_data->document && !_data->document->thumb->isNull());
 	}
 	ImagePtr replyPreview() override;
 
@@ -980,13 +972,12 @@ private:
 	Text _title, _description;
 
 	int _gameTagWidth = 0;
-
 };
 
 class HistoryInvoice : public HistoryMedia {
 public:
-	HistoryInvoice(not_null<HistoryItem*> parent, const MTPDmessageMediaInvoice &data);
-	HistoryInvoice(not_null<HistoryItem*> parent, const HistoryInvoice &other);
+	HistoryInvoice(not_null<HistoryItem *> parent, const MTPDmessageMediaInvoice &data);
+	HistoryInvoice(not_null<HistoryItem *> parent, const HistoryInvoice &other);
 	HistoryMediaType type() const override {
 		return MediaTypeInvoice;
 	}
@@ -1071,7 +1062,6 @@ private:
 	Text _status;
 
 	MsgId _receiptMsgId = 0;
-
 };
 
 class LocationCoords;
@@ -1079,8 +1069,9 @@ struct LocationData;
 
 class HistoryLocation : public HistoryMedia {
 public:
-	HistoryLocation(not_null<HistoryItem*> parent, const LocationCoords &coords, const QString &title = QString(), const QString &description = QString());
-	HistoryLocation(not_null<HistoryItem*> parent, const HistoryLocation &other);
+	HistoryLocation(not_null<HistoryItem *> parent, const LocationCoords &coords, const QString &title = QString(),
+	                const QString &description = QString());
+	HistoryLocation(not_null<HistoryItem *> parent, const HistoryLocation &other);
 	HistoryMediaType type() const override {
 		return MediaTypeLocation;
 	}
@@ -1136,5 +1127,4 @@ private:
 
 	qint32 fullWidth() const;
 	qint32 fullHeight() const;
-
 };
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 58a1ea587..2cab1cfe6 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -20,24 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_message.h"
 
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "boxes/share_box.h"
+#include "history/history_location_manager.h"
+#include "history/history_media_types.h"
+#include "history/history_service.h"
+#include "history/history_service_layout.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "apiwrap.h"
-#include "history/history_location_manager.h"
-#include "history/history_service_layout.h"
-#include "history/history_media_types.h"
-#include "history/history_service.h"
-#include "auth_session.h"
-#include "boxes/share_box.h"
-#include "boxes/confirm_box.h"
-#include "ui/toast/toast.h"
 #include "messenger.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_widgets.h"
-#include "styles/style_history.h"
-#include "window/notifications_manager.h"
 #include "observer_peer.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_history.h"
+#include "styles/style_widgets.h"
+#include "ui/toast/toast.h"
+#include "window/notifications_manager.h"
 
 namespace {
 
@@ -51,14 +51,8 @@ inline void initTextOptions() {
 style::color fromNameFg(int index) {
 	Expects(index >= 0 && index < 8);
 	style::color colors[] = {
-		st::historyPeer1NameFg,
-		st::historyPeer2NameFg,
-		st::historyPeer3NameFg,
-		st::historyPeer4NameFg,
-		st::historyPeer5NameFg,
-		st::historyPeer6NameFg,
-		st::historyPeer7NameFg,
-		st::historyPeer8NameFg,
+	    st::historyPeer1NameFg, st::historyPeer2NameFg, st::historyPeer3NameFg, st::historyPeer4NameFg,
+	    st::historyPeer5NameFg, st::historyPeer6NameFg, st::historyPeer7NameFg, st::historyPeer8NameFg,
 	};
 	return colors[index];
 }
@@ -66,19 +60,14 @@ style::color fromNameFg(int index) {
 style::color fromNameFgSelected(int index) {
 	Expects(index >= 0 && index < 8);
 	style::color colors[] = {
-		st::historyPeer1NameFgSelected,
-		st::historyPeer2NameFgSelected,
-		st::historyPeer3NameFgSelected,
-		st::historyPeer4NameFgSelected,
-		st::historyPeer5NameFgSelected,
-		st::historyPeer6NameFgSelected,
-		st::historyPeer7NameFgSelected,
-		st::historyPeer8NameFgSelected,
+	    st::historyPeer1NameFgSelected, st::historyPeer2NameFgSelected, st::historyPeer3NameFgSelected,
+	    st::historyPeer4NameFgSelected, st::historyPeer5NameFgSelected, st::historyPeer6NameFgSelected,
+	    st::historyPeer7NameFgSelected, st::historyPeer8NameFgSelected,
 	};
 	return colors[index];
 }
 
-MTPDmessage::Flags NewForwardedFlags(not_null<PeerData*> peer, UserId from, not_null<HistoryMessage*> fwd) {
+MTPDmessage::Flags NewForwardedFlags(not_null<PeerData *> peer, UserId from, not_null<HistoryMessage *> fwd) {
 	auto result = NewMessageFlags(peer) | MTPDmessage::Flag::f_fwd_from;
 	if (from) {
 		result |= MTPDmessage::Flag::f_from_id;
@@ -99,8 +88,8 @@ MTPDmessage::Flags NewForwardedFlags(not_null<PeerData*> peer, UserId from, not_
 		if (auto media = fwd->getMedia()) {
 			if (media->type() == MediaTypeVoiceFile) {
 				result |= MTPDmessage::Flag::f_media_unread;
-//			} else if (media->type() == MediaTypeVideo) {
-//				result |= MTPDmessage::flag_media_unread;
+				//			} else if (media->type() == MediaTypeVideo) {
+				//				result |= MTPDmessage::flag_media_unread;
 			}
 		}
 	}
@@ -170,10 +159,10 @@ bool HasInlineItems(const SelectedItemSet &items) {
 
 } // namespace
 
-void FastShareMessage(not_null<HistoryItem*> item) {
+void FastShareMessage(not_null<HistoryItem *> item) {
 	struct ShareData {
-		ShareData(const FullMsgId &msgId) : msgId(msgId) {
-		}
+		ShareData(const FullMsgId &msgId)
+		    : msgId(msgId) {}
 		FullMsgId msgId;
 		OrderedSet<mtpRequestId> requests;
 	};
@@ -198,9 +187,10 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 				} else if (auto bot = item->getMessageBot()) {
 					if (auto media = item->getMedia()) {
 						if (media->type() == MediaTypeGame) {
-							auto shortName = static_cast<HistoryGame*>(media)->game()->shortName;
+							auto shortName = static_cast<HistoryGame *>(media)->game()->shortName;
 
-							QApplication::clipboard()->setText(Messenger::Instance().createInternalLinkFull(bot->username + qsl("?game=") + shortName));
+							QApplication::clipboard()->setText(Messenger::Instance().createInternalLinkFull(
+							    bot->username + qsl("?game=") + shortName));
 
 							Ui::Toast::Show(lang(lng_share_game_link_copied));
 						}
@@ -209,7 +199,7 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 			}
 		}
 	};
-	auto submitCallback = [data](const QVector<PeerData*> &result) {
+	auto submitCallback = [data](const QVector<PeerData *> &result) {
 		if (!data->requests.empty()) {
 			return; // Share clicked already.
 		}
@@ -259,7 +249,8 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 				}
 
 				MTPVector<MTPlong> random = MTP_vector<MTPlong>(1, rand_value<MTPlong>());
-				auto request = MTPmessages_ForwardMessages(MTP_flags(sendFlags), item->history()->peer->input, msgIds, random, peer->input);
+				auto request = MTPmessages_ForwardMessages(MTP_flags(sendFlags), item->history()->peer->input, msgIds,
+				                                           random, peer->input);
 				auto callback = doneCallback;
 				auto requestId = MTP::send(request, rpcDone(std::move(callback)));
 				data->requests.insert(requestId);
@@ -283,7 +274,7 @@ void HistoryInitMessages() {
 	initTextOptions();
 }
 
-base::lambda<void(ChannelData*, MsgId)> HistoryDependentItemCallback(const FullMsgId &msgId) {
+base::lambda<void(ChannelData *, MsgId)> HistoryDependentItemCallback(const FullMsgId &msgId) {
 	return [dependent = msgId](ChannelData *channel, MsgId msgId) {
 		if (auto item = App::histItemById(dependent)) {
 			item->updateDependencyItem();
@@ -291,18 +282,18 @@ base::lambda<void(ChannelData*, MsgId)> HistoryDependentItemCallback(const FullM
 	};
 }
 
-MTPDmessage::Flags NewMessageFlags(not_null<PeerData*> peer) {
+MTPDmessage::Flags NewMessageFlags(not_null<PeerData *> peer) {
 	MTPDmessage::Flags result = 0;
 	if (!peer->isSelf()) {
 		result |= MTPDmessage::Flag::f_out;
-		//if (p->isChat() || (p->isUser() && !p->asUser()->botInfo)) {
+		// if (p->isChat() || (p->isUser() && !p->asUser()->botInfo)) {
 		//	result |= MTPDmessage::Flag::f_unread;
 		//}
 	}
 	return result;
 }
 
-QString GetErrorTextForForward(not_null<PeerData*> peer, const SelectedItemSet &items) {
+QString GetErrorTextForForward(not_null<PeerData *> peer, const SelectedItemSet &items) {
 	if (!peer->canWrite()) {
 		return lang(lng_forward_cant);
 	}
@@ -326,9 +317,7 @@ QString GetErrorTextForForward(not_null<PeerData*> peer, const SelectedItemSet &
 void HistoryMessageVia::create(UserId userId) {
 	_bot = App::user(peerFromUser(userId));
 	_maxWidth = st::msgServiceNameFont->width(lng_inline_bot_via(lt_inline_bot, '@' + _bot->username));
-	_lnk = MakeShared<LambdaClickHandler>([bot = _bot] {
-		App::insertBotCommand('@' + bot->username);
-	});
+	_lnk = MakeShared<LambdaClickHandler>([bot = _bot] { App::insertBotCommand('@' + bot->username); });
 }
 
 void HistoryMessageVia::resize(qint32 availw) const {
@@ -381,9 +370,11 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 	}
 	if (via) {
 		if (fromChannel) {
-			text = lng_forwarded_channel_via(lt_channel, textcmdLink(1, text), lt_inline_bot, textcmdLink(2, '@' + via->_bot->username));
+			text = lng_forwarded_channel_via(lt_channel, textcmdLink(1, text), lt_inline_bot,
+			                                 textcmdLink(2, '@' + via->_bot->username));
 		} else {
-			text = lng_forwarded_via(lt_user, textcmdLink(1, text), lt_inline_bot, textcmdLink(2, '@' + via->_bot->username));
+			text = lng_forwarded_via(lt_user, textcmdLink(1, text), lt_inline_bot,
+			                         textcmdLink(2, '@' + via->_bot->username));
 		}
 	} else {
 		if (fromChannel) {
@@ -392,7 +383,7 @@ void HistoryMessageForwarded::create(const HistoryMessageVia *via) const {
 			text = lng_forwarded(lt_user, textcmdLink(1, text));
 		}
 	}
-	TextParseOptions opts = { TextParseRichText, 0, 0, Qt::LayoutDirectionAuto };
+	TextParseOptions opts = {TextParseRichText, 0, 0, Qt::LayoutDirectionAuto};
 	_text.setText(st::fwdTextStyle, text, opts);
 	_text.setLink(1, fromChannel ? goToMessageClickHandler(_originalSender, _originalId) : _originalSender->openLink());
 	if (via) {
@@ -453,11 +444,14 @@ bool HistoryMessageReply::isNameUpdated() const {
 
 void HistoryMessageReply::updateName() const {
 	if (replyToMsg) {
-		QString name = (_replyToVia && replyToMsg->author()->isUser()) ? replyToMsg->author()->asUser()->firstName : App::peerName(replyToMsg->author());
+		QString name = (_replyToVia && replyToMsg->author()->isUser()) ? replyToMsg->author()->asUser()->firstName :
+		                                                                 App::peerName(replyToMsg->author());
 		replyToName.setText(st::fwdTextStyle, name, _textNameOptions);
 		replyToVersion = replyToMsg->author()->nameVersion;
 		bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false;
-		qint32 previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
+		qint32 previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip -
+		                                   st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) :
+		                                  0;
 		qint32 w = replyToName.maxWidth();
 		if (_replyToVia) {
 			w += st::msgServiceFont->spacew + _replyToVia->_maxWidth;
@@ -473,8 +467,11 @@ void HistoryMessageReply::updateName() const {
 void HistoryMessageReply::resize(int width) const {
 	if (_replyToVia) {
 		bool hasPreview = replyToMsg->getMedia() ? replyToMsg->getMedia()->hasReplyPreview() : false;
-		int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
-		_replyToVia->resize(width - st::msgReplyBarSkip - previewSkip - replyToName.maxWidth() - st::msgServiceFont->spacew);
+		int previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip -
+		                                st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) :
+		                               0;
+		_replyToVia->resize(width - st::msgReplyBarSkip - previewSkip - replyToName.maxWidth() -
+		                    st::msgServiceFont->spacew);
 	}
 }
 
@@ -490,9 +487,11 @@ void HistoryMessageReply::paint(Painter &p, const HistoryItem *holder, int x, in
 
 	style::color bar = st::msgImgReplyBarColor;
 	if (flags & PaintFlag::InBubble) {
-		bar = (flags & PaintFlag::Selected) ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
+		bar = (flags & PaintFlag::Selected) ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) :
+		                                      (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
 	}
-	QRect rbar(rtlrect(x + st::msgReplyBarPos.x(), y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height(), w + 2 * x));
+	QRect rbar(rtlrect(x + st::msgReplyBarPos.x(), y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
+	                   st::msgReplyBarSize.width(), st::msgReplyBarSize.height(), w + 2 * x));
 	p.fillRect(rbar, bar);
 
 	if (w > st::msgReplyBarSkip) {
@@ -501,44 +500,63 @@ void HistoryMessageReply::paint(Painter &p, const HistoryItem *holder, int x, in
 			if (hasPreview && w < st::msgReplyBarSkip + st::msgReplyBarSize.height()) {
 				hasPreview = false;
 			}
-			auto previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) : 0;
+			auto previewSkip = hasPreview ? (st::msgReplyBarSize.height() + st::msgReplyBarSkip -
+			                                 st::msgReplyBarSize.width() - st::msgReplyBarPos.x()) :
+			                                0;
 
 			if (hasPreview) {
 				ImagePtr replyPreview = replyToMsg->getMedia()->replyPreview();
 				if (!replyPreview->isNull()) {
-					auto to = rtlrect(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height(), w + 2 * x);
+					auto to = rtlrect(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
+					                  st::msgReplyBarSize.height(), st::msgReplyBarSize.height(), w + 2 * x);
 					auto previewWidth = replyPreview->width() / cIntRetinaFactor();
 					auto previewHeight = replyPreview->height() / cIntRetinaFactor();
-					auto preview = replyPreview->pixSingle(previewWidth, previewHeight, to.width(), to.height(), ImageRoundRadius::Small, ImageRoundCorner::All, selected ? &st::msgStickerOverlay : nullptr);
+					auto preview = replyPreview->pixSingle(previewWidth, previewHeight, to.width(), to.height(),
+					                                       ImageRoundRadius::Small, ImageRoundCorner::All,
+					                                       selected ? &st::msgStickerOverlay : nullptr);
 					p.drawPixmap(to.x(), to.y(), preview);
 				}
 			}
 			if (w > st::msgReplyBarSkip + previewSkip) {
 				if (flags & PaintFlag::InBubble) {
-					p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
+					p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+					                    (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
 				} else {
 					p.setPen(st::msgImgReplyBarColor);
 				}
-				replyToName.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top(), w - st::msgReplyBarSkip - previewSkip, w + 2 * x);
-				if (_replyToVia && w > st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew) {
+				replyToName.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top(),
+				                           w - st::msgReplyBarSkip - previewSkip, w + 2 * x);
+				if (_replyToVia &&
+				    w > st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew) {
 					p.setFont(st::msgServiceFont);
-					p.drawText(x + st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() + st::msgServiceFont->spacew, y + st::msgReplyPadding.top() + st::msgServiceFont->ascent, _replyToVia->_text);
+					p.drawText(x + st::msgReplyBarSkip + previewSkip + replyToName.maxWidth() +
+					               st::msgServiceFont->spacew,
+					           y + st::msgReplyPadding.top() + st::msgServiceFont->ascent, _replyToVia->_text);
 				}
 
 				auto replyToAsMsg = replyToMsg->toHistoryMessage();
 				if (!(flags & PaintFlag::InBubble)) {
 				} else if ((replyToAsMsg && replyToAsMsg->emptyText()) || replyToMsg->serviceMsg()) {
-					p.setPen(outbg ? (selected ? st::msgOutDateFgSelected : st::msgOutDateFg) : (selected ? st::msgInDateFgSelected : st::msgInDateFg));
+					p.setPen(outbg ? (selected ? st::msgOutDateFgSelected : st::msgOutDateFg) :
+					                 (selected ? st::msgInDateFgSelected : st::msgInDateFg));
 				} else {
-					p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+					p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+					                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 				}
-				replyToText.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top() + st::msgServiceNameFont->height, w - st::msgReplyBarSkip - previewSkip, w + 2 * x);
+				replyToText.drawLeftElided(p, x + st::msgReplyBarSkip + previewSkip,
+				                           y + st::msgReplyPadding.top() + st::msgServiceNameFont->height,
+				                           w - st::msgReplyBarSkip - previewSkip, w + 2 * x);
 			}
 		} else {
 			p.setFont(st::msgDateFont);
-			auto &date = outbg ? (selected ? st::msgOutDateFgSelected : st::msgOutDateFg) : (selected ? st::msgInDateFgSelected : st::msgInDateFg);
+			auto &date = outbg ? (selected ? st::msgOutDateFgSelected : st::msgOutDateFg) :
+			                     (selected ? st::msgInDateFgSelected : st::msgInDateFg);
 			p.setPen((flags & PaintFlag::InBubble) ? date : st::msgDateImgFg);
-			p.drawTextLeft(x + st::msgReplyBarSkip, y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2, w + 2 * x, st::msgDateFont->elided(lang(replyToMsgId ? lng_profile_loading : lng_deleted_message), w - st::msgReplyBarSkip));
+			p.drawTextLeft(x + st::msgReplyBarSkip,
+			               y + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2,
+			               w + 2 * x,
+			               st::msgDateFont->elided(lang(replyToMsgId ? lng_profile_loading : lng_deleted_message),
+			                                       w - st::msgReplyBarSkip));
 		}
 	}
 }
@@ -551,7 +569,7 @@ const style::TextStyle &HistoryMessage::KeyboardStyle::textStyle() const {
 	return st::serviceTextStyle;
 }
 
-void HistoryMessage::KeyboardStyle::repaint(not_null<const HistoryItem*> item) const {
+void HistoryMessage::KeyboardStyle::repaint(not_null<const HistoryItem *> item) const {
 	Ui::repaintHistoryItem(item);
 }
 
@@ -569,9 +587,10 @@ void HistoryMessage::KeyboardStyle::paintButtonBg(Painter &p, const QRect &rect,
 	}
 }
 
-void HistoryMessage::KeyboardStyle::paintButtonIcon(Painter &p, const QRect &rect, int outerWidth, HistoryMessageReplyMarkup::Button::Type type) const {
+void HistoryMessage::KeyboardStyle::paintButtonIcon(Painter &p, const QRect &rect, int outerWidth,
+                                                    HistoryMessageReplyMarkup::Button::Type type) const {
 	using Button = HistoryMessageReplyMarkup::Button;
-	auto getIcon = [](Button::Type type) -> const style::icon* {
+	auto getIcon = [](Button::Type type) -> const style::icon * {
 		switch (type) {
 		case Button::Type::Url: return &st::msgBotKbUrlIcon;
 		case Button::Type::SwitchInlineSame:
@@ -580,13 +599,15 @@ void HistoryMessage::KeyboardStyle::paintButtonIcon(Painter &p, const QRect &rec
 		return nullptr;
 	};
 	if (auto icon = getIcon(type)) {
-		icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding, rect.y() + st::msgBotKbIconPadding, outerWidth);
+		icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding,
+		            rect.y() + st::msgBotKbIconPadding, outerWidth);
 	}
 }
 
 void HistoryMessage::KeyboardStyle::paintButtonLoading(Painter &p, const QRect &rect) const {
 	auto icon = &st::historySendingInvertedIcon;
-	icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding, rect.y() + rect.height() - icon->height() - st::msgBotKbIconPadding, rect.x() * 2 + rect.width());
+	icon->paint(p, rect.x() + rect.width() - icon->width() - st::msgBotKbIconPadding,
+	            rect.y() + rect.height() - icon->height() - st::msgBotKbIconPadding, rect.x() * 2 + rect.width());
 }
 
 int HistoryMessage::KeyboardStyle::minButtonWidth(HistoryMessageReplyMarkup::Button::Type type) const {
@@ -605,8 +626,8 @@ int HistoryMessage::KeyboardStyle::minButtonWidth(HistoryMessageReplyMarkup::But
 	return result;
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessage &msg)
-: HistoryItem(history, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, const MTPDmessage &msg)
+    : HistoryItem(history, msg.vid.v, msg.vflags.v, ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0) {
 	CreateConfig config;
 
 	if (msg.has_fwd_from() && msg.vfwd_from.type() == mtpc_messageFwdHeader) {
@@ -631,11 +652,12 @@ HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessage &ms
 
 	auto text = TextUtilities::Clean(qs(msg.vmessage));
 	auto entities = msg.has_entities() ? TextUtilities::EntitiesFromMTP(msg.ventities.v) : EntitiesInText();
-	setText({ text, entities });
+	setText({text, entities});
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessageService &msg)
-: HistoryItem(history, msg.vid.v, mtpCastFlags(msg.vflags.v), ::date(msg.vdate), msg.has_from_id() ? msg.vfrom_id.v : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, const MTPDmessageService &msg)
+    : HistoryItem(history, msg.vid.v, mtpCastFlags(msg.vflags.v), ::date(msg.vdate),
+                  msg.has_from_id() ? msg.vfrom_id.v : 0) {
 	CreateConfig config;
 
 	if (msg.has_reply_to_msg_id()) config.replyTo = msg.vreply_to_msg_id.v;
@@ -650,11 +672,12 @@ HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessageServ
 	default: Unexpected("Service message action type in HistoryMessage.");
 	}
 
-	setText(TextWithEntities {});
+	setText(TextWithEntities{});
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, not_null<HistoryMessage*> fwd)
-: HistoryItem(history, id, NewForwardedFlags(history->peer, from, fwd) | flags, date, from) {
+HistoryMessage::HistoryMessage(not_null<History *> history, MsgId id, MTPDmessage::Flags flags, QDateTime date,
+                               UserId from, const QString &postAuthor, not_null<HistoryMessage *> fwd)
+    : HistoryItem(history, id, NewForwardedFlags(history->peer, from, fwd) | flags, date, from) {
 	CreateConfig config;
 
 	if (fwd->Has<HistoryMessageForwarded>() || !fwd->history()->peer->isSelf()) {
@@ -704,38 +727,47 @@ HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage
 	setText(fwd->originalText());
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, const TextWithEntities &textWithEntities)
-	: HistoryItem(history, id, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, MsgId id, MTPDmessage::Flags flags, MsgId replyTo,
+                               UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor,
+                               const TextWithEntities &textWithEntities)
+    : HistoryItem(history, id, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, MTPnullMarkup);
 
 	setText(textWithEntities);
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo,
+                               UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor,
+                               DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup)
+    : HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	initMediaFromDocument(doc, caption);
 	setText(TextWithEntities());
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo,
+                               UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor,
+                               PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup)
+    : HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	_media = std::make_unique<HistoryPhoto>(this, photo, caption);
 	setText(TextWithEntities());
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+HistoryMessage::HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo,
+                               UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, GameData *game,
+                               const MTPReplyMarkup &markup)
+    : HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	_media = std::make_unique<HistoryGame>(this, game);
 	setText(TextWithEntities());
 }
 
-void HistoryMessage::createComponentsHelper(MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, const QString &postAuthor, const MTPReplyMarkup &markup) {
+void HistoryMessage::createComponentsHelper(MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId,
+                                            const QString &postAuthor, const MTPReplyMarkup &markup) {
 	CreateConfig config;
 
 	if (flags & MTPDmessage::Flag::f_via_bot_id) config.viaBotId = viaBotId;
@@ -757,7 +789,9 @@ void HistoryMessage::updateMediaInBubbleState() {
 	if (entry) {
 		mediaHasSomethingBelow = true;
 		mediaHasSomethingAbove = getMediaHasSomethingAbove();
-		auto entryState = (mediaHasSomethingAbove || !emptyText() || (_media && _media->isDisplayed())) ? MediaInBubbleState::Bottom : MediaInBubbleState::None;
+		auto entryState = (mediaHasSomethingAbove || !emptyText() || (_media && _media->isDisplayed())) ?
+		                      MediaInBubbleState::Bottom :
+		                      MediaInBubbleState::None;
 		entry->_page->setInBubbleState(entryState);
 	}
 	if (!_media) {
@@ -852,7 +886,8 @@ void HistoryMessage::createComponents(const CreateConfig &config) {
 	if (config.mtpMarkup) {
 		// optimization: don't create markup component for the case
 		// MTPDreplyKeyboardHide with flags = 0, assume it has f_zero flag
-		if (config.mtpMarkup->type() != mtpc_replyKeyboardHide || config.mtpMarkup->c_replyKeyboardHide().vflags.v != 0) {
+		if (config.mtpMarkup->type() != mtpc_replyKeyboardHide ||
+		    config.mtpMarkup->c_replyKeyboardHide().vflags.v != 0) {
 			mask |= HistoryMessageReplyMarkup::Bit();
 		}
 	} else if (config.inlineMarkup) {
@@ -864,7 +899,8 @@ void HistoryMessage::createComponents(const CreateConfig &config) {
 	if (auto reply = Get<HistoryMessageReply>()) {
 		reply->replyToMsgId = config.replyTo;
 		if (!reply->updateData(this)) {
-			Auth().api().requestMessageData(history()->peer->asChannel(), reply->replyToMsgId, HistoryDependentItemCallback(fullId()));
+			Auth().api().requestMessageData(history()->peer->asChannel(), reply->replyToMsgId,
+			                                HistoryDependentItemCallback(fullId()));
 		}
 	}
 	if (auto via = Get<HistoryMessageVia>()) {
@@ -938,7 +974,8 @@ void HistoryMessage::initMedia(const MTPMessageMedia *media) {
 	switch (media ? media->type() : mtpc_messageMediaEmpty) {
 	case mtpc_messageMediaContact: {
 		auto &d = media->c_messageMediaContact();
-		_media = std::make_unique<HistoryContact>(this, d.vuser_id.v, qs(d.vfirst_name), qs(d.vlast_name), qs(d.vphone_number));
+		_media = std::make_unique<HistoryContact>(this, d.vuser_id.v, qs(d.vfirst_name), qs(d.vlast_name),
+		                                          qs(d.vphone_number));
 	} break;
 	case mtpc_messageMediaGeo: {
 		auto &point = media->c_messageMediaGeo().vgeo;
@@ -949,7 +986,8 @@ void HistoryMessage::initMedia(const MTPMessageMedia *media) {
 	case mtpc_messageMediaVenue: {
 		auto &d = media->c_messageMediaVenue();
 		if (d.vgeo.type() == mtpc_geoPoint) {
-			_media = std::make_unique<HistoryLocation>(this, LocationCoords(d.vgeo.c_geoPoint()), qs(d.vtitle), qs(d.vaddress));
+			_media = std::make_unique<HistoryLocation>(this, LocationCoords(d.vgeo.c_geoPoint()), qs(d.vtitle),
+			                                           qs(d.vaddress));
 		}
 	} break;
 	case mtpc_messageMediaPhoto: {
@@ -957,7 +995,8 @@ void HistoryMessage::initMedia(const MTPMessageMedia *media) {
 		if (photo.has_ttl_seconds()) {
 			LOG(("App Error: Unexpected MTPMessageMediaPhoto with ttl_seconds in HistoryMessage."));
 		} else if (photo.has_photo() && photo.vphoto.type() == mtpc_photo) {
-			_media = std::make_unique<HistoryPhoto>(this, App::feedPhoto(photo.vphoto.c_photo()), photo.has_caption() ? qs(photo.vcaption) : QString());
+			_media = std::make_unique<HistoryPhoto>(this, App::feedPhoto(photo.vphoto.c_photo()),
+			                                        photo.has_caption() ? qs(photo.vcaption) : QString());
 		} else {
 			LOG(("API Error: Got MTPMessageMediaPhoto without photo and without ttl_seconds."));
 		}
@@ -967,7 +1006,8 @@ void HistoryMessage::initMedia(const MTPMessageMedia *media) {
 		if (document.has_ttl_seconds()) {
 			LOG(("App Error: Unexpected MTPMessageMediaDocument with ttl_seconds in HistoryMessage."));
 		} else if (document.has_document() && document.vdocument.type() == mtpc_document) {
-			return initMediaFromDocument(App::feedDocument(document.vdocument.c_document()), document.has_caption() ? qs(document.vcaption) : QString());
+			return initMediaFromDocument(App::feedDocument(document.vdocument.c_document()),
+			                             document.has_caption() ? qs(document.vcaption) : QString());
 		} else {
 			LOG(("API Error: Got MTPMessageMediaDocument without document and without ttl_seconds."));
 		}
@@ -993,7 +1033,7 @@ void HistoryMessage::initMedia(const MTPMessageMedia *media) {
 	} break;
 	case mtpc_messageMediaInvoice: {
 		_media = std::make_unique<HistoryInvoice>(this, media->c_messageMediaInvoice());
-		if (static_cast<HistoryInvoice*>(getMedia())->getReceiptMsgId()) {
+		if (static_cast<HistoryInvoice *>(getMedia())->getReceiptMsgId()) {
 			replaceBuyWithReceiptInMarkup();
 		}
 	} break;
@@ -1052,7 +1092,8 @@ void HistoryMessage::initDimensions() {
 		}
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && _media->isBubbleBottom()) || (entry/* && entry->_page->isBubbleBottom()*/);
+		auto mediaOnBottom =
+		    (mediaDisplayed && _media->isBubbleBottom()) || (entry /* && entry->_page->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && _media->isBubbleTop()) || (entry && entry->_page->isBubbleTop());
 
 		if (mediaOnBottom) {
@@ -1102,7 +1143,8 @@ void HistoryMessage::initDimensions() {
 				accumulate_max(_maxw, namew);
 			}
 			if (reply) {
-				auto replyw = st::msgPadding.left() + reply->_maxReplyWidth - st::msgReplyPadding.left() - st::msgReplyPadding.right() + st::msgPadding.right();
+				auto replyw = st::msgPadding.left() + reply->_maxReplyWidth - st::msgReplyPadding.left() -
+				              st::msgReplyPadding.right() + st::msgPadding.right();
 				if (reply->_replyToVia) {
 					replyw += st::msgServiceFont->spacew + reply->_replyToVia->_maxWidth;
 				}
@@ -1123,7 +1165,8 @@ void HistoryMessage::initDimensions() {
 	}
 	if (auto markup = inlineReplyMarkup()) {
 		if (!markup->inlineKeyboard) {
-			markup->inlineKeyboard = std::make_unique<ReplyKeyboard>(this, std::make_unique<KeyboardStyle>(st::msgBotKbButton));
+			markup->inlineKeyboard =
+			    std::make_unique<ReplyKeyboard>(this, std::make_unique<KeyboardStyle>(st::msgBotKbButton));
 		}
 
 		// if we have a text bubble we can resize it to fit the keyboard
@@ -1150,8 +1193,8 @@ QRect HistoryMessage::countGeometry() const {
 	auto contentLeft = (!isPost() && out() && !Adaptive::ChatWide()) ? st::msgMargin.right() : st::msgMargin.left();
 	if (hasFromPhoto()) {
 		contentLeft += st::msgPhotoSkip;
-//	} else if (!Adaptive::Wide() && !out() && !fromChannel() && st::msgPhotoSkip - (hmaxwidth - hwidth) > 0) {
-//		contentLeft += st::msgPhotoSkip - (hmaxwidth - hwidth);
+		//	} else if (!Adaptive::Wide() && !out() && !fromChannel() && st::msgPhotoSkip - (hmaxwidth - hwidth) > 0) {
+		//		contentLeft += st::msgPhotoSkip - (hmaxwidth - hwidth);
 	}
 
 	auto contentWidth = width() - st::msgMargin.left() - st::msgMargin.right();
@@ -1170,7 +1213,8 @@ void HistoryMessage::fromNameUpdated(qint32 width) const {
 	_authorNameVersion = author()->nameVersion;
 	if (!Has<HistoryMessageForwarded>()) {
 		if (auto via = Get<HistoryMessageVia>()) {
-			via->resize(width - st::msgPadding.left() - st::msgPadding.right() - author()->nameText.maxWidth() - st::msgServiceFont->spacew);
+			via->resize(width - st::msgPadding.left() - st::msgPadding.right() - author()->nameText.maxWidth() -
+			            st::msgServiceFont->spacew);
 		}
 	}
 }
@@ -1206,7 +1250,7 @@ void HistoryMessage::applyEdition(const MTPDmessage &message) {
 		initTime();
 	}
 
-	TextWithEntities textWithEntities = { qs(message.vmessage), EntitiesInText() };
+	TextWithEntities textWithEntities = {qs(message.vmessage), EntitiesInText()};
 	if (message.has_entities()) {
 		textWithEntities.entities = TextUtilities::EntitiesFromMTP(message.ventities.v);
 	}
@@ -1235,11 +1279,8 @@ void HistoryMessage::applyEditionToEmpty() {
 
 bool HistoryMessage::displayForwardedFrom() const {
 	if (auto forwarded = Get<HistoryMessageForwarded>()) {
-		return Has<HistoryMessageVia>()
-			|| !_media
-			|| !_media->isDisplayed()
-			|| !_media->hideForwardedFrom()
-			|| forwarded->_originalSender->isChannel();
+		return Has<HistoryMessageVia>() || !_media || !_media->isDisplayed() || !_media->hideForwardedFrom() ||
+		       forwarded->_originalSender->isChannel();
 	}
 	return false;
 }
@@ -1299,7 +1340,8 @@ void HistoryMessage::eraseFromOverview() {
 
 TextWithEntities HistoryMessage::selectedText(TextSelection selection) const {
 	TextWithEntities logEntryOriginalResult;
-	auto textResult = _text.originalTextWithEntities((selection == FullSelection) ? AllTextSelection : selection, ExpandLinksAll);
+	auto textResult =
+	    _text.originalTextWithEntities((selection == FullSelection) ? AllTextSelection : selection, ExpandLinksAll);
 	auto skipped = skipTextSelection(selection);
 	auto mediaDisplayed = (_media && _media->isDisplayed());
 	auto mediaResult = mediaDisplayed ? _media->selectedText(skipped) : TextWithEntities();
@@ -1322,8 +1364,13 @@ TextWithEntities HistoryMessage::selectedText(TextSelection selection) const {
 	if (auto reply = Get<HistoryMessageReply>()) {
 		if (selection == FullSelection && reply->replyToMsg) {
 			TextWithEntities wrapped;
-			wrapped.text.reserve(lang(lng_in_reply_to).size() + reply->replyToMsg->author()->name.size() + 4 + result.text.size());
-			wrapped.text.append('[').append(lang(lng_in_reply_to)).append(' ').append(reply->replyToMsg->author()->name).append(qsl("]\n"));
+			wrapped.text.reserve(lang(lng_in_reply_to).size() + reply->replyToMsg->author()->name.size() + 4 +
+			                     result.text.size());
+			wrapped.text.append('[')
+			    .append(lang(lng_in_reply_to))
+			    .append(' ')
+			    .append(reply->replyToMsg->author()->name)
+			    .append(qsl("]\n"));
 			TextUtilities::Append(wrapped, std::move(result));
 			result = wrapped;
 		}
@@ -1381,11 +1428,13 @@ void HistoryMessage::setText(const TextWithEntities &textWithEntities) {
 	if (mediaDisplayed && _media->consumeMessageText(textWithEntities)) {
 		setEmptyText();
 	} else {
-		auto mediaOnBottom = (_media && _media->isDisplayed() && _media->isBubbleBottom()) || Has<HistoryMessageLogEntryOriginal>();
+		auto mediaOnBottom =
+		    (_media && _media->isDisplayed() && _media->isBubbleBottom()) || Has<HistoryMessageLogEntryOriginal>();
 		if (mediaOnBottom) {
 			_text.setMarkedText(st::messageTextStyle, textWithEntities, itemTextOptions(this));
 		} else {
-			_text.setMarkedText(st::messageTextStyle, { textWithEntities.text + skipBlock(), textWithEntities.entities }, itemTextOptions(this));
+			_text.setMarkedText(st::messageTextStyle, {textWithEntities.text + skipBlock(), textWithEntities.entities},
+			                    itemTextOptions(this));
 		}
 		_textWidth = -1;
 		_textHeight = 0;
@@ -1393,7 +1442,7 @@ void HistoryMessage::setText(const TextWithEntities &textWithEntities) {
 }
 
 void HistoryMessage::setEmptyText() {
-	_text.setMarkedText(st::messageTextStyle, { QString(), EntitiesInText() }, itemTextOptions(this));
+	_text.setMarkedText(st::messageTextStyle, {QString(), EntitiesInText()}, itemTextOptions(this));
 
 	_textWidth = -1;
 	_textHeight = 0;
@@ -1445,7 +1494,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) {
 
 TextWithEntities HistoryMessage::originalText() const {
 	if (emptyText()) {
-		return { QString(), EntitiesInText() };
+		return {QString(), EntitiesInText()};
 	}
 	return _text.originalTextWithEntities();
 }
@@ -1476,7 +1525,8 @@ int HistoryMessage::timeLeft() const {
 	return result;
 }
 
-void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected, InfoDisplayType type) const {
+void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected,
+                              InfoDisplayType type) const {
 	p.setFont(st::msgDateFont);
 
 	bool outbg = out() && !isPost();
@@ -1486,18 +1536,19 @@ void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 wi
 	case InfoDisplayDefault:
 		infoRight -= st::msgPadding.right() - st::msgDateDelta.x();
 		infoBottom -= st::msgPadding.bottom() - st::msgDateDelta.y();
-		p.setPen(selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) : (outbg ? st::msgOutDateFg : st::msgInDateFg));
-	break;
+		p.setPen(selected ? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected) :
+		                    (outbg ? st::msgOutDateFg : st::msgInDateFg));
+		break;
 	case InfoDisplayOverImage:
 		infoRight -= st::msgDateImgDelta + st::msgDateImgPadding.x();
 		infoBottom -= st::msgDateImgDelta + st::msgDateImgPadding.y();
 		p.setPen(st::msgDateImgFg);
-	break;
+		break;
 	case InfoDisplayOverBackground:
 		infoRight -= st::msgDateImgDelta + st::msgDateImgPadding.x();
 		infoBottom -= st::msgDateImgDelta + st::msgDateImgPadding.y();
 		p.setPen(st::msgServiceFg);
-	break;
+		break;
 	}
 
 	qint32 infoW = HistoryMessage::infoWidth();
@@ -1506,11 +1557,17 @@ void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 wi
 	qint32 dateX = infoRight - infoW;
 	qint32 dateY = infoBottom - st::msgDateFont->height;
 	if (type == InfoDisplayOverImage) {
-		qint32 dateW = infoW + 2 * st::msgDateImgPadding.x(), dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
-		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		qint32 dateW = infoW + 2 * st::msgDateImgPadding.x(),
+		       dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
+		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH,
+		               selected ? st::msgDateImgBgSelected : st::msgDateImgBg,
+		               selected ? DateSelectedCorners : DateCorners);
 	} else if (type == InfoDisplayOverBackground) {
-		qint32 dateW = infoW + 2 * st::msgDateImgPadding.x(), dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
-		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		qint32 dateW = infoW + 2 * st::msgDateImgPadding.x(),
+		       dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
+		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH,
+		               selected ? st::msgServiceBgSelected : st::msgServiceBg,
+		               selected ? StickerSelectedCorners : StickerCorners);
 	}
 	dateX += HistoryMessage::timeLeft();
 
@@ -1526,15 +1583,18 @@ void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 wi
 		auto icon = ([this, outbg, invertedsprites, selected] {
 			if (id > 0) {
 				if (outbg) {
-					return &(invertedsprites ? st::historyViewsInvertedIcon : (selected ? st::historyViewsOutSelectedIcon : st::historyViewsOutIcon));
+					return &(invertedsprites ? st::historyViewsInvertedIcon :
+					                           (selected ? st::historyViewsOutSelectedIcon : st::historyViewsOutIcon));
 				}
-				return &(invertedsprites ? st::historyViewsInvertedIcon : (selected ? st::historyViewsInSelectedIcon : st::historyViewsInIcon));
+				return &(invertedsprites ? st::historyViewsInvertedIcon :
+				                           (selected ? st::historyViewsInSelectedIcon : st::historyViewsInIcon));
 			}
 			return &(invertedsprites ? st::historyViewsSendingInvertedIcon : st::historyViewsSendingIcon);
 		})();
 		if (id > 0) {
 			icon->paint(p, infoRight - infoW, infoBottom + st::historyViewsTop, width);
-			p.drawText(infoRight - infoW + st::historyViewsWidth, infoBottom - st::msgDateFont->descent, views->_viewsText);
+			p.drawText(infoRight - infoW + st::historyViewsWidth, infoBottom - st::msgDateFont->descent,
+			           views->_viewsText);
 		} else if (!outbg) { // sending outbg icon will be painted below
 			auto iconSkip = st::historyViewsSpace + views->_viewsWidth;
 			icon->paint(p, infoRight - infoW + iconSkip, infoBottom + st::historyViewsTop, width);
@@ -1547,9 +1607,11 @@ void HistoryMessage::drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 wi
 		auto icon = ([this, invertedsprites, selected] {
 			if (id > 0) {
 				if (unread()) {
-					return &(invertedsprites ? st::historySentInvertedIcon : (selected ? st::historySentSelectedIcon : st::historySentIcon));
+					return &(invertedsprites ? st::historySentInvertedIcon :
+					                           (selected ? st::historySentSelectedIcon : st::historySentIcon));
 				}
-				return &(invertedsprites ? st::historyReceivedInvertedIcon : (selected ? st::historyReceivedSelectedIcon : st::historyReceivedIcon));
+				return &(invertedsprites ? st::historyReceivedInvertedIcon :
+				                           (selected ? st::historyReceivedSelectedIcon : st::historyReceivedIcon));
 			}
 			return &(invertedsprites ? st::historySendingInvertedIcon : st::historySendingIcon);
 		})();
@@ -1623,7 +1685,9 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 			auto skiptop = top - fill;
 			auto fillheight = fill + g.height() + fill;
 
-			auto dt = (animms > st::activeFadeInDuration) ? (1. - (animms - st::activeFadeInDuration) / double(st::activeFadeOutDuration)) : (animms / double(st::activeFadeInDuration));
+			auto dt = (animms > st::activeFadeInDuration) ?
+			              (1. - (animms - st::activeFadeInDuration) / double(st::activeFadeOutDuration)) :
+			              (animms / double(st::activeFadeInDuration));
 			auto o = p.opacity();
 			p.setOpacity(o * dt);
 			p.fillRect(0, skiptop, width(), fillheight, st::defaultTextPalette.selectOverlay);
@@ -1631,7 +1695,8 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 		}
 	}
 
-	p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) : (outbg ? st::outTextPalette : st::inTextPalette));
+	p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) :
+	                            (outbg ? st::outTextPalette : st::inTextPalette));
 
 	auto keyboard = inlineReplyKeyboard();
 	if (keyboard) {
@@ -1652,11 +1717,13 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 		auto mediaDisplayed = _media && _media->isDisplayed();
 
 		auto skipTail = isAttachedToNext() || (_media && _media->skipBubbleTail()) || (keyboard != nullptr);
-		auto displayTail = skipTail ? RectPart::None : (outbg && !Adaptive::ChatWide()) ? RectPart::Right : RectPart::Left;
+		auto displayTail =
+		    skipTail ? RectPart::None : (outbg && !Adaptive::ChatWide()) ? RectPart::Right : RectPart::Left;
 		HistoryLayout::paintBubble(p, g, width(), selected, outbg, displayTail);
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && _media->isBubbleBottom()) || (entry/* && entry->_page->isBubbleBottom()*/);
+		auto mediaOnBottom =
+		    (mediaDisplayed && _media->isBubbleBottom()) || (entry /* && entry->_page->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && _media->isBubbleTop()) || (entry && entry->_page->isBubbleTop());
 
 		auto trect = g.marginsRemoved(st::msgPadding);
@@ -1674,7 +1741,8 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 		if (entry) {
 			trect.setHeight(trect.height() - entry->_page->height());
 		}
-		auto needDrawInfo = mediaOnBottom ? !(entry ? entry->_page->customInfoLayout() : _media->customInfoLayout()) : true;
+		auto needDrawInfo =
+		    mediaOnBottom ? !(entry ? entry->_page->customInfoLayout() : _media->customInfoLayout()) : true;
 		if (mediaDisplayed) {
 			auto mediaAboveText = _media->isAboveMessage();
 			auto mediaHeight = _media->height();
@@ -1708,7 +1776,8 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 			p.translate(-entryLeft, -entryTop);
 		}
 		if (needDrawInfo) {
-			HistoryMessage::drawInfo(p, g.left() + g.width(), g.top() + g.height(), 2 * g.left() + g.width(), selected, InfoDisplayDefault);
+			HistoryMessage::drawInfo(p, g.left() + g.width(), g.top() + g.height(), 2 * g.left() + g.width(), selected,
+			                         InfoDisplayDefault);
 		}
 		if (displayFastShare()) {
 			auto fastShareLeft = g.left() + g.width() + st::historyFastShareLeft;
@@ -1725,7 +1794,7 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 
 	auto reply = Get<HistoryMessageReply>();
 	if (reply && reply->isNameUpdated()) {
-		const_cast<HistoryMessage*>(this)->setPendingInitDimensions();
+		const_cast<HistoryMessage *>(this)->setPendingInitDimensions();
 	}
 }
 
@@ -1754,8 +1823,10 @@ void HistoryMessage::paintFromName(Painter &p, QRect &trect, bool selected) cons
 		auto via = Get<HistoryMessageVia>();
 		if (via && !forwarded && trect.width() > author()->nameText.maxWidth() + st::msgServiceFont->spacew) {
 			bool outbg = out() && !isPost();
-			p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
-			p.drawText(trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew, trect.top() + st::msgServiceFont->ascent, via->_text);
+			p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+			                    (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
+			p.drawText(trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew,
+			           trect.top() + st::msgServiceFont->ascent, via->_text);
 		}
 		trect.setY(trect.y() + st::msgNameFont->height);
 	}
@@ -1766,14 +1837,18 @@ void HistoryMessage::paintForwardedInfo(Painter &p, QRect &trect, bool selected)
 		style::font serviceFont(st::msgServiceFont), serviceName(st::msgServiceNameFont);
 
 		auto outbg = hasOutLayout();
-		p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
+		p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+		                    (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
 		p.setFont(serviceFont);
 
 		auto forwarded = Get<HistoryMessageForwarded>();
 		auto breakEverywhere = (forwarded->_text.countHeight(trect.width()) > 2 * serviceFont->height);
-		p.setTextPalette(selected ? (outbg ? st::outFwdTextPaletteSelected : st::inFwdTextPaletteSelected) : (outbg ? st::outFwdTextPalette : st::inFwdTextPalette));
-		forwarded->_text.drawElided(p, trect.x(), trect.y(), trect.width(), 2, style::al_left, 0, -1, 0, breakEverywhere);
-		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) : (outbg ? st::outTextPalette : st::inTextPalette));
+		p.setTextPalette(selected ? (outbg ? st::outFwdTextPaletteSelected : st::inFwdTextPaletteSelected) :
+		                            (outbg ? st::outFwdTextPalette : st::inFwdTextPalette));
+		forwarded->_text.drawElided(p, trect.x(), trect.y(), trect.width(), 2, style::al_left, 0, -1, 0,
+		                            breakEverywhere);
+		p.setTextPalette(selected ? (outbg ? st::outTextPaletteSelected : st::inTextPaletteSelected) :
+		                            (outbg ? st::outTextPalette : st::inTextPalette));
 
 		trect.setY(trect.y() + (((forwarded->_text.maxWidth() > trect.width()) ? 2 : 1) * serviceFont->height));
 	}
@@ -1797,7 +1872,8 @@ void HistoryMessage::paintViaBotIdInfo(Painter &p, QRect &trect, bool selected)
 	if (!displayFromName() && !Has<HistoryMessageForwarded>()) {
 		if (auto via = Get<HistoryMessageVia>()) {
 			p.setFont(st::msgServiceNameFont);
-			p.setPen(selected ? (hasOutLayout() ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (hasOutLayout() ? st::msgOutServiceFg : st::msgInServiceFg));
+			p.setPen(selected ? (hasOutLayout() ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) :
+			                    (hasOutLayout() ? st::msgOutServiceFg : st::msgInServiceFg));
 			p.drawTextLeft(trect.left(), trect.top(), width(), via->_text);
 			trect.setY(trect.y() + st::msgServiceNameFont->height);
 		}
@@ -1807,7 +1883,8 @@ void HistoryMessage::paintViaBotIdInfo(Painter &p, QRect &trect, bool selected)
 void HistoryMessage::paintText(Painter &p, QRect &trect, TextSelection selection) const {
 	auto outbg = out() && !isPost();
 	auto selected = (selection == FullSelection);
-	p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+	p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) :
+	                 (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 	p.setFont(st::msgFont);
 	_text.draw(p, trect.x(), trect.y(), trect.width(), style::al_left, 0, -1, selection);
 }
@@ -1860,7 +1937,8 @@ int HistoryMessage::performResizeGetHeight() {
 		}
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && _media->isBubbleBottom()) || (entry/* && entry->_page->isBubbleBottom()*/);
+		auto mediaOnBottom =
+		    (mediaDisplayed && _media->isBubbleBottom()) || (entry /* && entry->_page->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && _media->isBubbleTop()) || (entry && entry->_page->isBubbleTop());
 
 		if (contentWidth >= _maxw) {
@@ -1913,7 +1991,11 @@ int HistoryMessage::performResizeGetHeight() {
 		}
 
 		if (displayForwardedFrom()) {
-			auto fwdheight = ((forwarded->_text.maxWidth() > (countGeometry().width() - st::msgPadding.left() - st::msgPadding.right())) ? 2 : 1) * st::semiboldFont->height;
+			auto fwdheight = ((forwarded->_text.maxWidth() >
+			                   (countGeometry().width() - st::msgPadding.left() - st::msgPadding.right())) ?
+			                      2 :
+			                      1) *
+			                 st::semiboldFont->height;
 			_height += fwdheight;
 		}
 
@@ -1959,11 +2041,11 @@ bool HistoryMessage::pointInTime(int right, int bottom, QPoint point, InfoDispla
 	case InfoDisplayDefault:
 		infoRight -= st::msgPadding.right() - st::msgDateDelta.x();
 		infoBottom -= st::msgPadding.bottom() - st::msgDateDelta.y();
-	break;
+		break;
 	case InfoDisplayOverImage:
 		infoRight -= st::msgDateImgDelta + st::msgDateImgPadding.x();
 		infoBottom -= st::msgDateImgDelta + st::msgDateImgPadding.y();
-	break;
+		break;
 	}
 	auto dateX = infoRight - HistoryMessage::infoWidth() + HistoryMessage::timeLeft();
 	auto dateY = infoBottom - st::msgDateFont->height;
@@ -1990,7 +2072,8 @@ HistoryTextState HistoryMessage::getState(QPoint point, HistoryStateRequest requ
 		auto mediaDisplayed = _media && _media->isDisplayed();
 
 		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && _media->isBubbleBottom()) || (entry/* && entry->_page->isBubbleBottom()*/);
+		auto mediaOnBottom =
+		    (mediaDisplayed && _media->isBubbleBottom()) || (entry /* && entry->_page->isBubbleBottom()*/);
 		auto mediaOnTop = (mediaDisplayed && _media->isBubbleTop()) || (entry && entry->_page->isBubbleTop());
 
 		auto trect = g.marginsRemoved(st::msgPadding);
@@ -2016,7 +2099,8 @@ HistoryTextState HistoryMessage::getState(QPoint point, HistoryStateRequest requ
 			}
 		}
 
-		auto needDateCheck = mediaOnBottom ? !(entry ? entry->_page->customInfoLayout() : _media->customInfoLayout()) : true;
+		auto needDateCheck =
+		    mediaOnBottom ? !(entry ? entry->_page->customInfoLayout() : _media->customInfoLayout()) : true;
 		if (mediaDisplayed) {
 			auto mediaAboveText = _media->isAboveMessage();
 			auto mediaHeight = _media->height();
@@ -2045,7 +2129,8 @@ HistoryTextState HistoryMessage::getState(QPoint point, HistoryStateRequest requ
 		if (displayFastShare()) {
 			auto fastShareLeft = g.left() + g.width() + st::historyFastShareLeft;
 			auto fastShareTop = g.top() + g.height() - st::historyFastShareBottom - st::historyFastShareSize;
-			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
+			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize)
+			        .contains(point)) {
 				result.link = fastShareLink();
 			}
 		}
@@ -2130,13 +2215,16 @@ void HistoryMessage::updatePressed(QPoint point) {
 bool HistoryMessage::getStateFromName(QPoint point, QRect &trect, HistoryTextState *outResult) const {
 	if (displayFromName()) {
 		if (point.y() >= trect.top() && point.y() < trect.top() + st::msgNameFont->height) {
-			if (point.x() >= trect.left() && point.x() < trect.left() + trect.width() && point.x() < trect.left() + author()->nameText.maxWidth()) {
+			if (point.x() >= trect.left() && point.x() < trect.left() + trect.width() &&
+			    point.x() < trect.left() + author()->nameText.maxWidth()) {
 				outResult->link = author()->openLink();
 				return true;
 			}
 			auto forwarded = Get<HistoryMessageForwarded>();
 			auto via = Get<HistoryMessageVia>();
-			if (via && !forwarded && point.x() >= trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew && point.x() < trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew + via->_width) {
+			if (via && !forwarded &&
+			    point.x() >= trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew &&
+			    point.x() < trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew + via->_width) {
 				outResult->link = via->_lnk;
 				return true;
 			}
@@ -2146,7 +2234,8 @@ bool HistoryMessage::getStateFromName(QPoint point, QRect &trect, HistoryTextSta
 	return false;
 }
 
-bool HistoryMessage::getStateForwardedInfo(QPoint point, QRect &trect, HistoryTextState *outResult, const HistoryStateRequest &request) const {
+bool HistoryMessage::getStateForwardedInfo(QPoint point, QRect &trect, HistoryTextState *outResult,
+                                           const HistoryStateRequest &request) const {
 	if (displayForwardedFrom()) {
 		auto forwarded = Get<HistoryMessageForwarded>();
 		auto fwdheight = ((forwarded->_text.maxWidth() > trect.width()) ? 2 : 1) * st::semiboldFont->height;
@@ -2175,7 +2264,9 @@ bool HistoryMessage::getStateReplyInfo(QPoint point, QRect &trect, HistoryTextSt
 	if (auto reply = Get<HistoryMessageReply>()) {
 		qint32 h = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 		if (point.y() >= trect.top() && point.y() < trect.top() + h) {
-			if (reply->replyToMsg && QRect(trect.x(), trect.y() + st::msgReplyPadding.top(), trect.width(), st::msgReplyBarSize.height()).contains(point)) {
+			if (reply->replyToMsg &&
+			    QRect(trect.x(), trect.y() + st::msgReplyPadding.top(), trect.width(), st::msgReplyBarSize.height())
+			        .contains(point)) {
 				outResult->link = reply->replyToLink();
 			}
 			return true;
@@ -2198,7 +2289,8 @@ bool HistoryMessage::getStateViaBotIdInfo(QPoint point, QRect &trect, HistoryTex
 	return false;
 }
 
-bool HistoryMessage::getStateText(QPoint point, QRect &trect, HistoryTextState *outResult, const HistoryStateRequest &request) const {
+bool HistoryMessage::getStateText(QPoint point, QRect &trect, HistoryTextState *outResult,
+                                  const HistoryStateRequest &request) const {
 	if (trect.contains(point)) {
 		*outResult = _text.getState(point - trect.topLeft(), trect.width(), request.forText());
 		return true;
@@ -2226,7 +2318,8 @@ TextSelection HistoryMessage::adjustSelection(TextSelection selection, TextSelec
 		return result;
 	}
 	if (auto entry = Get<HistoryMessageLogEntryOriginal>()) {
-		auto entrySelection = mediaDisplayed ? _media->skipSelection(skipTextSelection(selection)) : skipTextSelection(selection);
+		auto entrySelection =
+		    mediaDisplayed ? _media->skipSelection(skipTextSelection(selection)) : skipTextSelection(selection);
 		auto logEntryOriginalSelection = entry->_page->adjustSelection(entrySelection, type);
 		if (mediaDisplayed) {
 			logEntryOriginalSelection = _media->unskipSelection(logEntryOriginalSelection);
diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h
index 902eec786..ff805b280 100644
--- a/Telegram/SourceFiles/history/history_message.h
+++ b/Telegram/SourceFiles/history/history_message.h
@@ -22,38 +22,50 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/lambda.h"
 #include "core/basic_types.h"
-#include "scheme.h"
-#include "structs.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "scheme.h"
+#include "structs.h"
 
 void HistoryInitMessages();
-base::lambda<void(ChannelData*, MsgId)> HistoryDependentItemCallback(const FullMsgId &msgId);
-MTPDmessage::Flags NewMessageFlags(not_null<PeerData*> peer);
-QString GetErrorTextForForward(not_null<PeerData*> peer, const SelectedItemSet &items);
-void FastShareMessage(not_null<HistoryItem*> item);
+base::lambda<void(ChannelData *, MsgId)> HistoryDependentItemCallback(const FullMsgId &msgId);
+MTPDmessage::Flags NewMessageFlags(not_null<PeerData *> peer);
+QString GetErrorTextForForward(not_null<PeerData *> peer, const SelectedItemSet &items);
+void FastShareMessage(not_null<HistoryItem *> item);
 
 class HistoryMessage : public HistoryItem, private HistoryItemInstantiated<HistoryMessage> {
 public:
-	static not_null<HistoryMessage*> create(not_null<History*> history, const MTPDmessage &msg) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, const MTPDmessage &msg) {
 		return _create(history, msg);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, const MTPDmessageService &msg) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, const MTPDmessageService &msg) {
 		return _create(history, msg);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, not_null<HistoryMessage*> fwd) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags,
+	                                         QDateTime date, UserId from, const QString &postAuthor,
+	                                         not_null<HistoryMessage *> fwd) {
 		return _create(history, msgId, flags, date, from, postAuthor, fwd);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, const TextWithEntities &textWithEntities) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags,
+	                                         MsgId replyTo, UserId viaBotId, QDateTime date, UserId from,
+	                                         const QString &postAuthor, const TextWithEntities &textWithEntities) {
 		return _create(history, msgId, flags, replyTo, viaBotId, date, from, postAuthor, textWithEntities);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags,
+	                                         MsgId replyTo, UserId viaBotId, QDateTime date, UserId from,
+	                                         const QString &postAuthor, DocumentData *doc, const QString &caption,
+	                                         const MTPReplyMarkup &markup) {
 		return _create(history, msgId, flags, replyTo, viaBotId, date, from, postAuthor, doc, caption, markup);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags,
+	                                         MsgId replyTo, UserId viaBotId, QDateTime date, UserId from,
+	                                         const QString &postAuthor, PhotoData *photo, const QString &caption,
+	                                         const MTPReplyMarkup &markup) {
 		return _create(history, msgId, flags, replyTo, viaBotId, date, from, postAuthor, photo, caption, markup);
 	}
-	static not_null<HistoryMessage*> create(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup) {
+	static not_null<HistoryMessage *> create(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags,
+	                                         MsgId replyTo, UserId viaBotId, QDateTime date, UserId from,
+	                                         const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup) {
 		return _create(history, msgId, flags, replyTo, viaBotId, date, from, postAuthor, game, markup);
 	}
 
@@ -78,7 +90,8 @@ public:
 	bool uploading() const;
 	bool displayFastShare() const override;
 
-	void drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected, InfoDisplayType type) const override;
+	void drawInfo(Painter &p, qint32 right, qint32 bottom, qint32 width, bool selected,
+	              InfoDisplayType type) const override;
 	void drawFastShare(Painter &p, int left, int top, int outerWidth) const override;
 	void setViewsCount(qint32 count) override;
 	void setId(MsgId newId) override;
@@ -153,13 +166,22 @@ public:
 	~HistoryMessage();
 
 private:
-	HistoryMessage(not_null<History*> history, const MTPDmessage &msg);
-	HistoryMessage(not_null<History*> history, const MTPDmessageService &msg);
-	HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, not_null<HistoryMessage*> fwd); // local forwarded
-	HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, const TextWithEntities &textWithEntities); // local message
-	HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup); // local document
-	HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup); // local photo
-	HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup); // local game
+	HistoryMessage(not_null<History *> history, const MTPDmessage &msg);
+	HistoryMessage(not_null<History *> history, const MTPDmessageService &msg);
+	HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, QDateTime date, UserId from,
+	               const QString &postAuthor, not_null<HistoryMessage *> fwd); // local forwarded
+	HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId,
+	               QDateTime date, UserId from, const QString &postAuthor,
+	               const TextWithEntities &textWithEntities); // local message
+	HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId,
+	               QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption,
+	               const MTPReplyMarkup &markup); // local document
+	HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId,
+	               QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption,
+	               const MTPReplyMarkup &markup); // local photo
+	HistoryMessage(not_null<History *> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId,
+	               QDateTime date, UserId from, const QString &postAuthor, GameData *game,
+	               const MTPReplyMarkup &markup); // local game
 	friend class HistoryItemInstantiated<HistoryMessage>;
 
 	void setEmptyText();
@@ -182,10 +204,12 @@ private:
 	void paintText(Painter &p, QRect &trect, TextSelection selection) const;
 
 	bool getStateFromName(QPoint point, QRect &trect, HistoryTextState *outResult) const;
-	bool getStateForwardedInfo(QPoint point, QRect &trect, HistoryTextState *outResult, const HistoryStateRequest &request) const;
+	bool getStateForwardedInfo(QPoint point, QRect &trect, HistoryTextState *outResult,
+	                           const HistoryStateRequest &request) const;
 	bool getStateReplyInfo(QPoint point, QRect &trect, HistoryTextState *outResult) const;
 	bool getStateViaBotIdInfo(QPoint point, QRect &trect, HistoryTextState *outResult) const;
-	bool getStateText(QPoint point, QRect &trect, HistoryTextState *outResult, const HistoryStateRequest &request) const;
+	bool getStateText(QPoint point, QRect &trect, HistoryTextState *outResult,
+	                  const HistoryStateRequest &request) const;
 
 	void setMedia(const MTPMessageMedia *media);
 	void setReplyMarkup(const MTPReplyMarkup *markup);
@@ -212,7 +236,8 @@ private:
 		// For messages created from existing messages (forwarded).
 		const HistoryMessageReplyMarkup *inlineMarkup = nullptr;
 	};
-	void createComponentsHelper(MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, const QString &postAuthor, const MTPReplyMarkup &markup);
+	void createComponentsHelper(MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, const QString &postAuthor,
+	                            const MTPReplyMarkup &markup);
 	void createComponents(const CreateConfig &config);
 
 	class KeyboardStyle : public ReplyKeyboard::Style {
@@ -223,16 +248,15 @@ private:
 
 		void startPaint(Painter &p) const override;
 		const style::TextStyle &textStyle() const override;
-		void repaint(not_null<const HistoryItem*> item) const override;
+		void repaint(not_null<const HistoryItem *> item) const override;
 
 	protected:
 		void paintButtonBg(Painter &p, const QRect &rect, double howMuchOver) const override;
-		void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth, HistoryMessageReplyMarkup::Button::Type type) const override;
+		void paintButtonIcon(Painter &p, const QRect &rect, int outerWidth,
+		                     HistoryMessageReplyMarkup::Button::Type type) const override;
 		void paintButtonLoading(Painter &p, const QRect &rect) const override;
 		int minButtonWidth(HistoryMessageReplyMarkup::Button::Type type) const override;
-
 	};
 
 	void updateMediaInBubbleState();
-
 };
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 48b71135b..4190d39b3 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_service.h"
 
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
 #include "apiwrap.h"
-#include "history/history_service_layout.h"
+#include "auth_session.h"
 #include "history/history_media_types.h"
 #include "history/history_message.h"
-#include "auth_session.h"
+#include "history/history_service_layout.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
 #include "window/notifications_manager.h"
 
 namespace {
@@ -36,15 +36,15 @@ constexpr auto kPinnedMessageTextLimit = 16;
 } // namespace
 
 TextParseOptions _historySrvOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags/* | TextParseMultiline*/ | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // lang-dependent
+    TextParseLinks | TextParseMentions | TextParseHashtags /* | TextParseMultiline*/ | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // lang-dependent
 };
 
 void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	auto prepareChatAddUserText = [this](const MTPDmessageActionChatAddUser &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		auto &users = action.vusers.v;
 		if (users.size() == 1) {
 			auto u = App::user(peerFromUser(users[0]));
@@ -80,32 +80,34 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	};
 
 	auto prepareChatJoinedByLink = [this](const MTPDmessageActionChatJoinedByLink &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		result.links.push_back(fromLink());
 		result.text = lng_action_user_joined_by_link(lt_from, fromLinkText());
 		return result;
 	};
 
 	auto prepareChatCreate = [this](const MTPDmessageActionChatCreate &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		result.links.push_back(fromLink());
-		result.text = lng_action_created_chat(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
+		result.text =
+		    lng_action_created_chat(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
 		return result;
 	};
 
 	auto prepareChannelCreate = [this](const MTPDmessageActionChannelCreate &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (isPost()) {
 			result.text = lang(lng_action_created_channel);
 		} else {
 			result.links.push_back(fromLink());
-			result.text = lng_action_created_chat(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
+			result.text =
+			    lng_action_created_chat(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
 		}
 		return result;
 	};
 
 	auto prepareChatDeletePhoto = [this] {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (isPost()) {
 			result.text = lang(lng_action_removed_photo_channel);
 		} else {
@@ -116,7 +118,7 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	};
 
 	auto prepareChatDeleteUser = [this](const MTPDmessageActionChatDeleteUser &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (peerFromUser(action.vuser_id) == _from->id) {
 			result.links.push_back(fromLink());
 			result.text = lng_action_user_left(lt_from, fromLinkText());
@@ -130,7 +132,7 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	};
 
 	auto prepareChatEditPhoto = [this](const MTPDmessageActionChatEditPhoto &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (isPost()) {
 			result.text = lang(lng_action_changed_photo_channel);
 		} else {
@@ -141,18 +143,19 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	};
 
 	auto prepareChatEditTitle = [this](const MTPDmessageActionChatEditTitle &action) {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (isPost()) {
 			result.text = lng_action_changed_title_channel(lt_title, TextUtilities::Clean(qs(action.vtitle)));
 		} else {
 			result.links.push_back(fromLink());
-			result.text = lng_action_changed_title(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
+			result.text =
+			    lng_action_changed_title(lt_from, fromLinkText(), lt_title, TextUtilities::Clean(qs(action.vtitle)));
 		}
 		return result;
 	};
 
 	auto prepareScreenshotTaken = [this] {
-		auto result = PreparedText {};
+		auto result = PreparedText{};
 		if (out()) {
 			result.text = lang(lng_action_you_took_screenshot);
 		} else {
@@ -162,18 +165,30 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
-	auto messageText = PreparedText {};
+	auto messageText = PreparedText{};
 
 	switch (action.type()) {
-	case mtpc_messageActionChatAddUser: messageText = prepareChatAddUserText(action.c_messageActionChatAddUser()); break;
-	case mtpc_messageActionChatJoinedByLink: messageText = prepareChatJoinedByLink(action.c_messageActionChatJoinedByLink()); break;
+	case mtpc_messageActionChatAddUser:
+		messageText = prepareChatAddUserText(action.c_messageActionChatAddUser());
+		break;
+	case mtpc_messageActionChatJoinedByLink:
+		messageText = prepareChatJoinedByLink(action.c_messageActionChatJoinedByLink());
+		break;
 	case mtpc_messageActionChatCreate: messageText = prepareChatCreate(action.c_messageActionChatCreate()); break;
-	case mtpc_messageActionChannelCreate: messageText = prepareChannelCreate(action.c_messageActionChannelCreate()); break;
+	case mtpc_messageActionChannelCreate:
+		messageText = prepareChannelCreate(action.c_messageActionChannelCreate());
+		break;
 	case mtpc_messageActionHistoryClear: break; // Leave empty text.
 	case mtpc_messageActionChatDeletePhoto: messageText = prepareChatDeletePhoto(); break;
-	case mtpc_messageActionChatDeleteUser: messageText = prepareChatDeleteUser(action.c_messageActionChatDeleteUser()); break;
-	case mtpc_messageActionChatEditPhoto: messageText = prepareChatEditPhoto(action.c_messageActionChatEditPhoto()); break;
-	case mtpc_messageActionChatEditTitle: messageText = prepareChatEditTitle(action.c_messageActionChatEditTitle()); break;
+	case mtpc_messageActionChatDeleteUser:
+		messageText = prepareChatDeleteUser(action.c_messageActionChatDeleteUser());
+		break;
+	case mtpc_messageActionChatEditPhoto:
+		messageText = prepareChatEditPhoto(action.c_messageActionChatEditPhoto());
+		break;
+	case mtpc_messageActionChatEditTitle:
+		messageText = prepareChatEditTitle(action.c_messageActionChatEditTitle());
+		break;
 	case mtpc_messageActionChatMigrateTo: messageText.text = lang(lng_action_group_migrate); break;
 	case mtpc_messageActionChannelMigrateFrom: messageText.text = lang(lng_action_group_migrate); break;
 	case mtpc_messageActionPinMessage: messageText = preparePinnedText(); break;
@@ -264,7 +279,7 @@ bool HistoryService::updateDependent(bool force) {
 }
 
 HistoryService::PreparedText HistoryService::preparePinnedText() {
-	auto result = PreparedText {};
+	auto result = PreparedText{};
 	auto pinned = Get<HistoryServicePinned>();
 	if (pinned && pinned->msg) {
 		auto mediaText = ([pinned]() -> QString {
@@ -283,7 +298,7 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 				return lang(lng_action_pinned_media_gif);
 			} break;
 			case MediaTypeSticker: {
-				auto emoji = static_cast<HistorySticker*>(media)->emoji();
+				auto emoji = static_cast<HistorySticker *>(media)->emoji();
 				if (emoji.isEmpty()) {
 					return lang(lng_action_pinned_media_sticker);
 				}
@@ -293,7 +308,7 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 			case MediaTypeMusicFile: return lang(lng_action_pinned_media_audio);
 			case MediaTypeVoiceFile: return lang(lng_action_pinned_media_voice);
 			case MediaTypeGame: {
-				auto title = static_cast<HistoryGame*>(media)->game()->title;
+				auto title = static_cast<HistoryGame *>(media)->game()->title;
 				return lng_action_pinned_media_game(lt_game, title);
 			} break;
 			}
@@ -310,7 +325,8 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 			for (; limit != 0;) {
 				--limit;
 				if (cutAt >= size) break;
-				if (original.at(cutAt).isLowSurrogate() && cutAt + 1 < size && original.at(cutAt + 1).isHighSurrogate()) {
+				if (original.at(cutAt).isLowSurrogate() && cutAt + 1 < size &&
+				    original.at(cutAt + 1).isHighSurrogate()) {
 					cutAt += 2;
 				} else {
 					++cutAt;
@@ -326,7 +342,8 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 	} else if (pinned && pinned->msgId) {
 		result.links.push_back(fromLink());
 		result.links.push_back(pinned->lnk);
-		result.text = lng_action_pinned_media(lt_from, fromLinkText(), lt_media, textcmdLink(2, lang(lng_contacts_loading)));
+		result.text =
+		    lng_action_pinned_media(lt_from, fromLinkText(), lt_media, textcmdLink(2, lang(lng_contacts_loading)));
 	} else {
 		result.links.push_back(fromLink());
 		result.text = lng_action_pinned_media(lt_from, fromLinkText(), lt_media, lang(lng_deleted_message));
@@ -335,7 +352,7 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 }
 
 HistoryService::PreparedText HistoryService::prepareGameScoreText() {
-	auto result = PreparedText {};
+	auto result = PreparedText{};
 	auto gamescore = Get<HistoryServiceGameScore>();
 
 	auto computeGameTitle = [gamescore, &result]() -> QString {
@@ -343,7 +360,7 @@ HistoryService::PreparedText HistoryService::prepareGameScoreText() {
 			if (auto media = gamescore->msg->getMedia()) {
 				if (media->type() == MediaTypeGame) {
 					result.links.push_back(MakeShared<ReplyMarkupClickHandler>(gamescore->msg, 0, 0));
-					auto titleText = static_cast<HistoryGame*>(media)->game()->title;
+					auto titleText = static_cast<HistoryGame *>(media)->game()->title;
 					return textcmdLink(result.links.size(), titleText);
 				}
 			}
@@ -375,14 +392,14 @@ HistoryService::PreparedText HistoryService::prepareGameScoreText() {
 }
 
 HistoryService::PreparedText HistoryService::preparePaymentSentText() {
-	auto result = PreparedText {};
+	auto result = PreparedText{};
 	auto payment = Get<HistoryServicePayment>();
 
 	auto invoiceTitle = ([payment]() -> QString {
 		if (payment && payment->msg) {
 			if (auto media = payment->msg->getMedia()) {
 				if (media->type() == MediaTypeInvoice) {
-					return static_cast<HistoryInvoice*>(media)->getTitle();
+					return static_cast<HistoryInvoice *>(media)->getTitle();
 				}
 			}
 			return lang(lng_deleted_message);
@@ -395,23 +412,27 @@ HistoryService::PreparedText HistoryService::preparePaymentSentText() {
 	if (invoiceTitle.isEmpty()) {
 		result.text = lng_action_payment_done(lt_amount, payment->amount, lt_user, history()->peer->name);
 	} else {
-		result.text = lng_action_payment_done_for(lt_amount, payment->amount, lt_user, history()->peer->name, lt_invoice, invoiceTitle);
+		result.text = lng_action_payment_done_for(lt_amount, payment->amount, lt_user, history()->peer->name,
+		                                          lt_invoice, invoiceTitle);
 	}
 	return result;
 }
 
-HistoryService::HistoryService(not_null<History*> history, const MTPDmessage &message) :
-	HistoryItem(history, message.vid.v, message.vflags.v, ::date(message.vdate), message.has_from_id() ? message.vfrom_id.v : 0) {
+HistoryService::HistoryService(not_null<History *> history, const MTPDmessage &message)
+    : HistoryItem(history, message.vid.v, message.vflags.v, ::date(message.vdate),
+                  message.has_from_id() ? message.vfrom_id.v : 0) {
 	createFromMtp(message);
 }
 
-HistoryService::HistoryService(not_null<History*> history, const MTPDmessageService &message) :
-	HistoryItem(history, message.vid.v, mtpCastFlags(message.vflags.v), ::date(message.vdate), message.has_from_id() ? message.vfrom_id.v : 0) {
+HistoryService::HistoryService(not_null<History *> history, const MTPDmessageService &message)
+    : HistoryItem(history, message.vid.v, mtpCastFlags(message.vflags.v), ::date(message.vdate),
+                  message.has_from_id() ? message.vfrom_id.v : 0) {
 	createFromMtp(message);
 }
 
-HistoryService::HistoryService(not_null<History*> history, MsgId msgId, QDateTime date, const PreparedText &message, MTPDmessage::Flags flags, qint32 from, PhotoData *photo) :
-	HistoryItem(history, msgId, flags, date, from) {
+HistoryService::HistoryService(not_null<History *> history, MsgId msgId, QDateTime date, const PreparedText &message,
+                               MTPDmessage::Flags flags, qint32 from, PhotoData *photo)
+    : HistoryItem(history, msgId, flags, date, from) {
 	setServiceText(message);
 	if (photo) {
 		_media = std::make_unique<HistoryPhoto>(this, history->peer, photo, st::msgServicePhotoWidth);
@@ -523,7 +544,8 @@ int HistoryService::resizeContentGetHeight() {
 		} else {
 			_height += _textHeight;
 		}
-		_height += st::msgServicePadding.top() + st::msgServicePadding.bottom() + st::msgServiceMargin.top() + st::msgServiceMargin.bottom();
+		_height += st::msgServicePadding.top() + st::msgServicePadding.bottom() + st::msgServiceMargin.top() +
+		           st::msgServiceMargin.bottom();
 		if (_media) {
 			_height += st::msgServiceMargin.top() + _media->resizeGetHeight(_media->currentWidth());
 		}
@@ -552,7 +574,7 @@ TimeMs HistoryService::getSelfDestructIn(TimeMs now) {
 					}
 					Unexpected("Type in HistoryServiceSelfDestruct::Type");
 				};
-				setServiceText({ text() });
+				setServiceText({text()});
 				return 0;
 			}
 			return selfdestruct->destructAt - now;
@@ -615,7 +637,9 @@ HistoryTextState HistoryService::getState(QPoint point, HistoryStateRequest requ
 			}
 		}
 	} else if (_media) {
-		result = _media->getState(point - QPoint(st::msgServiceMargin.left() + (g.width() - _media->maxWidth()) / 2, st::msgServiceMargin.top() + g.height() + st::msgServiceMargin.top()), request);
+		result = _media->getState(point - QPoint(st::msgServiceMargin.left() + (g.width() - _media->maxWidth()) / 2,
+		                                         st::msgServiceMargin.top() + g.height() + st::msgServiceMargin.top()),
+		                          request);
 	}
 	return result;
 }
@@ -629,7 +653,7 @@ void HistoryService::createFromMtp(const MTPDmessage &message) {
 			Assert(photo.has_ttl_seconds());
 			setSelfDestruct(HistoryServiceSelfDestruct::Type::Photo, photo.vttl_seconds.v);
 			if (out()) {
-				setServiceText({ lang(lng_ttl_photo_sent) });
+				setServiceText({lang(lng_ttl_photo_sent)});
 			} else {
 				auto result = PreparedText();
 				result.links.push_back(fromLink());
@@ -637,7 +661,7 @@ void HistoryService::createFromMtp(const MTPDmessage &message) {
 				setServiceText(std::move(result));
 			}
 		} else {
-			setServiceText({ lang(lng_ttl_photo_expired) });
+			setServiceText({lang(lng_ttl_photo_expired)});
 		}
 	} break;
 	case mtpc_messageMediaDocument: {
@@ -646,7 +670,7 @@ void HistoryService::createFromMtp(const MTPDmessage &message) {
 			Assert(document.has_ttl_seconds());
 			setSelfDestruct(HistoryServiceSelfDestruct::Type::Video, document.vttl_seconds.v);
 			if (out()) {
-				setServiceText({ lang(lng_ttl_video_sent) });
+				setServiceText({lang(lng_ttl_video_sent)});
 			} else {
 				auto result = PreparedText();
 				result.links.push_back(fromLink());
@@ -654,7 +678,7 @@ void HistoryService::createFromMtp(const MTPDmessage &message) {
 				setServiceText(std::move(result));
 			}
 		} else {
-			setServiceText({ lang(lng_ttl_video_expired) });
+			setServiceText({lang(lng_ttl_video_expired)});
 		}
 	} break;
 
@@ -679,7 +703,8 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 		if (auto dependent = GetDependentData()) {
 			dependent->msgId = message.vreply_to_msg_id.v;
 			if (!updateDependent()) {
-				Auth().api().requestMessageData(history()->peer->asChannel(), dependent->msgId, HistoryDependentItemCallback(fullId()));
+				Auth().api().requestMessageData(history()->peer->asChannel(), dependent->msgId,
+				                                HistoryDependentItemCallback(fullId()));
 			}
 		}
 	}
@@ -738,7 +763,7 @@ void HistoryService::eraseFromOverview() {
 }
 
 void HistoryService::updateDependentText() {
-	auto text = PreparedText {};
+	auto text = PreparedText{};
 	if (Has<HistoryServicePinned>()) {
 		text = preparePinnedText();
 	} else if (Has<HistoryServiceGameScore>()) {
@@ -772,16 +797,17 @@ HistoryService::~HistoryService() {
 	_media.reset();
 }
 
-HistoryJoined::HistoryJoined(not_null<History*> history, const QDateTime &inviteDate, not_null<UserData*> inviter, MTPDmessage::Flags flags)
-	: HistoryService(history, clientMsgId(), inviteDate, GenerateText(history, inviter), flags) {
-}
+HistoryJoined::HistoryJoined(not_null<History *> history, const QDateTime &inviteDate, not_null<UserData *> inviter,
+                             MTPDmessage::Flags flags)
+    : HistoryService(history, clientMsgId(), inviteDate, GenerateText(history, inviter), flags) {}
 
-HistoryJoined::PreparedText HistoryJoined::GenerateText(not_null<History*> history, not_null<UserData*> inviter) {
+HistoryJoined::PreparedText HistoryJoined::GenerateText(not_null<History *> history, not_null<UserData *> inviter) {
 	if (inviter->id == Auth().userPeerId()) {
-		return { lang(history->isMegagroup() ? lng_action_you_joined_group : lng_action_you_joined) };
+		return {lang(history->isMegagroup() ? lng_action_you_joined_group : lng_action_you_joined)};
 	}
-	auto result = PreparedText {};
+	auto result = PreparedText{};
 	result.links.push_back(inviter->createOpenLink());
-	result.text = (history->isMegagroup() ? lng_action_add_you_group : lng_action_add_you)(lt_from, textcmdLink(1, inviter->name));
+	result.text = (history->isMegagroup() ? lng_action_add_you_group :
+	                                        lng_action_add_you)(lt_from, textcmdLink(1, inviter->name));
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/history_service.h b/Telegram/SourceFiles/history/history_service.h
index a4b053b65..4a9df9bc5 100644
--- a/Telegram/SourceFiles/history/history_service.h
+++ b/Telegram/SourceFiles/history/history_service.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
-#include <QList>
 #include "base/runtime_composer.h"
 #include "core/click_handler.h"
 #include "core/utils.h"
-#include "structs.h"
 #include "history/history_item.h"
+#include "structs.h"
+#include <QList>
+#include <QString>
 
 struct HistoryServiceDependentData {
 	MsgId msgId = 0;
@@ -34,8 +34,7 @@ struct HistoryServiceDependentData {
 	ClickHandlerPtr lnk;
 };
 
-struct HistoryServicePinned : public RuntimeComponent<HistoryServicePinned>, public HistoryServiceDependentData {
-};
+struct HistoryServicePinned : public RuntimeComponent<HistoryServicePinned>, public HistoryServiceDependentData {};
 
 struct HistoryServiceGameScore : public RuntimeComponent<HistoryServiceGameScore>, public HistoryServiceDependentData {
 	int score = 0;
@@ -66,13 +65,15 @@ public:
 		QList<ClickHandlerPtr> links;
 	};
 
-	static not_null<HistoryService*> create(not_null<History*> history, const MTPDmessage &message) {
+	static not_null<HistoryService *> create(not_null<History *> history, const MTPDmessage &message) {
 		return _create(history, message);
 	}
-	static not_null<HistoryService*> create(not_null<History*> history, const MTPDmessageService &message) {
+	static not_null<HistoryService *> create(not_null<History *> history, const MTPDmessageService &message) {
 		return _create(history, message);
 	}
-	static not_null<HistoryService*> create(not_null<History*> history, MsgId msgId, QDateTime date, const PreparedText &message, MTPDmessage::Flags flags = 0, UserId from = 0, PhotoData *photo = nullptr) {
+	static not_null<HistoryService *> create(not_null<History *> history, MsgId msgId, QDateTime date,
+	                                         const PreparedText &message, MTPDmessage::Flags flags = 0, UserId from = 0,
+	                                         PhotoData *photo = nullptr) {
 		return _create(history, msgId, date, message, flags, from, photo);
 	}
 
@@ -124,9 +125,10 @@ public:
 protected:
 	friend class HistoryLayout::ServiceMessagePainter;
 
-	HistoryService(not_null<History*> history, const MTPDmessage &message);
-	HistoryService(not_null<History*> history, const MTPDmessageService &message);
-	HistoryService(not_null<History*> history, MsgId msgId, QDateTime date, const PreparedText &message, MTPDmessage::Flags flags = 0, UserId from = 0, PhotoData *photo = 0);
+	HistoryService(not_null<History *> history, const MTPDmessage &message);
+	HistoryService(not_null<History *> history, const MTPDmessageService &message);
+	HistoryService(not_null<History *> history, MsgId msgId, QDateTime date, const PreparedText &message,
+	               MTPDmessage::Flags flags = 0, UserId from = 0, PhotoData *photo = 0);
 	friend class HistoryItemInstantiated<HistoryService>;
 
 	void initDimensions() override;
@@ -157,7 +159,7 @@ private:
 		return nullptr;
 	}
 	const HistoryServiceDependentData *GetDependentData() const {
-		return const_cast<HistoryService*>(this)->GetDependentData();
+		return const_cast<HistoryService *>(this)->GetDependentData();
 	}
 	bool updateDependent(bool force = false);
 	void updateDependentText();
@@ -171,23 +173,23 @@ private:
 	PreparedText preparePinnedText();
 	PreparedText prepareGameScoreText();
 	PreparedText preparePaymentSentText();
-
 };
 
 class HistoryJoined : public HistoryService, private HistoryItemInstantiated<HistoryJoined> {
 public:
-	static not_null<HistoryJoined*> create(not_null<History*> history, const QDateTime &inviteDate, not_null<UserData*> inviter, MTPDmessage::Flags flags) {
+	static not_null<HistoryJoined *> create(not_null<History *> history, const QDateTime &inviteDate,
+	                                        not_null<UserData *> inviter, MTPDmessage::Flags flags) {
 		return _create(history, inviteDate, inviter, flags);
 	}
 
 protected:
-	HistoryJoined(not_null<History*> history, const QDateTime &inviteDate, not_null<UserData*> inviter, MTPDmessage::Flags flags);
+	HistoryJoined(not_null<History *> history, const QDateTime &inviteDate, not_null<UserData *> inviter,
+	              MTPDmessage::Flags flags);
 	using HistoryItemInstantiated<HistoryJoined>::_create;
 	friend class HistoryItemInstantiated<HistoryJoined>;
 
 private:
-	static PreparedText GenerateText(not_null<History*> history, not_null<UserData*> inviter);
-
+	static PreparedText GenerateText(not_null<History *> history, not_null<UserData *> inviter);
 };
 
 extern TextParseOptions _historySrvOptions;
diff --git a/Telegram/SourceFiles/history/history_service_layout.cpp b/Telegram/SourceFiles/history/history_service_layout.cpp
index 0f5fb0cf3..6b629af0a 100644
--- a/Telegram/SourceFiles/history/history_service_layout.cpp
+++ b/Telegram/SourceFiles/history/history_service_layout.cpp
@@ -20,30 +20,30 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "history/history_service_layout.h"
 
-#include "history/history_service.h"
-#include "history/history_media.h"
 #include "data/data_abstract_structure.h"
-#include "styles/style_history.h"
-#include "mainwidget.h"
+#include "history/history_media.h"
+#include "history/history_service.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "styles/style_history.h"
 
 namespace HistoryLayout {
 namespace {
 
 enum CircleMask {
-	NormalMask     = 0x00,
-	InvertedMask   = 0x01,
+	NormalMask = 0x00,
+	InvertedMask = 0x01,
 };
 enum CircleMaskMultiplier {
 	MaskMultiplier = 0x04,
 };
 enum CornerVerticalSide {
-	CornerTop      = 0x00,
-	CornerBottom   = 0x02,
+	CornerTop = 0x00,
+	CornerBottom = 0x02,
 };
 enum CornerHorizontalSide {
-	CornerLeft     = 0x00,
-	CornerRight    = 0x01,
+	CornerLeft = 0x00,
+	CornerRight = 0x01,
 };
 
 class ServiceMessageStyleData : public Data::AbstractStructure {
@@ -73,9 +73,7 @@ int historyServiceMsgInvertedRadius() {
 }
 
 int historyServiceMsgInvertedShrink() {
-	static int HistoryServiceMsgInvertedShrink = ([]() {
-		return (historyServiceMsgInvertedRadius() * 2) / 3;
-	})();
+	static int HistoryServiceMsgInvertedShrink = ([]() { return (historyServiceMsgInvertedRadius() * 2) / 3; })();
 	return HistoryServiceMsgInvertedShrink;
 }
 
@@ -142,7 +140,8 @@ int paintBubbleSide(Painter &p, int x, int y, int width, SideStyle style, Corner
 	return 0;
 }
 
-void paintBubblePart(Painter &p, int x, int y, int width, int height, SideStyle topStyle, SideStyle bottomStyle, bool forceShrink = false) {
+void paintBubblePart(Painter &p, int x, int y, int width, int height, SideStyle topStyle, SideStyle bottomStyle,
+                     bool forceShrink = false) {
 	if (topStyle == SideStyle::Inverted || bottomStyle == SideStyle::Inverted || forceShrink) {
 		width -= historyServiceMsgInvertedShrink() * 2;
 		x += historyServiceMsgInvertedShrink();
@@ -175,24 +174,24 @@ void paintPreparedDate(Painter &p, const QString &dateText, int dateTextWidth, i
 
 	left += (w - dateTextWidth - st::msgServicePadding.left() - st::msgServicePadding.right()) / 2;
 	int height = st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
-	ServiceMessagePainter::paintBubble(p, left, y + st::msgServiceMargin.top(), dateTextWidth + st::msgServicePadding.left() + st::msgServicePadding.left(), height);
+	ServiceMessagePainter::paintBubble(p, left, y + st::msgServiceMargin.top(),
+	                                   dateTextWidth + st::msgServicePadding.left() + st::msgServicePadding.left(),
+	                                   height);
 
 	p.setFont(st::msgServiceFont);
 	p.setPen(st::msgServiceFg);
-	p.drawText(left + st::msgServicePadding.left(), y + st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->ascent, dateText);
+	p.drawText(left + st::msgServicePadding.left(),
+	           y + st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->ascent, dateText);
 }
 
-} // namepsace
+} // namespace
 
 int WideChatWidth() {
 	return st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left();
 }
 
-void ServiceMessagePainter::paint(
-		Painter &p,
-		not_null<const HistoryService*> message,
-		const PaintContext &context,
-		int height) {
+void ServiceMessagePainter::paint(Painter &p, not_null<const HistoryService *> message, const PaintContext &context,
+                                  int height) {
 	auto g = message->countGeometry();
 	if (g.width() < 1) return;
 
@@ -206,7 +205,9 @@ void ServiceMessagePainter::paint(
 			auto skiptop = top - fill;
 			auto fillheight = fill + height + fill;
 
-			auto dt = (animms > st::activeFadeInDuration) ? (1. - (animms - st::activeFadeInDuration) / double(st::activeFadeOutDuration)) : (animms / double(st::activeFadeInDuration));
+			auto dt = (animms > st::activeFadeInDuration) ?
+			              (1. - (animms - st::activeFadeInDuration) / double(st::activeFadeOutDuration)) :
+			              (animms / double(st::activeFadeInDuration));
 			auto o = p.opacity();
 			p.setOpacity(o * dt);
 			p.fillRect(0, skiptop, message->history()->width, fillheight, st::defaultTextPalette.selectOverlay);
@@ -218,7 +219,8 @@ void ServiceMessagePainter::paint(
 
 	if (auto media = message->getMedia()) {
 		height -= st::msgServiceMargin.top() + media->height();
-		auto left = st::msgServiceMargin.left() + (g.width() - media->maxWidth()) / 2, top = st::msgServiceMargin.top() + height + st::msgServiceMargin.top();
+		auto left = st::msgServiceMargin.left() + (g.width() - media->maxWidth()) / 2,
+		     top = st::msgServiceMargin.top() + height + st::msgServiceMargin.top();
 		p.translate(left, top);
 		media->draw(p, context.clip.translated(-left, -top), message->skipTextSelection(context.selection), context.ms);
 		p.translate(-left, -top);
@@ -252,7 +254,8 @@ void ServiceMessagePainter::paintBubble(Painter &p, int x, int y, int w, int h)
 	paintBubblePart(p, x, y, w, h, SideStyle::Rounded, SideStyle::Rounded);
 }
 
-void ServiceMessagePainter::paintComplexBubble(Painter &p, int left, int width, const Text &text, const QRect &textRect) {
+void ServiceMessagePainter::paintComplexBubble(Painter &p, int left, int width, const Text &text,
+                                               const QRect &textRect) {
 	createCircleMasks();
 
 	auto lineWidths = countLineWidths(text, textRect);
@@ -288,7 +291,8 @@ void ServiceMessagePainter::paintComplexBubble(Painter &p, int left, int width,
 			richHeight -= st::msgServicePadding.top();
 		}
 		forceShrink = previousShrink && (richWidth == previousRichWidth);
-		paintBubblePart(p, left + ((width - richWidth) / 2), y, richWidth, richHeight, topStyle, bottomStyle, forceShrink);
+		paintBubblePart(p, left + ((width - richWidth) / 2), y, richWidth, richHeight, topStyle, bottomStyle,
+		                forceShrink);
 		y += richHeight;
 
 		previousShrink = forceShrink || (topStyle == SideStyle::Inverted) || (bottomStyle == SideStyle::Inverted);
@@ -310,7 +314,8 @@ QVector<int> ServiceMessagePainter::countLineWidths(const Text &text, const QRec
 	lineWidths.reserve(linesCount);
 	text.countLineWidths(textRect.width(), &lineWidths);
 
-	int minDelta = 2 * (historyServiceMsgRadius() + historyServiceMsgInvertedRadius() - historyServiceMsgInvertedShrink());
+	int minDelta =
+	    2 * (historyServiceMsgRadius() + historyServiceMsgInvertedRadius() - historyServiceMsgInvertedShrink());
 	for (int i = 0, count = lineWidths.size(); i < count; ++i) {
 		int width = std::max(lineWidths.at(i), 0);
 		if (i > 0) {
@@ -338,8 +343,7 @@ QVector<int> ServiceMessagePainter::countLineWidths(const Text &text, const QRec
 	return lineWidths;
 }
 
-void paintEmpty(Painter &p, int width, int height) {
-}
+void paintEmpty(Painter &p, int width, int height) {}
 
 void serviceColorsUpdated() {
 	if (serviceMessageStyle) {
@@ -351,21 +355,29 @@ void serviceColorsUpdated() {
 
 void paintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide) {
 	auto &bg = selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg);
-	auto &sh = selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) : (outbg ? st::msgOutShadow : st::msgInShadow);
-	auto cors = selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners);
+	auto &sh = selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) :
+	                      (outbg ? st::msgOutShadow : st::msgInShadow);
+	auto cors = selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) :
+	                       (outbg ? MessageOutCorners : MessageInCorners);
 	auto parts = RectPart::FullTop | RectPart::NoTopBottom | RectPart::Bottom;
 	if (tailSide == RectPart::Right) {
 		parts |= RectPart::BottomLeft;
-		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
+		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius,
+		           rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius,
+		           st::historyMessageRadius, bg);
 		auto &tail = selected ? st::historyBubbleTailOutRightSelected : st::historyBubbleTailOutRight;
 		tail.paint(p, rect.x() + rect.width(), rect.y() + rect.height() - tail.height(), outerWidth);
-		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
+		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height(),
+		           st::historyMessageRadius + tail.width(), st::msgShadow, sh);
 	} else if (tailSide == RectPart::Left) {
 		parts |= RectPart::BottomRight;
-		p.fillRect(rect.x(), rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
-		auto &tail = selected ? (outbg ? st::historyBubbleTailOutLeftSelected : st::historyBubbleTailInLeftSelected) : (outbg ? st::historyBubbleTailOutLeft : st::historyBubbleTailInLeft);
+		p.fillRect(rect.x(), rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius,
+		           st::historyMessageRadius, bg);
+		auto &tail = selected ? (outbg ? st::historyBubbleTailOutLeftSelected : st::historyBubbleTailInLeftSelected) :
+		                        (outbg ? st::historyBubbleTailOutLeft : st::historyBubbleTailInLeft);
 		tail.paint(p, rect.x() - tail.width(), rect.y() + rect.height() - tail.height(), outerWidth);
-		p.fillRect(rect.x() - tail.width(), rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
+		p.fillRect(rect.x() - tail.width(), rect.y() + rect.height(), st::historyMessageRadius + tail.width(),
+		           st::msgShadow, sh);
 	} else {
 		parts |= RectPart::FullBottom;
 	}
diff --git a/Telegram/SourceFiles/history/history_service_layout.h b/Telegram/SourceFiles/history/history_service_layout.h
index 7c32b418b..d222a4514 100644
--- a/Telegram/SourceFiles/history/history_service_layout.h
+++ b/Telegram/SourceFiles/history/history_service_layout.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "core/basic_types.h"
-#include "ui/twidget.h"
 #include "ui/text/text.h"
+#include "ui/twidget.h"
 
 class HistoryService;
 
@@ -32,10 +32,9 @@ int WideChatWidth();
 
 struct PaintContext {
 	PaintContext(TimeMs ms, const QRect &clip, TextSelection selection)
-		: ms(ms)
-		, clip(clip)
-		, selection(selection) {
-	}
+	    : ms(ms)
+	    , clip(clip)
+	    , selection(selection) {}
 	TimeMs ms;
 	const QRect &clip;
 	TextSelection selection;
@@ -43,11 +42,7 @@ struct PaintContext {
 
 class ServiceMessagePainter {
 public:
-	static void paint(
-		Painter &p,
-		not_null<const HistoryService*> message,
-		const PaintContext &context,
-		int height);
+	static void paint(Painter &p, not_null<const HistoryService *> message, const PaintContext &context, int height);
 
 	static void paintDate(Painter &p, const QDateTime &date, int y, int w);
 	static void paintDate(Painter &p, const QString &dateText, int dateTextWidth, int y, int w);
@@ -57,7 +52,6 @@ public:
 private:
 	static void paintComplexBubble(Painter &p, int left, int width, const Text &text, const QRect &textRect);
 	static QVector<int> countLineWidths(const Text &text, const QRect &textRect);
-
 };
 
 void paintEmpty(Painter &p, int width, int height);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7c77af655..5220e79c2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -18,80 +18,77 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
 #include "history/history_widget.h"
-#include "styles/style_history.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_window.h"
-#include "styles/style_boxes.h"
-#include "styles/style_profile.h"
-#include "styles/style_chat_helpers.h"
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "base/qthelp_regex.h"
 #include "boxes/confirm_box.h"
 #include "boxes/send_files_box.h"
 #include "boxes/share_box.h"
-#include "core/file_utilities.h"
-#include "ui/toast/toast.h"
-#include "ui/special_buttons.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/inner_dropdown.h"
-#include "ui/widgets/dropdown_menu.h"
-#include "ui/widgets/labels.h"
-#include "ui/effects/ripple_animation.h"
-#include "inline_bots/inline_bot_result.h"
-#include "data/data_drafts.h"
-#include "history/history_message.h"
-#include "history/history_service_layout.h"
-#include "history/history_media_types.h"
-#include "history/history_drag_area.h"
-#include "history/history_inner_widget.h"
-#include "profile/profile_block_group_members.h"
-#include "core/click_handler_types.h"
+#include "chat_helpers/bot_keyboard.h"
+#include "chat_helpers/emoji_suggestions_widget.h"
+#include "chat_helpers/message_field.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_section.h"
 #include "chat_helpers/tabbed_selector.h"
-#include "chat_helpers/bot_keyboard.h"
-#include "chat_helpers/message_field.h"
+#include "core/click_handler_types.h"
+#include "core/file_utilities.h"
+#include "data/data_drafts.h"
+#include "facades.h"
+#include "history/history_drag_area.h"
+#include "history/history_inner_widget.h"
+#include "history/history_media_types.h"
+#include "history/history_message.h"
+#include "history/history_service_layout.h"
+#include "inline_bots/inline_bot_result.h"
+#include "inline_bots/inline_results_widget.h"
 #include "lang/lang_keys.h"
-#include "application.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "passcodewidget.h"
-#include "storage/file_upload.h"
 #include "media/media_audio.h"
 #include "media/media_audio_capture.h"
 #include "media/player/media_player_instance.h"
-#include "storage/localstorage.h"
-#include "apiwrap.h"
-#include "window/top_bar_widget.h"
-#include "window/themes/window_theme.h"
 #include "observer_peer.h"
-#include "base/qthelp_regex.h"
-#include "ui/widgets/popup_menu.h"
+#include "passcodewidget.h"
 #include "platform/platform_file_utilities.h"
-#include "auth_session.h"
+#include "profile/profile_block_group_members.h"
+#include "storage/file_upload.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_history.h"
+#include "styles/style_profile.h"
+#include "styles/style_window.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/special_buttons.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/inner_dropdown.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "window/notifications_manager.h"
+#include "window/themes/window_theme.h"
+#include "window/top_bar_widget.h"
 #include "window/window_controller.h"
-#include "inline_bots/inline_results_widget.h"
-#include "chat_helpers/emoji_suggestions_widget.h"
-#include "facades.h"
-#include "mainwindow.h"
+#include <QWindow>
 // Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent.
-template <typename Object>
-class test_ptr {
+template <typename Object> class test_ptr {
 public:
-	test_ptr(std::nullptr_t) {
-	}
+	test_ptr(std::nullptr_t) {}
 
 	// No default constructor, but constructors with at least
 	// one argument are simply make functions.
 	template <typename Parent, typename... Args>
-	explicit test_ptr(Parent &&parent, Args&&... args) : _object(new Object(std::forward<Parent>(parent), std::forward<Args>(args)...)) {
-	}
+	explicit test_ptr(Parent &&parent, Args &&... args)
+	    : _object(new Object(std::forward<Parent>(parent), std::forward<Args>(args)...)) {}
 
 	test_ptr(const test_ptr &other) = delete;
 	test_ptr &operator=(const test_ptr &other) = delete;
-	test_ptr(test_ptr &&other) : _object(base::take(other._object)) {
-	}
+	test_ptr(test_ptr &&other)
+	    : _object(base::take(other._object)) {}
 	test_ptr &operator=(test_ptr &&other) {
 		auto temp = std::move(other);
 		destroy();
@@ -100,8 +97,8 @@ public:
 	}
 
 	template <typename OtherObject, typename = std::enable_if_t<std::is_base_of<Object, OtherObject>::value>>
-	test_ptr(test_ptr<OtherObject> &&other) : _object(base::take(other._object)) {
-	}
+	test_ptr(test_ptr<OtherObject> &&other)
+	    : _object(base::take(other._object)) {}
 
 	template <typename OtherObject, typename = std::enable_if_t<std::is_base_of<Object, OtherObject>::value>>
 	test_ptr &operator=(test_ptr<OtherObject> &&other) {
@@ -116,9 +113,9 @@ public:
 
 	// So we can pass this pointer to methods like connect().
 	Object *data() const {
-		return static_cast<Object*>(_object);
+		return static_cast<Object *>(_object);
 	}
-	operator Object*() const {
+	operator Object *() const {
 		return data();
 	}
 
@@ -134,8 +131,7 @@ public:
 	}
 
 	// Use that instead "= new Object(parent, ...)"
-	template <typename Parent, typename... Args>
-	void create(Parent &&parent, Args&&... args) {
+	template <typename Parent, typename... Args> void create(Parent &&parent, Args &&... args) {
 		destroy();
 		_object = new Object(std::forward<Parent>(parent), std::forward<Args>(args)...);
 	}
@@ -144,7 +140,7 @@ public:
 	}
 	void destroyDelayed() {
 		if (_object) {
-			if (auto widget = base::up_cast<QWidget*>(data())) {
+			if (auto widget = base::up_cast<QWidget *>(data())) {
 				widget->hide();
 			}
 			base::take(_object)->deleteLater();
@@ -160,15 +156,13 @@ public:
 	}
 
 private:
-	template <typename OtherObject>
-	friend class test_ptr;
+	template <typename OtherObject> friend class test_ptr;
 
 	QPointer<QObject> _object;
-
 };
 
 class TestClass;
-test_ptr<TestClass> tmp = { nullptr };
+test_ptr<TestClass> tmp = {nullptr};
 
 namespace {
 
@@ -201,31 +195,40 @@ MTPVector<MTPDocumentAttribute> composeDocumentAttributes(DocumentData *document
 			if (document->isRoundVideo()) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_round_message;
 			}
-			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(duration), MTP_int(document->dimensions.width()), MTP_int(document->dimensions.height())));
+			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(duration),
+			                                                MTP_int(document->dimensions.width()),
+			                                                MTP_int(document->dimensions.height())));
 		} else {
-			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(document->dimensions.width()), MTP_int(document->dimensions.height())));
+			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(document->dimensions.width()),
+			                                                    MTP_int(document->dimensions.height())));
 		}
 	}
 	if (document->type == AnimatedDocument) {
 		attributes.push_back(MTP_documentAttributeAnimated());
 	} else if (document->type == StickerDocument && document->sticker()) {
-		attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(document->sticker()->alt), document->sticker()->set, MTPMaskCoords()));
+		attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(document->sticker()->alt),
+		                                                  document->sticker()->set, MTPMaskCoords()));
 	} else if (document->type == SongDocument && document->song()) {
 		auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
-		attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(document->song()->duration), MTP_string(document->song()->title), MTP_string(document->song()->performer), MTPstring()));
+		attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(document->song()->duration),
+		                                                MTP_string(document->song()->title),
+		                                                MTP_string(document->song()->performer), MTPstring()));
 	} else if (document->type == VoiceDocument && document->voice()) {
 		auto flags = MTPDdocumentAttributeAudio::Flag::f_voice | MTPDdocumentAttributeAudio::Flag::f_waveform;
-		attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(document->voice()->duration), MTPstring(), MTPstring(), MTP_bytes(documentWaveformEncode5bit(document->voice()->waveform))));
+		attributes.push_back(
+		    MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(document->voice()->duration), MTPstring(), MTPstring(),
+		                               MTP_bytes(documentWaveformEncode5bit(document->voice()->waveform))));
 	}
 	return MTP_vector<MTPDocumentAttribute>(attributes);
 }
 
 } // namespace
 
-ReportSpamPanel::ReportSpamPanel(QWidget *parent) : TWidget(parent),
-_report(this, lang(lng_report_spam), st::reportSpamHide),
-_hide(this, lang(lng_report_spam_hide), st::reportSpamHide),
-_clear(this, lang(lng_profile_delete_conversation)) {
+ReportSpamPanel::ReportSpamPanel(QWidget *parent)
+    : TWidget(parent)
+    , _report(this, lang(lng_report_spam), st::reportSpamHide)
+    , _hide(this, lang(lng_report_spam_hide), st::reportSpamHide)
+    , _clear(this, lang(lng_profile_delete_conversation)) {
 	resize(parent->width(), _hide->height() + st::lineWidth);
 
 	connect(_report, SIGNAL(clicked()), this, SIGNAL(reportClicked()));
@@ -239,24 +242,29 @@ void ReportSpamPanel::resizeEvent(QResizeEvent *e) {
 	_report->resize(width() - (_hide->width() + st::reportSpamSeparator) * 2, _report->height());
 	_report->moveToLeft(_hide->width() + st::reportSpamSeparator, 0);
 	_hide->moveToRight(0, 0);
-	_clear->move((width() - _clear->width()) / 2, height() - _clear->height() - ((height() - st::msgFont->height - _clear->height()) / 2));
+	_clear->move((width() - _clear->width()) / 2,
+	             height() - _clear->height() - ((height() - st::msgFont->height - _clear->height()) / 2));
 }
 
 void ReportSpamPanel::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	p.fillRect(QRect(0, 0, width(), height() - st::lineWidth), st::reportSpamBg);
-	p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, height() - st::lineWidth, width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
+	p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, height() - st::lineWidth,
+	           width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
 	if (!_clear->isHidden()) {
 		p.setPen(st::reportSpamFg);
 		p.setFont(st::msgFont);
-		p.drawText(QRect(_report->x(), (_clear->y() - st::msgFont->height) / 2, _report->width(), st::msgFont->height), lang(lng_report_spam_thanks), style::al_top);
+		p.drawText(QRect(_report->x(), (_clear->y() - st::msgFont->height) / 2, _report->width(), st::msgFont->height),
+		           lang(lng_report_spam_thanks), style::al_top);
 	}
 }
 
 void ReportSpamPanel::setReported(bool reported, PeerData *onPeer) {
 	if (reported) {
 		_report->hide();
-		_clear->setText(lang(onPeer->isChannel() ? (onPeer->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel) : lng_profile_delete_conversation));
+		_clear->setText(lang(onPeer->isChannel() ?
+		                         (onPeer->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel) :
+		                         lng_profile_delete_conversation));
 		_clear->show();
 	} else {
 		_report->show();
@@ -265,39 +273,44 @@ void ReportSpamPanel::setReported(bool reported, PeerData *onPeer) {
 	update();
 }
 
-HistoryHider::HistoryHider(MainWidget *parent, const SelectedItemSet &items) : TWidget(parent)
-, _forwardItems(items)
-, _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
-, _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
+HistoryHider::HistoryHider(MainWidget *parent, const SelectedItemSet &items)
+    : TWidget(parent)
+    , _forwardItems(items)
+    , _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
+    , _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
 	init();
 }
 
-HistoryHider::HistoryHider(MainWidget *parent, UserData *sharedContact) : TWidget(parent)
-, _sharedContact(sharedContact)
-, _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
-, _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
+HistoryHider::HistoryHider(MainWidget *parent, UserData *sharedContact)
+    : TWidget(parent)
+    , _sharedContact(sharedContact)
+    , _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
+    , _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
 	init();
 }
 
-HistoryHider::HistoryHider(MainWidget *parent) : TWidget(parent)
-, _sendPath(true)
-, _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
-, _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
+HistoryHider::HistoryHider(MainWidget *parent)
+    : TWidget(parent)
+    , _sendPath(true)
+    , _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
+    , _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
 	init();
 }
 
-HistoryHider::HistoryHider(MainWidget *parent, const QString &botAndQuery) : TWidget(parent)
-, _botAndQuery(botAndQuery)
-, _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
-, _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
+HistoryHider::HistoryHider(MainWidget *parent, const QString &botAndQuery)
+    : TWidget(parent)
+    , _botAndQuery(botAndQuery)
+    , _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
+    , _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
 	init();
 }
 
-HistoryHider::HistoryHider(MainWidget *parent, const QString &url, const QString &text) : TWidget(parent)
-, _shareUrl(url)
-, _shareText(text)
-, _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
-, _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
+HistoryHider::HistoryHider(MainWidget *parent, const QString &url, const QString &text)
+    : TWidget(parent)
+    , _shareUrl(url)
+    , _shareText(text)
+    , _send(this, langFactory(lng_forward_send), st::defaultBoxButton)
+    , _cancel(this, langFactory(lng_cancel), st::defaultBoxButton) {
 	init();
 }
 
@@ -320,7 +333,8 @@ void HistoryHider::init() {
 	connect(_cancel, SIGNAL(clicked()), this, SLOT(startHide()));
 	subscribe(Global::RefPeerChooseCancel(), [this] { startHide(); });
 
-	_chooseWidth = st::historyForwardChooseFont->width(lang(_botAndQuery.isEmpty() ? lng_forward_choose : lng_inline_switch_choose));
+	_chooseWidth = st::historyForwardChooseFont->width(
+	    lang(_botAndQuery.isEmpty() ? lng_forward_choose : lng_inline_switch_choose));
 
 	resizeEvent(0);
 	_a_opacity.start([this] { update(); }, 0., 1., st::boxDuration);
@@ -355,14 +369,18 @@ void HistoryHider::paintEvent(QPaintEvent *e) {
 			App::roundRect(p, _box, st::boxBg, BoxCorners);
 
 			p.setPen(st::boxTextFg);
-			_toText.drawLeftElided(p, _box.left() + st::boxPadding.left(), _box.y() + st::boxTopMargin + st::boxPadding.top(), _toTextWidth + 2, width(), 1, style::al_left);
+			_toText.drawLeftElided(p, _box.left() + st::boxPadding.left(),
+			                       _box.y() + st::boxTopMargin + st::boxPadding.top(), _toTextWidth + 2, width(), 1,
+			                       style::al_left);
 		} else {
 			auto w = st::historyForwardChooseMargins.left() + _chooseWidth + st::historyForwardChooseMargins.right();
-			auto h = st::historyForwardChooseMargins.top() + st::historyForwardChooseFont->height + st::historyForwardChooseMargins.bottom();
+			auto h = st::historyForwardChooseMargins.top() + st::historyForwardChooseFont->height +
+			         st::historyForwardChooseMargins.bottom();
 			App::roundRect(p, (width() - w) / 2, (height() - h) / 2, w, h, st::historyForwardChooseBg, ForwardCorners);
 
 			p.setPen(st::historyForwardChooseFg);
-			p.drawText(_box, lang(_botAndQuery.isEmpty() ? lng_forward_choose : lng_inline_switch_choose), QTextOption(style::al_center));
+			p.drawText(_box, lang(_botAndQuery.isEmpty() ? lng_forward_choose : lng_inline_switch_choose),
+			           QTextOption(style::al_center));
 		}
 	} else {
 		p.drawPixmap(_box.left(), _box.top(), _cacheForAnim);
@@ -438,7 +456,7 @@ void HistoryHider::forwardDone() {
 }
 
 MainWidget *HistoryHider::parent() {
-	return static_cast<MainWidget*>(parentWidget());
+	return static_cast<MainWidget *>(parentWidget());
 }
 
 void HistoryHider::resizeEvent(QResizeEvent *e) {
@@ -453,15 +471,19 @@ void HistoryHider::updateControlsGeometry() {
 			_send->show();
 			_cancel->show();
 		}
-		h += st::boxTopMargin + std::max(st::boxTextFont->height, st::boxLabelStyle.lineHeight) + st::boxButtonPadding.top() + _send->height() + st::boxButtonPadding.bottom();
+		h += st::boxTopMargin + std::max(st::boxTextFont->height, st::boxLabelStyle.lineHeight) +
+		     st::boxButtonPadding.top() + _send->height() + st::boxButtonPadding.bottom();
 	} else {
 		h += st::historyForwardChooseFont->height;
 		_send->hide();
 		_cancel->hide();
 	}
 	_box = QRect((width() - w) / 2, (height() - h) / 2, w, h);
-	_send->moveToRight(width() - (_box.x() + _box.width()) + st::boxButtonPadding.right(), _box.y() + _box.height() - st::boxButtonPadding.bottom() - _send->height());
-	_cancel->moveToRight(width() - (_box.x() + _box.width()) + st::boxButtonPadding.right() + _send->width() + st::boxButtonPadding.left(), _send->y());
+	_send->moveToRight(width() - (_box.x() + _box.width()) + st::boxButtonPadding.right(),
+	                   _box.y() + _box.height() - st::boxButtonPadding.bottom() - _send->height());
+	_cancel->moveToRight(width() - (_box.x() + _box.width()) + st::boxButtonPadding.right() + _send->width() +
+	                         st::boxButtonPadding.left(),
+	                     _send->y());
 }
 
 bool HistoryHider::offerPeer(PeerId peer) {
@@ -561,10 +583,10 @@ protected:
 
 private:
 	bool _checked = false;
-
 };
 
-SilentToggle::SilentToggle(QWidget *parent) : IconButton(parent, st::historySilentToggle) {
+SilentToggle::SilentToggle(QWidget *parent)
+    : IconButton(parent, st::historySilentToggle) {
 	setMouseTracking(true);
 }
 
@@ -580,7 +602,8 @@ void SilentToggle::mouseMoveEvent(QMouseEvent *e) {
 void SilentToggle::setChecked(bool checked) {
 	if (_checked != checked) {
 		_checked = checked;
-		setIconOverride(_checked ? &st::historySilentToggleOn : nullptr, _checked ? &st::historySilentToggleOnOver : nullptr);
+		setIconOverride(_checked ? &st::historySilentToggleOn : nullptr,
+		                _checked ? &st::historySilentToggleOnOver : nullptr);
 	}
 }
 
@@ -595,7 +618,8 @@ void SilentToggle::mouseReleaseEvent(QMouseEvent *e) {
 	Ui::Tooltip::Show(0, this);
 	auto p = App::main() ? App::main()->peer() : nullptr;
 	if (p && p->isChannel() && p->notify != UnknownNotifySettings) {
-		App::main()->updateNotifySetting(p, NotifySettingDontChange, _checked ? SilentNotifiesSetSilent : SilentNotifiesSetNotify);
+		App::main()->updateNotifySetting(p, NotifySettingDontChange,
+		                                 _checked ? SilentNotifiesSetSilent : SilentNotifiesSetNotify);
 	}
 }
 
@@ -607,34 +631,35 @@ QPoint SilentToggle::tooltipPos() const {
 	return QCursor::pos();
 }
 
-HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> controller) : Window::AbstractSectionWidget(parent, controller)
-, _fieldBarCancel(this, st::historyReplyCancel)
-, _topBar(this, controller)
-, _scroll(this, st::historyScroll, false)
-, _historyDown(_scroll, st::historyToDown)
-, _unreadMentions(_scroll, st::historyUnreadMentions)
-, _fieldAutocomplete(this)
-, _send(this)
-, _unblock(this, lang(lng_unblock_button).toUpper(), st::historyUnblock)
-, _botStart(this, lang(lng_bot_start).toUpper(), st::historyComposeButton)
-, _joinChannel(this, lang(lng_channel_join).toUpper(), st::historyComposeButton)
-, _muteUnmute(this, lang(lng_channel_mute).toUpper(), st::historyComposeButton)
-, _attachToggle(this, st::historyAttach)
-, _tabbedSelectorToggle(this, st::historyAttachEmoji)
-, _botKeyboardShow(this, st::historyBotKeyboardShow)
-, _botKeyboardHide(this, st::historyBotKeyboardHide)
-, _botCommandStart(this, st::historyBotCommandStart)
-, _silent(this)
-, _field(this, controller, st::historyComposeField, langFactory(lng_message_ph))
-, _recordCancelWidth(st::historyRecordFont->width(lang(lng_record_cancel)))
-, _a_recording(animation(this, &HistoryWidget::step_recording))
-, _kbScroll(this, st::botKbScroll)
-, _tabbedPanel(this, controller)
-, _tabbedSelector(_tabbedPanel->getSelector())
-, _attachDragDocument(this)
-, _attachDragPhoto(this)
-, _fileLoader(this, FileLoaderQueueStopTimeout)
-, _topShadow(this, st::shadowFg) {
+HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : Window::AbstractSectionWidget(parent, controller)
+    , _fieldBarCancel(this, st::historyReplyCancel)
+    , _topBar(this, controller)
+    , _scroll(this, st::historyScroll, false)
+    , _historyDown(_scroll, st::historyToDown)
+    , _unreadMentions(_scroll, st::historyUnreadMentions)
+    , _fieldAutocomplete(this)
+    , _send(this)
+    , _unblock(this, lang(lng_unblock_button).toUpper(), st::historyUnblock)
+    , _botStart(this, lang(lng_bot_start).toUpper(), st::historyComposeButton)
+    , _joinChannel(this, lang(lng_channel_join).toUpper(), st::historyComposeButton)
+    , _muteUnmute(this, lang(lng_channel_mute).toUpper(), st::historyComposeButton)
+    , _attachToggle(this, st::historyAttach)
+    , _tabbedSelectorToggle(this, st::historyAttachEmoji)
+    , _botKeyboardShow(this, st::historyBotKeyboardShow)
+    , _botKeyboardHide(this, st::historyBotKeyboardHide)
+    , _botCommandStart(this, st::historyBotCommandStart)
+    , _silent(this)
+    , _field(this, controller, st::historyComposeField, langFactory(lng_message_ph))
+    , _recordCancelWidth(st::historyRecordFont->width(lang(lng_record_cancel)))
+    , _a_recording(animation(this, &HistoryWidget::step_recording))
+    , _kbScroll(this, st::botKbScroll)
+    , _tabbedPanel(this, controller)
+    , _tabbedSelector(_tabbedPanel->getSelector())
+    , _attachDragDocument(this)
+    , _attachDragPhoto(this)
+    , _fileLoader(this, FileLoaderQueueStopTimeout)
+    , _topShadow(this, st::shadowFg) {
 	setAcceptDrops(true);
 
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
@@ -657,21 +682,23 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
 	connect(_field, SIGNAL(changed()), this, SLOT(onTextChange()));
 	connect(_field, SIGNAL(spacedReturnedPasted()), this, SLOT(onPreviewParse()));
 	connect(_field, SIGNAL(linksChanged()), this, SLOT(onPreviewCheck()));
-    connect(static_cast<const QWindow*>(App::wnd()->windowHandle()), SIGNAL(visibleChanged(bool)), this, SLOT(onWindowVisibleChanged()));
+	connect(static_cast<const QWindow *>(App::wnd()->windowHandle()), SIGNAL(visibleChanged(bool)), this,
+	        SLOT(onWindowVisibleChanged()));
 	connect(&_scrollTimer, SIGNAL(timeout()), this, SLOT(onScrollTimer()));
 	connect(_tabbedSelector, SIGNAL(emojiSelected(EmojiPtr)), _field, SLOT(onEmojiInsert(EmojiPtr)));
-	connect(_tabbedSelector, SIGNAL(stickerSelected(DocumentData*)), this, SLOT(onStickerSend(DocumentData*)));
-	connect(_tabbedSelector, SIGNAL(photoSelected(PhotoData*)), this, SLOT(onPhotoSend(PhotoData*)));
-	connect(_tabbedSelector, SIGNAL(inlineResultSelected(InlineBots::Result*,UserData*)), this, SLOT(onInlineResultSend(InlineBots::Result*,UserData*)));
+	connect(_tabbedSelector, SIGNAL(stickerSelected(DocumentData *)), this, SLOT(onStickerSend(DocumentData *)));
+	connect(_tabbedSelector, SIGNAL(photoSelected(PhotoData *)), this, SLOT(onPhotoSend(PhotoData *)));
+	connect(_tabbedSelector, SIGNAL(inlineResultSelected(InlineBots::Result *, UserData *)), this,
+	        SLOT(onInlineResultSend(InlineBots::Result *, UserData *)));
 	connect(&_sendActionStopTimer, SIGNAL(timeout()), this, SLOT(onCancelSendAction()));
 	connect(&_previewTimer, SIGNAL(timeout()), this, SLOT(onPreviewTimeout()));
 	connect(Media::Capture::instance(), SIGNAL(error()), this, SLOT(onRecordError()));
-	connect(Media::Capture::instance(), SIGNAL(updated(quint16,qint32)), this, SLOT(onRecordUpdate(quint16,qint32)));
-	connect(Media::Capture::instance(), SIGNAL(done(QByteArray,VoiceWaveform,qint32)), this, SLOT(onRecordDone(QByteArray,VoiceWaveform,qint32)));
+	connect(Media::Capture::instance(), SIGNAL(updated(quint16, qint32)), this, SLOT(onRecordUpdate(quint16, qint32)));
+	connect(Media::Capture::instance(), SIGNAL(done(QByteArray, VoiceWaveform, qint32)), this,
+	        SLOT(onRecordDone(QByteArray, VoiceWaveform, qint32)));
 
-	_attachToggle->setClickedCallback(App::LambdaDelayed(st::historyAttach.ripple.hideDuration, this, [this] {
-		chooseAttach();
-	}));
+	_attachToggle->setClickedCallback(
+	    App::LambdaDelayed(st::historyAttach.ripple.hideDuration, this, [this] { chooseAttach(); }));
 
 	_updateHistoryItems.setSingleShot(true);
 	connect(&_updateHistoryItems, SIGNAL(timeout()), this, SLOT(onUpdateHistoryItems()));
@@ -707,15 +734,19 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
 	_unreadMentions->installEventFilter(this);
 
 	_fieldAutocomplete->hide();
-	connect(_fieldAutocomplete, SIGNAL(mentionChosen(UserData*,FieldAutocomplete::ChooseMethod)), this, SLOT(onMentionInsert(UserData*)));
-	connect(_fieldAutocomplete, SIGNAL(hashtagChosen(QString,FieldAutocomplete::ChooseMethod)), this, SLOT(onHashtagOrBotCommandInsert(QString,FieldAutocomplete::ChooseMethod)));
-	connect(_fieldAutocomplete, SIGNAL(botCommandChosen(QString,FieldAutocomplete::ChooseMethod)), this, SLOT(onHashtagOrBotCommandInsert(QString,FieldAutocomplete::ChooseMethod)));
-	connect(_fieldAutocomplete, SIGNAL(stickerChosen(DocumentData*,FieldAutocomplete::ChooseMethod)), this, SLOT(onStickerSend(DocumentData*)));
-	connect(_fieldAutocomplete, SIGNAL(moderateKeyActivate(int,bool*)), this, SLOT(onModerateKeyActivate(int,bool*)));
+	connect(_fieldAutocomplete, SIGNAL(mentionChosen(UserData *, FieldAutocomplete::ChooseMethod)), this,
+	        SLOT(onMentionInsert(UserData *)));
+	connect(_fieldAutocomplete, SIGNAL(hashtagChosen(QString, FieldAutocomplete::ChooseMethod)), this,
+	        SLOT(onHashtagOrBotCommandInsert(QString, FieldAutocomplete::ChooseMethod)));
+	connect(_fieldAutocomplete, SIGNAL(botCommandChosen(QString, FieldAutocomplete::ChooseMethod)), this,
+	        SLOT(onHashtagOrBotCommandInsert(QString, FieldAutocomplete::ChooseMethod)));
+	connect(_fieldAutocomplete, SIGNAL(stickerChosen(DocumentData *, FieldAutocomplete::ChooseMethod)), this,
+	        SLOT(onStickerSend(DocumentData *)));
+	connect(_fieldAutocomplete, SIGNAL(moderateKeyActivate(int, bool *)), this,
+	        SLOT(onModerateKeyActivate(int, bool *)));
 	_field->installEventFilter(_fieldAutocomplete);
-	_field->setInsertFromMimeDataHook([this](const QMimeData *data) {
-		return confirmSendingFiles(data, CompressConfirm::Auto, data->text());
-	});
+	_field->setInsertFromMimeDataHook(
+	    [this](const QMimeData *data) { return confirmSendingFiles(data, CompressConfirm::Auto, data->text()); });
 	_emojiSuggestions.create(this, _field.data());
 	updateFieldSubmitSettings();
 
@@ -751,15 +782,15 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
 
 	_topShadow->hide();
 
-	_attachDragDocument->setDroppedCallback([this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::No); });
-	_attachDragPhoto->setDroppedCallback([this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::Yes); });
+	_attachDragDocument->setDroppedCallback(
+	    [this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::No); });
+	_attachDragPhoto->setDroppedCallback(
+	    [this](const QMimeData *data) { confirmSendingFiles(data, CompressConfirm::Yes); });
 
 	connect(&_updateEditTimeLeftDisplay, SIGNAL(timeout()), this, SLOT(updateField()));
 
 	subscribe(Adaptive::Changed(), [this] { update(); });
-	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) {
-		itemRemoved(item);
-	});
+	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) { itemRemoved(item); });
 	subscribe(Auth().data().contactsLoaded(), [this](bool) {
 		if (_peer) {
 			updateReportSpamStatus();
@@ -772,53 +803,45 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
 		}
 	});
 	using UpdateFlag = Notify::PeerUpdate::Flag;
-	auto changes = UpdateFlag::ChannelRightsChanged
-		| UpdateFlag::UnreadMentionsChanged
-		| UpdateFlag::MigrationChanged
-		| UpdateFlag::RestrictionReasonChanged
-		| UpdateFlag::ChannelPinnedChanged
-		| UpdateFlag::UserIsBlocked
-		| UpdateFlag::AdminsChanged
-		| UpdateFlag::MembersChanged
-		| UpdateFlag::UserOnlineChanged;
+	auto changes = UpdateFlag::ChannelRightsChanged | UpdateFlag::UnreadMentionsChanged | UpdateFlag::MigrationChanged |
+	               UpdateFlag::RestrictionReasonChanged | UpdateFlag::ChannelPinnedChanged | UpdateFlag::UserIsBlocked |
+	               UpdateFlag::AdminsChanged | UpdateFlag::MembersChanged | UpdateFlag::UserOnlineChanged;
 	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(changes, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _peer) {
-			if (update.flags & UpdateFlag::ChannelRightsChanged) {
-				onPreviewCheck();
-			}
-			if (update.flags & UpdateFlag::UnreadMentionsChanged) {
-				updateUnreadMentionsVisibility();
-			}
-			if (update.flags & UpdateFlag::MigrationChanged) {
-				if (auto channel = _peer->migrateTo()) {
-					Ui::showPeerHistory(channel, ShowAtUnreadMsgId);
-					Auth().api().requestParticipantsCountDelayed(channel);
-					return;
-				}
-			}
-			if (update.flags & UpdateFlag::RestrictionReasonChanged) {
-				auto restriction = _peer->restrictionReason();
-				if (!restriction.isEmpty()) {
-					App::main()->showBackFromStack();
-					Ui::show(Box<InformBox>(restriction));
-					return;
-				}
-			}
-			if (update.flags & UpdateFlag::ChannelPinnedChanged) {
-				if (pinnedMsgVisibilityUpdated()) {
-					updateHistoryGeometry();
-					updateControlsVisibility();
-					updateControlsGeometry();
-				}
-			}
-			if (update.flags & (UpdateFlag::UserIsBlocked
-				| UpdateFlag::AdminsChanged
-				| UpdateFlag::MembersChanged
-				| UpdateFlag::UserOnlineChanged)) {
-				handlePeerUpdate();
-			}
-		}
-	}));
+		          if (update.peer == _peer) {
+			          if (update.flags & UpdateFlag::ChannelRightsChanged) {
+				          onPreviewCheck();
+			          }
+			          if (update.flags & UpdateFlag::UnreadMentionsChanged) {
+				          updateUnreadMentionsVisibility();
+			          }
+			          if (update.flags & UpdateFlag::MigrationChanged) {
+				          if (auto channel = _peer->migrateTo()) {
+					          Ui::showPeerHistory(channel, ShowAtUnreadMsgId);
+					          Auth().api().requestParticipantsCountDelayed(channel);
+					          return;
+				          }
+			          }
+			          if (update.flags & UpdateFlag::RestrictionReasonChanged) {
+				          auto restriction = _peer->restrictionReason();
+				          if (!restriction.isEmpty()) {
+					          App::main()->showBackFromStack();
+					          Ui::show(Box<InformBox>(restriction));
+					          return;
+				          }
+			          }
+			          if (update.flags & UpdateFlag::ChannelPinnedChanged) {
+				          if (pinnedMsgVisibilityUpdated()) {
+					          updateHistoryGeometry();
+					          updateControlsVisibility();
+					          updateControlsGeometry();
+				          }
+			          }
+			          if (update.flags & (UpdateFlag::UserIsBlocked | UpdateFlag::AdminsChanged |
+			                              UpdateFlag::MembersChanged | UpdateFlag::UserOnlineChanged)) {
+				          handlePeerUpdate();
+			          }
+		          }
+	          }));
 	subscribe(controller->window()->widgetGrabbed(), [this] {
 		// Qt bug workaround: QWidget::render() for an arbitrary widget calls
 		// sendPendingMoveAndResizeEvents(true, true) for the whole window,
@@ -931,7 +954,8 @@ void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
 		// jump to the bottom of history in some updateHistoryGeometry() call.
 		synteticScrollToY(scrollTop);
 	}
-	_scrollToAnimation.start([this, itemId = attachTo->fullId()] { scrollToAnimationCallback(itemId); }, scrollTop - itemTop, scrollTo - itemTop, st::slideDuration, anim::sineInOut);
+	_scrollToAnimation.start([this, itemId = attachTo->fullId()] { scrollToAnimationCallback(itemId); },
+	                         scrollTop - itemTop, scrollTo - itemTop, st::slideDuration, anim::sineInOut);
 }
 
 void HistoryWidget::scrollToAnimationCallback(FullMsgId attachToId) {
@@ -947,12 +971,11 @@ void HistoryWidget::scrollToAnimationCallback(FullMsgId attachToId) {
 	}
 }
 
-void HistoryWidget::enqueueMessageHighlight(not_null<HistoryItem*> item) {
+void HistoryWidget::enqueueMessageHighlight(not_null<HistoryItem *> item) {
 	auto enqueueMessageId = [this](MsgId universalId) {
 		if (_highlightQueue.empty() && !_highlightTimer.isActive()) {
 			highlightMessage(universalId);
-		} else if (_highlightedMessageId != universalId
-			&& !base::contains(_highlightQueue, universalId)) {
+		} else if (_highlightedMessageId != universalId && !base::contains(_highlightQueue, universalId)) {
 			_highlightQueue.push_back(universalId);
 			checkNextHighlight();
 		}
@@ -973,17 +996,10 @@ void HistoryWidget::highlightMessage(MsgId universalMessageId) {
 }
 
 void HistoryWidget::adjustHighlightedMessageToMigrated() {
-	if (_history
-		&& _highlightTimer.isActive()
-		&& _highlightedMessageId > 0
-		&& _migrated
-		&& !_migrated->isEmpty()
-		&& _migrated->loadedAtBottom()
-		&& _migrated->blocks.back()->items.back()->isGroupMigrate()
-		&& _list->historyTop() != _list->historyDrawTop()) {
-		auto highlighted = App::histItemById(
-			_history->channelId(),
-			_highlightedMessageId);
+	if (_history && _highlightTimer.isActive() && _highlightedMessageId > 0 && _migrated && !_migrated->isEmpty() &&
+	    _migrated->loadedAtBottom() && _migrated->blocks.back()->items.back()->isGroupMigrate() &&
+	    _list->historyTop() != _list->historyDrawTop()) {
+		auto highlighted = App::histItemById(_history->channelId(), _highlightedMessageId);
 		if (highlighted && highlighted->isGroupMigrate()) {
 			_highlightedMessageId = -_migrated->blocks.back()->items.back()->id;
 		}
@@ -1024,8 +1040,8 @@ void HistoryWidget::updateHighlightedMessage() {
 	Ui::repaintHistoryItem(item);
 }
 
-TimeMs HistoryWidget::highlightStartTime(not_null<const HistoryItem*> item) const {
-	auto isHighlighted = [this](not_null<const HistoryItem*> item) {
+TimeMs HistoryWidget::highlightStartTime(not_null<const HistoryItem *> item) const {
+	auto isHighlighted = [this](not_null<const HistoryItem *> item) {
 		if (item->id == _highlightedMessageId) {
 			return (item->history() == _history);
 		} else if (item->id == -_highlightedMessageId) {
@@ -1033,9 +1049,7 @@ TimeMs HistoryWidget::highlightStartTime(not_null<const HistoryItem*> item) cons
 		}
 		return false;
 	};
-	return (isHighlighted(item) && _highlightTimer.isActive())
-		? _highlightStart
-		: 0;
+	return (isHighlighted(item) && _highlightTimer.isActive()) ? _highlightStart : 0;
 }
 
 void HistoryWidget::stopMessageHighlight() {
@@ -1049,7 +1063,7 @@ void HistoryWidget::clearHighlightMessages() {
 	stopMessageHighlight();
 }
 
-int HistoryWidget::itemTopForHighlight(not_null<HistoryItem*> item) const {
+int HistoryWidget::itemTopForHighlight(not_null<HistoryItem *> item) const {
 	auto itemTop = _list->itemTop(item);
 	Assert(itemTop >= 0);
 
@@ -1067,9 +1081,7 @@ void HistoryWidget::start() {
 	});
 	updateRecentStickers();
 	Auth().data().savedGifsUpdated().notify();
-	subscribe(Auth().api().fullPeerUpdated(), [this](PeerData *peer) {
-		fullPeerUpdated(peer);
-	});
+	subscribe(Auth().api().fullPeerUpdated(), [this](PeerData *peer) { fullPeerUpdated(peer); });
 }
 
 void HistoryWidget::onMentionInsert(UserData *user) {
@@ -1104,14 +1116,16 @@ void HistoryWidget::updateInlineBotQuery() {
 	if (inlineBotUsername != _inlineBotUsername) {
 		_inlineBotUsername = inlineBotUsername;
 		if (_inlineBotResolveRequestId) {
-//			Notify::inlineBotRequesting(false);
+			//			Notify::inlineBotRequesting(false);
 			MTP::cancel(_inlineBotResolveRequestId);
 			_inlineBotResolveRequestId = 0;
 		}
 		if (bot == Ui::LookingUpInlineBot) {
 			_inlineBot = Ui::LookingUpInlineBot;
-//			Notify::inlineBotRequesting(true);
-			_inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)), rpcDone(&HistoryWidget::inlineBotResolveDone), rpcFail(&HistoryWidget::inlineBotResolveFail, _inlineBotUsername));
+			//			Notify::inlineBotRequesting(true);
+			_inlineBotResolveRequestId = MTP::send(MTPcontacts_ResolveUsername(MTP_string(_inlineBotUsername)),
+			                                       rpcDone(&HistoryWidget::inlineBotResolveDone),
+			                                       rpcFail(&HistoryWidget::inlineBotResolveFail, _inlineBotUsername));
 			return;
 		}
 	} else if (bot == Ui::LookingUpInlineBot) {
@@ -1132,9 +1146,8 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 		}
 		if (!_inlineResults) {
 			_inlineResults.create(this, controller());
-			_inlineResults->setResultSelectedCallback([this](InlineBots::Result *result, UserData *bot) {
-				onInlineResultSend(result, bot);
-			});
+			_inlineResults->setResultSelectedCallback(
+			    [this](InlineBots::Result *result, UserData *bot) { onInlineResultSend(result, bot); });
 			updateControlsGeometry();
 			orderWidgets();
 		}
@@ -1263,7 +1276,8 @@ void HistoryWidget::saveFieldToHistoryLocalDraft() {
 	if (!_history) return;
 
 	if (_editMsgId) {
-		_history->setEditDraft(std::make_unique<Data::Draft>(_field, _editMsgId, _previewCancelled, _saveEditMsgRequestId));
+		_history->setEditDraft(
+		    std::make_unique<Data::Draft>(_field, _editMsgId, _previewCancelled, _saveEditMsgRequestId));
 	} else {
 		if (_replyToId || !_field->isEmpty()) {
 			_history->setLocalDraft(std::make_unique<Data::Draft>(_field, _replyToId, _previewCancelled));
@@ -1292,14 +1306,16 @@ void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraf
 			Local::MessageDraft storedLocalDraft, storedEditDraft;
 			if (localDraft) {
 				if (*localDraft) {
-					storedLocalDraft = Local::MessageDraft((*localDraft)->msgId, (*localDraft)->textWithTags, (*localDraft)->previewCancelled);
+					storedLocalDraft = Local::MessageDraft((*localDraft)->msgId, (*localDraft)->textWithTags,
+					                                       (*localDraft)->previewCancelled);
 				}
 			} else {
 				storedLocalDraft = Local::MessageDraft(_replyToId, _field->getTextWithTags(), _previewCancelled);
 			}
 			if (editDraft) {
 				if (*editDraft) {
-					storedEditDraft = Local::MessageDraft((*editDraft)->msgId, (*editDraft)->textWithTags, (*editDraft)->previewCancelled);
+					storedEditDraft = Local::MessageDraft((*editDraft)->msgId, (*editDraft)->textWithTags,
+					                                      (*editDraft)->previewCancelled);
 				}
 			} else if (_editMsgId) {
 				storedEditDraft = Local::MessageDraft(_editMsgId, _field->getTextWithTags(), _previewCancelled);
@@ -1373,7 +1389,9 @@ void HistoryWidget::updateSendAction(History *history, SendAction::Type type, qi
 			case Type::ChooseContact: action = MTP_sendMessageChooseContactAction(); break;
 			case Type::PlayGame: action = MTP_sendMessageGamePlayAction(); break;
 			}
-			_sendActionRequests.insert(qMakePair(history, type), MTP::send(MTPmessages_SetTyping(history->peer->input, action), rpcDone(&HistoryWidget::sendActionDone)));
+			_sendActionRequests.insert(qMakePair(history, type),
+			                           MTP::send(MTPmessages_SetTyping(history->peer->input, action),
+			                                     rpcDone(&HistoryWidget::sendActionDone)));
 			if (type == Type::Typing) _sendActionStopTimer.start(5000);
 		}
 	}
@@ -1415,7 +1433,8 @@ void HistoryWidget::setInnerFocus() {
 	if (_scroll->isHidden()) {
 		setFocus();
 	} else if (_list) {
-		if (_nonEmptySelection || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
+		if (_nonEmptySelection || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() ||
+		    !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field->setFocus();
@@ -1481,11 +1500,12 @@ void HistoryWidget::notify_inlineKeyboardMoved(const HistoryItem *item, int oldK
 	}
 }
 
-bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
+bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot,
+                                                         MsgId samePeerReplyTo) {
 	if (samePeerBot) {
 		if (_history) {
-			TextWithTags textWithTags = { '@' + samePeerBot->username + ' ' + query, TextWithTags::Tags() };
-			MessageCursor cursor = { textWithTags.text.size(), textWithTags.text.size(), QFIXED_MAX };
+			TextWithTags textWithTags = {'@' + samePeerBot->username + ' ' + query, TextWithTags::Tags()};
+			MessageCursor cursor = {textWithTags.text.size(), textWithTags.text.size(), QFIXED_MAX};
 			auto replyTo = _history->peer->isUser() ? 0 : samePeerReplyTo;
 			_history->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, replyTo, cursor, false));
 			applyDraft();
@@ -1498,8 +1518,8 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 		}
 		bot->botInfo->inlineReturnPeerId = 0;
 		History *h = App::history(toPeerId);
-		TextWithTags textWithTags = { '@' + bot->username + ' ' + query, TextWithTags::Tags() };
-		MessageCursor cursor = { textWithTags.text.size(), textWithTags.text.size(), QFIXED_MAX };
+		TextWithTags textWithTags = {'@' + bot->username + ' ' + query, TextWithTags::Tags()};
+		MessageCursor cursor = {textWithTags.text.size(), textWithTags.text.size(), QFIXED_MAX};
 		h->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
 		if (h == _history) {
 			applyDraft();
@@ -1528,7 +1548,12 @@ void HistoryWidget::notify_migrateUpdated(PeerData *peer) {
 			} else if ((_migrated ? _migrated->peer : 0) != peer->migrateFrom()) {
 				auto migrated = _history->migrateFrom();
 				if (_migrated || (migrated && migrated->unreadCount() > 0)) {
-					showHistory(peer->id, peer->migrateFrom() ? _showAtMsgId : ((_showAtMsgId < 0 && -_showAtMsgId < ServerMaxMsgId) ? ShowAtUnreadMsgId : _showAtMsgId), true);
+					showHistory(
+					    peer->id,
+					    peer->migrateFrom() ?
+					        _showAtMsgId :
+					        ((_showAtMsgId < 0 && -_showAtMsgId < ServerMaxMsgId) ? ShowAtUnreadMsgId : _showAtMsgId),
+					    true);
 				} else {
 					_migrated = migrated;
 					_list->notifyMigrateUpdated();
@@ -1704,7 +1729,8 @@ void HistoryWidget::applyDraft(bool parseLinks, Ui::FlatTextarea::UndoHistoryAct
 	if (_editMsgId || _replyToId) {
 		updateReplyEditTexts();
 		if (!_replyEditMsg) {
-			Auth().api().requestMessageData(_peer->asChannel(), _editMsgId ? _editMsgId : _replyToId, replyEditMessageDataCallback());
+			Auth().api().requestMessageData(_peer->asChannel(), _editMsgId ? _editMsgId : _replyToId,
+			                                replyEditMessageDataCallback());
 		}
 	}
 }
@@ -1850,7 +1876,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
 
 	noSelectingScroll();
 	_nonEmptySelection = false;
-	_topBar->showSelected(Window::TopBarWidget::SelectedState {});
+	_topBar->showSelected(Window::TopBarWidget::SelectedState{});
 
 	App::hoveredItem(nullptr);
 	App::pressedItem(nullptr);
@@ -1972,7 +1998,8 @@ void HistoryWidget::updateNotifySettings() {
 
 	_muteUnmute->setText(lang(_history->mute() ? lng_channel_unmute : lng_channel_mute).toUpper());
 	if (_peer->notify != UnknownNotifySettings) {
-		_silent->setChecked(_peer->notify != EmptyNotifySettings && (_peer->notify->flags & MTPDpeerNotifySettings::Flag::f_silent));
+		_silent->setChecked(_peer->notify != EmptyNotifySettings &&
+		                    (_peer->notify->flags & MTPDpeerNotifySettings::Flag::f_silent));
 		if (_silent->isHidden() && hasSilentToggle()) {
 			updateControlsVisibility();
 		}
@@ -1980,15 +2007,14 @@ void HistoryWidget::updateNotifySettings() {
 }
 
 bool HistoryWidget::contentOverlapped(const QRect &globalRect) {
-	return (_attachDragDocument->overlaps(globalRect)
-			|| _attachDragPhoto->overlaps(globalRect)
-			|| _fieldAutocomplete->overlaps(globalRect)
-			|| (_tabbedPanel && _tabbedPanel->overlaps(globalRect))
-			|| (_inlineResults && _inlineResults->overlaps(globalRect)));
+	return (_attachDragDocument->overlaps(globalRect) || _attachDragPhoto->overlaps(globalRect) ||
+	        _fieldAutocomplete->overlaps(globalRect) || (_tabbedPanel && _tabbedPanel->overlaps(globalRect)) ||
+	        (_inlineResults && _inlineResults->overlaps(globalRect)));
 }
 
 void HistoryWidget::updateReportSpamStatus() {
-	if (!_peer || (_peer->isUser() && (_peer->id == Auth().userPeerId() || isNotificationsUser(_peer->id) || isServiceUser(_peer->id) || _peer->asUser()->botInfo))) {
+	if (!_peer || (_peer->isUser() && (_peer->id == Auth().userPeerId() || isNotificationsUser(_peer->id) ||
+	                                   isServiceUser(_peer->id) || _peer->asUser()->botInfo))) {
 		setReportSpamStatus(dbiprsHidden);
 		return;
 	} else if (!_firstLoadRequest && _history->isEmpty()) {
@@ -2054,7 +2080,9 @@ void HistoryWidget::updateReportSpamStatus() {
 void HistoryWidget::requestReportSpamSetting() {
 	if (_reportSpamSettingRequestId >= 0 || !_peer) return;
 
-	_reportSpamSettingRequestId = MTP::send(MTPmessages_GetPeerSettings(_peer->input), rpcDone(&HistoryWidget::reportSpamSettingDone), rpcFail(&HistoryWidget::reportSpamSettingFail));
+	_reportSpamSettingRequestId =
+	    MTP::send(MTPmessages_GetPeerSettings(_peer->input), rpcDone(&HistoryWidget::reportSpamSettingDone),
+	              rpcFail(&HistoryWidget::reportSpamSettingFail));
 }
 
 void HistoryWidget::reportSpamSettingDone(const MTPPeerSettings &result, mtpRequestId req) {
@@ -2249,7 +2277,8 @@ void HistoryWidget::updateControlsVisibility() {
 			}
 			updateFieldPlaceholder();
 		}
-		if (_editMsgId || _replyToId || readyToForward() || (_previewData && _previewData->pendingTill >= 0) || _kbReplyTo) {
+		if (_editMsgId || _replyToId || readyToForward() || (_previewData && _previewData->pendingTill >= 0) ||
+		    _kbReplyTo) {
 			if (_fieldBarCancel->isHidden()) {
 				_fieldBarCancel->show();
 				updateControlsGeometry();
@@ -2345,10 +2374,12 @@ void HistoryWidget::unreadCountChanged(History *history) {
 bool HistoryWidget::messagesFailed(const RPCError &error, mtpRequestId requestId) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	if (error.type() == qstr("CHANNEL_PRIVATE") || error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA") || error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
+	if (error.type() == qstr("CHANNEL_PRIVATE") || error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA") ||
+	    error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
 		auto was = _peer;
 		App::main()->showBackFromStack();
-		Ui::show(Box<InformBox>(lang((was && was->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
+		Ui::show(
+		    Box<InformBox>(lang((was && was->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
 		return true;
 	}
 
@@ -2400,7 +2431,9 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages
 		if (peer && peer->isChannel()) {
 			peer->asChannel()->ptsReceived(d.vpts.v);
 		} else {
-			LOG(("API Error: received messages.channelMessages when no channel was passed! (HistoryWidget::messagesReceived)"));
+			LOG(
+			    ("API Error: received messages.channelMessages when no channel was passed! "
+			     "(HistoryWidget::messagesReceived)"));
 		}
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
@@ -2500,7 +2533,8 @@ bool HistoryWidget::doWeReadServerHistory() const {
 		int scrollTop = _scroll->scrollTop();
 		if (scrollTop + 1 > _scroll->scrollTopMax()) return true;
 
-		auto showFrom = (_migrated && _migrated->showFrom) ? _migrated->showFrom : (_history ? _history->showFrom : nullptr);
+		auto showFrom =
+		    (_migrated && _migrated->showFrom) ? _migrated->showFrom : (_history ? _history->showFrom : nullptr);
 		if (showFrom && !showFrom->detached()) {
 			int scrollBottom = scrollTop + _scroll->height();
 			if (scrollBottom > _list->itemTop(showFrom)) return true;
@@ -2568,7 +2602,10 @@ void HistoryWidget::firstLoadMessages() {
 		}
 	}
 
-	_firstLoadRequest = MTP::send(MTPmessages_GetHistory(from->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, from), rpcFail(&HistoryWidget::messagesFailed));
+	_firstLoadRequest =
+	    MTP::send(MTPmessages_GetHistory(from->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset),
+	                                     MTP_int(loadCount), MTP_int(0), MTP_int(0)),
+	              rpcDone(&HistoryWidget::messagesReceived, from), rpcFail(&HistoryWidget::messagesFailed));
 }
 
 void HistoryWidget::loadMessages() {
@@ -2578,7 +2615,8 @@ void HistoryWidget::loadMessages() {
 		return firstLoadMessages();
 	}
 
-	auto loadMigrated = _migrated && (_history->isEmpty() || _history->loadedAtTop() || (!_migrated->isEmpty() && !_migrated->loadedAtBottom()));
+	auto loadMigrated = _migrated && (_history->isEmpty() || _history->loadedAtTop() ||
+	                                  (!_migrated->isEmpty() && !_migrated->loadedAtBottom()));
 	auto from = loadMigrated ? _migrated : _history;
 	if (from->loadedAtTop()) {
 		return;
@@ -2588,7 +2626,10 @@ void HistoryWidget::loadMessages() {
 	auto offset = 0;
 	auto loadCount = offset_id ? kMessagesPerPage : kMessagesPerPageFirst;
 
-	_preloadRequest = MTP::send(MTPmessages_GetHistory(from->peer->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, from->peer), rpcFail(&HistoryWidget::messagesFailed));
+	_preloadRequest =
+	    MTP::send(MTPmessages_GetHistory(from->peer->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset),
+	                                     MTP_int(loadCount), MTP_int(0), MTP_int(0)),
+	              rpcDone(&HistoryWidget::messagesReceived, from->peer), rpcFail(&HistoryWidget::messagesFailed));
 }
 
 void HistoryWidget::loadMessagesDown() {
@@ -2598,7 +2639,8 @@ void HistoryWidget::loadMessagesDown() {
 		return firstLoadMessages();
 	}
 
-	bool loadMigrated = _migrated && !(_migrated->isEmpty() || _migrated->loadedAtBottom() || (!_history->isEmpty() && !_history->loadedAtTop()));
+	bool loadMigrated = _migrated && !(_migrated->isEmpty() || _migrated->loadedAtBottom() ||
+	                                   (!_history->isEmpty() && !_history->loadedAtTop()));
 	History *from = loadMigrated ? _migrated : _history;
 	if (from->loadedAtBottom()) {
 		return;
@@ -2613,7 +2655,10 @@ void HistoryWidget::loadMessagesDown() {
 		++offset;
 	}
 
-	_preloadDownRequest = MTP::send(MTPmessages_GetHistory(from->peer->input, MTP_int(offset_id + 1), MTP_int(0), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, from->peer), rpcFail(&HistoryWidget::messagesFailed));
+	_preloadDownRequest =
+	    MTP::send(MTPmessages_GetHistory(from->peer->input, MTP_int(offset_id + 1), MTP_int(0), MTP_int(offset),
+	                                     MTP_int(loadCount), MTP_int(0), MTP_int(0)),
+	              rpcDone(&HistoryWidget::messagesReceived, from->peer), rpcFail(&HistoryWidget::messagesFailed));
 }
 
 void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
@@ -2650,7 +2695,10 @@ void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
 		}
 	}
 
-	_delayedShowAtRequest = MTP::send(MTPmessages_GetHistory(from->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset), MTP_int(loadCount), MTP_int(0), MTP_int(0)), rpcDone(&HistoryWidget::messagesReceived, from), rpcFail(&HistoryWidget::messagesFailed));
+	_delayedShowAtRequest =
+	    MTP::send(MTPmessages_GetHistory(from->input, MTP_int(offset_id), MTP_int(0), MTP_int(offset),
+	                                     MTP_int(loadCount), MTP_int(0), MTP_int(0)),
+	              rpcDone(&HistoryWidget::messagesReceived, from), rpcFail(&HistoryWidget::messagesFailed));
 }
 
 void HistoryWidget::onScroll() {
@@ -2679,8 +2727,10 @@ void HistoryWidget::visibleAreaUpdated() {
 		auto scrollTop = _scroll->scrollTop();
 		auto scrollBottom = scrollTop + _scroll->height();
 		_list->visibleAreaUpdated(scrollTop, scrollBottom);
-		if (_history->loadedAtBottom() && (_history->unreadCount() > 0 || (_migrated && _migrated->unreadCount() > 0))) {
-			auto showFrom = (_migrated && _migrated->showFrom) ? _migrated->showFrom : (_history ? _history->showFrom : nullptr);
+		if (_history->loadedAtBottom() &&
+		    (_history->unreadCount() > 0 || (_migrated && _migrated->unreadCount() > 0))) {
+			auto showFrom =
+			    (_migrated && _migrated->showFrom) ? _migrated->showFrom : (_history ? _history->showFrom : nullptr);
 			auto showFromVisible = (showFrom && !showFrom->detached() && scrollBottom > _list->itemTop(showFrom));
 			auto atBottom = (scrollTop >= _scroll->scrollTopMax());
 			if ((showFromVisible || atBottom) && App::wnd()->doWeReadServerHistory()) {
@@ -2733,12 +2783,14 @@ void HistoryWidget::checkReplyReturns() {
 	auto scrollTopMax = _scroll->scrollTopMax();
 	auto scrollHeight = _scroll->height();
 	while (_replyReturn) {
-		auto below = (_replyReturn->detached() && _replyReturn->history() == _history && !_history->isEmpty() && _replyReturn->id < _history->blocks.back()->items.back()->id);
+		auto below = (_replyReturn->detached() && _replyReturn->history() == _history && !_history->isEmpty() &&
+		              _replyReturn->id < _history->blocks.back()->items.back()->id);
 		if (!below) {
 			below = (_replyReturn->detached() && _replyReturn->history() == _migrated && !_history->isEmpty());
 		}
 		if (!below) {
-			below = (_replyReturn->detached() && _migrated && _replyReturn->history() == _migrated && !_migrated->isEmpty() && _replyReturn->id < _migrated->blocks.back()->items.back()->id);
+			below = (_replyReturn->detached() && _migrated && _replyReturn->history() == _migrated &&
+			         !_migrated->isEmpty() && _replyReturn->id < _migrated->blocks.back()->items.back()->id);
 		}
 		if (!below && !_replyReturn->detached()) {
 			below = (scrollTop >= scrollTopMax) || (_list->itemTop(_replyReturn) < scrollTop + scrollHeight / 2);
@@ -2754,7 +2806,8 @@ void HistoryWidget::checkReplyReturns() {
 void HistoryWidget::onInlineBotCancel() {
 	auto &textWithTags = _field->getTextWithTags();
 	if (textWithTags.text.size() > _inlineBotUsername.size() + 2) {
-		setFieldText({ '@' + _inlineBotUsername + ' ', TextWithTags::Tags() }, TextUpdateEvent::SaveDraft, Ui::FlatTextarea::AddToUndoHistory);
+		setFieldText({'@' + _inlineBotUsername + ' ', TextWithTags::Tags()}, TextUpdateEvent::SaveDraft,
+		             Ui::FlatTextarea::AddToUndoHistory);
 	} else {
 		clearFieldText(TextUpdateEvent::SaveDraft, Ui::FlatTextarea::AddToUndoHistory);
 	}
@@ -2781,12 +2834,13 @@ void HistoryWidget::showNextUnreadMention() {
 void HistoryWidget::saveEditMsg() {
 	if (_saveEditMsgRequestId) return;
 
-	WebPageId webPageId = _previewCancelled ? CancelledWebPageId : ((_previewData && _previewData->pendingTill >= 0) ? _previewData->id : 0);
+	WebPageId webPageId = _previewCancelled ? CancelledWebPageId :
+	                                          ((_previewData && _previewData->pendingTill >= 0) ? _previewData->id : 0);
 
 	auto &textWithTags = _field->getTextWithTags();
 	auto prepareFlags = itemTextOptions(_history, App::self()).flags;
 	auto sending = TextWithEntities();
-	auto left = TextWithEntities { textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags) };
+	auto left = TextWithEntities{textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags)};
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
 	if (!TextUtilities::CutPart(sending, left, MaxMessageSize)) {
@@ -2807,7 +2861,10 @@ void HistoryWidget::saveEditMsg() {
 	if (!sentEntities.v.isEmpty()) {
 		sendFlags |= MTPmessages_EditMessage::Flag::f_entities;
 	}
-	_saveEditMsgRequestId = MTP::send(MTPmessages_EditMessage(MTP_flags(sendFlags), _history->peer->input, MTP_int(_editMsgId), MTP_string(sending.text), MTPnullMarkup, sentEntities), rpcDone(&HistoryWidget::saveEditMsgDone, _history), rpcFail(&HistoryWidget::saveEditMsgFail, _history));
+	_saveEditMsgRequestId = MTP::send(
+	    MTPmessages_EditMessage(MTP_flags(sendFlags), _history->peer->input, MTP_int(_editMsgId),
+	                            MTP_string(sending.text), MTPnullMarkup, sentEntities),
+	    rpcDone(&HistoryWidget::saveEditMsgDone, _history), rpcFail(&HistoryWidget::saveEditMsgFail, _history));
 }
 
 void HistoryWidget::saveEditMsgDone(History *history, const MTPUpdates &updates, mtpRequestId req) {
@@ -2838,7 +2895,8 @@ bool HistoryWidget::saveEditMsgFail(History *history, const RPCError &error, mtp
 	}
 
 	QString err = error.type();
-	if (err == qstr("MESSAGE_ID_INVALID") || err == qstr("CHAT_ADMIN_REQUIRED") || err == qstr("MESSAGE_EDIT_TIME_EXPIRED")) {
+	if (err == qstr("MESSAGE_ID_INVALID") || err == qstr("CHAT_ADMIN_REQUIRED") ||
+	    err == qstr("MESSAGE_EDIT_TIME_EXPIRED")) {
 		Ui::show(Box<InformBox>(lang(lng_edit_error)));
 	} else if (err == qstr("MESSAGE_NOT_MODIFIED")) {
 		cancelEdit();
@@ -2872,7 +2930,8 @@ void HistoryWidget::onSend(bool ctrlShiftEnter, MsgId replyTo) {
 
 	bool lastKeyboardUsed = lastForceReplyReplied(FullMsgId(_channel, replyTo));
 
-	WebPageId webPageId = _previewCancelled ? CancelledWebPageId : ((_previewData && _previewData->pendingTill >= 0) ? _previewData->id : 0);
+	WebPageId webPageId = _previewCancelled ? CancelledWebPageId :
+	                                          ((_previewData && _previewData->pendingTill >= 0) ? _previewData->id : 0);
 
 	MainWidget::MessageToSend message;
 	message.history = _history;
@@ -2903,7 +2962,8 @@ void HistoryWidget::onUnblock() {
 		return;
 	}
 
-	_unblockRequest = MTP::send(MTPcontacts_Unblock(_peer->asUser()->inputUser), rpcDone(&HistoryWidget::unblockDone, _peer), rpcFail(&HistoryWidget::unblockFail));
+	_unblockRequest = MTP::send(MTPcontacts_Unblock(_peer->asUser()->inputUser),
+	                            rpcDone(&HistoryWidget::unblockDone, _peer), rpcFail(&HistoryWidget::unblockFail));
 }
 
 void HistoryWidget::unblockDone(PeerData *peer, const MTPBool &result, mtpRequestId req) {
@@ -2936,11 +2996,15 @@ void HistoryWidget::onBotStart() {
 		sendBotCommand(_peer, _peer->asUser(), qsl("/start"), 0);
 	} else {
 		quint64 randomId = rand_value<quint64>();
-		MTP::send(MTPmessages_StartBot(_peer->asUser()->inputUser, MTP_inputPeerEmpty(), MTP_long(randomId), MTP_string(token)), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::addParticipantFail, { _peer->asUser(), (PeerData*)nullptr }));
+		MTP::send(MTPmessages_StartBot(_peer->asUser()->inputUser, MTP_inputPeerEmpty(), MTP_long(randomId),
+		                               MTP_string(token)),
+		          App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+		          App::main()->rpcFail(&MainWidget::addParticipantFail, {_peer->asUser(), (PeerData *)nullptr}));
 
 		_peer->asUser()->botInfo->startToken = QString();
 		if (_keyboard->hasMarkup()) {
-			if (_keyboard->singleUse() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) && _history->lastKeyboardUsed) {
+			if (_keyboard->singleUse() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) &&
+			    _history->lastKeyboardUsed) {
 				_history->lastKeyboardHiddenId = _history->lastKeyboardId;
 			}
 			if (!kbWasHidden()) _kbShown = _keyboard->hasMarkup();
@@ -2957,7 +3021,8 @@ void HistoryWidget::onJoinChannel() {
 		return;
 	}
 
-	_unblockRequest = MTP::send(MTPchannels_JoinChannel(_peer->asChannel()->inputChannel), rpcDone(&HistoryWidget::joinDone), rpcFail(&HistoryWidget::joinFail));
+	_unblockRequest = MTP::send(MTPchannels_JoinChannel(_peer->asChannel()->inputChannel),
+	                            rpcDone(&HistoryWidget::joinDone), rpcFail(&HistoryWidget::joinFail));
 }
 
 void HistoryWidget::joinDone(const MTPUpdates &result, mtpRequestId req) {
@@ -2969,8 +3034,10 @@ bool HistoryWidget::joinFail(const RPCError &error, mtpRequestId req) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
 	if (_unblockRequest == req) _unblockRequest = 0;
-	if (error.type() == qstr("CHANNEL_PRIVATE") || error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA") || error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
-		Ui::show(Box<InformBox>(lang((_peer && _peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
+	if (error.type() == qstr("CHANNEL_PRIVATE") || error.type() == qstr("CHANNEL_PUBLIC_GROUP_NA") ||
+	    error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
+		Ui::show(Box<InformBox>(
+		    lang((_peer && _peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
 		return true;
 	} else if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
 		Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
@@ -2998,7 +3065,8 @@ void HistoryWidget::onShareContact(const PeerId &peer, UserData *contact) {
 	shareContact(peer, phone, contact->firstName, contact->lastName, replyToId(), peerToUser(contact->id));
 }
 
-void HistoryWidget::shareContact(const PeerId &peer, const QString &phone, const QString &fname, const QString &lname, MsgId replyTo, qint32 userId) {
+void HistoryWidget::shareContact(const PeerId &peer, const QString &phone, const QString &fname, const QString &lname,
+                                 MsgId replyTo, qint32 userId) {
 	auto history = App::history(peer);
 
 	quint64 randomId = rand_value<quint64>();
@@ -3034,8 +3102,18 @@ void HistoryWidget::shareContact(const PeerId &peer, const QString &phone, const
 	}
 	auto messageFromId = channelPost ? 0 : Auth().userId();
 	auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
-	history->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(peer), MTPnullFwdHeader, MTPint(), MTP_int(replyToId()), MTP_int(unixtime()), MTP_string(""), MTP_messageMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname), MTP_int(userId)), MTPnullMarkup, MTPnullEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)), NewMessageUnread);
-	history->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), p->input, MTP_int(replyTo), MTP_inputMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname)), MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, history->sendRequestId);
+	history->addNewMessage(
+	    MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(peer), MTPnullFwdHeader,
+	                MTPint(), MTP_int(replyToId()), MTP_int(unixtime()), MTP_string(""),
+	                MTP_messageMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname), MTP_int(userId)),
+	                MTPnullMarkup, MTPnullEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)),
+	    NewMessageUnread);
+	history->sendRequestId =
+	    MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), p->input, MTP_int(replyTo),
+	                                    MTP_inputMediaContact(MTP_string(phone), MTP_string(fname), MTP_string(lname)),
+	                                    MTP_long(randomId), MTPnullMarkup),
+	              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+	              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, history->sendRequestId);
 
 	App::historyRegRandom(randomId, newId);
 
@@ -3170,31 +3248,32 @@ void HistoryWidget::chooseAttach() {
 
 	auto filter = FileDialog::AllFilesFilter() + qsl(";;Image files (*") + cImgExtensions().join(qsl(" *")) + qsl(")");
 
-	FileDialog::GetOpenPaths(lang(lng_choose_files), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
-			return;
-		}
+	FileDialog::GetOpenPaths(lang(lng_choose_files), filter,
+	                         base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+		                         if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			                         return;
+		                         }
 
-		if (!result.remoteContent.isEmpty()) {
-			auto animated = false;
-			auto image = App::readImage(result.remoteContent, nullptr, false, &animated);
-			if (!image.isNull() && !animated) {
-				confirmSendingFiles(image, result.remoteContent);
-			} else {
-				uploadFile(result.remoteContent, SendMediaType::File);
-			}
-		} else {
-			auto lists = getSendingFilesLists(result.paths);
-			if (lists.allFilesForCompress) {
-				confirmSendingFiles(lists);
-			} else {
-				validateSendingFiles(lists, [this](const QStringList &files) {
-					uploadFiles(files, SendMediaType::File);
-					return true;
-				});
-			}
-		}
-	}));
+		                         if (!result.remoteContent.isEmpty()) {
+			                         auto animated = false;
+			                         auto image = App::readImage(result.remoteContent, nullptr, false, &animated);
+			                         if (!image.isNull() && !animated) {
+				                         confirmSendingFiles(image, result.remoteContent);
+			                         } else {
+				                         uploadFile(result.remoteContent, SendMediaType::File);
+			                         }
+		                         } else {
+			                         auto lists = getSendingFilesLists(result.paths);
+			                         if (lists.allFilesForCompress) {
+				                         confirmSendingFiles(lists);
+			                         } else {
+				                         validateSendingFiles(lists, [this](const QStringList &files) {
+					                         uploadFiles(files, SendMediaType::File);
+					                         return true;
+				                         });
+			                         }
+		                         }
+	                         }));
 }
 
 void HistoryWidget::sendButtonClicked() {
@@ -3239,9 +3318,14 @@ void HistoryWidget::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void HistoryWidget::updateOverStates(QPoint pos) {
-	auto inField = pos.y() >= (_scroll->y() + _scroll->height()) && pos.y() < height() && pos.x() >= 0 && pos.x() < width();
-	auto inReplyEditForward = QRect(st::historyReplySkip, _field->y() - st::historySendPadding - st::historyReplyHeight, width() - st::historyReplySkip - _fieldBarCancel->width(), st::historyReplyHeight).contains(pos) && (_editMsgId || replyToId() || readyToForward());
-	auto inPinnedMsg = QRect(0, _topBar->bottomNoMargins(), width(), st::historyReplyHeight).contains(pos) && _pinnedBar;
+	auto inField =
+	    pos.y() >= (_scroll->y() + _scroll->height()) && pos.y() < height() && pos.x() >= 0 && pos.x() < width();
+	auto inReplyEditForward = QRect(st::historyReplySkip, _field->y() - st::historySendPadding - st::historyReplyHeight,
+	                                width() - st::historyReplySkip - _fieldBarCancel->width(), st::historyReplyHeight)
+	                              .contains(pos) &&
+	                          (_editMsgId || replyToId() || readyToForward());
+	auto inPinnedMsg =
+	    QRect(0, _topBar->bottomNoMargins(), width(), st::historyReplyHeight).contains(pos) && _pinnedBar;
 	auto inClickable = inReplyEditForward || inPinnedMsg;
 	if (inField != _inField && _recording) {
 		_inField = inField;
@@ -3324,25 +3408,28 @@ void HistoryWidget::stopRecording(bool send) {
 	_send->setRecordActive(false);
 }
 
-void HistoryWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo) { // replyTo != 0 from ReplyKeyboardMarkup, == 0 from cmd links
+void HistoryWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd,
+                                   MsgId replyTo) { // replyTo != 0 from ReplyKeyboardMarkup, == 0 from cmd links
 	if (!_peer || _peer != peer) return;
 
-	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
+	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) &&
+	                        (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
 
 	QString toSend = cmd;
 	if (bot && (!bot->isUser() || !bot->asUser()->botInfo)) {
 		bot = nullptr;
 	}
 	QString username = bot ? bot->asUser()->username : QString();
-	qint32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
+	qint32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus :
+	                                     (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
 	if (!replyTo && toSend.indexOf('@') < 2 && !username.isEmpty() && (botStatus == 0 || botStatus == 2)) {
 		toSend += '@' + username;
 	}
 
 	MainWidget::MessageToSend message;
 	message.history = _history;
-	message.textWithTags = { toSend, TextWithTags::Tags() };
-	message.replyTo = replyTo ? ((!_peer->isUser()/* && (botStatus == 0 || botStatus == 2)*/) ? replyTo : -1) : 0;
+	message.textWithTags = {toSend, TextWithTags::Tags()};
+	message.replyTo = replyTo ? ((!_peer->isUser() /* && (botStatus == 0 || botStatus == 2)*/) ? replyTo : -1) : 0;
 	message.silent = false;
 	App::main()->sendMessage(message);
 	if (replyTo) {
@@ -3362,7 +3449,8 @@ void HistoryWidget::sendBotCommand(PeerData *peer, UserData *bot, const QString
 void HistoryWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) {
 	if (!_peer || _peer != peer) return;
 
-	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
+	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) &&
+	                        (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
 	if (replyTo) {
 		if (_replyToId == replyTo) {
 			cancelReply();
@@ -3375,17 +3463,19 @@ void HistoryWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) {
 	}
 }
 
-void HistoryWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, not_null<const HistoryItem*> msg, int row, int col) {
+void HistoryWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button,
+                                        not_null<const HistoryItem *> msg, int row, int col) {
 	if (msg->id < 0 || _peer != msg->history()->peer) {
 		return;
 	}
 
-	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, msg->id));
+	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) &&
+	                        (_keyboard->forMsgId() == FullMsgId(_channel, msg->id));
 
 	auto bot = msg->getMessageBot();
 
 	using ButtonType = HistoryMessageReplyMarkup::Button::Type;
-	BotCallbackInfo info = { bot, msg->fullId(), row, col, (button->type == ButtonType::Game) };
+	BotCallbackInfo info = {bot, msg->fullId(), row, col, (button->type == ButtonType::Game)};
 	auto flags = MTPmessages_GetBotCallbackAnswer::Flags(0);
 	QByteArray sendData;
 	if (info.game) {
@@ -3394,7 +3484,9 @@ void HistoryWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button
 		flags |= MTPmessages_GetBotCallbackAnswer::Flag::f_data;
 		sendData = button->data;
 	}
-	button->requestId = MTP::send(MTPmessages_GetBotCallbackAnswer(MTP_flags(flags), _peer->input, MTP_int(msg->id), MTP_bytes(sendData)), rpcDone(&HistoryWidget::botCallbackDone, info), rpcFail(&HistoryWidget::botCallbackFail, info));
+	button->requestId = MTP::send(
+	    MTPmessages_GetBotCallbackAnswer(MTP_flags(flags), _peer->input, MTP_int(msg->id), MTP_bytes(sendData)),
+	    rpcDone(&HistoryWidget::botCallbackDone, info), rpcFail(&HistoryWidget::botCallbackFail, info));
 	Ui::repaintHistoryItem(msg);
 
 	if (_replyToId == msg->id) {
@@ -3406,7 +3498,8 @@ void HistoryWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button
 	}
 }
 
-void HistoryWidget::botCallbackDone(BotCallbackInfo info, const MTPmessages_BotCallbackAnswer &answer, mtpRequestId req) {
+void HistoryWidget::botCallbackDone(BotCallbackInfo info, const MTPmessages_BotCallbackAnswer &answer,
+                                    mtpRequestId req) {
 	auto item = App::histItemById(info.msgId);
 	if (item) {
 		if (auto markup = item->Get<HistoryMessageReplyMarkup>()) {
@@ -3462,12 +3555,14 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
 	auto insertingInlineBot = !cmd.isEmpty() && (cmd.at(0) == '@');
 	auto toInsert = cmd;
 	if (!toInsert.isEmpty() && !insertingInlineBot) {
-		auto bot = _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->fromOriginal() : nullptr);
+		auto bot =
+		    _peer->isUser() ? _peer : (App::hoveredLinkItem() ? App::hoveredLinkItem()->fromOriginal() : nullptr);
 		if (bot && (!bot->isUser() || !bot->asUser()->botInfo)) {
 			bot = nullptr;
 		}
 		auto username = bot ? bot->asUser()->username : QString();
-		auto botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
+		auto botStatus = _peer->isChat() ? _peer->asChat()->botStatus :
+		                                   (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
 		if (toInsert.indexOf('@') < 0 && !username.isEmpty() && (botStatus == 0 || botStatus == 2)) {
 			toInsert += '@' + username;
 		}
@@ -3477,7 +3572,8 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
 	if (!insertingInlineBot) {
 		auto &textWithTags = _field->getTextWithTags();
 		TextWithTags textWithTagsToSet;
-		QRegularExpressionMatch m = QRegularExpression(qsl("^/[A-Za-z_0-9]{0,64}(@[A-Za-z_0-9]{0,32})?(\\s|$)")).match(textWithTags.text);
+		QRegularExpressionMatch m =
+		    QRegularExpression(qsl("^/[A-Za-z_0-9]{0,64}(@[A-Za-z_0-9]{0,32})?(\\s|$)")).match(textWithTags.text);
 		if (m.hasMatch()) {
 			textWithTagsToSet = _field->getTextWithTagsPart(m.capturedLength());
 		} else {
@@ -3493,7 +3589,7 @@ bool HistoryWidget::insertBotCommand(const QString &cmd) {
 		cur.movePosition(QTextCursor::End);
 		_field->setTextCursor(cur);
 	} else {
-		setFieldText({ toInsert, TextWithTags::Tags() }, TextUpdateEvent::SaveDraft, Ui::FlatTextarea::AddToUndoHistory);
+		setFieldText({toInsert, TextWithTags::Tags()}, TextUpdateEvent::SaveDraft, Ui::FlatTextarea::AddToUndoHistory);
 		_field->setFocus();
 		return true;
 	}
@@ -3524,10 +3620,10 @@ QRect HistoryWidget::rectForFloatPlayer(Window::Column myColumn, Window::Column
 }
 
 DragState HistoryWidget::getDragState(const QMimeData *d) {
-	if (!d
-		|| d->hasFormat(qsl("application/x-td-forward-selected"))
-		|| d->hasFormat(qsl("application/x-td-forward-pressed"))
-		|| d->hasFormat(qsl("application/x-td-forward-pressed-link"))) return DragStateNone;
+	if (!d || d->hasFormat(qsl("application/x-td-forward-selected")) ||
+	    d->hasFormat(qsl("application/x-td-forward-pressed")) ||
+	    d->hasFormat(qsl("application/x-td-forward-pressed-link")))
+		return DragStateNone;
 
 	if (d->hasImage()) return DragStateImage;
 
@@ -3557,7 +3653,8 @@ DragState HistoryWidget::getDragState(const QMimeData *d) {
 				allAreSmallImages = false;
 			} else {
 				bool foundImageExtension = false;
-				for (QStringList::const_iterator j = imgExtensions.cbegin(), end = imgExtensions.cend(); j != end; ++j) {
+				for (QStringList::const_iterator j = imgExtensions.cbegin(), end = imgExtensions.cend(); j != end;
+				     ++j) {
 					if (file.right(j->size()).toLower() == (*j).toLower()) {
 						foundImageExtension = true;
 						break;
@@ -3580,23 +3677,23 @@ void HistoryWidget::updateDragAreas() {
 	case DragStateNone:
 		_attachDragDocument->otherLeave();
 		_attachDragPhoto->otherLeave();
-	break;
+		break;
 	case DragStateFiles:
 		_attachDragDocument->setText(lang(lng_drag_files_here), lang(lng_drag_to_send_files));
 		_attachDragDocument->otherEnter();
 		_attachDragPhoto->hideFast();
-	break;
+		break;
 	case DragStatePhotoFiles:
 		_attachDragDocument->setText(lang(lng_drag_images_here), lang(lng_drag_to_send_no_compression));
 		_attachDragPhoto->setText(lang(lng_drag_photos_here), lang(lng_drag_to_send_quick));
 		_attachDragDocument->otherEnter();
 		_attachDragPhoto->otherEnter();
-	break;
+		break;
 	case DragStateImage:
 		_attachDragPhoto->setText(lang(lng_drag_images_here), lang(lng_drag_to_send_quick));
 		_attachDragDocument->hideFast();
 		_attachDragPhoto->otherEnter();
-	break;
+		break;
 	};
 }
 
@@ -3609,12 +3706,13 @@ bool HistoryWidget::readyToForward() const {
 }
 
 bool HistoryWidget::hasSilentToggle() const {
-	return _peer && _peer->isChannel() && !_peer->isMegagroup() && _peer->asChannel()->canPublish() && _peer->notify != UnknownNotifySettings;
+	return _peer && _peer->isChannel() && !_peer->isMegagroup() && _peer->asChannel()->canPublish() &&
+	       _peer->notify != UnknownNotifySettings;
 }
 
 void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result) {
 	_inlineBotResolveRequestId = 0;
-//	Notify::inlineBotRequesting(false);
+	//	Notify::inlineBotRequesting(false);
 	UserData *resolvedBot = nullptr;
 	if (result.type() == mtpc_contacts_resolvedPeer) {
 		const auto &d(result.c_contacts_resolvedPeer());
@@ -3648,7 +3746,7 @@ bool HistoryWidget::inlineBotResolveFail(QString name, const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
 	_inlineBotResolveRequestId = 0;
-//	Notify::inlineBotRequesting(false);
+	//	Notify::inlineBotRequesting(false);
 	if (name == _inlineBotUsername) {
 		clearInlineBot();
 	}
@@ -3697,7 +3795,10 @@ void HistoryWidget::updateSendButtonType() {
 
 bool HistoryWidget::updateCmdStartShown() {
 	bool cmdStartShown = false;
-	if (_history && _peer && ((_peer->isChat() && _peer->asChat()->botStatus > 0) || (_peer->isMegagroup() && _peer->asChannel()->mgInfo->botStatus > 0) || (_peer->isUser() && _peer->asUser()->botInfo))) {
+	if (_history && _peer &&
+	    ((_peer->isChat() && _peer->asChat()->botStatus > 0) ||
+	     (_peer->isMegagroup() && _peer->asChannel()->mgInfo->botStatus > 0) ||
+	     (_peer->isUser() && _peer->asUser()->botInfo))) {
 		if (!isBotStart() && !isBlocked() && !_keyboard->hasMarkup() && !_keyboard->forceReply()) {
 			if (!_field->hasSendText()) {
 				cmdStartShown = true;
@@ -3761,10 +3862,13 @@ void HistoryWidget::onKbToggle(bool manual) {
 
 		_field->setMaxHeight(st::historyComposeFieldMaxHeight);
 
-		_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ? App::histItemById(_keyboard->forMsgId()) : 0;
+		_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ?
+		                 App::histItemById(_keyboard->forMsgId()) :
+		                 0;
 		if (_kbReplyTo && !_editMsgId && !_replyToId && fieldEnabled) {
 			updateReplyToName();
-			_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()), _textDlgOptions);
+			_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()),
+			                          _textDlgOptions);
 			_fieldBarCancel->show();
 			updateMouseTracking();
 		}
@@ -3777,13 +3881,17 @@ void HistoryWidget::onKbToggle(bool manual) {
 		_kbScroll->show();
 		_kbShown = true;
 
-		qint32 maxh = std::min(_keyboard->height(), st::historyComposeFieldMaxHeight - (st::historyComposeFieldMaxHeight / 2));
+		qint32 maxh =
+		    std::min(_keyboard->height(), st::historyComposeFieldMaxHeight - (st::historyComposeFieldMaxHeight / 2));
 		_field->setMaxHeight(st::historyComposeFieldMaxHeight - maxh);
 
-		_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ? App::histItemById(_keyboard->forMsgId()) : 0;
+		_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ?
+		                 App::histItemById(_keyboard->forMsgId()) :
+		                 0;
 		if (_kbReplyTo && !_editMsgId && !_replyToId) {
 			updateReplyToName();
-			_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()), _textDlgOptions);
+			_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()),
+			                          _textDlgOptions);
 			_fieldBarCancel->show();
 			updateMouseTracking();
 		}
@@ -3801,7 +3909,7 @@ void HistoryWidget::onKbToggle(bool manual) {
 }
 
 void HistoryWidget::onCmdStart() {
-	setFieldText({ qsl("/"), TextWithTags::Tags() }, 0, Ui::FlatTextarea::AddToUndoHistory);
+	setFieldText({qsl("/"), TextWithTags::Tags()}, 0, Ui::FlatTextarea::AddToUndoHistory);
 }
 
 void HistoryWidget::forwardMessage() {
@@ -3823,7 +3931,9 @@ void HistoryWidget::selectMessage() {
 bool HistoryWidget::paintTopBar(Painter &p, int decreaseWidth, TimeMs ms) {
 	if (!_history) return false;
 
-	auto increaseLeft = (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) ? (st::topBarArrowPadding.left() - st::topBarArrowPadding.right()) : 0;
+	auto increaseLeft = (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) ?
+	                        (st::topBarArrowPadding.left() - st::topBarArrowPadding.right()) :
+	                        0;
 	auto nameleft = st::topBarArrowPadding.right() + increaseLeft;
 	auto nametop = st::topBarArrowPadding.top();
 	auto statustop = st::topBarHeight - st::topBarArrowPadding.bottom() - st::dialogsTextFont->height;
@@ -3838,13 +3948,16 @@ bool HistoryWidget::paintTopBar(Painter &p, int decreaseWidth, TimeMs ms) {
 	_peer->dialogName().drawElided(p, nameleft, nametop, namewidth);
 
 	if (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) {
-		st::topBarBackward.paint(p, (st::topBarArrowPadding.left() - st::topBarBackward.width()) / 2, (st::topBarHeight - st::topBarBackward.height()) / 2, width());
+		st::topBarBackward.paint(p, (st::topBarArrowPadding.left() - st::topBarBackward.width()) / 2,
+		                         (st::topBarHeight - st::topBarBackward.height()) / 2, width());
 	}
 	return true;
 }
 
 QRect HistoryWidget::getMembersShowAreaGeometry() const {
-	int increaseLeft = (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) ? (st::topBarArrowPadding.left() - st::topBarArrowPadding.right()) : 0;
+	int increaseLeft = (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) ?
+	                       (st::topBarArrowPadding.left() - st::topBarArrowPadding.right()) :
+	                       0;
 	int membersTextLeft = st::topBarArrowPadding.right() + increaseLeft;
 	int membersTextTop = st::topBarHeight - st::topBarArrowPadding.bottom() - st::dialogsTextFont->height;
 	int membersTextWidth = _titlePeerTextWidth;
@@ -3871,7 +3984,8 @@ void HistoryWidget::setMembersShowAreaActive(bool active) {
 void HistoryWidget::onMembersDropdownShow() {
 	if (!_membersDropdown) {
 		_membersDropdown.create(this, st::membersInnerDropdown);
-		_membersDropdown->setOwnedWidget(object_ptr<Profile::GroupMembersWidget>(this, _peer, Profile::GroupMembersWidget::TitleVisibility::Hidden, st::membersInnerItem));
+		_membersDropdown->setOwnedWidget(object_ptr<Profile::GroupMembersWidget>(
+		    this, _peer, Profile::GroupMembersWidget::TitleVisibility::Hidden, st::membersInnerItem));
 		_membersDropdown->resizeToWidth(st::membersInnerWidth);
 
 		_membersDropdown->setMaxHeight(countMembersDropdownHeightMax());
@@ -3908,7 +4022,8 @@ void HistoryWidget::updateTabbedSelectorSectionShown() {
 	if (_tabbedSectionUsed) {
 		_tabbedSection.create(this, controller(), _tabbedPanel->takeSelector());
 		_tabbedSection->setCancelledCallback([this] { setInnerFocus(); });
-		_tabbedSelectorToggle->setColorOverrides(&st::historyAttachEmojiActive, &st::historyRecordVoiceFgActive, &st::historyRecordVoiceRippleBgActive);
+		_tabbedSelectorToggle->setColorOverrides(&st::historyAttachEmojiActive, &st::historyRecordVoiceFgActive,
+		                                         &st::historyRecordVoiceRippleBgActive);
 		_rightShadow.create(this, st::shadowFg);
 		auto destroyingPanel = std::move(_tabbedPanel);
 		updateControlsVisibility();
@@ -3931,10 +4046,12 @@ void HistoryWidget::checkTabbedSelectorToggleTooltip() {
 			auto shownCount = Auth().data().tabbedSelectorSectionTooltipShown();
 			if (shownCount < kTabbedSelectorToggleTooltipCount) {
 				_tabbedSelectorToggleTooltipShown = true;
-				_tabbedSelectorToggleTooltip.create(this, object_ptr<Ui::FlatLabel>(this, lang(lng_emoji_hide_panel), Ui::FlatLabel::InitType::Simple, st::defaultImportantTooltipLabel), st::defaultImportantTooltip);
-				_tabbedSelectorToggleTooltip->setHiddenCallback([this] {
-					_tabbedSelectorToggleTooltip.destroy();
-				});
+				_tabbedSelectorToggleTooltip.create(this,
+				                                    object_ptr<Ui::FlatLabel>(this, lang(lng_emoji_hide_panel),
+				                                                              Ui::FlatLabel::InitType::Simple,
+				                                                              st::defaultImportantTooltipLabel),
+				                                    st::defaultImportantTooltip);
+				_tabbedSelectorToggleTooltip->setHiddenCallback([this] { _tabbedSelectorToggleTooltip.destroy(); });
 				InvokeQueued(_tabbedSelectorToggleTooltip, [this, shownCount] {
 					Auth().data().setTabbedSelectorSectionTooltipShown(shownCount + 1);
 					Auth().saveDataDelayed(kTabbedSelectorToggleTooltipTimeoutMs);
@@ -4042,13 +4159,17 @@ void HistoryWidget::updateOnlineDisplay() {
 			}
 		}
 	} else if (_peer->isChannel()) {
-		if (_peer->isMegagroup() && _peer->asChannel()->membersCount() > 0 && _peer->asChannel()->membersCount() <= Global::ChatSizeMax()) {
-			if (_peer->asChannel()->mgInfo->lastParticipants.size() < _peer->asChannel()->membersCount() || _peer->asChannel()->lastParticipantsCountOutdated()) {
+		if (_peer->isMegagroup() && _peer->asChannel()->membersCount() > 0 &&
+		    _peer->asChannel()->membersCount() <= Global::ChatSizeMax()) {
+			if (_peer->asChannel()->mgInfo->lastParticipants.size() < _peer->asChannel()->membersCount() ||
+			    _peer->asChannel()->lastParticipantsCountOutdated()) {
 				Auth().api().requestLastParticipants(_peer->asChannel());
 			}
 			auto online = 0;
 			bool onlyMe = true;
-			for (auto i = _peer->asChannel()->mgInfo->lastParticipants.cbegin(), e = _peer->asChannel()->mgInfo->lastParticipants.cend(); i != e; ++i) {
+			for (auto i = _peer->asChannel()->mgInfo->lastParticipants.cbegin(),
+			          e = _peer->asChannel()->mgInfo->lastParticipants.cend();
+			     i != e; ++i) {
 				if ((*i)->onlineTill > t) {
 					++online;
 					if (onlyMe && (*i) != App::self()) onlyMe = false;
@@ -4113,24 +4234,30 @@ void HistoryWidget::moveFieldControls() {
 		_kbScroll->setGeometryToLeft(0, bottom, _chatWidth, keyboardHeight);
 	}
 
-// _attachToggle --------- _inlineResults -------------------------------------- _tabbedPanel --------- _fieldBarCancel
-// (_attachDocument|_attachPhoto) _field (_silent|_cmdStart|_kbShow) (_kbHide|_tabbedSelectorToggle) [_broadcast] _send
-// (_botStart|_unblock|_joinChannel|_muteUnmute)
+	// _attachToggle --------- _inlineResults -------------------------------------- _tabbedPanel ---------
+	// _fieldBarCancel
+	// (_attachDocument|_attachPhoto) _field (_silent|_cmdStart|_kbShow) (_kbHide|_tabbedSelectorToggle) [_broadcast]
+	// _send
+	// (_botStart|_unblock|_joinChannel|_muteUnmute)
 
 	auto buttonsBottom = bottom - _attachToggle->height();
 	auto left = 0;
-	_attachToggle->moveToLeft(left, buttonsBottom); left += _attachToggle->width();
+	_attachToggle->moveToLeft(left, buttonsBottom);
+	left += _attachToggle->width();
 	_field->moveToLeft(left, bottom - _field->height() - st::historySendPadding);
 	auto right = (width() - _chatWidth) + st::historySendRight;
-	_send->moveToRight(right, buttonsBottom); right += _send->width();
+	_send->moveToRight(right, buttonsBottom);
+	right += _send->width();
 	_tabbedSelectorToggle->moveToRight(right, buttonsBottom);
 	updateTabbedSelectorToggleTooltipGeometry();
-	_botKeyboardHide->moveToRight(right, buttonsBottom); right += _botKeyboardHide->width();
+	_botKeyboardHide->moveToRight(right, buttonsBottom);
+	right += _botKeyboardHide->width();
 	_botKeyboardShow->moveToRight(right, buttonsBottom);
 	_botCommandStart->moveToRight(right, buttonsBottom);
 	_silent->moveToRight(right, buttonsBottom);
 
-	_fieldBarCancel->moveToRight(width() - _chatWidth, _field->y() - st::historySendPadding - _fieldBarCancel->height());
+	_fieldBarCancel->moveToRight(width() - _chatWidth,
+	                             _field->y() - st::historySendPadding - _fieldBarCancel->height());
 	if (_inlineResults) {
 		_inlineResults->moveBottom(_field->y() - st::historySendPadding);
 	}
@@ -4209,7 +4336,8 @@ void HistoryWidget::onCheckFieldAutocomplete() {
 	auto isInlineBot = _inlineBot && (_inlineBot != Ui::LookingUpInlineBot);
 	auto query = isInlineBot ? QString() : _field->getMentionHashtagBotCommandPart(start);
 	if (!query.isEmpty()) {
-		if (query.at(0) == '#' && cRecentWriteHashtags().isEmpty() && cRecentSearchHashtags().isEmpty()) Local::readRecentHashtagsAndBots();
+		if (query.at(0) == '#' && cRecentWriteHashtags().isEmpty() && cRecentSearchHashtags().isEmpty())
+			Local::readRecentHashtagsAndBots();
 		if (query.at(0) == '@' && cRecentInlineBots().isEmpty()) Local::readRecentHashtagsAndBots();
 		if (query.at(0) == '/' && _peer->isUser() && !_peer->asUser()->botInfo) return;
 	}
@@ -4224,37 +4352,41 @@ void HistoryWidget::updateFieldPlaceholder() {
 			auto text = _inlineBot->botInfo->inlinePlaceholder.mid(1);
 			_field->setPlaceholder([text] { return text; }, _inlineBot->username.size() + 2);
 		} else {
-			_field->setPlaceholder(langFactory((_history && _history->isChannel() && !_history->isMegagroup()) ? (_silent->checked() ? lng_broadcast_silent_ph : lng_broadcast_ph) : lng_message_ph));
+			_field->setPlaceholder(langFactory((_history && _history->isChannel() && !_history->isMegagroup()) ?
+			                                       (_silent->checked() ? lng_broadcast_silent_ph : lng_broadcast_ph) :
+			                                       lng_message_ph));
 		}
 	}
 	updateSendButtonType();
 }
 
 template <typename SendCallback>
-bool HistoryWidget::showSendFilesBox(object_ptr<SendFilesBox> box, const QString &insertTextOnCancel, const QString *addedComment, SendCallback callback) {
+bool HistoryWidget::showSendFilesBox(object_ptr<SendFilesBox> box, const QString &insertTextOnCancel,
+                                     const QString *addedComment, SendCallback callback) {
 	App::wnd()->activateWindow();
 
 	auto withComment = (addedComment != nullptr);
-	box->setConfirmedCallback(base::lambda_guarded(this, [this, withComment, sendCallback = std::move(callback)](const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, bool ctrlShiftEnter) {
-		if (!canWriteMessage()) return;
+	box->setConfirmedCallback(
+	    base::lambda_guarded(this, [this, withComment, sendCallback = std::move(callback)](
+	                                   const QStringList &files, const QImage &image,
+	                                   std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed,
+	                                   const QString &caption, bool ctrlShiftEnter) {
+		    if (!canWriteMessage()) return;
 
-		auto replyTo = replyToId();
-		if (withComment) {
-			onSend(ctrlShiftEnter, replyTo);
-		}
-		sendCallback(files, image, std::move(information), compressed, caption, replyTo);
-	}));
+		    auto replyTo = replyToId();
+		    if (withComment) {
+			    onSend(ctrlShiftEnter, replyTo);
+		    }
+		    sendCallback(files, image, std::move(information), compressed, caption, replyTo);
+	    }));
 
 	if (withComment) {
 		auto was = _field->getTextWithTags();
-		setFieldText({ *addedComment, TextWithTags::Tags() });
-		box->setCancelledCallback(base::lambda_guarded(this, [this, was] {
-			setFieldText(was);
-		}));
+		setFieldText({*addedComment, TextWithTags::Tags()});
+		box->setCancelledCallback(base::lambda_guarded(this, [this, was] { setFieldText(was); }));
 	} else if (!insertTextOnCancel.isEmpty()) {
-		box->setCancelledCallback(base::lambda_guarded(this, [this, insertTextOnCancel] {
-			_field->textCursor().insertText(insertTextOnCancel);
-		}));
+		box->setCancelledCallback(base::lambda_guarded(
+		    this, [this, insertTextOnCancel] { _field->textCursor().insertText(insertTextOnCancel); }));
 	}
 
 	Ui::show(std::move(box));
@@ -4278,15 +4410,18 @@ bool HistoryWidget::validateSendingFiles(const SendingFilesLists &lists, Callbac
 	return false;
 }
 
-bool HistoryWidget::confirmSendingFiles(const QList<QUrl> &files, CompressConfirm compressed, const QString *addedComment) {
+bool HistoryWidget::confirmSendingFiles(const QList<QUrl> &files, CompressConfirm compressed,
+                                        const QString *addedComment) {
 	return confirmSendingFiles(getSendingFilesLists(files), compressed, addedComment);
 }
 
-bool HistoryWidget::confirmSendingFiles(const QStringList &files, CompressConfirm compressed, const QString *addedComment) {
+bool HistoryWidget::confirmSendingFiles(const QStringList &files, CompressConfirm compressed,
+                                        const QString *addedComment) {
 	return confirmSendingFiles(getSendingFilesLists(files), compressed, addedComment);
 }
 
-bool HistoryWidget::confirmSendingFiles(const SendingFilesLists &lists, CompressConfirm compressed, const QString *addedComment) {
+bool HistoryWidget::confirmSendingFiles(const SendingFilesLists &lists, CompressConfirm compressed,
+                                        const QString *addedComment) {
 	if (auto megagroup = _peer ? _peer->asMegagroup() : nullptr) {
 		if (megagroup->restrictedRights().is_send_media()) {
 			Ui::show(Box<InformBox>(lang(lng_restricted_send_media)));
@@ -4295,7 +4430,9 @@ bool HistoryWidget::confirmSendingFiles(const SendingFilesLists &lists, Compress
 	}
 	return validateSendingFiles(lists, [this, &lists, compressed, addedComment](const QStringList &files) {
 		auto insertTextOnCancel = QString();
-		auto sendCallback = [this](const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, MsgId replyTo) {
+		auto sendCallback = [this](const QStringList &files, const QImage &image,
+		                           std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed,
+		                           const QString &caption, MsgId replyTo) {
 			auto type = compressed ? SendMediaType::Photo : SendMediaType::File;
 			uploadFilesAfterConfirmation(files, QByteArray(), image, std::move(information), type, caption);
 		};
@@ -4308,11 +4445,14 @@ bool HistoryWidget::confirmSendingFiles(const SendingFilesLists &lists, Compress
 	});
 }
 
-bool HistoryWidget::confirmSendingFiles(const QImage &image, const QByteArray &content, CompressConfirm compressed, const QString &insertTextOnCancel) {
+bool HistoryWidget::confirmSendingFiles(const QImage &image, const QByteArray &content, CompressConfirm compressed,
+                                        const QString &insertTextOnCancel) {
 	if (!canWriteMessage() || image.isNull()) return false;
 
 	App::wnd()->activateWindow();
-	auto sendCallback = [this, content](const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, MsgId replyTo) {
+	auto sendCallback = [this, content](const QStringList &files, const QImage &image,
+	                                    std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed,
+	                                    const QString &caption, MsgId replyTo) {
 		auto type = compressed ? SendMediaType::Photo : SendMediaType::File;
 		uploadFilesAfterConfirmation(files, content, image, std::move(information), type, caption);
 	};
@@ -4320,7 +4460,8 @@ bool HistoryWidget::confirmSendingFiles(const QImage &image, const QByteArray &c
 	return showSendFilesBox(std::move(box), insertTextOnCancel, nullptr, std::move(sendCallback));
 }
 
-bool HistoryWidget::confirmSendingFiles(const QMimeData *data, CompressConfirm compressed, const QString &insertTextOnCancel) {
+bool HistoryWidget::confirmSendingFiles(const QMimeData *data, CompressConfirm compressed,
+                                        const QString &insertTextOnCancel) {
 	if (!canWriteMessage()) {
 		return false;
 	}
@@ -4344,11 +4485,14 @@ bool HistoryWidget::confirmSendingFiles(const QMimeData *data, CompressConfirm c
 	return false;
 }
 
-bool HistoryWidget::confirmShareContact(const QString &phone, const QString &fname, const QString &lname, const QString *addedComment) {
+bool HistoryWidget::confirmShareContact(const QString &phone, const QString &fname, const QString &lname,
+                                        const QString *addedComment) {
 	if (!canWriteMessage()) return false;
 
 	auto box = Box<SendFilesBox>(phone, fname, lname);
-	auto sendCallback = [this, phone, fname, lname](const QStringList &files, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, bool compressed, const QString &caption, MsgId replyTo) {
+	auto sendCallback = [this, phone, fname, lname](const QStringList &files, const QImage &image,
+	                                                std::unique_ptr<FileLoadTask::MediaInformation> information,
+	                                                bool compressed, const QString &caption, MsgId replyTo) {
 		shareContact(_peer->id, phone, fname, lname, replyTo);
 	};
 	auto insertTextOnCancel = QString();
@@ -4370,9 +4514,7 @@ HistoryWidget::SendingFilesLists HistoryWidget::getSendingFilesLists(const QList
 
 HistoryWidget::SendingFilesLists HistoryWidget::getSendingFilesLists(const QStringList &files) {
 	auto result = SendingFilesLists();
-	for_const (auto &filepath, files) {
-		getSendingLocalFileInfo(result, filepath);
-	}
+	for_const (auto &filepath, files) { getSendingLocalFileInfo(result, filepath); }
 	return result;
 }
 
@@ -4412,14 +4554,17 @@ void HistoryWidget::uploadFiles(const QStringList &files, SendMediaType type) {
 	uploadFilesAfterConfirmation(files, QByteArray(), QImage(), nullptr, type, caption);
 }
 
-void HistoryWidget::uploadFilesAfterConfirmation(const QStringList &files, const QByteArray &content, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, SendMediaType type, QString caption) {
+void HistoryWidget::uploadFilesAfterConfirmation(const QStringList &files, const QByteArray &content,
+                                                 const QImage &image,
+                                                 std::unique_ptr<FileLoadTask::MediaInformation> information,
+                                                 SendMediaType type, QString caption) {
 	Assert(canWriteMessage());
 
 	auto to = FileLoadTo(_peer->id, _silent->checked(), replyToId());
 	if (files.size() > 1 && !caption.isEmpty()) {
 		MainWidget::MessageToSend message;
 		message.history = _history;
-		message.textWithTags = { caption, TextWithTags::Tags() };
+		message.textWithTags = {caption, TextWithTags::Tags()};
 		message.replyTo = to.replyTo;
 		message.silent = to.silent;
 		message.clearDraft = false;
@@ -4455,13 +4600,22 @@ void HistoryWidget::sendFileConfirmed(const FileLoadResultPtr &file) {
 
 	FullMsgId newId(peerToChannel(file->to.peer), clientMsgId());
 
-	connect(&Auth().uploader(), SIGNAL(photoReady(const FullMsgId&,bool,const MTPInputFile&)), this, SLOT(onPhotoUploaded(const FullMsgId&,bool,const MTPInputFile&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(documentReady(const FullMsgId&,bool,const MTPInputFile&)), this, SLOT(onDocumentUploaded(const FullMsgId&,bool,const MTPInputFile&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(thumbDocumentReady(const FullMsgId&,bool,const MTPInputFile&,const MTPInputFile&)), this, SLOT(onThumbDocumentUploaded(const FullMsgId&,bool,const MTPInputFile&, const MTPInputFile&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(photoProgress(const FullMsgId&)), this, SLOT(onPhotoProgress(const FullMsgId&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(documentProgress(const FullMsgId&)), this, SLOT(onDocumentProgress(const FullMsgId&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(photoFailed(const FullMsgId&)), this, SLOT(onPhotoFailed(const FullMsgId&)), Qt::UniqueConnection);
-	connect(&Auth().uploader(), SIGNAL(documentFailed(const FullMsgId&)), this, SLOT(onDocumentFailed(const FullMsgId&)), Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(photoReady(const FullMsgId &, bool, const MTPInputFile &)), this,
+	        SLOT(onPhotoUploaded(const FullMsgId &, bool, const MTPInputFile &)), Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(documentReady(const FullMsgId &, bool, const MTPInputFile &)), this,
+	        SLOT(onDocumentUploaded(const FullMsgId &, bool, const MTPInputFile &)), Qt::UniqueConnection);
+	connect(&Auth().uploader(),
+	        SIGNAL(thumbDocumentReady(const FullMsgId &, bool, const MTPInputFile &, const MTPInputFile &)), this,
+	        SLOT(onThumbDocumentUploaded(const FullMsgId &, bool, const MTPInputFile &, const MTPInputFile &)),
+	        Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(photoProgress(const FullMsgId &)), this,
+	        SLOT(onPhotoProgress(const FullMsgId &)), Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(documentProgress(const FullMsgId &)), this,
+	        SLOT(onDocumentProgress(const FullMsgId &)), Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(photoFailed(const FullMsgId &)), this, SLOT(onPhotoFailed(const FullMsgId &)),
+	        Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(documentFailed(const FullMsgId &)), this,
+	        SLOT(onDocumentFailed(const FullMsgId &)), Qt::UniqueConnection);
 
 	Auth().uploader().upload(newId, file);
 
@@ -4493,14 +4647,23 @@ void HistoryWidget::sendFileConfirmed(const FileLoadResultPtr &file) {
 			photoFlags |= MTPDmessageMediaPhoto::Flag::f_caption;
 		}
 		auto photo = MTP_messageMediaPhoto(MTP_flags(photoFlags), file->photo, MTP_string(file->caption), MTPint());
-		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo), MTP_int(unixtime()), MTP_string(""), photo, MTPnullMarkup, MTPnullEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)), NewMessageUnread);
+		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId),
+		                             peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo),
+		                             MTP_int(unixtime()), MTP_string(""), photo, MTPnullMarkup, MTPnullEntities,
+		                             MTP_int(1), MTPint(), MTP_string(messagePostAuthor)),
+		                 NewMessageUnread);
 	} else if (file->type == SendMediaType::File) {
 		auto documentFlags = MTPDmessageMediaDocument::Flag::f_document | 0;
 		if (!file->caption.isEmpty()) {
 			documentFlags |= MTPDmessageMediaDocument::Flag::f_caption;
 		}
-		auto document = MTP_messageMediaDocument(MTP_flags(documentFlags), file->document, MTP_string(file->caption), MTPint());
-		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo), MTP_int(unixtime()), MTP_string(""), document, MTPnullMarkup, MTPnullEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)), NewMessageUnread);
+		auto document =
+		    MTP_messageMediaDocument(MTP_flags(documentFlags), file->document, MTP_string(file->caption), MTPint());
+		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId),
+		                             peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo),
+		                             MTP_int(unixtime()), MTP_string(""), document, MTPnullMarkup, MTPnullEntities,
+		                             MTP_int(1), MTPint(), MTP_string(messagePostAuthor)),
+		                 NewMessageUnread);
 	} else if (file->type == SendMediaType::Audio) {
 		if (!h->peer->isChannel()) {
 			flags |= MTPDmessage::Flag::f_media_unread;
@@ -4509,8 +4672,13 @@ void HistoryWidget::sendFileConfirmed(const FileLoadResultPtr &file) {
 		if (!file->caption.isEmpty()) {
 			documentFlags |= MTPDmessageMediaDocument::Flag::f_caption;
 		}
-		auto document = MTP_messageMediaDocument(MTP_flags(documentFlags), file->document, MTP_string(file->caption), MTPint());
-		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo), MTP_int(unixtime()), MTP_string(""), document, MTPnullMarkup, MTPnullEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)), NewMessageUnread);
+		auto document =
+		    MTP_messageMediaDocument(MTP_flags(documentFlags), file->document, MTP_string(file->caption), MTPint());
+		h->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId),
+		                             peerToMTP(file->to.peer), MTPnullFwdHeader, MTPint(), MTP_int(file->to.replyTo),
+		                             MTP_int(unixtime()), MTP_string(""), document, MTPnullMarkup, MTPnullEntities,
+		                             MTP_int(1), MTPint(), MTP_string(messagePostAuthor)),
+		                 NewMessageUnread);
 	}
 
 	if (_peer && file->to.peer == _peer->id) {
@@ -4539,13 +4707,18 @@ void HistoryWidget::onPhotoUploaded(const FullMsgId &newId, bool silent, const M
 			sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 		}
 		auto caption = item->getMedia() ? item->getMedia()->getCaption() : TextWithEntities();
-		auto media = MTP_inputMediaUploadedPhoto(MTP_flags(0), file, MTP_string(caption.text), MTPVector<MTPInputDocument>(), MTP_int(0));
-		hist->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo), media, MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
+		auto media = MTP_inputMediaUploadedPhoto(MTP_flags(0), file, MTP_string(caption.text),
+		                                         MTPVector<MTPInputDocument>(), MTP_int(0));
+		hist->sendRequestId =
+		    MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo), media,
+		                                    MTP_long(randomId), MTPnullMarkup),
+		              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+		              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
 	}
 }
 
 void HistoryWidget::onDocumentUploaded(const FullMsgId &newId, bool silent, const MTPInputFile &file) {
-	if (auto item = dynamic_cast<HistoryMessage*>(App::histItemById(newId))) {
+	if (auto item = dynamic_cast<HistoryMessage *>(App::histItemById(newId))) {
 		auto media = item->getMedia();
 		if (auto document = media ? media->getDocument() : nullptr) {
 			auto randomId = rand_value<quint64>();
@@ -4563,14 +4736,21 @@ void HistoryWidget::onDocumentUploaded(const FullMsgId &newId, bool silent, cons
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 			}
 			auto caption = item->getMedia() ? item->getMedia()->getCaption() : TextWithEntities();
-			auto media = MTP_inputMediaUploadedDocument(MTP_flags(0), file, MTPInputFile(), MTP_string(document->mime), composeDocumentAttributes(document), MTP_string(caption.text), MTPVector<MTPInputDocument>(), MTP_int(0));
-			hist->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo), media, MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
+			auto media = MTP_inputMediaUploadedDocument(MTP_flags(0), file, MTPInputFile(), MTP_string(document->mime),
+			                                            composeDocumentAttributes(document), MTP_string(caption.text),
+			                                            MTPVector<MTPInputDocument>(), MTP_int(0));
+			hist->sendRequestId =
+			    MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo),
+			                                    media, MTP_long(randomId), MTPnullMarkup),
+			              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+			              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
 		}
 	}
 }
 
-void HistoryWidget::onThumbDocumentUploaded(const FullMsgId &newId, bool silent, const MTPInputFile &file, const MTPInputFile &thumb) {
-	if (auto item = dynamic_cast<HistoryMessage*>(App::histItemById(newId))) {
+void HistoryWidget::onThumbDocumentUploaded(const FullMsgId &newId, bool silent, const MTPInputFile &file,
+                                            const MTPInputFile &thumb) {
+	if (auto item = dynamic_cast<HistoryMessage *>(App::histItemById(newId))) {
 		auto media = item->getMedia();
 		if (auto document = media ? media->getDocument() : nullptr) {
 			auto randomId = rand_value<quint64>();
@@ -4588,15 +4768,24 @@ void HistoryWidget::onThumbDocumentUploaded(const FullMsgId &newId, bool silent,
 				sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 			}
 			auto caption = media ? media->getCaption() : TextWithEntities();
-			auto media = MTP_inputMediaUploadedDocument(MTP_flags(MTPDinputMediaUploadedDocument::Flag::f_thumb), file, thumb, MTP_string(document->mime), composeDocumentAttributes(document), MTP_string(caption.text), MTPVector<MTPInputDocument>(), MTP_int(0));
-			hist->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo), media, MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
+			auto media =
+			    MTP_inputMediaUploadedDocument(MTP_flags(MTPDinputMediaUploadedDocument::Flag::f_thumb), file, thumb,
+			                                   MTP_string(document->mime), composeDocumentAttributes(document),
+			                                   MTP_string(caption.text), MTPVector<MTPInputDocument>(), MTP_int(0));
+			hist->sendRequestId =
+			    MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), item->history()->peer->input, MTP_int(replyTo),
+			                                    media, MTP_long(randomId), MTPnullMarkup),
+			              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+			              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, hist->sendRequestId);
 		}
 	}
 }
 
 void HistoryWidget::onPhotoProgress(const FullMsgId &newId) {
 	if (auto item = App::histItemById(newId)) {
-		auto photo = (item->getMedia() && item->getMedia()->type() == MediaTypePhoto) ? static_cast<HistoryPhoto*>(item->getMedia())->photo() : nullptr;
+		auto photo = (item->getMedia() && item->getMedia()->type() == MediaTypePhoto) ?
+		                 static_cast<HistoryPhoto *>(item->getMedia())->photo() :
+		                 nullptr;
 		if (!item->isPost()) {
 			updateSendAction(item->history(), SendAction::Type::UploadPhoto, 0);
 		}
@@ -4609,7 +4798,10 @@ void HistoryWidget::onDocumentProgress(const FullMsgId &newId) {
 		auto media = item->getMedia();
 		auto document = media ? media->getDocument() : nullptr;
 		if (!item->isPost()) {
-			updateSendAction(item->history(), (document && document->voice()) ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile, document ? document->uploadOffset : 0);
+			updateSendAction(item->history(),
+			                 (document && document->voice()) ? SendAction::Type::UploadVoice :
+			                                                   SendAction::Type::UploadFile,
+			                 document ? document->uploadOffset : 0);
 		}
 		Ui::repaintHistoryItem(item);
 	}
@@ -4621,7 +4813,7 @@ void HistoryWidget::onPhotoFailed(const FullMsgId &newId) {
 		if (!item->isPost()) {
 			updateSendAction(item->history(), SendAction::Type::UploadPhoto, -1);
 		}
-//		Ui::repaintHistoryItem(item);
+		//		Ui::repaintHistoryItem(item);
 	}
 }
 
@@ -4630,23 +4822,31 @@ void HistoryWidget::onDocumentFailed(const FullMsgId &newId) {
 		auto media = item->getMedia();
 		auto document = media ? media->getDocument() : nullptr;
 		if (!item->isPost()) {
-			updateSendAction(item->history(), (document && document->voice()) ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile, -1);
+			updateSendAction(
+			    item->history(),
+			    (document && document->voice()) ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile, -1);
 		}
 		Ui::repaintHistoryItem(item);
 	}
 }
 
 void HistoryWidget::onReportSpamClicked() {
-	auto text = lang(_peer->isUser() ? lng_report_spam_sure : ((_peer->isChat() || _peer->isMegagroup()) ? lng_report_spam_sure_group : lng_report_spam_sure_channel));
-	Ui::show(Box<ConfirmBox>(text, lang(lng_report_spam_ok), st::attentionBoxButton, base::lambda_guarded(this, [this, peer = _peer] {
-		if (_reportSpamRequest) return;
+	auto text = lang(_peer->isUser() ? lng_report_spam_sure :
+	                                   ((_peer->isChat() || _peer->isMegagroup()) ? lng_report_spam_sure_group :
+	                                                                                lng_report_spam_sure_channel));
+	Ui::show(Box<ConfirmBox>(text, lang(lng_report_spam_ok), st::attentionBoxButton,
+	                         base::lambda_guarded(this, [this, peer = _peer] {
+		                         if (_reportSpamRequest) return;
 
-		Ui::hideLayer();
-		if (auto user = peer->asUser()) {
-			MTP::send(MTPcontacts_Block(user->inputUser), rpcDone(&HistoryWidget::blockDone, peer), RPCFailHandlerPtr(), 0, 5);
-		}
-		_reportSpamRequest = MTP::send(MTPmessages_ReportSpam(peer->input), rpcDone(&HistoryWidget::reportSpamDone, peer), rpcFail(&HistoryWidget::reportSpamFail));
-	})));
+		                         Ui::hideLayer();
+		                         if (auto user = peer->asUser()) {
+			                         MTP::send(MTPcontacts_Block(user->inputUser),
+			                                   rpcDone(&HistoryWidget::blockDone, peer), RPCFailHandlerPtr(), 0, 5);
+		                         }
+		                         _reportSpamRequest = MTP::send(MTPmessages_ReportSpam(peer->input),
+		                                                        rpcDone(&HistoryWidget::reportSpamDone, peer),
+		                                                        rpcFail(&HistoryWidget::reportSpamFail));
+	                         })));
 }
 
 void HistoryWidget::reportSpamDone(PeerData *peer, const MTPBool &result, mtpRequestId req) {
@@ -4690,12 +4890,15 @@ void HistoryWidget::onReportSpamClear() {
 		if (peer->isUser()) {
 			App::main()->deleteConversation(peer);
 		} else if (auto chat = peer->asChat()) {
-			MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, App::self()->inputUser), App::main()->rpcDone(&MainWidget::deleteHistoryAfterLeave, peer), App::main()->rpcFail(&MainWidget::leaveChatFailed, peer));
+			MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, App::self()->inputUser),
+			          App::main()->rpcDone(&MainWidget::deleteHistoryAfterLeave, peer),
+			          App::main()->rpcFail(&MainWidget::leaveChatFailed, peer));
 		} else if (auto channel = peer->asChannel()) {
 			if (channel->migrateFrom()) {
 				App::main()->deleteConversation(channel->migrateFrom());
 			}
-			MTP::send(MTPchannels_LeaveChannel(channel->inputChannel), App::main()->rpcDone(&MainWidget::sentUpdatesReceived));
+			MTP::send(MTPchannels_LeaveChannel(channel->inputChannel),
+			          App::main()->rpcDone(&MainWidget::sentUpdatesReceived));
 		}
 	});
 
@@ -4708,7 +4911,8 @@ void HistoryWidget::peerMessagesUpdated(PeerId peer) {
 		updateHistoryGeometry();
 		updateBotKeyboard();
 		if (!_scroll->isHidden()) {
-			bool unblock = isBlocked(), botStart = isBotStart(), joinChannel = isJoinChannel(), muteUnmute = isMuteUnmute();
+			bool unblock = isBlocked(), botStart = isBotStart(), joinChannel = isJoinChannel(),
+			     muteUnmute = isMuteUnmute();
 			bool upd = (_unblock->isHidden() == unblock);
 			if (!upd && !unblock) upd = (_botStart->isHidden() == botStart);
 			if (!upd && !unblock && !botStart) upd = (_joinChannel->isHidden() == joinChannel);
@@ -4736,7 +4940,7 @@ void HistoryWidget::grabFinish() {
 	_topShadow->show();
 }
 
-void HistoryWidget::ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
+void HistoryWidget::ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
 	if (_peer && _list && (item->history() == _history || (_migrated && item->history() == _migrated))) {
 		auto ms = getms();
 		if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) {
@@ -4807,7 +5011,7 @@ void HistoryWidget::updateControlsGeometry() {
 		_reportSpamPanel->setGeometryToLeft(0, _scroll->y(), _chatWidth, _reportSpamPanel->height());
 	}
 
-	updateHistoryGeometry(false, false, { ScrollChangeAdd, App::main() ? App::main()->contentScrollAddToY() : 0 });
+	updateHistoryGeometry(false, false, {ScrollChangeAdd, App::main() ? App::main()->contentScrollAddToY() : 0});
 
 	updateFieldSize();
 
@@ -4819,19 +5023,22 @@ void HistoryWidget::updateControlsGeometry() {
 
 	switch (_attachDrag) {
 	case DragStateFiles:
-		_attachDragDocument->resize(width() - st::dragMargin.left() - st::dragMargin.right(), height() - st::dragMargin.top() - st::dragMargin.bottom());
+		_attachDragDocument->resize(width() - st::dragMargin.left() - st::dragMargin.right(),
+		                            height() - st::dragMargin.top() - st::dragMargin.bottom());
 		_attachDragDocument->move(st::dragMargin.left(), st::dragMargin.top());
-	break;
+		break;
 	case DragStatePhotoFiles:
-		_attachDragDocument->resize(width() - st::dragMargin.left() - st::dragMargin.right(), (height() - st::dragMargin.top() - st::dragMargin.bottom()) / 2);
+		_attachDragDocument->resize(width() - st::dragMargin.left() - st::dragMargin.right(),
+		                            (height() - st::dragMargin.top() - st::dragMargin.bottom()) / 2);
 		_attachDragDocument->move(st::dragMargin.left(), st::dragMargin.top());
 		_attachDragPhoto->resize(_attachDragDocument->width(), _attachDragDocument->height());
 		_attachDragPhoto->move(st::dragMargin.left(), height() - _attachDragPhoto->height() - st::dragMargin.bottom());
-	break;
+		break;
 	case DragStateImage:
-		_attachDragPhoto->resize(width() - st::dragMargin.left() - st::dragMargin.right(), height() - st::dragMargin.top() - st::dragMargin.bottom());
+		_attachDragPhoto->resize(width() - st::dragMargin.left() - st::dragMargin.right(),
+		                         height() - st::dragMargin.top() - st::dragMargin.bottom());
 		_attachDragPhoto->move(st::dragMargin.left(), st::dragMargin.top());
-	break;
+		break;
 	}
 
 	if (_rightShadow) {
@@ -4839,7 +5046,8 @@ void HistoryWidget::updateControlsGeometry() {
 	}
 	auto topShadowLeft = (Adaptive::OneColumn() || _inGrab) ? 0 : st::lineWidth;
 	auto topShadowRight = _rightShadow ? st::lineWidth : 0;
-	_topShadow->setGeometryToLeft(topShadowLeft, _topBar->bottomNoMargins(), _chatWidth - topShadowLeft - topShadowRight, st::lineWidth);
+	_topShadow->setGeometryToLeft(topShadowLeft, _topBar->bottomNoMargins(),
+	                              _chatWidth - topShadowLeft - topShadowRight, st::lineWidth);
 }
 
 void HistoryWidget::itemRemoved(HistoryItem *item) {
@@ -4905,7 +5113,8 @@ int HistoryWidget::countAutomaticScrollTop() {
 	auto result = ScrollMax;
 	if (_migrated && _migrated->showFrom) {
 		result = _list->itemTop(_migrated->showFrom);
-		if (result < _scroll->scrollTopMax() + HistoryMessageUnreadBar::height() - HistoryMessageUnreadBar::marginTop()) {
+		if (result <
+		    _scroll->scrollTopMax() + HistoryMessageUnreadBar::height() - HistoryMessageUnreadBar::marginTop()) {
 			_migrated->addUnreadBar();
 			if (hasPendingResizedItems()) {
 				updateListSize();
@@ -4919,7 +5128,8 @@ int HistoryWidget::countAutomaticScrollTop() {
 		}
 	} else if (_history->showFrom) {
 		result = _list->itemTop(_history->showFrom);
-		if (result < _scroll->scrollTopMax() + HistoryMessageUnreadBar::height() - HistoryMessageUnreadBar::marginTop()) {
+		if (result <
+		    _scroll->scrollTopMax() + HistoryMessageUnreadBar::height() - HistoryMessageUnreadBar::marginTop()) {
 			_history->addUnreadBar();
 			if (hasPendingResizedItems()) {
 				updateListSize();
@@ -4975,11 +5185,14 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
 		_fieldAutocomplete->setBoundings(_scroll->geometry());
 		if (!_historyDownShown.animating()) {
 			// _historyDown is a child widget of _scroll, not me.
-			_historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->height() - _historyDown->height() - st::historyToDownPosition.y());
+			_historyDown->moveToRight(st::historyToDownPosition.x(),
+			                          _scroll->height() - _historyDown->height() - st::historyToDownPosition.y());
 			if (!_unreadMentionsShown.animating()) {
 				// _unreadMentions is a child widget of _scroll, not me.
-				auto additionalSkip = _historyDownIsShown ? (_historyDown->height() + st::historyUnreadMentionsSkip) : 0;
-				_unreadMentions->moveToRight(st::historyToDownPosition.x(), _scroll->height() - additionalSkip - st::historyToDownPosition.y());
+				auto additionalSkip =
+				    _historyDownIsShown ? (_historyDown->height() + st::historyUnreadMentionsSkip) : 0;
+				_unreadMentions->moveToRight(st::historyToDownPosition.x(),
+				                             _scroll->height() - additionalSkip - st::historyToDownPosition.y());
 			}
 		}
 
@@ -4989,7 +5202,9 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
 	updateListSize();
 	_updateHistoryGeometryRequired = false;
 
-	if ((!initial && !wasAtBottom) || (loadedDown && (!_history->showFrom || _history->unreadBar || _history->loadedAtBottom()) && (!_migrated || !_migrated->showFrom || _migrated->unreadBar || _history->loadedAtBottom()))) {
+	if ((!initial && !wasAtBottom) ||
+	    (loadedDown && (!_history->showFrom || _history->unreadBar || _history->loadedAtBottom()) &&
+	     (!_migrated || !_migrated->showFrom || _migrated->unreadBar || _history->loadedAtBottom()))) {
 		auto toY = std::min(_list->historyScrollTop(), _scroll->scrollTopMax());
 		if (change.type == ScrollChangeAdd) {
 			toY += change.value;
@@ -5034,7 +5249,7 @@ void HistoryWidget::updateListSize() {
 }
 
 int HistoryWidget::unreadBarTop() const {
-	auto getUnreadBar = [this]() -> HistoryItem* {
+	auto getUnreadBar = [this]() -> HistoryItem * {
 		if (_migrated && _migrated->unreadBar) {
 			return _migrated->unreadBar;
 		}
@@ -5065,7 +5280,7 @@ void HistoryWidget::addMessagesToFront(PeerData *peer, const QVector<MTPMessage>
 void HistoryWidget::addMessagesToBack(PeerData *peer, const QVector<MTPMessage> &messages) {
 	_list->messagesReceivedDown(peer, messages);
 	if (!_firstLoadRequest) {
-		updateHistoryGeometry(false, true, { ScrollChangeNoJumpToBottom, 0 });
+		updateHistoryGeometry(false, true, {ScrollChangeNoJumpToBottom, 0});
 	}
 }
 
@@ -5092,7 +5307,8 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 	} else if (_replyToId && _replyEditMsg) {
 		changed = _keyboard->updateMarkup(_replyEditMsg, force);
 	} else {
-		HistoryItem *keyboardItem = _history->lastKeyboardId ? App::histItemById(_channel, _history->lastKeyboardId) : nullptr;
+		HistoryItem *keyboardItem =
+		    _history->lastKeyboardId ? App::histItemById(_channel, _history->lastKeyboardId) : nullptr;
 		changed = _keyboard->updateMarkup(keyboardItem, force);
 	}
 	updateCmdStartShown();
@@ -5100,10 +5316,12 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 
 	bool hasMarkup = _keyboard->hasMarkup(), forceReply = _keyboard->forceReply() && (!_replyToId || !_replyEditMsg);
 	if (hasMarkup || forceReply) {
-		if (_keyboard->singleUse() && _keyboard->hasMarkup() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) && _history->lastKeyboardUsed) {
+		if (_keyboard->singleUse() && _keyboard->hasMarkup() &&
+		    _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) && _history->lastKeyboardUsed) {
 			_history->lastKeyboardHiddenId = _history->lastKeyboardId;
 		}
-		if (!isBotStart() && !isBlocked() && _canSendMessages && (wasVisible || (_replyToId && _replyEditMsg) || (!_field->hasSendText() && !kbWasHidden()))) {
+		if (!isBotStart() && !isBlocked() && _canSendMessages &&
+		    (wasVisible || (_replyToId && _replyEditMsg) || (!_field->hasSendText() && !kbWasHidden()))) {
 			if (!_a_show.animating()) {
 				if (hasMarkup) {
 					_kbScroll->show();
@@ -5117,13 +5335,18 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 				_botKeyboardShow->hide();
 				_botCommandStart->hide();
 			}
-			qint32 maxh = hasMarkup ? std::min(_keyboard->height(), st::historyComposeFieldMaxHeight - (st::historyComposeFieldMaxHeight / 2)) : 0;
+			qint32 maxh = hasMarkup ? std::min(_keyboard->height(), st::historyComposeFieldMaxHeight -
+			                                                            (st::historyComposeFieldMaxHeight / 2)) :
+			                          0;
 			_field->setMaxHeight(st::historyComposeFieldMaxHeight - maxh);
 			_kbShown = hasMarkup;
-			_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ? App::histItemById(_keyboard->forMsgId()) : 0;
+			_kbReplyTo = (_peer->isChat() || _peer->isChannel() || _keyboard->forceReply()) ?
+			                 App::histItemById(_keyboard->forMsgId()) :
+			                 0;
 			if (_kbReplyTo && !_replyToId) {
 				updateReplyToName();
-				_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()), _textDlgOptions);
+				_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_kbReplyTo->inReplyText()),
+				                          _textDlgOptions);
 				_fieldBarCancel->show();
 				updateMouseTracking();
 			}
@@ -5165,7 +5388,8 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 
 void HistoryWidget::updateHistoryDownPosition() {
 	// _historyDown is a child widget of _scroll, not me.
-	auto top = anim::interpolate(0, _historyDown->height() + st::historyToDownPosition.y(), _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
+	auto top = anim::interpolate(0, _historyDown->height() + st::historyToDownPosition.y(),
+	                             _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
 	_historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->height() - top);
 	auto shouldBeHidden = !_historyDownIsShown && !_historyDownShown.animating();
 	if (shouldBeHidden != _historyDown->isHidden()) {
@@ -5204,14 +5428,17 @@ void HistoryWidget::updateHistoryDownVisibility() {
 	auto historyDownIsShown = historyDownIsVisible();
 	if (_historyDownIsShown != historyDownIsShown) {
 		_historyDownIsShown = historyDownIsShown;
-		_historyDownShown.start([this] { updateHistoryDownPosition(); }, _historyDownIsShown ? 0. : 1., _historyDownIsShown ? 1. : 0., st::historyToDownDuration);
+		_historyDownShown.start([this] { updateHistoryDownPosition(); }, _historyDownIsShown ? 0. : 1.,
+		                        _historyDownIsShown ? 1. : 0., st::historyToDownDuration);
 	}
 }
 
 void HistoryWidget::updateUnreadMentionsPosition() {
 	// _unreadMentions is a child widget of _scroll, not me.
-	auto right = anim::interpolate(-_unreadMentions->width(), st::historyToDownPosition.x(), _unreadMentionsShown.current(_unreadMentionsIsShown ? 1. : 0.));
-	auto shift = anim::interpolate(0, _historyDown->height() + st::historyUnreadMentionsSkip, _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
+	auto right = anim::interpolate(-_unreadMentions->width(), st::historyToDownPosition.x(),
+	                               _unreadMentionsShown.current(_unreadMentionsIsShown ? 1. : 0.));
+	auto shift = anim::interpolate(0, _historyDown->height() + st::historyUnreadMentionsSkip,
+	                               _historyDownShown.current(_historyDownIsShown ? 1. : 0.));
 	auto top = _scroll->height() - _unreadMentions->height() - st::historyToDownPosition.y() - shift;
 	_unreadMentions->moveToRight(right, top);
 	auto shouldBeHidden = !_unreadMentionsIsShown && !_unreadMentionsShown.animating();
@@ -5239,12 +5466,15 @@ void HistoryWidget::updateUnreadMentionsVisibility() {
 	}
 	if (_unreadMentionsIsShown != unreadMentionsIsShown) {
 		_unreadMentionsIsShown = unreadMentionsIsShown;
-		_unreadMentionsShown.start([this] { updateUnreadMentionsPosition(); }, _unreadMentionsIsShown ? 0. : 1., _unreadMentionsIsShown ? 1. : 0., st::historyToDownDuration);
+		_unreadMentionsShown.start([this] { updateUnreadMentionsPosition(); }, _unreadMentionsIsShown ? 0. : 1.,
+		                           _unreadMentionsIsShown ? 1. : 0., st::historyToDownDuration);
 	}
 }
 
 void HistoryWidget::mousePressEvent(QMouseEvent *e) {
-	_replyForwardPressed = QRect(0, _field->y() - st::historySendPadding - st::historyReplyHeight, st::historyReplySkip, st::historyReplyHeight).contains(e->pos());
+	_replyForwardPressed = QRect(0, _field->y() - st::historySendPadding - st::historyReplyHeight, st::historyReplySkip,
+	                             st::historyReplyHeight)
+	                           .contains(e->pos());
 	if (_replyForwardPressed && !_fieldBarCancel->isHidden()) {
 		updateField();
 	} else if (_inReplyEditForward) {
@@ -5369,9 +5599,14 @@ void HistoryWidget::onInlineResultSend(InlineBots::Result *result, UserData *bot
 	UserId messageViaBotId = bot ? peerToUser(bot->id) : 0;
 	MsgId messageId = newId.msg;
 
-	result->addToHistory(_history, flags, messageId, messageFromId, messageDate, messageViaBotId, replyToId(), messagePostAuthor);
+	result->addToHistory(_history, flags, messageId, messageFromId, messageDate, messageViaBotId, replyToId(),
+	                     messagePostAuthor);
 
-	_history->sendRequestId = MTP::send(MTPmessages_SendInlineBotResult(MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()), MTP_long(randomId), MTP_long(result->getQueryId()), MTP_string(result->getId())), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, _history->sendRequestId);
+	_history->sendRequestId = MTP::send(
+	    MTPmessages_SendInlineBotResult(MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()), MTP_long(randomId),
+	                                    MTP_long(result->getQueryId()), MTP_string(result->getId())),
+	    App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0,
+	    0, _history->sendRequestId);
 	App::main()->finishForwarding(_history, _silent->checked());
 	cancelReply(lastKeyboardUsed);
 
@@ -5400,10 +5635,9 @@ void HistoryWidget::onInlineResultSend(InlineBots::Result *result, UserData *bot
 }
 
 HistoryWidget::PinnedBar::PinnedBar(MsgId msgId, HistoryWidget *parent)
-: msgId(msgId)
-, cancel(parent, st::historyReplyCancel)
-, shadow(parent, st::shadowFg) {
-}
+    : msgId(msgId)
+    , cancel(parent, st::historyReplyCancel)
+    , shadow(parent, st::shadowFg) {}
 
 HistoryWidget::PinnedBar::~PinnedBar() {
 	cancel.destroyDelayed();
@@ -5426,7 +5660,8 @@ void HistoryWidget::updatePinnedBar(bool force) {
 		_pinnedBar->msg = App::histItemById(_history->channelId(), _pinnedBar->msgId);
 	}
 	if (_pinnedBar->msg) {
-		_pinnedBar->text.setText(st::messageTextStyle, TextUtilities::Clean(_pinnedBar->msg->notificationText()), _textDlgOptions);
+		_pinnedBar->text.setText(st::messageTextStyle, TextUtilities::Clean(_pinnedBar->msg->notificationText()),
+		                         _textDlgOptions);
 		update();
 	} else if (force) {
 		if (_peer && _peer->isMegagroup()) {
@@ -5536,9 +5771,15 @@ bool HistoryWidget::sendExistingDocument(DocumentData *doc, const QString &capti
 	}
 	auto messageFromId = channelPost ? 0 : Auth().userId();
 	auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
-	_history->addNewDocument(newId.msg, flags, 0, replyToId(), date(MTP_int(unixtime())), messageFromId, messagePostAuthor, doc, caption, MTPnullMarkup);
+	_history->addNewDocument(newId.msg, flags, 0, replyToId(), date(MTP_int(unixtime())), messageFromId,
+	                         messagePostAuthor, doc, caption, MTPnullMarkup);
 
-	_history->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()), MTP_inputMediaDocument(MTP_flags(0), mtpInput, MTP_string(caption), MTPint()), MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, _history->sendRequestId);
+	_history->sendRequestId =
+	    MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()),
+	                                    MTP_inputMediaDocument(MTP_flags(0), mtpInput, MTP_string(caption), MTPint()),
+	                                    MTP_long(randomId), MTPnullMarkup),
+	              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+	              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, _history->sendRequestId);
 	App::main()->finishForwarding(_history, _silent->checked());
 	cancelReplyAfterMediaSend(lastKeyboardUsed);
 
@@ -5550,7 +5791,7 @@ bool HistoryWidget::sendExistingDocument(DocumentData *doc, const QString &capti
 		clearFieldText();
 		//_saveDraftText = true;
 		//_saveDraftStart = getms();
-		//onDraftSave();
+		// onDraftSave();
 		onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
 	}
 
@@ -5594,9 +5835,17 @@ void HistoryWidget::sendExistingPhoto(PhotoData *photo, const QString &caption)
 	}
 	auto messageFromId = channelPost ? 0 : Auth().userId();
 	auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
-	_history->addNewPhoto(newId.msg, flags, 0, replyToId(), date(MTP_int(unixtime())), messageFromId, messagePostAuthor, photo, caption, MTPnullMarkup);
+	_history->addNewPhoto(newId.msg, flags, 0, replyToId(), date(MTP_int(unixtime())), messageFromId, messagePostAuthor,
+	                      photo, caption, MTPnullMarkup);
 
-	_history->sendRequestId = MTP::send(MTPmessages_SendMedia(MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()), MTP_inputMediaPhoto(MTP_flags(0), MTP_inputPhoto(MTP_long(photo->id), MTP_long(photo->access)), MTP_string(caption), MTPint()), MTP_long(randomId), MTPnullMarkup), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, _history->sendRequestId);
+	_history->sendRequestId =
+	    MTP::send(MTPmessages_SendMedia(
+	                  MTP_flags(sendFlags), _peer->input, MTP_int(replyToId()),
+	                  MTP_inputMediaPhoto(MTP_flags(0), MTP_inputPhoto(MTP_long(photo->id), MTP_long(photo->access)),
+	                                      MTP_string(caption), MTPint()),
+	                  MTP_long(randomId), MTPnullMarkup),
+	              App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+	              App::main()->rpcFail(&MainWidget::sendMessageFail), 0, 0, _history->sendRequestId);
 	App::main()->finishForwarding(_history, _silent->checked());
 	cancelReplyAfterMediaSend(lastKeyboardUsed);
 
@@ -5607,7 +5856,8 @@ void HistoryWidget::sendExistingPhoto(PhotoData *photo, const QString &caption)
 	_field->setFocus();
 }
 
-void HistoryWidget::setFieldText(const TextWithTags &textWithTags, TextUpdateEvents events, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction) {
+void HistoryWidget::setFieldText(const TextWithTags &textWithTags, TextUpdateEvents events,
+                                 Ui::FlatTextarea::UndoHistoryAction undoHistoryAction) {
 	_textUpdateEvents = events;
 	_field->setTextWithTags(textWithTags, undoHistoryAction);
 	_field->moveCursor(QTextCursor::End);
@@ -5627,7 +5877,8 @@ void HistoryWidget::onReplyToMessage() {
 	if (!to || to->id <= 0 || !_canSendMessages) return;
 
 	if (to->history() == _migrated) {
-		if (to->isGroupMigrate() && !_history->isEmpty() && _history->blocks.front()->items.front()->isGroupMigrate() && _history != _migrated) {
+		if (to->isGroupMigrate() && !_history->isEmpty() && _history->blocks.front()->items.front()->isGroupMigrate() &&
+		    _history != _migrated) {
 			App::contextItem(_history->blocks.front()->items.front());
 			onReplyToMessage();
 			App::contextItem(to);
@@ -5635,14 +5886,15 @@ void HistoryWidget::onReplyToMessage() {
 			if (to->id < 0 || to->serviceMsg()) {
 				Ui::show(Box<InformBox>(lang(lng_reply_cant)));
 			} else {
-				Ui::show(Box<ConfirmBox>(lang(lng_reply_cant_forward), lang(lng_selected_forward), base::lambda_guarded(this, [this] {
-					auto item = App::contextItem();
-					if (!item || item->id < 0 || item->serviceMsg()) return;
+				Ui::show(Box<ConfirmBox>(lang(lng_reply_cant_forward), lang(lng_selected_forward),
+				                         base::lambda_guarded(this, [this] {
+					                         auto item = App::contextItem();
+					                         if (!item || item->id < 0 || item->serviceMsg()) return;
 
-					auto items = SelectedItemSet();
-					items.insert(item->id, item);
-					App::main()->setForwardDraft(_peer->id, items);
-				})));
+					                         auto items = SelectedItemSet();
+					                         items.insert(item->id, item);
+					                         App::main()->setForwardDraft(_peer->id, items);
+				                         })));
 			}
 		}
 		return;
@@ -5659,7 +5911,8 @@ void HistoryWidget::onReplyToMessage() {
 	} else {
 		_replyEditMsg = to;
 		_replyToId = to->id;
-		_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_replyEditMsg->inReplyText()), _textDlgOptions);
+		_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_replyEditMsg->inReplyText()),
+		                          _textDlgOptions);
 
 		updateBotKeyboard();
 
@@ -5701,15 +5954,15 @@ void HistoryWidget::onEditMessage() {
 	}
 
 	auto original = to->originalText();
-	auto editData = TextWithTags { TextUtilities::ApplyEntities(original), ConvertEntitiesToTextTags(original.entities) };
-	auto cursor = MessageCursor { editData.text.size(), editData.text.size(), QFIXED_MAX };
+	auto editData = TextWithTags{TextUtilities::ApplyEntities(original), ConvertEntitiesToTextTags(original.entities)};
+	auto cursor = MessageCursor{editData.text.size(), editData.text.size(), QFIXED_MAX};
 	_history->setEditDraft(std::make_unique<Data::Draft>(editData, to->id, cursor, false));
 	applyDraft(false);
 
 	_previewData = nullptr;
 	if (auto media = to->getMedia()) {
 		if (media->type() == MediaTypeWebPage) {
-			_previewData = static_cast<HistoryWebPage*>(media)->webpage();
+			_previewData = static_cast<HistoryWebPage *>(media)->webpage();
 			updatePreview();
 		}
 	}
@@ -5744,17 +5997,19 @@ void HistoryWidget::onUnpinMessage() {
 	if (!_peer || !_peer->isMegagroup()) return;
 
 	Ui::show(Box<ConfirmBox>(lang(lng_pinned_unpin_sure), lang(lng_pinned_unpin), base::lambda_guarded(this, [this] {
-		if (!_peer || !_peer->isMegagroup()) return;
+		                         if (!_peer || !_peer->isMegagroup()) return;
 
-		_peer->asChannel()->mgInfo->pinnedMsgId = 0;
-		if (pinnedMsgVisibilityUpdated()) {
-			updateControlsGeometry();
-			update();
-		}
+		                         _peer->asChannel()->mgInfo->pinnedMsgId = 0;
+		                         if (pinnedMsgVisibilityUpdated()) {
+			                         updateControlsGeometry();
+			                         update();
+		                         }
 
-		Ui::hideLayer();
-		MTP::send(MTPchannels_UpdatePinnedMessage(MTP_flags(0), _peer->asChannel()->inputChannel, MTP_int(0)), rpcDone(&HistoryWidget::unpinDone));
-	})));
+		                         Ui::hideLayer();
+		                         MTP::send(MTPchannels_UpdatePinnedMessage(
+		                                       MTP_flags(0), _peer->asChannel()->inputChannel, MTP_int(0)),
+		                                   rpcDone(&HistoryWidget::unpinDone));
+	                         })));
 }
 
 void HistoryWidget::unpinDone(const MTPUpdates &updates) {
@@ -5794,7 +6049,8 @@ void HistoryWidget::onCopyPostLink() {
 
 bool HistoryWidget::lastForceReplyReplied(const FullMsgId &replyTo) const {
 	if (replyTo.msg > 0 && replyTo.channel != _channel) return false;
-	return _keyboard->forceReply() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) && _keyboard->forMsgId().msg == (replyTo.msg < 0 ? replyToId() : replyTo.msg);
+	return _keyboard->forceReply() && _keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId) &&
+	       _keyboard->forMsgId().msg == (replyTo.msg < 0 ? replyToId() : replyTo.msg);
 }
 
 bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
@@ -5950,7 +6206,8 @@ void HistoryWidget::onPreviewCheck() {
 		} else {
 			PreviewCache::const_iterator i = _previewCache.constFind(_previewLinks);
 			if (i == _previewCache.cend()) {
-				_previewRequest = MTP::send(MTPmessages_GetWebPagePreview(MTP_string(_previewLinks)), rpcDone(&HistoryWidget::gotPreview, _previewLinks));
+				_previewRequest = MTP::send(MTPmessages_GetWebPagePreview(MTP_string(_previewLinks)),
+				                            rpcDone(&HistoryWidget::gotPreview, _previewLinks));
 			} else if (i.value()) {
 				_previewData = App::webPage(i.value());
 				updatePreview();
@@ -5963,7 +6220,8 @@ void HistoryWidget::onPreviewCheck() {
 
 void HistoryWidget::onPreviewTimeout() {
 	if (_previewData && _previewData->pendingTill > 0 && !_previewLinks.isEmpty()) {
-		_previewRequest = MTP::send(MTPmessages_GetWebPagePreview(MTP_string(_previewLinks)), rpcDone(&HistoryWidget::gotPreview, _previewLinks));
+		_previewRequest = MTP::send(MTPmessages_GetWebPagePreview(MTP_string(_previewLinks)),
+		                            rpcDone(&HistoryWidget::gotPreview, _previewLinks));
 	}
 }
 
@@ -6014,18 +6272,38 @@ void HistoryWidget::updatePreview() {
 				if (_previewData->title.isEmpty()) {
 					if (_previewData->description.text.isEmpty()) {
 						title = _previewData->author;
-						desc = ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url);
+						desc = ((_previewData->document && !_previewData->document->name.isEmpty()) ?
+						            _previewData->document->name :
+						            _previewData->url);
 					} else {
 						title = _previewData->description.text;
-						desc = _previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author;
+						desc = _previewData->author.isEmpty() ?
+						           ((_previewData->document && !_previewData->document->name.isEmpty()) ?
+						                _previewData->document->name :
+						                _previewData->url) :
+						           _previewData->author;
 					}
 				} else {
 					title = _previewData->title;
-					desc = _previewData->description.text.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description.text;
+					desc = _previewData->description.text.isEmpty() ?
+					           (_previewData->author.isEmpty() ?
+					                ((_previewData->document && !_previewData->document->name.isEmpty()) ?
+					                     _previewData->document->name :
+					                     _previewData->url) :
+					                _previewData->author) :
+					           _previewData->description.text;
 				}
 			} else {
 				title = _previewData->siteName;
-				desc = _previewData->title.isEmpty() ? (_previewData->description.text.isEmpty() ? (_previewData->author.isEmpty() ? ((_previewData->document && !_previewData->document->name.isEmpty()) ? _previewData->document->name : _previewData->url) : _previewData->author) : _previewData->description.text) : _previewData->title;
+				desc = _previewData->title.isEmpty() ?
+				           (_previewData->description.text.isEmpty() ?
+				                (_previewData->author.isEmpty() ?
+				                     ((_previewData->document && !_previewData->document->name.isEmpty()) ?
+				                          _previewData->document->name :
+				                          _previewData->url) :
+				                     _previewData->author) :
+				                _previewData->description.text) :
+				           _previewData->title;
 			}
 			if (title.isEmpty()) {
 				if (_previewData->document) {
@@ -6050,21 +6328,18 @@ void HistoryWidget::onCancel() {
 		onInlineBotCancel();
 	} else if (_editMsgId) {
 		auto original = _replyEditMsg ? _replyEditMsg->originalText() : TextWithEntities();
-		auto editData = TextWithTags { TextUtilities::ApplyEntities(original), ConvertEntitiesToTextTags(original.entities) };
+		auto editData =
+		    TextWithTags{TextUtilities::ApplyEntities(original), ConvertEntitiesToTextTags(original.entities)};
 		if (_replyEditMsg && editData != _field->getTextWithTags()) {
-			Ui::show(Box<ConfirmBox>(
-				lang(lng_cancel_edit_post_sure),
-				lang(lng_cancel_edit_post_yes),
-				lang(lng_cancel_edit_post_no),
-				base::lambda_guarded(this, [this] {
-				onFieldBarCancel();
-			})));
+			Ui::show(Box<ConfirmBox>(lang(lng_cancel_edit_post_sure), lang(lng_cancel_edit_post_yes),
+			                         lang(lng_cancel_edit_post_no),
+			                         base::lambda_guarded(this, [this] { onFieldBarCancel(); })));
 		} else {
 			onFieldBarCancel();
 		}
 	} else if (!_fieldAutocomplete->isHidden()) {
 		_fieldAutocomplete->hideAnimated();
-	} else  {
+	} else {
 		App::main()->showBackFromStack();
 		emit cancelled();
 	}
@@ -6101,7 +6376,8 @@ void HistoryWidget::handlePeerUpdate() {
 	if (_peer->isChannel()) updateReportSpamStatus();
 	if (_peer->isChat() && _peer->asChat()->noParticipantInfo()) {
 		Auth().api().requestFullPeer(_peer);
-	} else if (_peer->isUser() && (_peer->asUser()->blockStatus() == UserData::BlockStatus::Unknown || _peer->asUser()->callsStatus() == UserData::CallsStatus::Unknown)) {
+	} else if (_peer->isUser() && (_peer->asUser()->blockStatus() == UserData::BlockStatus::Unknown ||
+	                               _peer->asUser()->callsStatus() == UserData::CallsStatus::Unknown)) {
 		Auth().api().requestFullPeer(_peer);
 	} else if (_peer->isMegagroup() && !_peer->asChannel()->mgInfo->botStatus) {
 		Auth().api().requestBots(_peer->asChannel());
@@ -6183,7 +6459,7 @@ void HistoryWidget::deleteSelectedItems(bool forEveryone) {
 	auto selected = _list->getSelectedItems();
 	if (selected.isEmpty()) return;
 
-	QMap<PeerData*, QVector<MTPint>> idsByPeer;
+	QMap<PeerData *, QVector<MTPint>> idsByPeer;
 	for_const (auto item, selected) {
 		if (item->id > 0) {
 			idsByPeer[item->history()->peer].push_back(MTP_int(item->id));
@@ -6191,9 +6467,7 @@ void HistoryWidget::deleteSelectedItems(bool forEveryone) {
 	}
 
 	onClearSelected();
-	for_const (auto item, selected) {
-		item->destroy();
-	}
+	for_const (auto item, selected) { item->destroy(); }
 
 	for (auto i = idsByPeer.cbegin(), e = idsByPeer.cend(); i != e; ++i) {
 		App::main()->deleteMessages(i.key(), i.value(), forEveryone);
@@ -6231,7 +6505,7 @@ SelectedItemSet HistoryWidget::getSelectedItems() const {
 
 void HistoryWidget::updateTopBarSelection() {
 	if (!_list) {
-		_topBar->showSelected(Window::TopBarWidget::SelectedState {});
+		_topBar->showSelected(Window::TopBarWidget::SelectedState{});
 		return;
 	}
 
@@ -6241,7 +6515,8 @@ void HistoryWidget::updateTopBarSelection() {
 	updateControlsVisibility();
 	updateHistoryGeometry();
 	if (!Ui::isLayerShown() && !App::passcoded()) {
-		if (_nonEmptySelection || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
+		if (_nonEmptySelection || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() ||
+		    !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field->setFocus();
@@ -6271,7 +6546,8 @@ void HistoryWidget::updateReplyEditTexts(bool force) {
 		_replyEditMsg = App::histItemById(_channel, _editMsgId ? _editMsgId : _replyToId);
 	}
 	if (_replyEditMsg) {
-		_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_replyEditMsg->inReplyText()), _textDlgOptions);
+		_replyEditMsgText.setText(st::messageTextStyle, TextUtilities::Clean(_replyEditMsg->inReplyText()),
+		                          _textDlgOptions);
 
 		updateBotKeyboard();
 
@@ -6306,8 +6582,8 @@ void HistoryWidget::updateForwardingTexts() {
 	qint32 version = 0;
 	QString from, text;
 	if (!_toForward.isEmpty()) {
-		QMap<PeerData*, bool> fromUsersMap;
-		QVector<PeerData*> fromUsers;
+		QMap<PeerData *, bool> fromUsersMap;
+		QVector<PeerData *> fromUsers;
 		fromUsers.reserve(_toForward.size());
 		for (auto i = _toForward.cbegin(), e = _toForward.cend(); i != e; ++i) {
 			auto from = i.value()->senderOriginal();
@@ -6322,7 +6598,8 @@ void HistoryWidget::updateForwardingTexts() {
 		} else if (fromUsers.size() < 2) {
 			from = fromUsers.at(0)->name;
 		} else {
-			from = lng_forwarding_from_two(lt_user, fromUsers.at(0)->shortName(), lt_second_user, fromUsers.at(1)->shortName());
+			from = lng_forwarding_from_two(lt_user, fromUsers.at(0)->shortName(), lt_second_user,
+			                               fromUsers.at(1)->shortName());
 		}
 
 		if (_toForward.size() < 2) {
@@ -6339,9 +6616,7 @@ void HistoryWidget::updateForwardingTexts() {
 void HistoryWidget::checkForwardingInfo() {
 	if (!_toForward.isEmpty()) {
 		auto version = 0;
-		for_const (auto item, _toForward) {
-			version += item->senderOriginal()->nameVersion;
-		}
+		for_const (auto item, _toForward) { version += item->senderOriginal()->nameVersion; }
 		if (version != _toForwardNameVersion) {
 			updateForwardingTexts();
 		}
@@ -6369,7 +6644,8 @@ void HistoryWidget::updateForwardingItemRemovedSubscription() {
 void HistoryWidget::updateReplyToName() {
 	if (_editMsgId) return;
 	if (!_replyEditMsg && (_replyToId || !_kbReplyTo)) return;
-	_replyToName.setText(st::msgNameStyle, App::peerName((_replyEditMsg ? _replyEditMsg : _kbReplyTo)->author()), _textNameOptions);
+	_replyToName.setText(st::msgNameStyle, App::peerName((_replyEditMsg ? _replyEditMsg : _kbReplyTo)->author()),
+	                     _textNameOptions);
 	_replyToNameVersion = (_replyEditMsg ? _replyEditMsg : _kbReplyTo)->author()->nameVersion;
 }
 
@@ -6401,29 +6677,47 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 	p.fillRect(myrtlrect(0, backy, _chatWidth, backh), st::historyReplyBg);
 	if (_editMsgId || _replyToId || (!hasForward && _kbReplyTo)) {
 		auto replyLeft = st::historyReplySkip;
-		(_editMsgId ? st::historyEditIcon : st::historyReplyIcon).paint(p, st::historyReplyIconPosition + QPoint(0, backy), width());
+		(_editMsgId ? st::historyEditIcon : st::historyReplyIcon)
+		    .paint(p, st::historyReplyIconPosition + QPoint(0, backy), width());
 		if (!drawWebPagePreview) {
 			if (drawMsgText) {
 				if (drawMsgText->getMedia() && drawMsgText->getMedia()->hasReplyPreview()) {
 					auto replyPreview = drawMsgText->getMedia()->replyPreview();
 					if (!replyPreview->isNull()) {
-						auto to = QRect(replyLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
-						p.drawPixmap(to.x(), to.y(), replyPreview->pixSingle(replyPreview->width() / cIntRetinaFactor(), replyPreview->height() / cIntRetinaFactor(), to.width(), to.height(), ImageRoundRadius::Small));
+						auto to = QRect(replyLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(),
+						                st::msgReplyBarSize.height());
+						p.drawPixmap(to.x(), to.y(),
+						             replyPreview->pixSingle(replyPreview->width() / cIntRetinaFactor(),
+						                                     replyPreview->height() / cIntRetinaFactor(), to.width(),
+						                                     to.height(), ImageRoundRadius::Small));
 					}
-					replyLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+					replyLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() -
+					             st::msgReplyBarPos.x();
 				}
 				p.setPen(st::historyReplyNameFg);
 				if (_editMsgId) {
 					paintEditHeader(p, rect, replyLeft, backy);
 				} else {
-					_replyToName.drawElided(p, replyLeft, backy + st::msgReplyPadding.top(), _chatWidth - replyLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+					_replyToName.drawElided(p, replyLeft, backy + st::msgReplyPadding.top(),
+					                        _chatWidth - replyLeft - _fieldBarCancel->width() -
+					                            st::msgReplyPadding.right());
 				}
-				p.setPen(((drawMsgText->toHistoryMessage() && drawMsgText->toHistoryMessage()->emptyText()) || drawMsgText->serviceMsg()) ? st::historyComposeAreaFgService : st::historyComposeAreaFg);
-				_replyEditMsgText.drawElided(p, replyLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height, _chatWidth - replyLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+				p.setPen(((drawMsgText->toHistoryMessage() && drawMsgText->toHistoryMessage()->emptyText()) ||
+				          drawMsgText->serviceMsg()) ?
+				             st::historyComposeAreaFgService :
+				             st::historyComposeAreaFg);
+				_replyEditMsgText.drawElided(
+				    p, replyLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height,
+				    _chatWidth - replyLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
 			} else {
 				p.setFont(st::msgDateFont);
 				p.setPen(st::historyComposeAreaFgService);
-				p.drawText(replyLeft, backy + st::msgReplyPadding.top() + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(lang(lng_profile_loading), _chatWidth - replyLeft - _fieldBarCancel->width() - st::msgReplyPadding.right()));
+				p.drawText(replyLeft,
+				           backy + st::msgReplyPadding.top() +
+				               (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent,
+				           st::msgDateFont->elided(lang(lng_profile_loading), _chatWidth - replyLeft -
+				                                                                  _fieldBarCancel->width() -
+				                                                                  st::msgReplyPadding.right()));
 			}
 		}
 	} else if (hasForward) {
@@ -6433,43 +6727,65 @@ void HistoryWidget::drawField(Painter &p, const QRect &rect) {
 			auto firstItem = _toForward.cbegin().value();
 			auto firstMedia = firstItem->getMedia();
 			auto serviceColor = (_toForward.size() > 1) || (firstMedia != nullptr) || firstItem->serviceMsg();
-			auto preview = (_toForward.size() < 2 && firstMedia && firstMedia->hasReplyPreview()) ? firstMedia->replyPreview() : ImagePtr();
+			auto preview = (_toForward.size() < 2 && firstMedia && firstMedia->hasReplyPreview()) ?
+			                   firstMedia->replyPreview() :
+			                   ImagePtr();
 			if (!preview->isNull()) {
-				auto to = QRect(forwardLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
+				auto to = QRect(forwardLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(),
+				                st::msgReplyBarSize.height());
 				if (preview->width() == preview->height()) {
 					p.drawPixmap(to.x(), to.y(), preview->pix());
 				} else {
-					auto from = (preview->width() > preview->height()) ? QRect((preview->width() - preview->height()) / 2, 0, preview->height(), preview->height()) : QRect(0, (preview->height() - preview->width()) / 2, preview->width(), preview->width());
+					auto from =
+					    (preview->width() > preview->height()) ?
+					        QRect((preview->width() - preview->height()) / 2, 0, preview->height(), preview->height()) :
+					        QRect(0, (preview->height() - preview->width()) / 2, preview->width(), preview->width());
 					p.drawPixmap(to, preview->pix(), from);
 				}
-				forwardLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+				forwardLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() -
+				               st::msgReplyBarPos.x();
 			}
 			p.setPen(st::historyReplyNameFg);
-			_toForwardFrom.drawElided(p, forwardLeft, backy + st::msgReplyPadding.top(), width() - forwardLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+			_toForwardFrom.drawElided(p, forwardLeft, backy + st::msgReplyPadding.top(),
+			                          width() - forwardLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
 			p.setPen(serviceColor ? st::historyComposeAreaFgService : st::historyComposeAreaFg);
-			_toForwardText.drawElided(p, forwardLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height, _chatWidth - forwardLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+			_toForwardText.drawElided(
+			    p, forwardLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height,
+			    _chatWidth - forwardLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
 		}
 	}
 	if (drawWebPagePreview) {
 		auto previewLeft = st::historyReplySkip + st::webPageLeft;
-		p.fillRect(st::historyReplySkip, backy + st::msgReplyPadding.top(), st::webPageBar, st::msgReplyBarSize.height(), st::msgInReplyBarColor);
-		if ((_previewData->photo && !_previewData->photo->thumb->isNull()) || (_previewData->document && !_previewData->document->thumb->isNull())) {
-			auto replyPreview = _previewData->photo ? _previewData->photo->makeReplyPreview() : _previewData->document->makeReplyPreview();
+		p.fillRect(st::historyReplySkip, backy + st::msgReplyPadding.top(), st::webPageBar,
+		           st::msgReplyBarSize.height(), st::msgInReplyBarColor);
+		if ((_previewData->photo && !_previewData->photo->thumb->isNull()) ||
+		    (_previewData->document && !_previewData->document->thumb->isNull())) {
+			auto replyPreview = _previewData->photo ? _previewData->photo->makeReplyPreview() :
+			                                          _previewData->document->makeReplyPreview();
 			if (!replyPreview->isNull()) {
-				auto to = QRect(previewLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
+				auto to = QRect(previewLeft, backy + st::msgReplyPadding.top(), st::msgReplyBarSize.height(),
+				                st::msgReplyBarSize.height());
 				if (replyPreview->width() == replyPreview->height()) {
 					p.drawPixmap(to.x(), to.y(), replyPreview->pix());
 				} else {
-					auto from = (replyPreview->width() > replyPreview->height()) ? QRect((replyPreview->width() - replyPreview->height()) / 2, 0, replyPreview->height(), replyPreview->height()) : QRect(0, (replyPreview->height() - replyPreview->width()) / 2, replyPreview->width(), replyPreview->width());
+					auto from = (replyPreview->width() > replyPreview->height()) ?
+					                QRect((replyPreview->width() - replyPreview->height()) / 2, 0,
+					                      replyPreview->height(), replyPreview->height()) :
+					                QRect(0, (replyPreview->height() - replyPreview->width()) / 2,
+					                      replyPreview->width(), replyPreview->width());
 					p.drawPixmap(to, replyPreview->pix(), from);
 				}
 			}
-			previewLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+			previewLeft += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() -
+			               st::msgReplyBarPos.x();
 		}
 		p.setPen(st::historyReplyNameFg);
-		_previewTitle.drawElided(p, previewLeft, backy + st::msgReplyPadding.top(), _chatWidth - previewLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+		_previewTitle.drawElided(p, previewLeft, backy + st::msgReplyPadding.top(),
+		                         _chatWidth - previewLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
 		p.setPen(st::historyComposeAreaFg);
-		_previewDescription.drawElided(p, previewLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height, _chatWidth - previewLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
+		_previewDescription.drawElided(
+		    p, previewLeft, backy + st::msgReplyPadding.top() + st::msgServiceNameFont->height,
+		    _chatWidth - previewLeft - _fieldBarCancel->width() - st::msgReplyPadding.right());
 	}
 }
 
@@ -6479,7 +6795,8 @@ void HistoryWidget::drawRestrictedWrite(Painter &p) {
 
 	p.setFont(st::normalFont);
 	p.setPen(st::windowSubTextFg);
-	p.drawText(rect.marginsRemoved(QMargins(st::historySendPadding, 0, st::historySendPadding, 0)), lang(lng_restricted_send_message), style::al_center);
+	p.drawText(rect.marginsRemoved(QMargins(st::historySendPadding, 0, st::historySendPadding, 0)),
+	           lang(lng_restricted_send_message), style::al_center);
 }
 
 void HistoryWidget::paintEditHeader(Painter &p, const QRect &rect, int left, int top) const {
@@ -6520,7 +6837,8 @@ void HistoryWidget::paintEditHeader(Painter &p, const QRect &rect, int left, int
 	if (!editTimeLeftText.isEmpty()) {
 		p.setFont(st::normalFont);
 		p.setPen(st::historyComposeAreaFgService);
-		p.drawText(left + st::msgServiceNameFont->width(lang(lng_edit_message)) + st::normalFont->spacew, top + st::msgReplyPadding.top() + st::msgServiceNameFont->ascent, editTimeLeftText);
+		p.drawText(left + st::msgServiceNameFont->width(lang(lng_edit_message)) + st::normalFont->spacew,
+		           top + st::msgReplyPadding.top() + st::msgServiceNameFont->ascent, editTimeLeftText);
 	}
 }
 
@@ -6529,23 +6847,28 @@ void HistoryWidget::drawRecording(Painter &p, double recordActive) {
 	p.setBrush(st::historyRecordSignalColor);
 
 	auto delta = std::min(a_recordingLevel.current() / 0x4000, 1.);
-	auto d = 2 * std::round(st::historyRecordSignalMin + (delta * (st::historyRecordSignalMax - st::historyRecordSignalMin)));
+	auto d = 2 * std::round(st::historyRecordSignalMin +
+	                        (delta * (st::historyRecordSignalMax - st::historyRecordSignalMin)));
 	{
 		PainterHighQualityEnabler hq(p);
-		p.drawEllipse(_attachToggle->x() + (_tabbedSelectorToggle->width() - d) / 2, _attachToggle->y() + (_attachToggle->height() - d) / 2, d, d);
+		p.drawEllipse(_attachToggle->x() + (_tabbedSelectorToggle->width() - d) / 2,
+		              _attachToggle->y() + (_attachToggle->height() - d) / 2, d, d);
 	}
 
 	auto duration = formatDurationText(_recordingSamples / Media::Player::kDefaultFrequency);
 	p.setFont(st::historyRecordFont);
 
 	p.setPen(st::historyRecordDurationFg);
-	p.drawText(_attachToggle->x() + _tabbedSelectorToggle->width(), _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, duration);
+	p.drawText(_attachToggle->x() + _tabbedSelectorToggle->width(),
+	           _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, duration);
 
-	qint32 left = _attachToggle->x() + _tabbedSelectorToggle->width() + st::historyRecordFont->width(duration) + ((_send->width() - st::historyRecordVoice.width()) / 2);
+	qint32 left = _attachToggle->x() + _tabbedSelectorToggle->width() + st::historyRecordFont->width(duration) +
+	              ((_send->width() - st::historyRecordVoice.width()) / 2);
 	qint32 right = _chatWidth - _send->width();
 
 	p.setPen(anim::pen(st::historyRecordCancel, st::historyRecordCancelActive, 1. - recordActive));
-	p.drawText(left + (right - left - _recordCancelWidth) / 2, _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, lang(lng_record_cancel));
+	p.drawText(left + (right - left - _recordCancelWidth) / 2,
+	           _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, lang(lng_record_cancel));
 }
 
 void HistoryWidget::drawPinnedBar(Painter &p) {
@@ -6558,7 +6881,8 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
 	p.fillRect(myrtlrect(0, top, _chatWidth, st::historyReplyHeight), st::historyPinnedBg);
 
 	top += st::msgReplyPadding.top();
-	QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
+	QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(),
+	                     st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
 	p.fillRect(rbar, st::msgInReplyBarColor);
 
 	qint32 left = st::msgReplyBarSkip + st::msgReplyBarSkip;
@@ -6567,20 +6891,30 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
 			ImagePtr replyPreview = _pinnedBar->msg->getMedia()->replyPreview();
 			if (!replyPreview->isNull()) {
 				QRect to(left, top, st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
-				p.drawPixmap(to.x(), to.y(), replyPreview->pixSingle(replyPreview->width() / cIntRetinaFactor(), replyPreview->height() / cIntRetinaFactor(), to.width(), to.height(), ImageRoundRadius::Small));
+				p.drawPixmap(to.x(), to.y(),
+				             replyPreview->pixSingle(replyPreview->width() / cIntRetinaFactor(),
+				                                     replyPreview->height() / cIntRetinaFactor(), to.width(),
+				                                     to.height(), ImageRoundRadius::Small));
 			}
-			left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+			left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() -
+			        st::msgReplyBarPos.x();
 		}
 		p.setPen(st::historyReplyNameFg);
 		p.setFont(st::msgServiceNameFont);
 		p.drawText(left, top + st::msgServiceNameFont->ascent, lang(lng_pinned_message));
 
-		p.setPen(((_pinnedBar->msg->toHistoryMessage() && _pinnedBar->msg->toHistoryMessage()->emptyText()) || _pinnedBar->msg->serviceMsg()) ? st::historyComposeAreaFgService : st::historyComposeAreaFg);
-		_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, _chatWidth - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
+		p.setPen(((_pinnedBar->msg->toHistoryMessage() && _pinnedBar->msg->toHistoryMessage()->emptyText()) ||
+		          _pinnedBar->msg->serviceMsg()) ?
+		             st::historyComposeAreaFgService :
+		             st::historyComposeAreaFg);
+		_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height,
+		                            _chatWidth - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
 	} else {
 		p.setFont(st::msgDateFont);
 		p.setPen(st::historyComposeAreaFgService);
-		p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(lang(lng_profile_loading), _chatWidth - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right()));
+		p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent,
+		           st::msgDateFont->elided(lang(lng_profile_loading), _chatWidth - left - _pinnedBar->cancel->width() -
+		                                                                  st::msgReplyPadding.right()));
 	}
 }
 
@@ -6606,16 +6940,20 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 		auto animationWidth = (!_tabbedSection || _tabbedSection->isHidden()) ? width() : _chatWidth;
 		auto retina = cIntRetinaFactor();
 		auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);
-		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
-		auto coordOver = fromLeft ? anim::interpolate(0, animationWidth, progress) : anim::interpolate(animationWidth, 0, progress);
+		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) :
+		                             anim::interpolate(0, -st::slideShift, progress);
+		auto coordOver =
+		    fromLeft ? anim::interpolate(0, animationWidth, progress) : anim::interpolate(animationWidth, 0, progress);
 		auto shadow = fromLeft ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, height() * retina));
+			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder,
+			             QRect(-coordUnder * retina, 0, coordOver * retina, height() * retina));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
 			p.setOpacity(1);
 		}
-		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, 0, _cacheOver.width(), height() * retina));
+		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver,
+		             QRect(0, 0, _cacheOver.width(), height() * retina));
 		p.setOpacity(shadow);
 		st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), height()));
 		return;
@@ -6674,13 +7012,15 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 		}
 	} else {
 		style::font font(st::msgServiceFont);
-		qint32 w = font->width(lang(lng_willbe_history)) + st::msgPadding.left() + st::msgPadding.right(), h = font->height + st::msgServicePadding.top() + st::msgServicePadding.bottom() + 2;
+		qint32 w = font->width(lang(lng_willbe_history)) + st::msgPadding.left() + st::msgPadding.right(),
+		       h = font->height + st::msgServicePadding.top() + st::msgServicePadding.bottom() + 2;
 		QRect tr((width() - w) / 2, (height() - _field->height() - 2 * st::historySendPadding - h) / 2, w, h);
 		HistoryLayout::ServiceMessagePainter::paintBubble(p, tr.x(), tr.y(), tr.width(), tr.height());
 
 		p.setPen(st::msgServiceFg);
 		p.setFont(font->f);
-		p.drawText(tr.left() + st::msgPadding.left(), tr.top() + st::msgServicePadding.top() + 1 + font->ascent, lang(lng_willbe_history));
+		p.drawText(tr.left() + st::msgPadding.left(), tr.top() + st::msgServicePadding.top() + 1 + font->ascent,
+		           lang(lng_willbe_history));
 	}
 }
 
@@ -6707,7 +7047,8 @@ QPoint HistoryWidget::clampMousePosition(QPoint point) {
 }
 
 void HistoryWidget::onScrollTimer() {
-	auto d = (_scrollDelta > 0) ? std::min(_scrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) : std::max(_scrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
+	auto d = (_scrollDelta > 0) ? std::min(_scrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) :
+	                              std::max(_scrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + d);
 }
 
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 31a73d6ce..afb4e4a97 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "storage/localimageloader.h"
-#include "ui/widgets/tooltip.h"
-#include "history/history_common.h"
-#include "chat_helpers/field_autocomplete.h"
-#include "window/section_widget.h"
-#include "core/single_timer.h"
-#include "ui/widgets/input_fields.h"
 #include "base/flags.h"
+#include "chat_helpers/field_autocomplete.h"
+#include "core/single_timer.h"
+#include "history/history_common.h"
 #include "history/history_item.h"
+#include "storage/localimageloader.h"
+#include "ui/widgets/input_fields.h"
+#include "ui/widgets/tooltip.h"
+#include "window/section_widget.h"
 
 namespace InlineBots {
 namespace Layout {
@@ -95,7 +95,6 @@ private:
 	object_ptr<Ui::FlatButton> _report;
 	object_ptr<Ui::FlatButton> _hide;
 	object_ptr<Ui::LinkButton> _clear;
-
 };
 
 class MainWidget;
@@ -166,14 +165,13 @@ private:
 	Text _toText;
 	qint32 _toTextWidth = 0;
 	QPixmap _cacheForAnim;
-
 };
 
 class HistoryWidget final : public Window::AbstractSectionWidget, public RPCSender {
 	Q_OBJECT
 
 public:
-	HistoryWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	HistoryWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void start();
 
@@ -187,7 +185,7 @@ public:
 	void leaveToChildEvent(QEvent *e, QWidget *child) override;
 	void dragEnterEvent(QDragEnterEvent *e) override;
 	void dragLeaveEvent(QDragLeaveEvent *e) override;
-    void dropEvent(QDropEvent *e) override;
+	void dropEvent(QDropEvent *e) override;
 
 	bool isItemCompletelyHidden(HistoryItem *item) const;
 	void updateTopBarSelection();
@@ -225,11 +223,17 @@ public:
 	void updateFieldPlaceholder();
 	void updateStickersByEmoji();
 
-	bool confirmSendingFiles(const QList<QUrl> &files, CompressConfirm compressed = CompressConfirm::Auto, const QString *addedComment = nullptr);
-	bool confirmSendingFiles(const QStringList &files, CompressConfirm compressed = CompressConfirm::Auto, const QString *addedComment = nullptr);
-	bool confirmSendingFiles(const QImage &image, const QByteArray &content, CompressConfirm compressed = CompressConfirm::Auto, const QString &insertTextOnCancel = QString());
-	bool confirmSendingFiles(const QMimeData *data, CompressConfirm compressed = CompressConfirm::Auto, const QString &insertTextOnCancel = QString());
-	bool confirmShareContact(const QString &phone, const QString &fname, const QString &lname, const QString *addedComment = nullptr);
+	bool confirmSendingFiles(const QList<QUrl> &files, CompressConfirm compressed = CompressConfirm::Auto,
+	                         const QString *addedComment = nullptr);
+	bool confirmSendingFiles(const QStringList &files, CompressConfirm compressed = CompressConfirm::Auto,
+	                         const QString *addedComment = nullptr);
+	bool confirmSendingFiles(const QImage &image, const QByteArray &content,
+	                         CompressConfirm compressed = CompressConfirm::Auto,
+	                         const QString &insertTextOnCancel = QString());
+	bool confirmSendingFiles(const QMimeData *data, CompressConfirm compressed = CompressConfirm::Auto,
+	                         const QString &insertTextOnCancel = QString());
+	bool confirmShareContact(const QString &phone, const QString &fname, const QString &lname,
+	                         const QString *addedComment = nullptr);
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	void uploadFiles(const QStringList &files, SendMediaType type);
@@ -243,7 +247,8 @@ public:
 
 	void onShareContact(const PeerId &peer, UserData *contact);
 
-	void shareContact(const PeerId &peer, const QString &phone, const QString &fname, const QString &lname, MsgId replyTo, qint32 userId = 0);
+	void shareContact(const PeerId &peer, const QString &phone, const QString &fname, const QString &lname,
+	                  MsgId replyTo, qint32 userId = 0);
 
 	History *history() const;
 	PeerData *peer() const;
@@ -265,8 +270,8 @@ public:
 
 	bool touchScroll(const QPoint &delta);
 
-	void enqueueMessageHighlight(not_null<HistoryItem*> item);
-	TimeMs highlightStartTime(not_null<const HistoryItem*> item) const;
+	void enqueueMessageHighlight(not_null<HistoryItem *> item);
+	TimeMs highlightStartTime(not_null<const HistoryItem *> item) const;
 
 	SelectedItemSet getSelectedItems() const;
 	void itemEdited(HistoryItem *item);
@@ -310,7 +315,8 @@ public:
 	DragState getDragState(const QMimeData *d);
 
 	void fastShowAtEnd(History *h);
-	void applyDraft(bool parseLinks = true, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory);
+	void applyDraft(bool parseLinks = true,
+	                Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory);
 	void showHistory(const PeerId &peer, MsgId showAtMsgId, bool reload = false);
 	void clearDelayedShowAt();
 	void clearAllLoadRequests();
@@ -352,9 +358,10 @@ public:
 	bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) override;
 	QRect rectForFloatPlayer(Window::Column myColumn, Window::Column playerColumn) override;
 
-	void app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, not_null<const HistoryItem*> msg, int row, int col);
+	void app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, not_null<const HistoryItem *> msg,
+	                         int row, int col);
 
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item);
 	PeerData *ui_getPeerForMouseAction();
 
 	void notify_historyItemLayoutChanged(const HistoryItem *item);
@@ -403,7 +410,8 @@ public slots:
 
 	void onPhotoUploaded(const FullMsgId &msgId, bool silent, const MTPInputFile &file);
 	void onDocumentUploaded(const FullMsgId &msgId, bool silent, const MTPInputFile &file);
-	void onThumbDocumentUploaded(const FullMsgId &msgId, bool silent, const MTPInputFile &file, const MTPInputFile &thumb);
+	void onThumbDocumentUploaded(const FullMsgId &msgId, bool silent, const MTPInputFile &file,
+	                             const MTPInputFile &thumb);
 
 	void onPhotoProgress(const FullMsgId &msgId);
 	void onDocumentProgress(const FullMsgId &msgId);
@@ -512,14 +520,17 @@ private:
 	SendingFilesLists getSendingFilesLists(const QList<QUrl> &files);
 	SendingFilesLists getSendingFilesLists(const QStringList &files);
 	void getSendingLocalFileInfo(SendingFilesLists &result, const QString &filepath);
-	bool confirmSendingFiles(const SendingFilesLists &lists, CompressConfirm compressed = CompressConfirm::Auto, const QString *addedComment = nullptr);
-	template <typename Callback>
-	bool validateSendingFiles(const SendingFilesLists &lists, Callback callback);
+	bool confirmSendingFiles(const SendingFilesLists &lists, CompressConfirm compressed = CompressConfirm::Auto,
+	                         const QString *addedComment = nullptr);
+	template <typename Callback> bool validateSendingFiles(const SendingFilesLists &lists, Callback callback);
 	template <typename SendCallback>
-	bool showSendFilesBox(object_ptr<SendFilesBox> box, const QString &insertTextOnCancel, const QString *addedComment, SendCallback callback);
+	bool showSendFilesBox(object_ptr<SendFilesBox> box, const QString &insertTextOnCancel, const QString *addedComment,
+	                      SendCallback callback);
 
 	// If an empty filepath is found we upload (possible) "image" with (possible) "content".
-	void uploadFilesAfterConfirmation(const QStringList &files, const QByteArray &content, const QImage &image, std::unique_ptr<FileLoadTask::MediaInformation> information, SendMediaType type, QString caption);
+	void uploadFilesAfterConfirmation(const QStringList &files, const QByteArray &content, const QImage &image,
+	                                  std::unique_ptr<FileLoadTask::MediaInformation> information, SendMediaType type,
+	                                  QString caption);
 
 	void itemRemoved(HistoryItem *item);
 
@@ -659,7 +670,8 @@ private:
 		ScrollChangeType type;
 		int value;
 	};
-	void updateHistoryGeometry(bool initial = false, bool loadedDown = false, const ScrollChange &change = { ScrollChangeNone, 0 });
+	void updateHistoryGeometry(bool initial = false, bool loadedDown = false,
+	                           const ScrollChange &change = {ScrollChangeNone, 0});
 	void updateListSize();
 
 	// Does any of the shown histories has this flag set.
@@ -670,7 +682,7 @@ private:
 	// Counts scrollTop for placing the scroll right at the unread
 	// messages bar, choosing from _history and _migrated unreadBar.
 	int unreadBarTop() const;
-	int itemTopForHighlight(not_null<HistoryItem*> item) const;
+	int itemTopForHighlight(not_null<HistoryItem *> item) const;
 	void scrollToCurrentVoiceMessage(FullMsgId fromId, FullMsgId toId);
 
 	// Scroll to current y without updating the _lastUserScrolled time.
@@ -693,16 +705,20 @@ private:
 	void countHistoryShowFrom();
 
 	enum class TextUpdateEvent {
-		SaveDraft  = (1 << 0),
+		SaveDraft = (1 << 0),
 		SendTyping = (1 << 1),
 	};
 	using TextUpdateEvents = base::flags<TextUpdateEvent>;
-	friend inline constexpr bool is_flag_type(TextUpdateEvent) { return true; };
+	friend inline constexpr bool is_flag_type(TextUpdateEvent) {
+		return true;
+	};
 
 	void writeDrafts(Data::Draft **localDraft, Data::Draft **editDraft);
 	void writeDrafts(History *history);
-	void setFieldText(const TextWithTags &textWithTags, TextUpdateEvents events = 0, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory);
-	void clearFieldText(TextUpdateEvents events = 0, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory) {
+	void setFieldText(const TextWithTags &textWithTags, TextUpdateEvents events = 0,
+	                  Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory);
+	void clearFieldText(TextUpdateEvents events = 0,
+	                    Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory) {
 		setFieldText(TextWithTags(), events, undoHistoryAction);
 	}
 
@@ -737,7 +753,7 @@ private:
 	MsgId _delayedShowAtMsgId = -1; // wtf?
 	mtpRequestId _delayedShowAtRequest = 0;
 
-	object_ptr<Ui::AbstractButton> _backAnimationButton = { nullptr };
+	object_ptr<Ui::AbstractButton> _backAnimationButton = {nullptr};
 	object_ptr<Window::TopBarWidget> _topBar;
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<HistoryInner> _list;
@@ -781,7 +797,7 @@ private:
 	bool showRecordButton() const;
 	bool showInlineBotCancel() const;
 
-	object_ptr<ReportSpamPanel> _reportSpamPanel = { nullptr };
+	object_ptr<ReportSpamPanel> _reportSpamPanel = {nullptr};
 
 	object_ptr<Ui::SendButton> _send;
 	object_ptr<Ui::FlatButton> _unblock;
@@ -792,7 +808,7 @@ private:
 	mtpRequestId _reportSpamRequest = 0;
 	object_ptr<Ui::IconButton> _attachToggle;
 	object_ptr<Ui::EmojiButton> _tabbedSelectorToggle;
-	object_ptr<Ui::ImportantTooltip> _tabbedSelectorToggleTooltip = { nullptr };
+	object_ptr<Ui::ImportantTooltip> _tabbedSelectorToggleTooltip = {nullptr};
 	bool _tabbedSelectorToggleTooltipShown = false;
 	object_ptr<Ui::IconButton> _botKeyboardShow;
 	object_ptr<Ui::IconButton> _botKeyboardHide;
@@ -820,23 +836,24 @@ private:
 	object_ptr<Ui::ScrollArea> _kbScroll;
 	QPointer<BotKeyboard> _keyboard;
 
-	object_ptr<Ui::InnerDropdown> _membersDropdown = { nullptr };
+	object_ptr<Ui::InnerDropdown> _membersDropdown = {nullptr};
 	QTimer _membersDropdownShowTimer;
 
-	object_ptr<InlineBots::Layout::Widget> _inlineResults = { nullptr };
+	object_ptr<InlineBots::Layout::Widget> _inlineResults = {nullptr};
 	object_ptr<ChatHelpers::TabbedPanel> _tabbedPanel;
-	object_ptr<ChatHelpers::TabbedSection> _tabbedSection = { nullptr };
+	object_ptr<ChatHelpers::TabbedSection> _tabbedSection = {nullptr};
 	QPointer<ChatHelpers::TabbedSelector> _tabbedSelector;
 	bool _tabbedSectionUsed = false;
 	DragState _attachDrag = DragStateNone;
 	object_ptr<DragArea> _attachDragDocument, _attachDragPhoto;
 
-	object_ptr<Ui::Emoji::SuggestionsController> _emojiSuggestions = { nullptr };
+	object_ptr<Ui::Emoji::SuggestionsController> _emojiSuggestions = {nullptr};
 
 	bool _nonEmptySelection = false;
 
 	TaskQueue _fileLoader;
-	TextUpdateEvents _textUpdateEvents = (TextUpdateEvents() | TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping);
+	TextUpdateEvents _textUpdateEvents =
+	    (TextUpdateEvents() | TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping);
 
 	qint64 _serviceImageCacheSize = 0;
 	QString _confirmSource;
@@ -857,7 +874,7 @@ private:
 	base::Timer _highlightTimer;
 	TimeMs _highlightStart = 0;
 
-	QMap<QPair<History*, SendAction::Type>, mtpRequestId> _sendActionRequests;
+	QMap<QPair<History *, SendAction::Type>, mtpRequestId> _sendActionRequests;
 	QTimer _sendActionStopTimer;
 
 	TimeMs _saveDraftStart = 0;
@@ -865,7 +882,6 @@ private:
 	QTimer _saveDraftTimer, _saveCloudDraftTimer;
 
 	object_ptr<Ui::PlainShadow> _topShadow;
-	object_ptr<Ui::PlainShadow> _rightShadow = { nullptr };
+	object_ptr<Ui::PlainShadow> _rightShadow = {nullptr};
 	bool _inGrab = false;
-
 };
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 5537ba202..34b05b295 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -20,29 +20,29 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "inline_bots/inline_bot_layout_internal.h"
 
-#include "styles/style_overview.h"
-#include "styles/style_history.h"
-#include "styles/style_chat_helpers.h"
-#include "styles/style_widgets.h"
+#include "app.h"
+#include "auth_session.h"
+#include "history/history_location_manager.h"
 #include "inline_bots/inline_bot_result.h"
+#include "lang/lang_keys.h"
 #include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
-#include "history/history_location_manager.h"
 #include "storage/localstorage.h"
-#include "auth_session.h"
-#include "lang/lang_keys.h"
-#include "app.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_history.h"
+#include "styles/style_overview.h"
+#include "styles/style_widgets.h"
 
 namespace InlineBots {
 namespace Layout {
 namespace internal {
 
-FileBase::FileBase(not_null<Context*> context, Result *result) : ItemBase(context, result) {
-}
+FileBase::FileBase(not_null<Context *> context, Result *result)
+    : ItemBase(context, result) {}
 
-FileBase::FileBase(not_null<Context*> context, DocumentData *document) : ItemBase(context, document) {
-}
+FileBase::FileBase(not_null<Context *> context, DocumentData *document)
+    : ItemBase(context, document) {}
 
 DocumentData *FileBase::getShownDocument() const {
 	if (DocumentData *result = getDocument()) {
@@ -95,10 +95,11 @@ ImagePtr FileBase::content_thumb() const {
 	return getResultThumb();
 }
 
-Gif::Gif(not_null<Context*> context, Result *result) : FileBase(context, result) {
-}
+Gif::Gif(not_null<Context *> context, Result *result)
+    : FileBase(context, result) {}
 
-Gif::Gif(not_null<Context*> context, DocumentData *document, bool hasDeleteButton) : FileBase(context, document) {
+Gif::Gif(not_null<Context *> context, DocumentData *document, bool hasDeleteButton)
+    : FileBase(context, document) {
 	if (hasDeleteButton) {
 		_delete = MakeShared<DeleteSavedGifClickHandler>(document);
 	}
@@ -139,7 +140,7 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 
 	bool loaded = document->loaded(), loading = document->loading(), displayLoading = document->displayLoading();
 	if (loaded && !_gif && !_gif.isBad()) {
-		auto that = const_cast<Gif*>(this);
+		auto that = const_cast<Gif *>(this);
 		that->_gif = Media::Clip::MakeReader(document, FullMsgId(), [that](Media::Clip::Notification notification) {
 			that->clipCallback(notification);
 		});
@@ -161,7 +162,8 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 	QRect r(0, 0, _width, height);
 	if (animating) {
 		if (!_thumb.isNull()) _thumb = QPixmap();
-		auto pixmap = _gif->current(frame.width(), frame.height(), _width, height, ImageRoundRadius::None, ImageRoundCorner::None, context->paused ? 0 : context->ms);
+		auto pixmap = _gif->current(frame.width(), frame.height(), _width, height, ImageRoundRadius::None,
+		                            ImageRoundCorner::None, context->paused ? 0 : context->ms);
 		p.drawPixmap(r.topLeft(), pixmap);
 	} else {
 		prepareThumb(_width, height, frame);
@@ -196,7 +198,8 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 		icon->paintInCenter(p, inner);
 		if (radial) {
 			p.setOpacity(1);
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 			_animation->radial.draw(p, rinner, st::msgFileRadialLine, st::msgInBg);
 		}
 	}
@@ -214,7 +217,8 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 
 void Gif::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint point) const {
 	if (QRect(0, 0, _width, st::inlineMediaHeight).contains(point)) {
-		if (_delete && rtlpoint(point, _width).x() >= _width - st::stickerPanDeleteIconBg.width() && point.y() < st::stickerPanDeleteIconBg.height()) {
+		if (_delete && rtlpoint(point, _width).x() >= _width - st::stickerPanDeleteIconBg.width() &&
+		    point.y() < st::stickerPanDeleteIconBg.height()) {
 			link = _delete;
 		} else {
 			link = _send;
@@ -257,7 +261,8 @@ void Gif::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
 
 QSize Gif::countFrameSize() const {
 	bool animating = (_gif && _gif->ready());
-	qint32 framew = animating ? _gif->width() : content_width(), frameh = animating ? _gif->height() : content_height(), height = st::inlineMediaHeight;
+	qint32 framew = animating ? _gif->width() : content_width(), frameh = animating ? _gif->height() : content_height(),
+	       height = st::inlineMediaHeight;
 	if (framew * height > frameh * _width) {
 		if (framew < st::maxStickerSize || frameh > height) {
 			if (frameh > height || (framew * height / frameh) <= st::maxStickerSize) {
@@ -287,7 +292,9 @@ void Gif::prepareThumb(qint32 width, qint32 height, const QSize &frame) const {
 		if (!document->thumb->isNull()) {
 			if (document->thumb->loaded()) {
 				if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
-					_thumb = document->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+					_thumb = document->thumb->pixNoCache(frame.width() * cIntRetinaFactor(),
+					                                     frame.height() * cIntRetinaFactor(), Images::Option::Smooth,
+					                                     width, height);
 				}
 			} else {
 				document->thumb->load();
@@ -298,7 +305,8 @@ void Gif::prepareThumb(qint32 width, qint32 height, const QSize &frame) const {
 		if (!thumb->isNull()) {
 			if (thumb->loaded()) {
 				if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
-					_thumb = thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+					_thumb = thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(),
+					                           Images::Option::Smooth, width, height);
 				}
 			} else {
 				thumb->load();
@@ -309,7 +317,7 @@ void Gif::prepareThumb(qint32 width, qint32 height, const QSize &frame) const {
 
 void Gif::ensureAnimation() const {
 	if (!_animation) {
-		_animation = std::make_unique<AnimationData>(animation(const_cast<Gif*>(this), &Gif::step_radial));
+		_animation = std::make_unique<AnimationData>(animation(const_cast<Gif *>(this), &Gif::step_radial));
 	}
 }
 
@@ -343,7 +351,8 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 			} else if (_gif->ready() && !_gif->started()) {
 				auto height = st::inlineMediaHeight;
 				auto frame = countFrameSize();
-				_gif->start(frame.width(), frame.height(), _width, height, ImageRoundRadius::None, ImageRoundCorner::None);
+				_gif->start(frame.width(), frame.height(), _width, height, ImageRoundRadius::None,
+				            ImageRoundCorner::None);
 			} else if (_gif->autoPausedGif() && !context()->inlineItemVisible(this)) {
 				_gif.reset();
 				getShownDocument()->forget();
@@ -361,8 +370,8 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
-Sticker::Sticker(not_null<Context*> context, Result *result) : FileBase(context, result) {
-}
+Sticker::Sticker(not_null<Context *> context, Result *result)
+    : FileBase(context, result) {}
 
 void Sticker::initDimensions() {
 	_maxw = st::stickerPanSize.width();
@@ -371,7 +380,8 @@ void Sticker::initDimensions() {
 
 void Sticker::preload() const {
 	if (DocumentData *document = getShownDocument()) {
-		bool goodThumb = !document->thumb->isNull() && ((document->thumb->width() >= 128) || (document->thumb->height() >= 128));
+		bool goodThumb =
+		    !document->thumb->isNull() && ((document->thumb->width() >= 128) || (document->thumb->height() >= 128));
 		if (goodThumb) {
 			document->thumb->load();
 		} else {
@@ -434,7 +444,8 @@ QSize Sticker::getThumbSize() const {
 
 void Sticker::prepareThumb() const {
 	if (DocumentData *document = getShownDocument()) {
-		bool goodThumb = !document->thumb->isNull() && ((document->thumb->width() >= 128) || (document->thumb->height() >= 128));
+		bool goodThumb =
+		    !document->thumb->isNull() && ((document->thumb->width() >= 128) || (document->thumb->height() >= 128));
 		if (goodThumb) {
 			document->thumb->load();
 		} else {
@@ -461,8 +472,8 @@ void Sticker::prepareThumb() const {
 	}
 }
 
-Photo::Photo(not_null<Context*> context, Result *result) : ItemBase(context, result) {
-}
+Photo::Photo(not_null<Context *> context, Result *result)
+    : ItemBase(context, result) {}
 
 void Photo::initDimensions() {
 	PhotoData *photo = getShownPhoto();
@@ -533,14 +544,19 @@ QSize Photo::countFrameSize() const {
 void Photo::prepareThumb(qint32 width, qint32 height, const QSize &frame) const {
 	if (PhotoData *photo = getShownPhoto()) {
 		if (photo->medium->loaded()) {
-			if (!_thumbLoaded || _thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
-				_thumb = photo->medium->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+			if (!_thumbLoaded || _thumb.width() != width * cIntRetinaFactor() ||
+			    _thumb.height() != height * cIntRetinaFactor()) {
+				_thumb =
+				    photo->medium->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(),
+				                              Images::Option::Smooth, width, height);
 			}
 			_thumbLoaded = true;
 		} else {
 			if (photo->thumb->loaded()) {
 				if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
-					_thumb = photo->thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+					_thumb = photo->thumb->pixNoCache(frame.width() * cIntRetinaFactor(),
+					                                  frame.height() * cIntRetinaFactor(), Images::Option::Smooth,
+					                                  width, height);
 				}
 			}
 			photo->medium->load();
@@ -549,7 +565,8 @@ void Photo::prepareThumb(qint32 width, qint32 height, const QSize &frame) const
 		ImagePtr thumb = getResultThumb();
 		if (thumb->loaded()) {
 			if (_thumb.width() != width * cIntRetinaFactor() || _thumb.height() != height * cIntRetinaFactor()) {
-				_thumb = thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+				_thumb = thumb->pixNoCache(frame.width() * cIntRetinaFactor(), frame.height() * cIntRetinaFactor(),
+				                           Images::Option::Smooth, width, height);
 			}
 		} else {
 			thumb->load();
@@ -557,10 +574,13 @@ void Photo::prepareThumb(qint32 width, qint32 height, const QSize &frame) const
 	}
 }
 
-Video::Video(not_null<Context*> context, Result *result) : FileBase(context, result)
-, _link(getResultContentUrlHandler())
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
+Video::Video(not_null<Context *> context, Result *result)
+    : FileBase(context, result)
+    , _link(getResultContentUrlHandler())
+    , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+             st::inlineThumbSkip)
+    , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+                   st::inlineThumbSkip) {
 	if (int duration = content_duration()) {
 		_duration = formatDurationText(duration);
 		_durationWidth = st::normalFont->width(_duration);
@@ -572,7 +592,7 @@ void Video::initDimensions() {
 
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
 	qint32 textWidth = _maxw - (withThumb ? (st::inlineThumbSize + st::inlineThumbSkip) : 0);
-	TextParseOptions titleOpts = { 0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions titleOpts = {0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto};
 	auto title = TextUtilities::SingleLine(_result->getLayoutTitle());
 	if (title.isEmpty()) {
 		title = lang(lng_media_video);
@@ -582,7 +602,8 @@ void Video::initDimensions() {
 
 	qint32 descriptionLines = withThumb ? (titleHeight > st::semiboldFont->height ? 1 : 2) : 3;
 
-	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, descriptionLines * st::normalFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions descriptionOpts = {TextParseMultiline, _maxw, descriptionLines * st::normalFont->height,
+	                                    Qt::LayoutDirectionAuto};
 	QString description = _result->getLayoutDescription();
 	if (description.isEmpty()) {
 		description = _duration;
@@ -601,19 +622,24 @@ void Video::paint(Painter &p, const QRect &clip, const PaintContext *context) co
 	if (withThumb) {
 		prepareThumb(st::inlineThumbSize, st::inlineThumbSize);
 		if (_thumb.isNull()) {
-			p.fillRect(rtlrect(0, st::inlineRowMargin, st::inlineThumbSize, st::inlineThumbSize, _width), st::overviewPhotoBg);
+			p.fillRect(rtlrect(0, st::inlineRowMargin, st::inlineThumbSize, st::inlineThumbSize, _width),
+			           st::overviewPhotoBg);
 		} else {
 			p.drawPixmapLeft(0, st::inlineRowMargin, _width, _thumb);
 		}
 	} else {
-		p.fillRect(rtlrect(0, st::inlineRowMargin, st::inlineThumbSize, st::inlineThumbSize, _width), st::overviewVideoBg);
+		p.fillRect(rtlrect(0, st::inlineRowMargin, st::inlineThumbSize, st::inlineThumbSize, _width),
+		           st::overviewVideoBg);
 	}
 
 	if (!_duration.isEmpty()) {
 		int durationTop = st::inlineRowMargin + st::inlineThumbSize - st::normalFont->height - st::inlineDurationMargin;
-		int durationW = _durationWidth + 2 * st::msgDateImgPadding.x(), durationH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-		int durationX = (st::inlineThumbSize - durationW) / 2, durationY = st::inlineRowMargin + st::inlineThumbSize - durationH;
-		App::roundRect(p, durationX, durationY - st::msgDateImgPadding.y(), durationW, durationH, st::msgDateImgBg, DateCorners);
+		int durationW = _durationWidth + 2 * st::msgDateImgPadding.x(),
+		    durationH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
+		int durationX = (st::inlineThumbSize - durationW) / 2,
+		    durationY = st::inlineRowMargin + st::inlineThumbSize - durationH;
+		App::roundRect(p, durationX, durationY - st::msgDateImgPadding.y(), durationW, durationH, st::msgDateImgBg,
+		               DateCorners);
 		p.setPen(st::msgDateImgFg);
 		p.setFont(st::normalFont);
 		p.drawText(durationX + st::msgDateImgPadding.x(), durationTop + st::normalFont->ascent, _duration);
@@ -628,7 +654,8 @@ void Video::paint(Painter &p, const QRect &clip, const PaintContext *context) co
 	_description.drawLeftElided(p, left, st::inlineRowMargin + titleHeight, _width - left, _width, descriptionLines);
 
 	if (!context->lastRow) {
-		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width), st::inlineRowBorderFg);
+		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width),
+		           st::inlineRowBorderFg);
 	}
 }
 
@@ -637,7 +664,8 @@ void Video::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint p
 		link = _link;
 		return;
 	}
-	if (QRect(st::inlineThumbSize + st::inlineThumbSkip, 0, _width - st::inlineThumbSize - st::inlineThumbSkip, _height).contains(point)) {
+	if (QRect(st::inlineThumbSize + st::inlineThumbSkip, 0, _width - st::inlineThumbSize - st::inlineThumbSkip, _height)
+	        .contains(point)) {
 		link = _send;
 		return;
 	}
@@ -659,7 +687,8 @@ void Video::prepareThumb(qint32 width, qint32 height) const {
 					w = width;
 				}
 			}
-			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width,
+			                           height);
 		}
 	} else {
 		thumb->load();
@@ -674,11 +703,13 @@ void CancelFileClickHandler::onClickImpl() const {
 	_result->cancelFile();
 }
 
-File::File(not_null<Context*> context, Result *result) : FileBase(context, result)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize - st::inlineThumbSkip)
-, _open(MakeShared<OpenFileClickHandler>(result))
-, _cancel(MakeShared<CancelFileClickHandler>(result)) {
+File::File(not_null<Context *> context, Result *result)
+    : FileBase(context, result)
+    , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize - st::inlineThumbSkip)
+    , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize -
+                   st::inlineThumbSkip)
+    , _open(MakeShared<OpenFileClickHandler>(result))
+    , _cancel(MakeShared<CancelFileClickHandler>(result)) {
 	updateStatusText();
 	regDocumentItem(getShownDocument(), this);
 }
@@ -687,10 +718,10 @@ void File::initDimensions() {
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
 	int textWidth = _maxw - (st::msgFileSize + st::inlineThumbSkip);
 
-	TextParseOptions titleOpts = { 0, _maxw, st::semiboldFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions titleOpts = {0, _maxw, st::semiboldFont->height, Qt::LayoutDirectionAuto};
 	_title.setText(st::semiboldTextStyle, TextUtilities::SingleLine(_result->getLayoutTitle()), titleOpts);
 
-	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, st::normalFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions descriptionOpts = {TextParseMultiline, _maxw, st::normalFont->height, Qt::LayoutDirectionAuto};
 	_description.setText(st::defaultTextStyle, _result->getLayoutDescription(), descriptionOpts);
 
 	_minh = st::msgFileSize;
@@ -727,7 +758,8 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 	}
 
 	if (radial) {
-		auto radialCircle = inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine));
+		auto radialCircle = inner.marginsRemoved(
+		    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine));
 		_animation->radial.draw(p, radialCircle, st::msgFileRadialLine, st::msgInBg);
 	}
 
@@ -756,7 +788,8 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 
 	p.setPen(st::inlineDescriptionFg);
 	bool drawStatusSize = true;
-	if (_statusSize == FileStatusSizeReady || _statusSize == FileStatusSizeLoaded || _statusSize == FileStatusSizeFailed) {
+	if (_statusSize == FileStatusSizeReady || _statusSize == FileStatusSizeLoaded ||
+	    _statusSize == FileStatusSizeFailed) {
 		if (!_description.isEmpty()) {
 			_description.drawLeftElided(p, left, descriptionTop, _width - left, _width);
 			drawStatusSize = false;
@@ -768,7 +801,8 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 	}
 
 	if (!context->lastRow) {
-		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width), st::inlineRowBorderFg);
+		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width),
+		           st::inlineRowBorderFg);
 	}
 }
 
@@ -787,7 +821,8 @@ void File::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint po
 void File::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
 	if (p == _open || p == _cancel) {
 		ensureAnimation();
-		_animation->a_thumbOver.start([this] { thumbAnimationCallback(); }, active ? 0. : 1., active ? 1. : 0., st::msgFileOverDuration);
+		_animation->a_thumbOver.start([this] { thumbAnimationCallback(); }, active ? 0. : 1., active ? 1. : 0.,
+		                              st::msgFileOverDuration);
 	}
 }
 
@@ -813,7 +848,7 @@ void File::step_radial(TimeMs ms, bool timer) {
 
 void File::ensureAnimation() const {
 	if (!_animation) {
-		_animation = std::make_unique<AnimationData>(animation(const_cast<File*>(this), &File::step_radial));
+		_animation = std::make_unique<AnimationData>(animation(const_cast<File *>(this), &File::step_radial));
 	}
 }
 
@@ -843,7 +878,8 @@ bool File::updateStatusText() const {
 			if (state.id == AudioMsgId(document, FullMsgId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 				statusSize = -1 - (state.position / state.frequency);
 				realDuration = (state.length / state.frequency);
-				showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+				showPause =
+				    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 			}
 		} else if (document->song()) {
 			statusSize = FileStatusSizeLoaded;
@@ -851,9 +887,11 @@ bool File::updateStatusText() const {
 			if (state.id == AudioMsgId(document, FullMsgId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 				statusSize = -1 - (state.position / state.frequency);
 				realDuration = (state.length / state.frequency);
-				showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+				showPause =
+				    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 			}
-			if (!showPause && (state.id == AudioMsgId(document, FullMsgId())) && Media::Player::instance()->isSeeking(AudioMsgId::Type::Song)) {
+			if (!showPause && (state.id == AudioMsgId(document, FullMsgId())) &&
+			    Media::Player::instance()->isSeeking(AudioMsgId::Type::Song)) {
 				showPause = true;
 			}
 		} else {
@@ -863,7 +901,8 @@ bool File::updateStatusText() const {
 		statusSize = FileStatusSizeReady;
 	}
 	if (statusSize != _statusSize) {
-		qint32 duration = document->song() ? document->song()->duration : (document->voice() ? document->voice()->duration : -1);
+		qint32 duration =
+		    document->song() ? document->song()->duration : (document->voice() ? document->voice()->duration : -1);
 		setStatusSize(statusSize, document->size, duration, realDuration);
 	}
 	return showPause;
@@ -872,9 +911,11 @@ bool File::updateStatusText() const {
 void File::setStatusSize(qint32 newSize, qint32 fullSize, qint32 duration, qint64 realDuration) const {
 	_statusSize = newSize;
 	if (_statusSize == FileStatusSizeReady) {
-		_statusText = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) : (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
+		_statusText = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) :
+		                                (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
 	} else if (_statusSize == FileStatusSizeLoaded) {
-		_statusText = (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
+		_statusText =
+		    (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
 	} else if (_statusSize == FileStatusSizeFailed) {
 		_statusText = lang(lng_attach_failed);
 	} else if (_statusSize >= 0) {
@@ -884,19 +925,21 @@ void File::setStatusSize(qint32 newSize, qint32 fullSize, qint32 duration, qint6
 	}
 }
 
-Contact::Contact(not_null<Context*> context, Result *result) : ItemBase(context, result)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
-}
+Contact::Contact(not_null<Context *> context, Result *result)
+    : ItemBase(context, result)
+    , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+             st::inlineThumbSkip)
+    , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+                   st::inlineThumbSkip) {}
 
 void Contact::initDimensions() {
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
 	qint32 textWidth = _maxw - (st::inlineThumbSize + st::inlineThumbSkip);
-	TextParseOptions titleOpts = { 0, _maxw, st::semiboldFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions titleOpts = {0, _maxw, st::semiboldFont->height, Qt::LayoutDirectionAuto};
 	_title.setText(st::semiboldTextStyle, TextUtilities::SingleLine(_result->getLayoutTitle()), titleOpts);
 	qint32 titleHeight = std::min(_title.countHeight(_maxw), st::semiboldFont->height);
 
-	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, st::normalFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions descriptionOpts = {TextParseMultiline, _maxw, st::normalFont->height, Qt::LayoutDirectionAuto};
 	_description.setText(st::defaultTextStyle, _result->getLayoutDescription(), descriptionOpts);
 	qint32 descriptionHeight = std::min(_description.countHeight(_maxw), st::normalFont->height);
 
@@ -928,7 +971,8 @@ void Contact::paint(Painter &p, const QRect &clip, const PaintContext *context)
 	_description.drawLeftElided(p, left, descriptionTop, _width - left, _width);
 
 	if (!context->lastRow) {
-		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width), st::inlineRowBorderFg);
+		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width),
+		           st::inlineRowBorderFg);
 	}
 }
 
@@ -966,19 +1010,23 @@ void Contact::prepareThumb(int width, int height) const {
 					w = width;
 				}
 			}
-			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width,
+			                           height);
 		}
 	} else {
 		thumb->load();
 	}
 }
 
-Article::Article(not_null<Context*> context, Result *result, bool withThumb) : ItemBase(context, result)
-, _url(getResultUrlHandler())
-, _link(getResultContentUrlHandler())
-, _withThumb(withThumb)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
+Article::Article(not_null<Context *> context, Result *result, bool withThumb)
+    : ItemBase(context, result)
+    , _url(getResultUrlHandler())
+    , _link(getResultContentUrlHandler())
+    , _withThumb(withThumb)
+    , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+             st::inlineThumbSkip)
+    , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+                   st::inlineThumbSkip) {
 	LocationCoords location;
 	if (!_link && result->getLocationCoords(&location)) {
 		_link = MakeShared<LocationClickHandler>(location);
@@ -989,13 +1037,14 @@ Article::Article(not_null<Context*> context, Result *result, bool withThumb) : I
 void Article::initDimensions() {
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
 	qint32 textWidth = _maxw - (_withThumb ? (st::inlineThumbSize + st::inlineThumbSkip) : 0);
-	TextParseOptions titleOpts = { 0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions titleOpts = {0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto};
 	_title.setText(st::semiboldTextStyle, TextUtilities::SingleLine(_result->getLayoutTitle()), titleOpts);
 	qint32 titleHeight = std::min(_title.countHeight(_maxw), 2 * st::semiboldFont->height);
 
 	qint32 descriptionLines = (_withThumb || _url) ? 2 : 3;
 	QString description = _result->getLayoutDescription();
-	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, descriptionLines * st::normalFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions descriptionOpts = {TextParseMultiline, _maxw, descriptionLines * st::normalFont->height,
+	                                    Qt::LayoutDirectionAuto};
 	_description.setText(st::defaultTextStyle, description, descriptionOpts);
 	qint32 descriptionHeight = std::min(_description.countHeight(_maxw), descriptionLines * st::normalFont->height);
 
@@ -1029,12 +1078,7 @@ void Article::paint(Painter &p, const QRect &clip, const PaintContext *context)
 			ImagePtr thumb = getResultThumb();
 			if (thumb->isNull() && !_thumbLetter.isEmpty()) {
 				qint32 index = (_thumbLetter.at(0).unicode() % 4);
-				style::color colors[] = {
-					st::msgFile3Bg,
-					st::msgFile4Bg,
-					st::msgFile2Bg,
-					st::msgFile1Bg
-				};
+				style::color colors[] = {st::msgFile3Bg, st::msgFile4Bg, st::msgFile2Bg, st::msgFile1Bg};
 
 				p.fillRect(rthumb, colors[index]);
 				if (!_thumbLetter.isEmpty()) {
@@ -1059,12 +1103,14 @@ void Article::paint(Painter &p, const QRect &clip, const PaintContext *context)
 	_description.drawLeftElided(p, left, st::inlineRowMargin + titleHeight, _width - left, _width, descriptionLines);
 
 	if (_url) {
-		qint32 descriptionHeight = std::min(_description.countHeight(_width - left), st::normalFont->height * descriptionLines);
+		qint32 descriptionHeight =
+		    std::min(_description.countHeight(_width - left), st::normalFont->height * descriptionLines);
 		p.drawTextLeft(left, st::inlineRowMargin + titleHeight + descriptionHeight, _width, _urlText, _urlWidth);
 	}
 
 	if (!context->lastRow) {
-		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width), st::inlineRowBorderFg);
+		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width),
+		           st::inlineRowBorderFg);
 	}
 }
 
@@ -1079,8 +1125,11 @@ void Article::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint
 			auto left = st::inlineThumbSize + st::inlineThumbSkip;
 			auto titleHeight = std::min(_title.countHeight(_width - left), st::semiboldFont->height * 2);
 			auto descriptionLines = 2;
-			auto descriptionHeight = std::min(_description.countHeight(_width - left), st::normalFont->height * descriptionLines);
-			if (rtlrect(left, st::inlineRowMargin + titleHeight + descriptionHeight, _urlWidth, st::normalFont->height, _width).contains(point)) {
+			auto descriptionHeight =
+			    std::min(_description.countHeight(_width - left), st::normalFont->height * descriptionLines);
+			if (rtlrect(left, st::inlineRowMargin + titleHeight + descriptionHeight, _urlWidth, st::normalFont->height,
+			            _width)
+			        .contains(point)) {
 				link = _url;
 				return;
 			}
@@ -1113,16 +1162,20 @@ void Article::prepareThumb(int width, int height) const {
 					w = width;
 				}
 			}
-			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width,
+			                           height);
 		}
 	} else {
 		thumb->load();
 	}
 }
 
-Game::Game(not_null<Context*> context, Result *result) : ItemBase(context, result)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize - st::inlineThumbSkip) {
+Game::Game(not_null<Context *> context, Result *result)
+    : ItemBase(context, result)
+    , _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+             st::inlineThumbSkip)
+    , _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineThumbSize -
+                   st::inlineThumbSkip) {
 	countFrameSize();
 }
 
@@ -1133,15 +1186,19 @@ void Game::countFrameSize() {
 			if (documentSize.isEmpty()) {
 				documentSize = QSize(st::inlineThumbSize, st::inlineThumbSize);
 			}
-			auto resizeByHeight1 = (documentSize.width() > documentSize.height()) && (documentSize.height() >= st::inlineThumbSize);
-			auto resizeByHeight2 = (documentSize.height() >= documentSize.width()) && (documentSize.width() < st::inlineThumbSize);
+			auto resizeByHeight1 =
+			    (documentSize.width() > documentSize.height()) && (documentSize.height() >= st::inlineThumbSize);
+			auto resizeByHeight2 =
+			    (documentSize.height() >= documentSize.width()) && (documentSize.width() < st::inlineThumbSize);
 			if (resizeByHeight1 || resizeByHeight2) {
 				if (documentSize.height() > st::inlineThumbSize) {
-					_frameSize = QSize((documentSize.width() * st::inlineThumbSize) / documentSize.height(), st::inlineThumbSize);
+					_frameSize = QSize((documentSize.width() * st::inlineThumbSize) / documentSize.height(),
+					                   st::inlineThumbSize);
 				}
 			} else {
 				if (documentSize.width() > st::inlineThumbSize) {
-					_frameSize = QSize(st::inlineThumbSize, (documentSize.height() * st::inlineThumbSize) / documentSize.width());
+					_frameSize = QSize(st::inlineThumbSize,
+					                   (documentSize.height() * st::inlineThumbSize) / documentSize.width());
 				}
 			}
 			if (!_frameSize.width()) {
@@ -1157,13 +1214,14 @@ void Game::countFrameSize() {
 void Game::initDimensions() {
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
 	qint32 textWidth = _maxw - (st::inlineThumbSize + st::inlineThumbSkip);
-	TextParseOptions titleOpts = { 0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions titleOpts = {0, _maxw, 2 * st::semiboldFont->height, Qt::LayoutDirectionAuto};
 	_title.setText(st::semiboldTextStyle, TextUtilities::SingleLine(_result->getLayoutTitle()), titleOpts);
 	qint32 titleHeight = std::min(_title.countHeight(_maxw), 2 * st::semiboldFont->height);
 
 	qint32 descriptionLines = 2;
 	QString description = _result->getLayoutDescription();
-	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, descriptionLines * st::normalFont->height, Qt::LayoutDirectionAuto };
+	TextParseOptions descriptionOpts = {TextParseMultiline, _maxw, descriptionLines * st::normalFont->height,
+	                                    Qt::LayoutDirectionAuto};
 	_description.setText(st::defaultTextStyle, description, descriptionOpts);
 	qint32 descriptionHeight = std::min(_description.countHeight(_maxw), descriptionLines * st::normalFont->height);
 
@@ -1194,7 +1252,7 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 
 		bool loaded = document->loaded(), loading = document->loading(), displayLoading = document->displayLoading();
 		if (loaded && !_gif && !_gif.isBad()) {
-			auto that = const_cast<Game*>(this);
+			auto that = const_cast<Game *>(this);
 			that->_gif = Media::Clip::MakeReader(document, FullMsgId(), [that](Media::Clip::Notification notification) {
 				that->clipCallback(notification);
 			});
@@ -1204,7 +1262,8 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 		bool animating = (_gif && _gif->started());
 		if (displayLoading) {
 			if (!_radial) {
-				_radial = std::make_unique<Ui::RadialAnimation>(animation(const_cast<Game*>(this), &Game::step_radial));
+				_radial =
+				    std::make_unique<Ui::RadialAnimation>(animation(const_cast<Game *>(this), &Game::step_radial));
 			}
 			if (!_radial->animating()) {
 				_radial->start(document->progress());
@@ -1214,7 +1273,9 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 
 		if (animating) {
 			if (!_thumb.isNull()) _thumb = QPixmap();
-			auto animationThumb = _gif->current(_frameSize.width(), _frameSize.height(), st::inlineThumbSize, st::inlineThumbSize, ImageRoundRadius::None, ImageRoundCorner::None, context->paused ? 0 : context->ms);
+			auto animationThumb =
+			    _gif->current(_frameSize.width(), _frameSize.height(), st::inlineThumbSize, st::inlineThumbSize,
+			                  ImageRoundRadius::None, ImageRoundCorner::None, context->paused ? 0 : context->ms);
 			p.drawPixmapLeft(rthumb.topLeft(), _width, animationThumb);
 			thumbDisplayed = true;
 		}
@@ -1231,10 +1292,12 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 
 	if (radial) {
 		p.fillRect(rthumb, st::msgDateImgBg);
-		QRect inner((st::inlineThumbSize - st::msgFileSize) / 2, (st::inlineThumbSize - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		QRect inner((st::inlineThumbSize - st::msgFileSize) / 2, (st::inlineThumbSize - st::msgFileSize) / 2,
+		            st::msgFileSize, st::msgFileSize);
 		if (radial) {
 			p.setOpacity(1);
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 			_radial->draw(p, rinner, st::msgFileRadialLine, st::msgInBg);
 		}
 	}
@@ -1248,7 +1311,8 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 	_description.drawLeftElided(p, left, st::inlineRowMargin + titleHeight, _width - left, _width, descriptionLines);
 
 	if (!context->lastRow) {
-		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width), st::inlineRowBorderFg);
+		p.fillRect(rtlrect(left, _height - st::inlineRowBorder, _width - left, st::inlineRowBorder, _width),
+		           st::inlineRowBorderFg);
 	}
 }
 
@@ -1293,7 +1357,8 @@ void Game::prepareThumb(int width, int height) const {
 					w = width;
 				}
 			}
-			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width, height);
+			_thumb = thumb->pixNoCache(w * cIntRetinaFactor(), h * cIntRetinaFactor(), Images::Option::Smooth, width,
+			                           height);
 		}
 	} else {
 		thumb->load();
@@ -1328,7 +1393,8 @@ void Game::clipCallback(Media::Clip::Notification notification) {
 				_gif.setBad();
 				getResultDocument()->forget();
 			} else if (_gif->ready() && !_gif->started()) {
-				_gif->start(_frameSize.width(), _frameSize.height(), st::inlineThumbSize, st::inlineThumbSize, ImageRoundRadius::None, ImageRoundCorner::None);
+				_gif->start(_frameSize.width(), _frameSize.height(), st::inlineThumbSize, st::inlineThumbSize,
+				            ImageRoundRadius::None, ImageRoundCorner::None);
 			} else if (_gif->autoPausedGif() && !context()->inlineItemVisible(this)) {
 				_gif.reset();
 				getResultDocument()->forget();
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
index 4f56eb020..b5bcd0763 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
@@ -31,9 +31,9 @@ namespace internal {
 
 class FileBase : public ItemBase {
 public:
-	FileBase(not_null<Context*> context, Result *result);
+	FileBase(not_null<Context *> context, Result *result);
 	// for saved gif layouts
-	FileBase(not_null<Context*> context, DocumentData *doc);
+	FileBase(not_null<Context *> context, DocumentData *doc);
 
 protected:
 	DocumentData *getShownDocument() const;
@@ -46,21 +46,20 @@ protected:
 
 class DeleteSavedGifClickHandler : public LeftButtonClickHandler {
 public:
-	DeleteSavedGifClickHandler(DocumentData *data) : _data(data) {
-	}
+	DeleteSavedGifClickHandler(DocumentData *data)
+	    : _data(data) {}
 
 protected:
 	void onClickImpl() const override;
 
 private:
-	DocumentData  *_data;
-
+	DocumentData *_data;
 };
 
 class Gif : public FileBase {
 public:
-	Gif(not_null<Context*> context, Result *result);
-	Gif(not_null<Context*> context, DocumentData *doc, bool hasDeleteButton);
+	Gif(not_null<Context *> context, Result *result);
+	Gif(not_null<Context *> context, DocumentData *doc, bool hasDeleteButton);
 
 	void setPosition(qint32 position) override;
 	void initDimensions() override;
@@ -82,11 +81,13 @@ private:
 	QSize countFrameSize() const;
 
 	enum class StateFlag {
-		Over       = (1 << 0),
+		Over = (1 << 0),
 		DeleteOver = (1 << 1),
 	};
 	using StateFlags = base::flags<StateFlag>;
-	friend inline constexpr auto is_flag_type(StateFlag) { return true; };
+	friend inline constexpr auto is_flag_type(StateFlag) {
+		return true;
+	};
 	StateFlags _state;
 
 	Media::Clip::ReaderPointer _gif;
@@ -102,23 +103,21 @@ private:
 
 	struct AnimationData {
 		AnimationData(AnimationCallbacks &&callbacks)
-			: over(false)
-			, radial(std::move(callbacks)) {
-		}
+		    : over(false)
+		    , radial(std::move(callbacks)) {}
 		bool over;
 		Animation _a_over;
 		Ui::RadialAnimation radial;
 	};
 	mutable std::unique_ptr<AnimationData> _animation;
 	mutable Animation _a_deleteOver;
-
 };
 
 class Photo : public ItemBase {
 public:
-	Photo(not_null<Context*> context, Result *result);
+	Photo(not_null<Context *> context, Result *result);
 	// Not used anywhere currently.
-	//Photo(not_null<Context*> context, PhotoData *photo);
+	// Photo(not_null<Context*> context, PhotoData *photo);
 
 	void initDimensions() override;
 
@@ -140,14 +139,13 @@ private:
 	mutable QPixmap _thumb;
 	mutable bool _thumbLoaded = false;
 	void prepareThumb(qint32 width, qint32 height, const QSize &frame) const;
-
 };
 
 class Sticker : public FileBase {
 public:
-	Sticker(not_null<Context*> context, Result *result);
+	Sticker(not_null<Context *> context, Result *result);
 	// Not used anywhere currently.
-	//Sticker(not_null<Context*> context, DocumentData *document);
+	// Sticker(not_null<Context*> context, DocumentData *document);
 
 	void initDimensions() override;
 
@@ -174,12 +172,11 @@ private:
 	mutable QPixmap _thumb;
 	mutable bool _thumbLoaded = false;
 	void prepareThumb() const;
-
 };
 
 class Video : public FileBase {
 public:
-	Video(not_null<Context*> context, Result *result);
+	Video(not_null<Context *> context, Result *result);
 
 	void initDimensions() override;
 
@@ -195,38 +192,35 @@ private:
 	int _durationWidth = 0;
 
 	void prepareThumb(qint32 width, qint32 height) const;
-
 };
 
 class OpenFileClickHandler : public LeftButtonClickHandler {
 public:
-	OpenFileClickHandler(Result *result) : _result(result) {
-	}
+	OpenFileClickHandler(Result *result)
+	    : _result(result) {}
 
 protected:
 	void onClickImpl() const override;
 
 private:
 	Result *_result;
-
 };
 
 class CancelFileClickHandler : public LeftButtonClickHandler {
 public:
-	CancelFileClickHandler(Result *result) : _result(result) {
-	}
+	CancelFileClickHandler(Result *result)
+	    : _result(result) {}
 
 protected:
 	void onClickImpl() const override;
 
 private:
 	Result *_result;
-
 };
 
 class File : public FileBase {
 public:
-	File(not_null<Context*> context, Result *result);
+	File(not_null<Context *> context, Result *result);
 
 	void initDimensions() override;
 
@@ -263,8 +257,8 @@ private:
 	}
 
 	struct AnimationData {
-		AnimationData(AnimationCallbacks &&radialCallbacks) : radial(std::move(radialCallbacks)) {
-		}
+		AnimationData(AnimationCallbacks &&radialCallbacks)
+		    : radial(std::move(radialCallbacks)) {}
 		Animation a_thumbOver;
 		Ui::RadialAnimation radial;
 	};
@@ -283,12 +277,11 @@ private:
 
 	// duration = -1 - no duration, duration = -2 - "GIF" duration
 	void setStatusSize(qint32 newSize, qint32 fullSize, qint32 duration, qint64 realDuration) const;
-
 };
 
 class Contact : public ItemBase {
 public:
-	Contact(not_null<Context*> context, Result *result);
+	Contact(not_null<Context *> context, Result *result);
 
 	void initDimensions() override;
 	int resizeGetHeight(int width) override;
@@ -301,12 +294,11 @@ private:
 	Text _title, _description;
 
 	void prepareThumb(int width, int height) const;
-
 };
 
 class Article : public ItemBase {
 public:
-	Article(not_null<Context*> context, Result *result, bool withThumb);
+	Article(not_null<Context *> context, Result *result, bool withThumb);
 
 	void initDimensions() override;
 	int resizeGetHeight(int width) override;
@@ -324,12 +316,11 @@ private:
 	qint32 _urlWidth;
 
 	void prepareThumb(int width, int height) const;
-
 };
 
 class Game : public ItemBase {
 public:
-	Game(not_null<Context*> context, Result *result);
+	Game(not_null<Context *> context, Result *result);
 
 	void setPosition(qint32 position) override;
 	void initDimensions() override;
@@ -353,7 +344,6 @@ private:
 	Text _title, _description;
 
 	QSize _frameSize;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
index 684940ca1..1ee847c7e 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
@@ -21,10 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "inline_bots/inline_bot_layout_item.h"
 
 #include "core/click_handler_types.h"
-#include "inline_bots/inline_bot_result.h"
 #include "inline_bots/inline_bot_layout_internal.h"
-#include "storage/localstorage.h"
+#include "inline_bots/inline_bot_result.h"
 #include "mainwidget.h"
+#include "storage/localstorage.h"
 
 namespace InlineBots {
 namespace Layout {
@@ -50,7 +50,7 @@ PhotoData *ItemBase::getPhoto() const {
 }
 
 DocumentData *ItemBase::getPreviewDocument() const {
-	auto previewDocument = [this]() -> DocumentData* {
+	auto previewDocument = [this]() -> DocumentData * {
 		if (_doc) {
 			return _doc;
 		}
@@ -105,7 +105,7 @@ void ItemBase::layoutChanged() {
 	}
 }
 
-std::unique_ptr<ItemBase> ItemBase::createLayout(not_null<Context*> context, Result *result, bool forceThumb) {
+std::unique_ptr<ItemBase> ItemBase::createLayout(not_null<Context *> context, Result *result, bool forceThumb) {
 	using Type = Result::Type;
 
 	switch (result->_type) {
@@ -124,7 +124,7 @@ std::unique_ptr<ItemBase> ItemBase::createLayout(not_null<Context*> context, Res
 	return nullptr;
 }
 
-std::unique_ptr<ItemBase> ItemBase::createLayoutGif(not_null<Context*> context, DocumentData *document) {
+std::unique_ptr<ItemBase> ItemBase::createLayoutGif(not_null<Context *> context, DocumentData *document) {
 	return std::make_unique<internal::Gif>(context, document, true);
 }
 
@@ -153,7 +153,8 @@ QPixmap ItemBase::getResultContactAvatar(int width, int height) const {
 	if (_result->_type == Result::Type::Contact) {
 		auto result = EmptyUserpic(qHash(_result->_id) % kUserColorsCount, _result->getLayoutTitle()).generate(width);
 		if (result.height() != height * cIntRetinaFactor()) {
-			result = result.scaled(QSize(width, height) * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+			result = result.scaled(QSize(width, height) * cIntRetinaFactor(), Qt::IgnoreAspectRatio,
+			                       Qt::SmoothTransformation);
 		}
 		return result;
 	}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
index 69702781d..fd180570f 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
@@ -32,19 +32,16 @@ namespace Layout {
 class PaintContext : public PaintContextBase {
 public:
 	PaintContext(TimeMs ms, bool selecting, bool paused, bool lastRow)
-		: PaintContextBase(ms, selecting)
-		, paused(paused)
-		, lastRow(lastRow) {
-	}
+	    : PaintContextBase(ms, selecting)
+	    , paused(paused)
+	    , lastRow(lastRow) {}
 	bool paused, lastRow;
-
 };
 
 // this type used as a flag, we dynamic_cast<> to it
 class SendClickHandler : public ClickHandler {
 public:
-	void onClick(Qt::MouseButton) const override {
-	}
+	void onClick(Qt::MouseButton) const override {}
 };
 
 class ItemBase;
@@ -58,12 +55,14 @@ public:
 
 class ItemBase : public LayoutItemBase {
 public:
-	ItemBase(not_null<Context*> context, Result *result) : _result(result), _context(context) {
-	}
-	ItemBase(not_null<Context*> context, DocumentData *doc) : _doc(doc), _context(context) {
-	}
+	ItemBase(not_null<Context *> context, Result *result)
+	    : _result(result)
+	    , _context(context) {}
+	ItemBase(not_null<Context *> context, DocumentData *doc)
+	    : _doc(doc)
+	    , _context(context) {}
 	// Not used anywhere currently.
-	//ItemBase(not_null<Context*> context, PhotoData *photo) : _photo(photo), _context(context) {
+	// ItemBase(not_null<Context*> context, PhotoData *photo) : _photo(photo), _context(context) {
 	//}
 
 	virtual void paint(Painter &p, const QRect &clip, const PaintContext *context) const = 0;
@@ -100,8 +99,8 @@ public:
 		update();
 	}
 
-	static std::unique_ptr<ItemBase> createLayout(not_null<Context*> context, Result *result, bool forceThumb);
-	static std::unique_ptr<ItemBase> createLayoutGif(not_null<Context*> context, DocumentData *document);
+	static std::unique_ptr<ItemBase> createLayout(not_null<Context *> context, Result *result, bool forceThumb);
+	static std::unique_ptr<ItemBase> createLayoutGif(not_null<Context *> context, DocumentData *document);
 
 protected:
 	DocumentData *getResultDocument() const;
@@ -114,7 +113,7 @@ protected:
 	ClickHandlerPtr getResultContentUrlHandler() const;
 	QString getResultThumbLetter() const;
 
-	not_null<Context*> context() const {
+	not_null<Context *> context() const {
 		return _context;
 	}
 
@@ -122,16 +121,15 @@ protected:
 	DocumentData *_doc = nullptr;
 	PhotoData *_photo = nullptr;
 
-	ClickHandlerPtr _send = ClickHandlerPtr{ new SendClickHandler() };
+	ClickHandlerPtr _send = ClickHandlerPtr{new SendClickHandler()};
 
 	int _position = 0; // < 0 means removed from layout
 
 private:
-	not_null<Context*> _context;
-
+	not_null<Context *> _context;
 };
 
-using DocumentItems = QMap<DocumentData*, OrderedSet<ItemBase*>>;
+using DocumentItems = QMap<DocumentData *, OrderedSet<ItemBase *>>;
 const DocumentItems *documentItems();
 
 namespace internal {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
index 7e7e079af..1307ed383 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -20,20 +20,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "inline_bots/inline_bot_result.h"
 
+#include "core/file_utilities.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "inline_bots/inline_bot_send_data.h"
-#include "storage/file_download.h"
-#include "core/file_utilities.h"
 #include "mainwidget.h"
+#include "storage/file_download.h"
 
 namespace InlineBots {
 
-Result::Result(const Creator &creator) : _queryId(creator.queryId), _type(creator.type) {
-}
+Result::Result(const Creator &creator)
+    : _queryId(creator.queryId)
+    , _type(creator.type) {}
 
 std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult &mtpData) {
 	using StringToTypeMap = QMap<QString, Result::Type>;
-	static StaticNeverFreedPointer<StringToTypeMap> stringToTypeMap{ ([]() -> StringToTypeMap* {
+	static StaticNeverFreedPointer<StringToTypeMap> stringToTypeMap{([]() -> StringToTypeMap * {
 		auto result = std::make_unique<StringToTypeMap>();
 		result->insert(qsl("photo"), Result::Type::Photo);
 		result->insert(qsl("video"), Result::Type::Video);
@@ -48,7 +49,7 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		result->insert(qsl("geo"), Result::Type::Geo);
 		result->insert(qsl("game"), Result::Type::Game);
 		return result.release();
-	})() };
+	})()};
 
 	auto getInlineResultType = [](const MTPBotInlineResult &inlineResult) -> Type {
 		QString type;
@@ -63,7 +64,7 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		return nullptr;
 	}
 
-	auto result = std::make_unique<Result>(Creator{ queryId, type });
+	auto result = std::make_unique<Result>(Creator{queryId, type});
 	const MTPBotInlineMessage *message = nullptr;
 	switch (mtpData.type()) {
 	case mtpc_botInlineResult: {
@@ -78,7 +79,8 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		if (r.has_w()) result->_width = r.vw.v;
 		if (r.has_h()) result->_height = r.vh.v;
 		if (r.has_duration()) result->_duration = r.vduration.v;
-		if (!result->_thumb_url.startsWith(qstr("http://"), Qt::CaseInsensitive) && !result->_thumb_url.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
+		if (!result->_thumb_url.startsWith(qstr("http://"), Qt::CaseInsensitive) &&
+		    !result->_thumb_url.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
 			result->_thumb_url = QString();
 		}
 		message = &r.vsend_message;
@@ -97,7 +99,8 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		message = &r.vsend_message;
 	} break;
 	}
-	bool badAttachment = (result->_photo && !result->_photo->access) || (result->_document && !result->_document->isValid());
+	bool badAttachment =
+	    (result->_photo && !result->_photo->access) || (result->_document && !result->_document->isValid());
 
 	if (!message) {
 		return nullptr;
@@ -140,7 +143,8 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 		result->sendData = std::make_unique<internal::SendText>(qs(r.vmessage), entities, r.is_no_webpage());
 		if (result->_type == Type::Photo) {
 			result->createPhoto();
-		} else if (result->_type == Type::Audio || result->_type == Type::File || result->_type == Type::Video || result->_type == Type::Sticker || result->_type == Type::Gif) {
+		} else if (result->_type == Type::Audio || result->_type == Type::File || result->_type == Type::Video ||
+		           result->_type == Type::Sticker || result->_type == Type::Gif) {
 			result->createDocument();
 		}
 		if (r.has_reply_markup()) {
@@ -163,7 +167,8 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 	case mtpc_botInlineMessageMediaVenue: {
 		auto &r = message->c_botInlineMessageMediaVenue();
 		if (r.vgeo.type() == mtpc_geoPoint) {
-			result->sendData = std::make_unique<internal::SendVenue>(r.vgeo.c_geoPoint(), qs(r.vvenue_id), qs(r.vprovider), qs(r.vtitle), qs(r.vaddress));
+			result->sendData = std::make_unique<internal::SendVenue>(r.vgeo.c_geoPoint(), qs(r.vvenue_id),
+			                                                         qs(r.vprovider), qs(r.vtitle), qs(r.vaddress));
 		} else {
 			badAttachment = true;
 		}
@@ -174,15 +179,14 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 
 	case mtpc_botInlineMessageMediaContact: {
 		auto &r = message->c_botInlineMessageMediaContact();
-		result->sendData = std::make_unique<internal::SendContact>(qs(r.vfirst_name), qs(r.vlast_name), qs(r.vphone_number));
+		result->sendData =
+		    std::make_unique<internal::SendContact>(qs(r.vfirst_name), qs(r.vlast_name), qs(r.vphone_number));
 		if (r.has_reply_markup()) {
 			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
 		}
 	} break;
 
-	default: {
-		badAttachment = true;
-	} break;
+	default: { badAttachment = true; } break;
 	}
 
 	if (badAttachment || !result->sendData || !result->sendData->isValid()) {
@@ -202,7 +206,13 @@ std::unique_ptr<Result> Result::create(quint64 queryId, const MTPBotInlineResult
 			h /= 2;
 		}
 		auto coords = location.latAsString() + ',' + location.lonAsString();
-		QString url = qsl("https://maps.googleapis.com/maps/api/staticmap?center=") + coords + qsl("&zoom=%1&size=%2x%3&maptype=roadmap&scale=%4&markers=color:red|size:big|").arg(zoom).arg(w).arg(h).arg(scale) + coords + qsl("&sensor=false");
+		QString url = qsl("https://maps.googleapis.com/maps/api/staticmap?center=") + coords +
+		              qsl("&zoom=%1&size=%2x%3&maptype=roadmap&scale=%4&markers=color:red|size:big|")
+		                  .arg(zoom)
+		                  .arg(w)
+		                  .arg(h)
+		                  .arg(scale) +
+		              coords + qsl("&sensor=false");
 		result->_locationThumb = ImagePtr(url);
 	}
 
@@ -219,12 +229,8 @@ bool Result::onChoose(Layout::ItemBase *layout) {
 		}
 		return false;
 	}
-	if (_document && (
-		_type == Type::Video ||
-		_type == Type::Audio ||
-		_type == Type::Sticker ||
-		_type == Type::File ||
-		_type == Type::Gif)) {
+	if (_document && (_type == Type::Video || _type == Type::Audio || _type == Type::Sticker || _type == Type::File ||
+	                  _type == Type::Gif)) {
 		if (_type == Type::Gif) {
 			if (_document->loaded()) {
 				return true;
@@ -279,7 +285,8 @@ bool Result::hasThumbDisplay() const {
 	return false;
 };
 
-void Result::addToHistory(History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor) const {
+void Result::addToHistory(History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
+                          UserId viaBotId, MsgId replyToId, const QString &postAuthor) const {
 	flags |= MTPDmessage_ClientFlag::f_from_inline_bot;
 
 	MTPReplyMarkup markup = MTPnullMarkup;
@@ -307,8 +314,7 @@ QString Result::getLayoutDescription() const {
 }
 
 // just to make unique_ptr see the destructors.
-Result::~Result() {
-}
+Result::~Result() {}
 
 void Result::createPhoto() {
 	if (_photo) return;
@@ -319,7 +325,7 @@ void Result::createPhoto() {
 	} else {
 		_thumb = ImagePtr(_thumb_url, QSize(320, 320));
 	}
-//	ImagePtr medium = ImagePtr(_content_url, QSize(320, 320));
+	//	ImagePtr medium = ImagePtr(_content_url, QSize(320, 320));
 	QSize mediumsize = shrinkToKeepAspect(_width, _height, 320, 320);
 	ImagePtr medium = ImagePtr(mediumsize.width(), mediumsize.height());
 
@@ -345,10 +351,12 @@ void Result::createDocument() {
 		attributes.push_back(MTP_documentAttributeFilename(MTP_string(filename)));
 		attributes.push_back(MTP_documentAttributeAnimated());
 		auto flags = MTPDdocumentAttributeVideo::Flags(0);
-		attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(_duration), MTP_int(_width), MTP_int(_height)));
+		attributes.push_back(
+		    MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(_duration), MTP_int(_width), MTP_int(_height)));
 	} else if (_type == Type::Video) {
 		auto flags = MTPDdocumentAttributeVideo::Flags(0);
-		attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(_duration), MTP_int(_width), MTP_int(_height)));
+		attributes.push_back(
+		    MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(_duration), MTP_int(_width), MTP_int(_height)));
 	} else if (_type == Type::Audio) {
 		auto flags = MTPDdocumentAttributeAudio::Flags(0);
 		if (mime == qstr("audio/ogg")) {
@@ -360,11 +368,13 @@ void Result::createDocument() {
 			QString filename = filedialogDefaultName(qsl("inline"), extension, QString(), true);
 			attributes.push_back(MTP_documentAttributeFilename(MTP_string(filename)));
 		}
-		attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(_duration), MTPstring(), MTPstring(), MTPbytes()));
+		attributes.push_back(
+		    MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(_duration), MTPstring(), MTPstring(), MTPbytes()));
 	}
 
 	auto documentId = rand_value<DocumentId>();
-	_document = App::documentSet(documentId, nullptr, 0, 0, unixtime(), attributes, mime, _thumb, MTP::maindc(), 0, StorageImageLocation());
+	_document = App::documentSet(documentId, nullptr, 0, 0, unixtime(), attributes, mime, _thumb, MTP::maindc(), 0,
+	                             StorageImageLocation());
 	_document->setContentUrl(_content_url);
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index f3cf5cc9d..b9adf7090 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -43,7 +43,6 @@ private:
 	struct Creator;
 
 public:
-
 	// Constructor is public only for std::make_unique<>() to work.
 	// You should use create() static method instead.
 	explicit Result(const Creator &creator);
@@ -68,7 +67,8 @@ public:
 
 	bool hasThumbDisplay() const;
 
-	void addToHistory(History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor) const;
+	void addToHistory(History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
+	                  UserId viaBotId, MsgId replyToId, const QString &postAuthor) const;
 	QString getErrorOnSend(History *history) const;
 
 	// interface for Layout:: usage
@@ -123,7 +123,6 @@ private:
 	ImagePtr _thumb, _locationThumb;
 
 	std::unique_ptr<internal::SendData> sendData;
-
 };
 
 } // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index a72d33479..189111bcf 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -18,11 +18,11 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "app.h"
 #include "inline_bots/inline_bot_send_data.h"
+#include "app.h"
 #include "inline_bots/inline_bot_result.h"
-#include "storage/localstorage.h"
 #include "lang/lang_keys.h"
+#include "storage/localstorage.h"
 
 namespace InlineBots {
 namespace internal {
@@ -35,14 +35,18 @@ QString SendData::getLayoutDescription(const Result *owner) const {
 	return owner->_description;
 }
 
-void SendDataCommon::addToHistory(const Result *owner, History *history,
-MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const {
+void SendDataCommon::addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId,
+                                  UserId fromId, MTPint mtpDate, UserId viaBotId, MsgId replyToId,
+                                  const QString &postAuthor, const MTPReplyMarkup &markup) const {
 	auto fields = getSentMessageFields();
 	if (!fields.entities.v.isEmpty()) {
 		flags |= MTPDmessage::Flag::f_entities;
 	}
-	history->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(msgId), MTP_int(fromId), peerToMTP(history->peer->id), MTPnullFwdHeader, MTP_int(viaBotId), MTP_int(replyToId), mtpDate, fields.text, fields.media, markup, fields.entities, MTP_int(1), MTPint(), MTP_string(postAuthor)), NewMessageUnread);
+	history->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(msgId), MTP_int(fromId), peerToMTP(history->peer->id),
+	                                   MTPnullFwdHeader, MTP_int(viaBotId), MTP_int(replyToId), mtpDate, fields.text,
+	                                   fields.media, markup, fields.entities, MTP_int(1), MTPint(),
+	                                   MTP_string(postAuthor)),
+	                       NewMessageUnread);
 }
 
 QString SendDataCommon::getErrorOnSend(const Result *owner, History *history) const {
@@ -69,13 +73,15 @@ SendDataCommon::SentMTPMessageFields SendGeo::getSentMessageFields() const {
 
 SendDataCommon::SentMTPMessageFields SendVenue::getSentMessageFields() const {
 	SentMTPMessageFields result;
-	result.media = MTP_messageMediaVenue(_location.toMTP(), MTP_string(_title), MTP_string(_address), MTP_string(_provider), MTP_string(_venueId));
+	result.media = MTP_messageMediaVenue(_location.toMTP(), MTP_string(_title), MTP_string(_address),
+	                                     MTP_string(_provider), MTP_string(_venueId));
 	return result;
 }
 
 SendDataCommon::SentMTPMessageFields SendContact::getSentMessageFields() const {
 	SentMTPMessageFields result;
-	result.media = MTP_messageMediaContact(MTP_string(_phoneNumber), MTP_string(_firstName), MTP_string(_lastName), MTP_int(0));
+	result.media =
+	    MTP_messageMediaContact(MTP_string(_phoneNumber), MTP_string(_firstName), MTP_string(_lastName), MTP_int(0));
 	return result;
 }
 
@@ -87,10 +93,11 @@ QString SendContact::getLayoutDescription(const Result *owner) const {
 	return result;
 }
 
-void SendPhoto::addToHistory(const Result *owner, History *history,
-MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const {
-	history->addNewPhoto(msgId, flags, viaBotId, replyToId, date(mtpDate), fromId, postAuthor, _photo, _caption, markup);
+void SendPhoto::addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId,
+                             UserId fromId, MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+                             const MTPReplyMarkup &markup) const {
+	history->addNewPhoto(msgId, flags, viaBotId, replyToId, date(mtpDate), fromId, postAuthor, _photo, _caption,
+	                     markup);
 }
 
 QString SendPhoto::getErrorOnSend(const Result *owner, History *history) const {
@@ -102,10 +109,11 @@ QString SendPhoto::getErrorOnSend(const Result *owner, History *history) const {
 	return QString();
 }
 
-void SendFile::addToHistory(const Result *owner, History *history,
-MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const {
-	history->addNewDocument(msgId, flags, viaBotId, replyToId, date(mtpDate), fromId, postAuthor, _document, _caption, markup);
+void SendFile::addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+                            MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+                            const MTPReplyMarkup &markup) const {
+	history->addNewDocument(msgId, flags, viaBotId, replyToId, date(mtpDate), fromId, postAuthor, _document, _caption,
+	                        markup);
 }
 
 QString SendFile::getErrorOnSend(const Result *owner, History *history) const {
@@ -114,16 +122,17 @@ QString SendFile::getErrorOnSend(const Result *owner, History *history) const {
 			return lang(lng_restricted_send_media);
 		} else if (megagroup->restrictedRights().is_send_stickers() && (_document->sticker() != nullptr)) {
 			return lang(lng_restricted_send_stickers);
-		} else if (megagroup->restrictedRights().is_send_gifs() && _document->isAnimation() && !_document->isRoundVideo()) {
+		} else if (megagroup->restrictedRights().is_send_gifs() && _document->isAnimation() &&
+		           !_document->isRoundVideo()) {
 			return lang(lng_restricted_send_gifs);
 		}
 	}
 	return QString();
 }
 
-void SendGame::addToHistory(const Result *owner, History *history,
-	MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-	UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const {
+void SendGame::addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+                            MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+                            const MTPReplyMarkup &markup) const {
 	history->addNewGame(msgId, flags, viaBotId, replyToId, date(mtpDate), fromId, postAuthor, _game, markup);
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
index beac1bc6c..152c238fc 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h
@@ -21,9 +21,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "core/basic_types.h"
-#include "structs.h"
 #include "history/history_location_manager.h"
 #include "mtproto/type_utils.h"
+#include "structs.h"
 
 class History;
 namespace InlineBots {
@@ -44,9 +44,9 @@ public:
 
 	virtual bool isValid() const = 0;
 
-	virtual void addToHistory(const Result *owner, History *history,
-		MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-		UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const = 0;
+	virtual void addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId,
+	                          UserId fromId, MTPint mtpDate, UserId viaBotId, MsgId replyToId,
+	                          const QString &postAuthor, const MTPReplyMarkup &markup) const = 0;
 	virtual QString getErrorOnSend(const Result *owner, History *history) const = 0;
 
 	virtual bool hasLocationCoords() const {
@@ -57,7 +57,6 @@ public:
 	}
 	virtual QString getLayoutTitle(const Result *owner) const;
 	virtual QString getLayoutDescription(const Result *owner) const;
-
 };
 
 // This class implements addHistory() for most of the types hiding
@@ -72,21 +71,19 @@ public:
 	};
 	virtual SentMTPMessageFields getSentMessageFields() const = 0;
 
-	void addToHistory(const Result *owner, History *history,
-		MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-		UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const override;
+	void addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+	                  MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+	                  const MTPReplyMarkup &markup) const override;
 
 	QString getErrorOnSend(const Result *owner, History *history) const override;
-
 };
 
 // Plain text message.
 class SendText : public SendDataCommon {
 public:
-	SendText(const QString &message, const EntitiesInText &entities, bool/* noWebPage*/)
-		: _message(message)
-		, _entities(entities) {
-	}
+	SendText(const QString &message, const EntitiesInText &entities, bool /* noWebPage*/)
+	    : _message(message)
+	    , _entities(entities) {}
 
 	bool isValid() const override {
 		return !_message.isEmpty();
@@ -97,14 +94,13 @@ public:
 private:
 	QString _message;
 	EntitiesInText _entities;
-
 };
 
 // Message with geo location point media.
 class SendGeo : public SendDataCommon {
 public:
-	explicit SendGeo(const MTPDgeoPoint &point) : _location(point) {
-	}
+	explicit SendGeo(const MTPDgeoPoint &point)
+	    : _location(point) {}
 
 	bool isValid() const override {
 		return true;
@@ -123,20 +119,18 @@ public:
 
 private:
 	LocationCoords _location;
-
 };
 
 // Message with venue media.
 class SendVenue : public SendDataCommon {
 public:
-	SendVenue(const MTPDgeoPoint &point, const QString &venueId,
-		const QString &provider, const QString &title, const QString &address)
-		: _location(point)
-		, _venueId(venueId)
-		, _provider(provider)
-		, _title(title)
-		, _address(address) {
-	}
+	SendVenue(const MTPDgeoPoint &point, const QString &venueId, const QString &provider, const QString &title,
+	          const QString &address)
+	    : _location(point)
+	    , _venueId(venueId)
+	    , _provider(provider)
+	    , _title(title)
+	    , _address(address) {}
 
 	bool isValid() const override {
 		return true;
@@ -156,17 +150,15 @@ public:
 private:
 	LocationCoords _location;
 	QString _venueId, _provider, _title, _address;
-
 };
 
 // Message with shared contact media.
 class SendContact : public SendDataCommon {
 public:
 	SendContact(const QString &firstName, const QString &lastName, const QString &phoneNumber)
-		: _firstName(firstName)
-		, _lastName(lastName)
-		, _phoneNumber(phoneNumber) {
-	}
+	    : _firstName(firstName)
+	    , _lastName(lastName)
+	    , _phoneNumber(phoneNumber) {}
 
 	bool isValid() const override {
 		return (!_firstName.isEmpty() || !_lastName.isEmpty()) && !_phoneNumber.isEmpty();
@@ -178,77 +170,70 @@ public:
 
 private:
 	QString _firstName, _lastName, _phoneNumber;
-
 };
 
 // Message with photo.
 class SendPhoto : public SendData {
 public:
 	SendPhoto(PhotoData *photo, const QString &caption)
-		: _photo(photo)
-		, _caption(caption) {
-	}
+	    : _photo(photo)
+	    , _caption(caption) {}
 
 	bool isValid() const override {
 		return _photo != nullptr;
 	}
 
-	void addToHistory(const Result *owner, History *history,
-		MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-		UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const override;
+	void addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+	                  MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+	                  const MTPReplyMarkup &markup) const override;
 
 	QString getErrorOnSend(const Result *owner, History *history) const override;
 
 private:
 	PhotoData *_photo;
 	QString _caption;
-
 };
 
 // Message with file.
 class SendFile : public SendData {
 public:
 	SendFile(DocumentData *document, const QString &caption)
-		: _document(document)
-		, _caption(caption) {
-	}
+	    : _document(document)
+	    , _caption(caption) {}
 
 	bool isValid() const override {
 		return _document != nullptr;
 	}
 
-	void addToHistory(const Result *owner, History *history,
-		MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-		UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const override;
+	void addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+	                  MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+	                  const MTPReplyMarkup &markup) const override;
 
 	QString getErrorOnSend(const Result *owner, History *history) const override;
 
 private:
 	DocumentData *_document;
 	QString _caption;
-
 };
 
 // Message with game.
 class SendGame : public SendData {
 public:
 	SendGame(GameData *game)
-		: _game(game) {
-	}
+	    : _game(game) {}
 
 	bool isValid() const override {
 		return _game != nullptr;
 	}
 
-	void addToHistory(const Result *owner, History *history,
-		MTPDmessage::Flags flags, MsgId msgId, UserId fromId, MTPint mtpDate,
-		UserId viaBotId, MsgId replyToId, const QString &postAuthor, const MTPReplyMarkup &markup) const override;
+	void addToHistory(const Result *owner, History *history, MTPDmessage::Flags flags, MsgId msgId, UserId fromId,
+	                  MTPint mtpDate, UserId viaBotId, MsgId replyToId, const QString &postAuthor,
+	                  const MTPReplyMarkup &markup) const override;
 
 	QString getErrorOnSend(const Result *owner, History *history) const override;
 
 private:
 	GameData *_game;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 104f93654..2db3f1703 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -19,26 +19,26 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "inline_bots/inline_results_widget.h"
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/shadow.h"
-#include "ui/effects/ripple_animation.h"
-#include "boxes/confirm_box.h"
-#include "inline_bots/inline_bot_result.h"
-#include "inline_bots/inline_bot_layout_item.h"
-#include "dialogs/dialogs_layout.h"
-#include "storage/localstorage.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
 #include "apiwrap.h"
-#include "mainwidget.h"
 #include "auth_session.h"
-#include "window/window_controller.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/labels.h"
+#include "boxes/confirm_box.h"
+#include "dialogs/dialogs_layout.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "inline_bots/inline_bot_result.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "observer_peer.h"
-#include <QWindow>
+#include "storage/localstorage.h"
+#include "styles/style_chat_helpers.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
+#include "window/window_controller.h"
 #include <QApplication>
+#include <QWindow>
 
 namespace InlineBots {
 namespace Layout {
@@ -49,8 +49,9 @@ constexpr auto kInlineBotRequestDelay = 400;
 
 } // namespace
 
-Inner::Inner(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller) {
+Inner::Inner(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller) {
 	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, st::emojiPanMinHeight);
 
 	setMouseTracking(true);
@@ -62,23 +63,23 @@ Inner::Inner(QWidget *parent, not_null<Window::Controller*> controller) : TWidge
 	_updateInlineItems.setSingleShot(true);
 	connect(&_updateInlineItems, SIGNAL(timeout()), this, SLOT(onUpdateInlineItems()));
 
-	subscribe(Auth().downloaderTaskFinished(), [this] {
-		update();
-	});
+	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 	subscribe(controller->gifPauseLevelChanged(), [this] {
 		if (!_controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults)) {
 			update();
 		}
 	});
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelRightsChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer == _inlineQueryPeer) {
-			auto isRestricted = (_restrictedLabel != nullptr);
-			if (isRestricted != isRestrictedView()) {
-				auto h = countHeight();
-				if (h != height()) resize(width(), h);
-			}
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::ChannelRightsChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer == _inlineQueryPeer) {
+			                                                            auto isRestricted =
+			                                                                (_restrictedLabel != nullptr);
+			                                                            if (isRestricted != isRestrictedView()) {
+				                                                            auto h = countHeight();
+				                                                            if (h != height()) resize(width(), h);
+			                                                            }
+		                                                            }
+	                                                            }));
 }
 
 void Inner::setVisibleTopBottom(int visibleTop, int visibleBottom) {
@@ -93,7 +94,8 @@ void Inner::checkRestrictedPeer() {
 	if (auto megagroup = _inlineQueryPeer ? _inlineQueryPeer->asMegagroup() : nullptr) {
 		if (megagroup->restrictedRights().is_send_inline()) {
 			if (!_restrictedLabel) {
-				_restrictedLabel.create(this, lang(lng_restricted_send_inline), Ui::FlatLabel::InitType::Simple, st::stickersRestrictedLabel);
+				_restrictedLabel.create(this, lang(lng_restricted_send_inline), Ui::FlatLabel::InitType::Simple,
+				                        st::stickersRestrictedLabel);
 				_restrictedLabel->show();
 				_restrictedLabel->move(st::inlineResultsLeft - st::buttonRadius, st::stickerPanPadding);
 				if (_switchPmButton) {
@@ -152,7 +154,8 @@ void Inner::paintInlineItems(Painter &p, const QRect &r) {
 	if (_rows.isEmpty() && !_switchPmButton) {
 		p.setFont(st::normalFont);
 		p.setPen(st::noContactsColor);
-		p.drawText(QRect(0, 0, width(), (height() / 3) * 2 + st::normalFont->height), lang(lng_inline_bot_no_results), style::al_center);
+		p.drawText(QRect(0, 0, width(), (height() / 3) * 2 + st::normalFont->height), lang(lng_inline_bot_no_results),
+		           style::al_center);
 		return;
 	}
 	auto gifPaused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults);
@@ -221,7 +224,7 @@ void Inner::mouseReleaseEvent(QMouseEvent *e) {
 		return;
 	}
 
-	if (dynamic_cast<InlineBots::Layout::SendClickHandler*>(activated.data())) {
+	if (dynamic_cast<InlineBots::Layout::SendClickHandler *>(activated.data())) {
 		int row = _selected / MatrixRowShift, column = _selected % MatrixRowShift;
 		selectInlineResult(row, column);
 	} else {
@@ -285,9 +288,7 @@ void Inner::hideFinish(bool completely) {
 			}
 		};
 		clearInlineRows(false);
-		for_const (auto &item, _inlineLayouts) {
-			itemForget(item.second);
-		}
+		for_const (auto &item, _inlineLayouts) { itemForget(item.second); }
 	}
 }
 
@@ -334,9 +335,7 @@ void Inner::clearInlineRows(bool resultsDeleted) {
 	} else {
 		clearSelection();
 		for_const (auto &row, _rows) {
-			for_const (auto &item, row.items) {
-				item->setPosition(-1);
-			}
+			for_const (auto &item, row.items) { item->setPosition(-1); }
 		}
 	}
 	_rows.clear();
@@ -384,9 +383,8 @@ Inner::Row &Inner::layoutInlineRow(Row &row, qint32 sumWidth) {
 	for (auto i = 0; i != count; ++i) {
 		indices[i] = i;
 	}
-	std::sort(indices, indices + count, [&row](int a, int b) -> bool {
-		return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth();
-	});
+	std::sort(indices, indices + count,
+	          [&row](int a, int b) -> bool { return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth(); });
 
 	row.height = 0;
 	int availw = width() - (st::inlineResultsLeft - st::buttonRadius);
@@ -712,11 +710,12 @@ void Inner::onSwitchPm() {
 
 } // namespace internal
 
-Widget::Widget(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller)
-, _contentMaxHeight(st::emojiPanMaxHeight)
-, _contentHeight(_contentMaxHeight)
-, _scroll(this, st::inlineBotsScroll) {
+Widget::Widget(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _contentMaxHeight(st::emojiPanMaxHeight)
+    , _contentHeight(_contentMaxHeight)
+    , _scroll(this, st::inlineBotsScroll) {
 	resize(QRect(0, 0, st::emojiPanWidth, _contentHeight).marginsAdded(innerPadding()).size());
 	_width = width();
 	_height = height();
@@ -744,7 +743,8 @@ Widget::Widget(QWidget *parent, not_null<Window::Controller*> controller) : TWid
 	// But we should force it to repaint so that GIFs will continue to animate without update() calls.
 	// We do that by creating a transparent widget above our _inner.
 	auto forceRepaintOnScroll = object_ptr<TWidget>(this);
-	forceRepaintOnScroll->setGeometry(innerRect().x() + st::buttonRadius, innerRect().y() + st::buttonRadius, st::buttonRadius, st::buttonRadius);
+	forceRepaintOnScroll->setGeometry(innerRect().x() + st::buttonRadius, innerRect().y() + st::buttonRadius,
+	                                  st::buttonRadius, st::buttonRadius);
 	forceRepaintOnScroll->setAttribute(Qt::WA_TransparentForMouseEvents);
 	forceRepaintOnScroll->show();
 
@@ -835,7 +835,9 @@ void Widget::paintContent(Painter &p) {
 	auto horizontal = horizontalRect();
 	auto sidesTop = horizontal.y();
 	auto sidesHeight = horizontal.height();
-	p.fillRect(myrtlrect(inner.x() + inner.width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight), st::emojiPanBg);
+	p.fillRect(
+	    myrtlrect(inner.x() + inner.width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight),
+	    st::emojiPanBg);
 	p.fillRect(myrtlrect(inner.x(), sidesTop, st::buttonRadius, sidesHeight), st::emojiPanBg);
 }
 
@@ -882,7 +884,8 @@ void Widget::startOpacityAnimation(bool hiding) {
 	prepareCache();
 	_hiding = hiding;
 	hideChildren();
-	_a_opacity.start([this] { opacityAnimationCallback(); }, _hiding ? 1. : 0., _hiding ? 0. : 1., st::emojiPanDuration);
+	_a_opacity.start([this] { opacityAnimationCallback(); }, _hiding ? 1. : 0., _hiding ? 0. : 1.,
+	                 st::emojiPanDuration);
 }
 
 void Widget::startShowAnimation() {
@@ -894,9 +897,11 @@ void Widget::startShowAnimation() {
 		_a_opacity = base::take(opacityAnimation);
 		_cache = base::take(_cache);
 
-		_showAnimation = std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::BottomLeft);
+		_showAnimation =
+		    std::make_unique<Ui::PanelAnimation>(st::emojiPanAnimation, Ui::PanelAnimation::Origin::BottomLeft);
 		auto inner = rect().marginsRemoved(st::emojiPanMargins);
-		_showAnimation->setFinalImage(std::move(image), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(std::move(image),
+		                              QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
 		auto corners = App::cornersMask(ImageRoundRadius::Small);
 		_showAnimation->setCornerMasks(corners[0], corners[1], corners[2], corners[3]);
 		_showAnimation->start();
@@ -988,8 +993,8 @@ bool Widget::overlaps(const QRect &globalRect) const {
 
 	auto testRect = QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size());
 	auto inner = rect().marginsRemoved(st::emojiPanMargins);
-	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect)
-		|| inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
+	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect) ||
+	       inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
 }
 
 void Widget::inlineBotChanged() {
@@ -1063,11 +1068,11 @@ void Widget::queryInlineBot(UserData *bot, PeerData *peer, QString query) {
 		inlineBotChanged();
 		_inlineBot = bot;
 		force = true;
-		//if (_inlineBot->isBotInlineGeo()) {
+		// if (_inlineBot->isBotInlineGeo()) {
 		//	Ui::show(Box<InformBox>(lang(lng_bot_inline_geo_unavailable)));
 		//}
 	}
-	//if (_inlineBot && _inlineBot->isBotInlineGeo()) {
+	// if (_inlineBot && _inlineBot->isBotInlineGeo()) {
 	//	return;
 	//}
 
@@ -1099,13 +1104,17 @@ void Widget::onInlineRequest() {
 		if (nextOffset.isEmpty()) return;
 	}
 	Notify::inlineBotRequesting(true);
-	_inlineRequestId = request(MTPmessages_GetInlineBotResults(MTP_flags(0), _inlineBot->inputUser, _inlineQueryPeer->input, MTPInputGeoPoint(), MTP_string(_inlineQuery), MTP_string(nextOffset))).done([this](const MTPmessages_BotResults &result, mtpRequestId requestId) {
-		inlineResultsDone(result);
-	}).fail([this](const RPCError &error) {
-		// show error?
-		Notify::inlineBotRequesting(false);
-		_inlineRequestId = 0;
-	}).handleAllErrors().send();
+	_inlineRequestId =
+	    request(MTPmessages_GetInlineBotResults(MTP_flags(0), _inlineBot->inputUser, _inlineQueryPeer->input,
+	                                            MTPInputGeoPoint(), MTP_string(_inlineQuery), MTP_string(nextOffset)))
+	        .done([this](const MTPmessages_BotResults &result, mtpRequestId requestId) { inlineResultsDone(result); })
+	        .fail([this](const RPCError &error) {
+		        // show error?
+		        Notify::inlineBotRequesting(false);
+		        _inlineRequestId = 0;
+	        })
+	        .handleAllErrors()
+	        .send();
 }
 
 void Widget::onEmptyInlineRows() {
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index b573efc6f..10e996fcf 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "mtproto/sender.h"
 #include "ui/abstract_button.h"
 #include "ui/effects/panel_animation.h"
-#include "mtproto/sender.h"
-#include "inline_bots/inline_bot_layout_item.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 class ScrollArea;
@@ -33,7 +33,7 @@ class LinkButton;
 class RoundButton;
 class FlatLabel;
 class RippleAnimation;
-} // namesapce Ui
+} // namespace Ui
 
 namespace Window {
 class Controller;
@@ -63,7 +63,7 @@ class Inner : public TWidget, public Context, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	Inner(QWidget *parent, not_null<Window::Controller*> controller);
+	Inner(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void hideFinish(bool completely);
 
@@ -118,7 +118,7 @@ private:
 
 	void refreshSwitchPmButton(const CacheEntry *entry);
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
@@ -129,19 +129,19 @@ private:
 	QTimer _updateInlineItems;
 	bool _inlineWithThumb = false;
 
-	object_ptr<Ui::RoundButton> _switchPmButton = { nullptr };
+	object_ptr<Ui::RoundButton> _switchPmButton = {nullptr};
 	QString _switchPmStartToken;
 
-	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
+	object_ptr<Ui::FlatLabel> _restrictedLabel = {nullptr};
 
 	struct Row {
 		int height = 0;
-		QVector<ItemBase*> items;
+		QVector<ItemBase *> items;
 	};
 	QVector<Row> _rows;
 	void clearInlineRows(bool resultsDeleted);
 
-	std::map<Result*, std::unique_ptr<ItemBase>> _inlineLayouts;
+	std::map<Result *, std::unique_ptr<ItemBase>> _inlineLayouts;
 	ItemBase *layoutPrepareInlineResult(Result *result, qint32 position);
 
 	bool inlineRowsAddItem(Result *result, Row &row, qint32 &sumWidth);
@@ -161,7 +161,6 @@ private:
 	bool _previewShown = false;
 
 	base::lambda<void(Result *result, UserData *bot)> _resultSelectedCallback;
-
 };
 
 } // namespace internal
@@ -170,7 +169,7 @@ class Widget : public TWidget, private MTP::Sender {
 	Q_OBJECT
 
 public:
-	Widget(QWidget *parent, not_null<Window::Controller*> controller);
+	Widget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void moveBottom(int bottom);
 
@@ -240,7 +239,7 @@ private:
 	bool refreshInlineRows(int *added = nullptr);
 	void inlineResultsDone(const MTPmessages_BotResults &result);
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	int _contentMaxHeight = 0;
 	int _contentHeight = 0;
@@ -268,7 +267,6 @@ private:
 	PeerData *_inlineQueryPeer = nullptr;
 	QString _inlineQuery, _inlineNextQuery, _inlineNextOffset;
 	mtpRequestId _inlineRequestId = 0;
-
 };
 
 } // namespace Layout
diff --git a/Telegram/SourceFiles/intro/introcode.cpp b/Telegram/SourceFiles/intro/introcode.cpp
index bef634d6e..b12a3133e 100644
--- a/Telegram/SourceFiles/intro/introcode.cpp
+++ b/Telegram/SourceFiles/intro/introcode.cpp
@@ -20,19 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/introcode.h"
 
-#include "lang/lang_keys.h"
+#include "app.h" // for formatPhone
 #include "application.h"
-#include "intro/introsignup.h"
 #include "intro/intropwdcheck.h"
+#include "intro/introsignup.h"
+#include "lang/lang_keys.h"
+#include "styles/style_intro.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "styles/style_intro.h"
-#include "app.h" // for formatPhone
 
 namespace Intro {
 
-CodeInput::CodeInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory) : Ui::MaskedInputField(parent, st, std::move(placeholderFactory)) {
-}
+CodeInput::CodeInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory)
+    : Ui::MaskedInputField(parent, st, std::move(placeholderFactory)) {}
 
 void CodeInput::setDigitsCountMax(int digitsCount) {
 	_digitsCountMax = digitsCount;
@@ -81,14 +81,15 @@ void CodeInput::correctValue(const QString &was, int wasCursor, QString &now, in
 	if (strict) emit codeEntered();
 }
 
-CodeWidget::CodeWidget(QWidget *parent, Widget::Data *data) : Step(parent, data)
-, _noTelegramCode(this, lang(lng_code_no_telegram), st::introLink)
-, _code(this, st::introCode, langFactory(lng_code_ph))
-, _callTimer(this)
-, _callStatus(getData()->callStatus)
-, _callTimeout(getData()->callTimeout)
-, _callLabel(this, st::introDescription)
-, _checkRequest(this) {
+CodeWidget::CodeWidget(QWidget *parent, Widget::Data *data)
+    : Step(parent, data)
+    , _noTelegramCode(this, lang(lng_code_no_telegram), st::introLink)
+    , _code(this, st::introCode, langFactory(lng_code_ph))
+    , _callTimer(this)
+    , _callStatus(getData()->callStatus)
+    , _callTimeout(getData()->callTimeout)
+    , _callLabel(this, st::introDescription)
+    , _checkRequest(this) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	connect(_code, SIGNAL(changed()), this, SLOT(onInputChange()));
@@ -133,9 +134,12 @@ void CodeWidget::updateCallText() {
 		switch (_callStatus) {
 		case Widget::Data::CallStatus::Waiting: {
 			if (_callTimeout >= 3600) {
-				return lng_code_call(lt_minutes, qsl("%1:%2").arg(_callTimeout / 3600).arg((_callTimeout / 60) % 60, 2, 10, QChar('0')), lt_seconds, qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0')));
+				return lng_code_call(
+				    lt_minutes, qsl("%1:%2").arg(_callTimeout / 3600).arg((_callTimeout / 60) % 60, 2, 10, QChar('0')),
+				    lt_seconds, qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0')));
 			} else {
-				return lng_code_call(lt_minutes, QString::number(_callTimeout / 60), lt_seconds, qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0')));
+				return lng_code_call(lt_minutes, QString::number(_callTimeout / 60), lt_seconds,
+				                     qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0')));
 			}
 		} break;
 		case Widget::Data::CallStatus::Calling: return lang(lng_code_calling);
@@ -253,7 +257,8 @@ bool CodeWidget::codeSubmitFail(const RPCError &error) {
 	} else if (err == qstr("SESSION_PASSWORD_NEEDED")) {
 		getData()->code = _sentCode;
 		_checkRequest->start(1000);
-		_sentRequest = MTP::send(MTPaccount_GetPassword(), rpcDone(&CodeWidget::gotPassword), rpcFail(&CodeWidget::codeSubmitFail));
+		_sentRequest = MTP::send(MTPaccount_GetPassword(), rpcDone(&CodeWidget::gotPassword),
+		                         rpcFail(&CodeWidget::codeSubmitFail));
 		return true;
 	}
 	if (cDebug()) { // internal server error
@@ -277,7 +282,9 @@ void CodeWidget::onSendCall() {
 		if (--_callTimeout <= 0) {
 			_callStatus = Widget::Data::CallStatus::Calling;
 			_callTimer->stop();
-			_callRequestId = MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash)), rpcDone(&CodeWidget::callDone));
+			_callRequestId =
+			    MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash)),
+			              rpcDone(&CodeWidget::callDone));
 		} else {
 			getData()->callStatus = _callStatus;
 			getData()->callTimeout = _callTimeout;
@@ -328,12 +335,16 @@ void CodeWidget::submit() {
 	getData()->pwdSalt = QByteArray();
 	getData()->hasRecovery = false;
 	getData()->pwdHint = QString();
-	_sentRequest = MTP::send(MTPauth_SignIn(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash), MTP_string(_sentCode)), rpcDone(&CodeWidget::codeSubmitDone), rpcFail(&CodeWidget::codeSubmitFail));
+	_sentRequest =
+	    MTP::send(MTPauth_SignIn(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash), MTP_string(_sentCode)),
+	              rpcDone(&CodeWidget::codeSubmitDone), rpcFail(&CodeWidget::codeSubmitFail));
 }
 
 void CodeWidget::onNoTelegramCode() {
 	if (_noTelegramCodeRequestId) return;
-	_noTelegramCodeRequestId = MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash)), rpcDone(&CodeWidget::noTelegramCodeDone), rpcFail(&CodeWidget::noTelegramCodeFail));
+	_noTelegramCodeRequestId =
+	    MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash)),
+	              rpcDone(&CodeWidget::noTelegramCodeDone), rpcFail(&CodeWidget::noTelegramCodeFail));
 }
 
 void CodeWidget::noTelegramCodeDone(const MTPauth_SentCode &result) {
diff --git a/Telegram/SourceFiles/intro/introcode.h b/Telegram/SourceFiles/intro/introcode.h
index 2aad77eaa..db6205e1d 100644
--- a/Telegram/SourceFiles/intro/introcode.h
+++ b/Telegram/SourceFiles/intro/introcode.h
@@ -47,7 +47,6 @@ protected:
 
 private:
 	int _digitsCountMax = 5;
-
 };
 
 class CodeWidget : public Widget::Step {
@@ -107,7 +106,6 @@ private:
 	object_ptr<Ui::FlatLabel> _callLabel;
 
 	object_ptr<QTimer> _checkRequest;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp
index 350743cde..b3ee53758 100644
--- a/Telegram/SourceFiles/intro/introphone.cpp
+++ b/Telegram/SourceFiles/intro/introphone.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/introphone.h"
 
-#include "lang/lang_keys.h"
+#include "app.h"
 #include "application.h"
+#include "boxes/confirm_box.h"
+#include "core/click_handler_types.h"
 #include "intro/introcode.h"
+#include "lang/lang_keys.h"
+#include "messenger.h"
 #include "styles/style_intro.h"
+#include "ui/effects/widget_fade_wrap.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "ui/effects/widget_fade_wrap.h"
-#include "core/click_handler_types.h"
-#include "boxes/confirm_box.h"
-#include "messenger.h"
-#include "app.h"
 
 namespace Intro {
 
-PhoneWidget::PhoneWidget(QWidget *parent, Widget::Data *data) : Step(parent, data)
-, _country(this, st::introCountry)
-, _code(this, st::introCountryCode)
-, _phone(this, st::introPhone)
-, _checkRequest(this) {
-	connect(_phone, SIGNAL(voidBackspace(QKeyEvent*)), _code, SLOT(startErasing(QKeyEvent*)));
+PhoneWidget::PhoneWidget(QWidget *parent, Widget::Data *data)
+    : Step(parent, data)
+    , _country(this, st::introCountry)
+    , _code(this, st::introCountryCode)
+    , _phone(this, st::introPhone)
+    , _checkRequest(this) {
+	connect(_phone, SIGNAL(voidBackspace(QKeyEvent *)), _code, SLOT(startErasing(QKeyEvent *)));
 	connect(_country, SIGNAL(codeChanged(const QString &)), _code, SLOT(codeSelected(const QString &)));
 	connect(_code, SIGNAL(codeChanged(const QString &)), _country, SLOT(onChooseCode(const QString &)));
 	connect(_code, SIGNAL(codeChanged(const QString &)), _phone, SLOT(onChooseCode(const QString &)));
@@ -93,13 +94,12 @@ void PhoneWidget::hidePhoneError() {
 void PhoneWidget::showSignup() {
 	showPhoneError(langFactory(lng_bad_phone_noreg));
 	if (!_signup) {
-		auto signupText = lng_phone_notreg(lt_link_start, textcmdStartLink(1), lt_link_end, textcmdStopLink(), lt_signup_start, textcmdStartLink(2), lt_signup_end, textcmdStopLink());
+		auto signupText = lng_phone_notreg(lt_link_start, textcmdStartLink(1), lt_link_end, textcmdStopLink(),
+		                                   lt_signup_start, textcmdStartLink(2), lt_signup_end, textcmdStopLink());
 		auto inner = object_ptr<Ui::FlatLabel>(this, signupText, Ui::FlatLabel::InitType::Rich, st::introDescription);
 		_signup.create(this, std::move(inner), st::introErrorDuration);
 		_signup->entity()->setLink(1, MakeShared<UrlClickHandler>(qsl("https://telegram.org"), false));
-		_signup->entity()->setLink(2, MakeShared<LambdaClickHandler>([this] {
-			toSignUp();
-		}));
+		_signup->entity()->setLink(2, MakeShared<LambdaClickHandler>([this] { toSignUp(); }));
 		_signup->hideFast();
 		updateSignupGeometry();
 	}
@@ -132,7 +132,8 @@ void PhoneWidget::submit() {
 	_checkRequest->start(1000);
 
 	_sentPhone = fullNumber();
-	_sentRequest = MTP::send(MTPauth_CheckPhone(MTP_string(_sentPhone)), rpcDone(&PhoneWidget::phoneCheckDone), rpcFail(&PhoneWidget::phoneSubmitFail));
+	_sentRequest = MTP::send(MTPauth_CheckPhone(MTP_string(_sentPhone)), rpcDone(&PhoneWidget::phoneCheckDone),
+	                         rpcFail(&PhoneWidget::phoneSubmitFail));
 }
 
 void PhoneWidget::stopCheck() {
@@ -161,7 +162,9 @@ void PhoneWidget::phoneCheckDone(const MTPauth_CheckedPhone &result) {
 
 		_checkRequest->start(1000);
 
-		_sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(0), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail));
+		_sentRequest = MTP::send(
+		    MTPauth_SendCode(MTP_flags(0), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)),
+		    rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail));
 	} else {
 		showSignup();
 		_sentRequest = 0;
@@ -197,7 +200,9 @@ void PhoneWidget::toSignUp() {
 
 	_checkRequest->start(1000);
 
-	_sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(0), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail));
+	_sentRequest = MTP::send(
+	    MTPauth_SendCode(MTP_flags(0), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)),
+	    rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail));
 }
 
 bool PhoneWidget::phoneSubmitFail(const RPCError &error) {
diff --git a/Telegram/SourceFiles/intro/introphone.h b/Telegram/SourceFiles/intro/introphone.h
index 9cdd9df3c..891250e5c 100644
--- a/Telegram/SourceFiles/intro/introphone.h
+++ b/Telegram/SourceFiles/intro/introphone.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/countryinput.h"
 #include "intro/introwidget.h"
+#include "ui/countryinput.h"
 
 namespace Ui {
 class PhonePartInput;
@@ -80,13 +80,12 @@ private:
 	object_ptr<Ui::CountryCodeInput> _code;
 	object_ptr<Ui::PhonePartInput> _phone;
 
-	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _signup = { nullptr };
+	object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _signup = {nullptr};
 
 	QString _sentPhone;
 	mtpRequestId _sentRequest = 0;
 
 	object_ptr<QTimer> _checkRequest;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intropwdcheck.cpp b/Telegram/SourceFiles/intro/intropwdcheck.cpp
index 4748e5df4..fa8a4624e 100644
--- a/Telegram/SourceFiles/intro/intropwdcheck.cpp
+++ b/Telegram/SourceFiles/intro/intropwdcheck.cpp
@@ -20,29 +20,30 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/intropwdcheck.h"
 
-#include "styles/style_intro.h"
-#include "styles/style_boxes.h"
-#include "core/file_utilities.h"
-#include "boxes/confirm_box.h"
-#include "lang/lang_keys.h"
 #include "application.h"
+#include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
 #include "intro/introsignup.h"
+#include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
+#include "styles/style_intro.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
 
 namespace Intro {
 
-PwdCheckWidget::PwdCheckWidget(QWidget *parent, Widget::Data *data) : Step(parent, data)
-, _salt(getData()->pwdSalt)
-, _hasRecovery(getData()->hasRecovery)
-, _hint(getData()->pwdHint)
-, _pwdField(this, st::introPassword, langFactory(lng_signin_password))
-, _pwdHint(this, st::introPasswordHint)
-, _codeField(this, st::introPassword, langFactory(lng_signin_code))
-, _toRecover(this, lang(lng_signin_recover))
-, _toPassword(this, lang(lng_signin_try_password))
-, _checkRequest(this) {
+PwdCheckWidget::PwdCheckWidget(QWidget *parent, Widget::Data *data)
+    : Step(parent, data)
+    , _salt(getData()->pwdSalt)
+    , _hasRecovery(getData()->hasRecovery)
+    , _hint(getData()->pwdHint)
+    , _pwdField(this, st::introPassword, langFactory(lng_signin_password))
+    , _pwdHint(this, st::introPasswordHint)
+    , _codeField(this, st::introPassword, langFactory(lng_signin_code))
+    , _toRecover(this, lang(lng_signin_recover))
+    , _toPassword(this, lang(lng_signin_try_password))
+    , _checkRequest(this) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	connect(_checkRequest, SIGNAL(timeout()), this, SLOT(onCheckRequest()));
@@ -242,7 +243,8 @@ void PwdCheckWidget::onToRecover() {
 		_codeField->setFocus();
 		updateDescriptionText();
 		if (_emailPattern.isEmpty()) {
-			MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PwdCheckWidget::recoverStarted), rpcFail(&PwdCheckWidget::recoverStartFail));
+			MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PwdCheckWidget::recoverStarted),
+			          rpcFail(&PwdCheckWidget::recoverStartFail));
 		}
 	} else {
 		Ui::show(Box<InformBox>(lang(lng_signin_no_email_forgot), [this] { showReset(); }));
@@ -290,13 +292,17 @@ void PwdCheckWidget::submit() {
 			return;
 		}
 
-		_sentRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&PwdCheckWidget::pwdSubmitDone, true), rpcFail(&PwdCheckWidget::codeSubmitFail));
+		_sentRequest =
+		    MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&PwdCheckWidget::pwdSubmitDone, true),
+		              rpcFail(&PwdCheckWidget::codeSubmitFail));
 	} else {
 		hideError();
 
 		QByteArray pwdData = _salt + _pwdField->getLastText().toUtf8() + _salt, pwdHash(32, Qt::Uninitialized);
 		hashSha256(pwdData.constData(), pwdData.size(), pwdHash.data());
-		_sentRequest = MTP::send(MTPauth_CheckPassword(MTP_bytes(pwdHash)), rpcDone(&PwdCheckWidget::pwdSubmitDone, false), rpcFail(&PwdCheckWidget::pwdSubmitFail));
+		_sentRequest =
+		    MTP::send(MTPauth_CheckPassword(MTP_bytes(pwdHash)), rpcDone(&PwdCheckWidget::pwdSubmitDone, false),
+		              rpcFail(&PwdCheckWidget::pwdSubmitFail));
 	}
 }
 
diff --git a/Telegram/SourceFiles/intro/intropwdcheck.h b/Telegram/SourceFiles/intro/intropwdcheck.h
index 182649268..a8d2d5daf 100644
--- a/Telegram/SourceFiles/intro/intropwdcheck.h
+++ b/Telegram/SourceFiles/intro/intropwdcheck.h
@@ -81,7 +81,6 @@ private:
 	QByteArray _pwdSalt;
 
 	object_ptr<QTimer> _checkRequest;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/introsignup.cpp b/Telegram/SourceFiles/intro/introsignup.cpp
index 0cbdf16a2..135c2b455 100644
--- a/Telegram/SourceFiles/intro/introsignup.cpp
+++ b/Telegram/SourceFiles/intro/introsignup.cpp
@@ -20,27 +20,28 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/introsignup.h"
 
-#include "styles/style_intro.h"
-#include "styles/style_boxes.h"
-#include "core/file_utilities.h"
-#include "boxes/photo_crop_box.h"
-#include "boxes/confirm_box.h"
-#include "lang/lang_keys.h"
+#include "app.h"
 #include "application.h"
+#include "boxes/confirm_box.h"
+#include "boxes/photo_crop_box.h"
+#include "core/file_utilities.h"
+#include "lang/lang_keys.h"
+#include "styles/style_boxes.h"
+#include "styles/style_intro.h"
+#include "ui/special_buttons.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
-#include "ui/special_buttons.h"
-#include "app.h"
 
 namespace Intro {
 
-SignupWidget::SignupWidget(QWidget *parent, Widget::Data *data) : Step(parent, data)
-, _photo(this, st::introPhotoSize, st::introPhotoIconPosition)
-, _first(this, st::introName, langFactory(lng_signup_firstname))
-, _last(this, st::introName, langFactory(lng_signup_lastname))
-, _invertOrder(langFirstNameGoesSecond())
-, _checkRequest(this) {
+SignupWidget::SignupWidget(QWidget *parent, Widget::Data *data)
+    : Step(parent, data)
+    , _photo(this, st::introPhotoSize, st::introPhotoIconPosition)
+    , _first(this, st::introName, langFactory(lng_signup_firstname))
+    , _last(this, st::introName, langFactory(lng_signup_lastname))
+    , _invertOrder(langFirstNameGoesSecond())
+    , _checkRequest(this) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 	if (_invertOrder) {
 		setTabOrder(_last, _first);
@@ -73,25 +74,26 @@ void SignupWidget::setupPhotoButton() {
 	_photo->setClickedCallback(App::LambdaDelayed(st::defaultActiveButton.ripple.hideDuration, this, [this] {
 		auto imgExtensions = cImgExtensions();
 		auto filter = qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + FileDialog::AllFilesFilter();
-		FileDialog::GetOpenPath(lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-			if (result.remoteContent.isEmpty() && result.paths.isEmpty()) {
-				return;
-			}
+		FileDialog::GetOpenPath(
+		    lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+			    if (result.remoteContent.isEmpty() && result.paths.isEmpty()) {
+				    return;
+			    }
 
-			QImage img;
-			if (!result.remoteContent.isEmpty()) {
-				img = App::readImage(result.remoteContent);
-			} else {
-				img = App::readImage(result.paths.front());
-			}
+			    QImage img;
+			    if (!result.remoteContent.isEmpty()) {
+				    img = App::readImage(result.remoteContent);
+			    } else {
+				    img = App::readImage(result.paths.front());
+			    }
 
-			if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) {
-				showError(langFactory(lng_bad_photo));
-				return;
-			}
-			auto box = Ui::show(Box<PhotoCropBox>(img, PeerId(0)));
-			connect(box, SIGNAL(ready(const QImage&)), this, SLOT(onPhotoReady(const QImage&)));
-		}));
+			    if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) {
+				    showError(langFactory(lng_bad_photo));
+				    return;
+			    }
+			    auto box = Ui::show(Box<PhotoCropBox>(img, PeerId(0)));
+			    connect(box, SIGNAL(ready(const QImage &)), this, SLOT(onPhotoReady(const QImage &)));
+		    }));
 	}));
 }
 
@@ -187,8 +189,8 @@ bool SignupWidget::nameSubmitFail(const RPCError &error) {
 		Ui::show(Box<InformBox>(lang(lng_error_phone_flood)));
 		return true;
 	} else if (err == qstr("PHONE_NUMBER_INVALID") || err == qstr("PHONE_CODE_EXPIRED") ||
-		err == qstr("PHONE_CODE_EMPTY") || err == qstr("PHONE_CODE_INVALID") ||
-		err == qstr("PHONE_NUMBER_OCCUPIED")) {
+	           err == qstr("PHONE_CODE_EMPTY") || err == qstr("PHONE_CODE_INVALID") ||
+	           err == qstr("PHONE_NUMBER_OCCUPIED")) {
 		goBack();
 		return true;
 	} else if (err == "FIRSTNAME_INVALID") {
@@ -221,7 +223,8 @@ void SignupWidget::onInputChange() {
 void SignupWidget::submit() {
 	if (_sentRequest) return;
 	if (_invertOrder) {
-		if ((_last->hasFocus() || _last->getLastText().trimmed().length()) && !_first->getLastText().trimmed().length()) {
+		if ((_last->hasFocus() || _last->getLastText().trimmed().length()) &&
+		    !_first->getLastText().trimmed().length()) {
 			_first->setFocus();
 			return;
 		} else if (!_last->getLastText().trimmed().length()) {
@@ -229,7 +232,8 @@ void SignupWidget::submit() {
 			return;
 		}
 	} else {
-		if ((_first->hasFocus() || _first->getLastText().trimmed().length()) && !_last->getLastText().trimmed().length()) {
+		if ((_first->hasFocus() || _first->getLastText().trimmed().length()) &&
+		    !_last->getLastText().trimmed().length()) {
 			_last->setFocus();
 			return;
 		} else if (!_first->getLastText().trimmed().length()) {
@@ -242,7 +246,9 @@ void SignupWidget::submit() {
 
 	_firstName = _first->getLastText().trimmed();
 	_lastName = _last->getLastText().trimmed();
-	_sentRequest = MTP::send(MTPauth_SignUp(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash), MTP_string(getData()->code), MTP_string(_firstName), MTP_string(_lastName)), rpcDone(&SignupWidget::nameSubmitDone), rpcFail(&SignupWidget::nameSubmitFail));
+	_sentRequest = MTP::send(MTPauth_SignUp(MTP_string(getData()->phone), MTP_bytes(getData()->phoneHash),
+	                                        MTP_string(getData()->code), MTP_string(_firstName), MTP_string(_lastName)),
+	                         rpcDone(&SignupWidget::nameSubmitDone), rpcFail(&SignupWidget::nameSubmitFail));
 }
 
 QString SignupWidget::nextButtonText() const {
diff --git a/Telegram/SourceFiles/intro/introsignup.h b/Telegram/SourceFiles/intro/introsignup.h
index 2cda87e86..4428ce978 100644
--- a/Telegram/SourceFiles/intro/introsignup.h
+++ b/Telegram/SourceFiles/intro/introsignup.h
@@ -71,7 +71,6 @@ private:
 	bool _invertOrder = false;
 
 	object_ptr<QTimer> _checkRequest;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/introstart.cpp b/Telegram/SourceFiles/intro/introstart.cpp
index be37b56d4..1e9fd64c7 100644
--- a/Telegram/SourceFiles/intro/introstart.cpp
+++ b/Telegram/SourceFiles/intro/introstart.cpp
@@ -20,16 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/introstart.h"
 
-#include "config.h"
-#include "lang/lang_keys.h"
 #include "application.h"
+#include "config.h"
 #include "intro/introphone.h"
+#include "lang/lang_keys.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 
 namespace Intro {
 
-StartWidget::StartWidget(QWidget *parent, Widget::Data *data) : Step(parent, data, true) {
+StartWidget::StartWidget(QWidget *parent, Widget::Data *data)
+    : Step(parent, data, true) {
 	setMouseTracking(true);
 	setTitleText([] { return str_const_toString(AppName); });
 	setDescriptionText(langFactory(lng_intro_about));
diff --git a/Telegram/SourceFiles/intro/introstart.h b/Telegram/SourceFiles/intro/introstart.h
index 9eba9471a..643b8d01a 100644
--- a/Telegram/SourceFiles/intro/introstart.h
+++ b/Telegram/SourceFiles/intro/introstart.h
@@ -36,7 +36,6 @@ public:
 
 	void submit() override;
 	QString nextButtonText() const override;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp
index e9f05c346..2bc0f83d4 100644
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@@ -20,32 +20,32 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "intro/introwidget.h"
 
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "lang/lang_file_parser.h"
-#include "intro/introstart.h"
-#include "intro/introphone.h"
-#include "intro/introcode.h"
-#include "intro/introsignup.h"
-#include "intro/intropwdcheck.h"
-#include "mainwidget.h"
 #include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "intro/introcode.h"
+#include "intro/introphone.h"
+#include "intro/intropwdcheck.h"
+#include "intro/introsignup.h"
+#include "intro/introstart.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_file_parser.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
 #include "mainwindow.h"
 #include "messenger.h"
-#include "application.h"
-#include "boxes/confirm_box.h"
-#include "ui/text/text.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/effects/widget_fade_wrap.h"
-#include "ui/effects/slide_animation.h"
-#include "window/window_slide_animation.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "styles/style_intro.h"
 #include "styles/style_window.h"
+#include "ui/effects/slide_animation.h"
+#include "ui/effects/widget_fade_wrap.h"
+#include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 #include "window/themes/window_theme.h"
-#include "lang/lang_cloud_manager.h"
-#include "auth_session.h"
+#include "window/window_slide_animation.h"
 
 namespace Intro {
 namespace {
@@ -54,10 +54,12 @@ constexpr str_const kDefaultCountry = "US";
 
 } // namespace
 
-Widget::Widget(QWidget *parent) : TWidget(parent)
-, _back(this, object_ptr<Ui::IconButton>(this, st::introBackButton), st::introSlideDuration)
-, _settings(this, object_ptr<Ui::RoundButton>(this, langFactory(lng_menu_settings), st::defaultBoxButton), st::introCoverDuration)
-, _next(this, base::lambda<QString()>(), st::introNextButton) {
+Widget::Widget(QWidget *parent)
+    : TWidget(parent)
+    , _back(this, object_ptr<Ui::IconButton>(this, st::introBackButton), st::introSlideDuration)
+    , _settings(this, object_ptr<Ui::RoundButton>(this, langFactory(lng_menu_settings), st::defaultBoxButton),
+                st::introCoverDuration)
+    , _next(this, base::lambda<QString()>(), st::introNextButton) {
 	auto country = Platform::SystemCountry();
 	if (country.isEmpty()) {
 		country = str_const_toString(kDefaultCountry);
@@ -102,9 +104,8 @@ void Widget::createLanguageLink() {
 		_changeLanguage.create(this, object_ptr<Ui::LinkButton>(this, text), st::introCoverDuration);
 		_changeLanguage->show();
 		_changeLanguage->hideFast();
-		_changeLanguage->entity()->setClickedCallback([this, languageId] {
-			Lang::CurrentCloudManager().switchToLanguage(languageId);
-		});
+		_changeLanguage->entity()->setClickedCallback(
+		    [this, languageId] { Lang::CurrentCloudManager().switchToLanguage(languageId); });
 		_changeLanguage->toggleAnimated(!_resetAccount);
 		updateControlsGeometry();
 	};
@@ -115,13 +116,16 @@ void Widget::createLanguageLink() {
 	if (!currentId.isEmpty() && currentId != defaultId) {
 		createLink(Lang::GetOriginalValue(lng_switch_to_this), defaultId);
 	} else if (!suggestedId.isEmpty() && suggestedId != currentId) {
-		request(MTPlangpack_GetStrings(MTP_string(suggestedId), MTP_vector<MTPstring>(1, MTP_string("lng_switch_to_this")))).done([this, suggestedId, createLink](const MTPVector<MTPLangPackString> &result) {
-			auto strings = Lang::Instance::ParseStrings(result);
-			auto it = strings.find(lng_switch_to_this);
-			if (it != strings.end()) {
-				createLink(it->second, suggestedId);
-			}
-		}).send();
+		request(
+		    MTPlangpack_GetStrings(MTP_string(suggestedId), MTP_vector<MTPstring>(1, MTP_string("lng_switch_to_this"))))
+		    .done([this, suggestedId, createLink](const MTPVector<MTPLangPackString> &result) {
+			    auto strings = Lang::Instance::ParseStrings(result);
+			    auto it = strings.find(lng_switch_to_this);
+			    if (it != strings.end()) {
+				    createLink(it->second, suggestedId);
+			    }
+		    })
+		    .send();
 	}
 }
 
@@ -149,7 +153,8 @@ void Widget::historyMove(Direction direction) {
 	if (wasStep->hasCover() != getStep()->hasCover()) {
 		_nextTopFrom = wasStep->contentTop() + st::introStepHeight;
 		_controlsTopFrom = wasStep->hasCover() ? st::introCoverHeight : 0;
-		_coverShownAnimation.start([this] { updateControlsGeometry(); }, 0., 1., st::introCoverDuration, wasStep->hasCover() ? anim::linear : anim::easeOutCirc);
+		_coverShownAnimation.start([this] { updateControlsGeometry(); }, 0., 1., st::introCoverDuration,
+		                           wasStep->hasCover() ? anim::linear : anim::easeOutCirc);
 	}
 
 	if (direction == Direction::Forward || direction == Direction::Replace) {
@@ -198,9 +203,7 @@ void Widget::appendStep(Step *step) {
 			moveToStep(step, direction);
 		}
 	});
-	step->setShowResetCallback([this] {
-		showResetButton();
-	});
+	step->setShowResetCallback([this] { showResetButton(); });
 }
 
 void Widget::showResetButton() {
@@ -218,53 +221,65 @@ void Widget::showResetButton() {
 void Widget::resetAccount() {
 	if (_resetRequest) return;
 
-	Ui::show(Box<ConfirmBox>(lang(lng_signin_sure_reset), lang(lng_signin_reset), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-		if (_resetRequest) return;
-		_resetRequest = request(MTPaccount_DeleteAccount(MTP_string("Forgot password"))).done([this](const MTPBool &result) {
-			_resetRequest = 0;
+	Ui::show(Box<ConfirmBox>(
+	    lang(lng_signin_sure_reset), lang(lng_signin_reset), st::attentionBoxButton, base::lambda_guarded(this, [this] {
+		    if (_resetRequest) return;
+		    _resetRequest =
+		        request(MTPaccount_DeleteAccount(MTP_string("Forgot password")))
+		            .done([this](const MTPBool &result) {
+			            _resetRequest = 0;
 
-			Ui::hideLayer();
-			moveToStep(new SignupWidget(this, getData()), Direction::Replace);
-		}).fail([this](const RPCError &error) {
-			_resetRequest = 0;
+			            Ui::hideLayer();
+			            moveToStep(new SignupWidget(this, getData()), Direction::Replace);
+		            })
+		            .fail([this](const RPCError &error) {
+			            _resetRequest = 0;
 
-			auto type = error.type();
-			if (type.startsWith(qstr("2FA_CONFIRM_WAIT_"))) {
-				auto seconds = type.mid(qstr("2FA_CONFIRM_WAIT_").size()).toInt();
-				auto days = (seconds + 59) / 86400;
-				auto hours = ((seconds + 59) % 86400) / 3600;
-				auto minutes = ((seconds + 59) % 3600) / 60;
-				auto when = lng_signin_reset_minutes(lt_count, minutes);
-				if (days > 0) {
-					auto daysCount = lng_signin_reset_days(lt_count, days);
-					auto hoursCount = lng_signin_reset_hours(lt_count, hours);
-					when = lng_signin_reset_in_days(lt_days_count, daysCount, lt_hours_count, hoursCount, lt_minutes_count, when);
-				} else if (hours > 0) {
-					auto hoursCount = lng_signin_reset_hours(lt_count, hours);
-					when = lng_signin_reset_in_hours(lt_hours_count, hoursCount, lt_minutes_count, when);
-				}
-				Ui::show(Box<InformBox>(lng_signin_reset_wait(lt_phone_number, App::formatPhone(getData()->phone), lt_when, when)));
-			} else if (type == qstr("2FA_RECENT_CONFIRM")) {
-				Ui::show(Box<InformBox>(lang(lng_signin_reset_cancelled)));
-			} else {
-				Ui::hideLayer();
-				getStep()->showError(langFactory(lng_server_error));
-			}
-		}).send();
-	})));
+			            auto type = error.type();
+			            if (type.startsWith(qstr("2FA_CONFIRM_WAIT_"))) {
+				            auto seconds = type.mid(qstr("2FA_CONFIRM_WAIT_").size()).toInt();
+				            auto days = (seconds + 59) / 86400;
+				            auto hours = ((seconds + 59) % 86400) / 3600;
+				            auto minutes = ((seconds + 59) % 3600) / 60;
+				            auto when = lng_signin_reset_minutes(lt_count, minutes);
+				            if (days > 0) {
+					            auto daysCount = lng_signin_reset_days(lt_count, days);
+					            auto hoursCount = lng_signin_reset_hours(lt_count, hours);
+					            when = lng_signin_reset_in_days(lt_days_count, daysCount, lt_hours_count, hoursCount,
+					                                            lt_minutes_count, when);
+				            } else if (hours > 0) {
+					            auto hoursCount = lng_signin_reset_hours(lt_count, hours);
+					            when = lng_signin_reset_in_hours(lt_hours_count, hoursCount, lt_minutes_count, when);
+				            }
+				            Ui::show(Box<InformBox>(lng_signin_reset_wait(
+				                lt_phone_number, App::formatPhone(getData()->phone), lt_when, when)));
+			            } else if (type == qstr("2FA_RECENT_CONFIRM")) {
+				            Ui::show(Box<InformBox>(lang(lng_signin_reset_cancelled)));
+			            } else {
+				            Ui::hideLayer();
+				            getStep()->showError(langFactory(lng_server_error));
+			            }
+		            })
+		            .send();
+	    })));
 }
 
 void Widget::getNearestDC() {
-	request(MTPhelp_GetNearestDc()).done([this](const MTPNearestDc &result) {
-		auto &nearest = result.c_nearestDc();
-		DEBUG_LOG(("Got nearest dc, country: %1, nearest: %2, this: %3").arg(qs(nearest.vcountry)).arg(nearest.vnearest_dc.v).arg(nearest.vthis_dc.v));
-		Messenger::Instance().suggestMainDcId(nearest.vnearest_dc.v);
-		auto nearestCountry = qs(nearest.vcountry);
-		if (getData()->country != nearestCountry) {
-			getData()->country = nearestCountry;
-			getData()->updated.notify();
-		}
-	}).send();
+	request(MTPhelp_GetNearestDc())
+	    .done([this](const MTPNearestDc &result) {
+		    auto &nearest = result.c_nearestDc();
+		    DEBUG_LOG(("Got nearest dc, country: %1, nearest: %2, this: %3")
+		                  .arg(qs(nearest.vcountry))
+		                  .arg(nearest.vnearest_dc.v)
+		                  .arg(nearest.vthis_dc.v));
+		    Messenger::Instance().suggestMainDcId(nearest.vnearest_dc.v);
+		    auto nearestCountry = qs(nearest.vcountry);
+		    if (getData()->country != nearestCountry) {
+			    getData()->country = nearestCountry;
+			    getData()->updated.notify();
+		    }
+	    })
+	    .send();
 }
 
 void Widget::showControls() {
@@ -327,11 +342,14 @@ void Widget::paintEvent(QPaintEvent *e) {
 	p.fillRect(e->rect(), st::windowBg);
 	auto progress = _a_show.current(getms(), 1.);
 	if (_a_show.animating()) {
-		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
+		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) :
+		                              anim::interpolate(0, -st::slideShift, progress);
 		auto coordOver = _showBack ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
 		auto shadow = _showBack ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
+			p.drawPixmap(
+			    QRect(0, 0, coordOver, height()), _cacheUnder,
+			    QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
 			p.setOpacity(1);
@@ -354,9 +372,7 @@ QRect Widget::calculateStepRect() const {
 
 void Widget::resizeEvent(QResizeEvent *e) {
 	auto stepRect = calculateStepRect();
-	for_const (auto step, _stepHistory) {
-		step->setGeometry(stepRect);
-	}
+	for_const (auto step, _stepHistory) { step->setGeometry(stepRect); }
 
 	updateControlsGeometry();
 }
@@ -376,10 +392,12 @@ void Widget::updateControlsGeometry() {
 	auto nextTop = anim::interpolate(_nextTopFrom, nextTopTo, shown);
 	_next->moveToLeft((width() - _next->width()) / 2, nextTop);
 	if (_changeLanguage) {
-		_changeLanguage->moveToLeft((width() - _changeLanguage->width()) / 2, _next->y() + _next->height() + _changeLanguage->height());
+		_changeLanguage->moveToLeft((width() - _changeLanguage->width()) / 2,
+		                            _next->y() + _next->height() + _changeLanguage->height());
 	}
 	if (_resetAccount) {
-		_resetAccount->moveToLeft((width() - _resetAccount->width()) / 2, height() - st::introResetBottom - _resetAccount->height());
+		_resetAccount->moveToLeft((width() - _resetAccount->width()) / 2,
+		                          height() - st::introResetBottom - _resetAccount->height());
 	}
 }
 
@@ -530,7 +548,8 @@ bool Widget::Step::paintAnimated(Painter &p, QRect clip) {
 	auto departingAlpha = 1. - progress;
 	auto showCoverMethod = progress;
 	auto hideCoverMethod = progress;
-	auto coverTop = (hasCover() ? anim::interpolate(-st::introCoverHeight, 0, showCoverMethod) : anim::interpolate(0, -st::introCoverHeight, hideCoverMethod));
+	auto coverTop = (hasCover() ? anim::interpolate(-st::introCoverHeight, 0, showCoverMethod) :
+	                              anim::interpolate(0, -st::introCoverHeight, hideCoverMethod));
 
 	paintCover(p, coverTop);
 
@@ -572,10 +591,12 @@ void Widget::Step::hideDescription() {
 
 void Widget::Step::paintContentSnapshot(Painter &p, const QPixmap &snapshot, double alpha, double howMuchHidden) {
 	if (!snapshot.isNull()) {
-		auto contentTop = anim::interpolate(height() - (snapshot.height() / cIntRetinaFactor()), height(), howMuchHidden);
+		auto contentTop =
+		    anim::interpolate(height() - (snapshot.height() / cIntRetinaFactor()), height(), howMuchHidden);
 		if (contentTop < height()) {
 			p.setOpacity(alpha);
-			p.drawPixmap(QPoint(contentLeft(), contentTop), snapshot, QRect(0, 0, snapshot.width(), (height() - contentTop) * cIntRetinaFactor()));
+			p.drawPixmap(QPoint(contentLeft(), contentTop), snapshot,
+			             QRect(0, 0, snapshot.width(), (height() - contentTop) * cIntRetinaFactor()));
 		}
 	}
 }
@@ -586,7 +607,7 @@ void Widget::Step::prepareCoverMask() {
 	auto maskWidth = cIntRetinaFactor();
 	auto maskHeight = st::introCoverHeight * cIntRetinaFactor();
 	auto mask = QImage(maskWidth, maskHeight, QImage::Format_ARGB32_Premultiplied);
-	auto maskInts = reinterpret_cast<quint32*>(mask.bits());
+	auto maskInts = reinterpret_cast<quint32 *>(mask.bits());
 	Assert(mask.depth() == (sizeof(quint32) << 3));
 	auto maskIntsPerLineAdded = (mask.bytesPerLine() >> 2) - maskWidth;
 	Assert(maskIntsPerLineAdded >= 0);
@@ -605,14 +626,17 @@ void Widget::Step::prepareCoverMask() {
 void Widget::Step::paintCover(Painter &p, int top) {
 	auto coverHeight = top + st::introCoverHeight;
 	if (coverHeight > 0) {
-		p.drawPixmap(QRect(0, 0, width(), coverHeight), _coverMask, QRect(0, -top * cIntRetinaFactor(), _coverMask.width(), coverHeight * cIntRetinaFactor()));
+		p.drawPixmap(QRect(0, 0, width(), coverHeight), _coverMask,
+		             QRect(0, -top * cIntRetinaFactor(), _coverMask.width(), coverHeight * cIntRetinaFactor()));
 	}
 
 	auto left = 0;
 	auto right = 0;
 	if (width() < st::introCoverMaxWidth) {
 		auto iconsMaxSkip = st::introCoverMaxWidth - st::introCoverLeft.width() - st::introCoverRight.width();
-		auto iconsSkip = st::introCoverIconsMinSkip + (iconsMaxSkip - st::introCoverIconsMinSkip) * (width() - st::introStepWidth) / (st::introCoverMaxWidth - st::introStepWidth);
+		auto iconsSkip = st::introCoverIconsMinSkip + (iconsMaxSkip - st::introCoverIconsMinSkip) *
+		                                                  (width() - st::introStepWidth) /
+		                                                  (st::introCoverMaxWidth - st::introStepWidth);
 		auto outside = iconsSkip + st::introCoverLeft.width() + st::introCoverRight.width() - width();
 		left = -outside / 2;
 		right = -outside - left;
@@ -625,15 +649,16 @@ void Widget::Step::paintCover(Painter &p, int top) {
 		right = rightShown - st::introCoverRight.width();
 	}
 	st::introCoverLeft.paint(p, left, coverHeight - st::introCoverLeft.height(), width());
-	st::introCoverRight.paint(p, width() - right - st::introCoverRight.width(), coverHeight - st::introCoverRight.height(), width());
+	st::introCoverRight.paint(p, width() - right - st::introCoverRight.width(),
+	                          coverHeight - st::introCoverRight.height(), width());
 
 	auto planeLeft = (width() - st::introCoverIcon.width()) / 2 - st::introCoverIconLeft;
 	auto planeTop = top + st::introCoverIconTop;
 	if (top < 0 && !_hasCover) {
 		auto deltaLeft = -std::round(double(st::introPlaneWidth / st::introPlaneHeight) * top);
-//		auto deltaTop = top;
+		//		auto deltaTop = top;
 		planeLeft += deltaLeft;
-	//	planeTop += top;
+		//	planeTop += top;
 	}
 	st::introCoverIcon.paint(p, planeLeft, planeTop, width());
 }
@@ -645,7 +670,8 @@ int Widget::Step::contentLeft() const {
 int Widget::Step::contentTop() const {
 	auto result = height() - st::introStepHeight - st::introStepHeightAdd;
 	if (_hasCover) {
-		auto added = 1. - snap(double(height() - st::windowMinHeight) / (st::introStepHeightFull - st::windowMinHeight), 0., 1.);
+		auto added =
+		    1. - snap(double(height() - st::windowMinHeight) / (st::introStepHeightFull - st::windowMinHeight), 0., 1.);
 		result += std::round(added * st::introStepHeightAdd);
 	}
 	return result;
@@ -674,7 +700,9 @@ void Widget::Step::refreshError() {
 		if (_error) _error->hideAnimated();
 	} else {
 		if (!_error) {
-			_error.create(this, object_ptr<Ui::FlatLabel>(this, _errorCentered ? st::introErrorCentered : st::introError), st::introErrorDuration);
+			_error.create(this,
+			              object_ptr<Ui::FlatLabel>(this, _errorCentered ? st::introErrorCentered : st::introError),
+			              st::introErrorDuration);
 			_error->hideFast();
 		}
 		_error->entity()->setText(_errorTextFactory());
@@ -683,11 +711,13 @@ void Widget::Step::refreshError() {
 	}
 }
 
-Widget::Step::Step(QWidget *parent, Data *data, bool hasCover) : TWidget(parent)
-, _data(data)
-, _hasCover(hasCover)
-, _title(this, _hasCover ? st::introCoverTitle : st::introTitle)
-, _description(this, object_ptr<Ui::FlatLabel>(this, _hasCover ? st::introCoverDescription : st::introDescription), st::introErrorDuration) {
+Widget::Step::Step(QWidget *parent, Data *data, bool hasCover)
+    : TWidget(parent)
+    , _data(data)
+    , _hasCover(hasCover)
+    , _title(this, _hasCover ? st::introCoverTitle : st::introTitle)
+    , _description(this, object_ptr<Ui::FlatLabel>(this, _hasCover ? st::introCoverDescription : st::introDescription),
+                   st::introErrorDuration) {
 	hide();
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
 		if (update.paletteChanged()) {
@@ -717,7 +747,8 @@ void Widget::Step::prepareShowAnimated(Step *after) {
 Widget::Step::CoverAnimation Widget::Step::prepareCoverAnimation(Step *after) {
 	auto result = CoverAnimation();
 	result.title = Ui::FlatLabel::CrossFade(after->_title, _title, st::introBg);
-	result.description = Ui::FlatLabel::CrossFade(after->_description->entity(), _description->entity(), st::introBg, after->_description->pos(), _description->pos());
+	result.description = Ui::FlatLabel::CrossFade(after->_description->entity(), _description->entity(), st::introBg,
+	                                              after->_description->pos(), _description->pos());
 	result.contentSnapshotWas = after->prepareContentSnapshot();
 	result.contentSnapshotNow = prepareContentSnapshot();
 	return result;
@@ -740,7 +771,8 @@ void Widget::Step::showAnimated(Direction direction) {
 	hideChildren();
 	if (_slideAnimation) {
 		auto slideLeft = (direction == Direction::Back);
-		_slideAnimation->start(slideLeft, [this] { update(0, contentTop(), width(), st::introStepHeight); }, st::introSlideDuration);
+		_slideAnimation->start(slideLeft, [this] { update(0, contentTop(), width(), st::introStepHeight); },
+		                       st::introSlideDuration);
 	} else {
 		_a_show.start([this] { update(); }, 0., 1., st::introCoverDuration);
 	}
@@ -779,8 +811,7 @@ void Widget::Step::activate() {
 	}
 }
 
-void Widget::Step::cancelled() {
-}
+void Widget::Step::cancelled() {}
 
 void Widget::Step::finished() {
 	hide();
diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h
index b344f0ea1..de5ae02ab 100644
--- a/Telegram/SourceFiles/intro/introwidget.h
+++ b/Telegram/SourceFiles/intro/introwidget.h
@@ -29,8 +29,7 @@ class LinkButton;
 class SlideAnimation;
 class CrossFadeAnimation;
 class FlatLabel;
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 } // namespace Ui
 
 namespace Intro {
@@ -81,7 +80,6 @@ public:
 		QString pwdHint;
 
 		base::Observable<void> updated;
-
 	};
 
 	enum class Direction {
@@ -199,13 +197,12 @@ public:
 		bool _errorCentered = false;
 		bool _errorBelowLink = false;
 		base::lambda<QString()> _errorTextFactory;
-		object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = { nullptr };
+		object_ptr<Ui::WidgetFadeWrap<Ui::FlatLabel>> _error = {nullptr};
 
 		Animation _a_show;
 		CoverAnimation _coverAnimation;
 		std::unique_ptr<Ui::SlideAnimation> _slideAnimation;
 		QPixmap _coverMask;
-
 	};
 
 private:
@@ -240,7 +237,7 @@ private:
 	bool _showBack = false;
 	QPixmap _cacheUnder, _cacheOver;
 
-	QVector<Step*> _stepHistory;
+	QVector<Step *> _stepHistory;
 
 	Data _data;
 
@@ -249,15 +246,14 @@ private:
 	int _controlsTopFrom = 0;
 
 	object_ptr<Ui::WidgetFadeWrap<Ui::IconButton>> _back;
-	object_ptr<Ui::WidgetFadeWrap<Ui::RoundButton>> _update = { nullptr };
+	object_ptr<Ui::WidgetFadeWrap<Ui::RoundButton>> _update = {nullptr};
 	object_ptr<Ui::WidgetFadeWrap<Ui::RoundButton>> _settings;
 
 	object_ptr<Ui::RoundButton> _next;
-	object_ptr<Ui::WidgetFadeWrap<Ui::LinkButton>> _changeLanguage = { nullptr };
-	object_ptr<Ui::WidgetFadeWrap<Ui::RoundButton>> _resetAccount = { nullptr };
+	object_ptr<Ui::WidgetFadeWrap<Ui::LinkButton>> _changeLanguage = {nullptr};
+	object_ptr<Ui::WidgetFadeWrap<Ui::RoundButton>> _resetAccount = {nullptr};
 
 	mtpRequestId _resetRequest = 0;
-
 };
 
 } // namespace Intro
diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
index 81d1e2ad9..00616419d 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
@@ -20,21 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "lang/lang_cloud_manager.h"
 
-#include "lang/lang_instance.h"
-#include "mtproto/mtp_instance.h"
-#include "storage/localstorage.h"
-#include "messenger.h"
 #include "apiwrap.h"
+#include "app.h"
 #include "auth_session.h"
 #include "boxes/confirm_box.h"
-#include "lang/lang_file_parser.h"
 #include "core/file_utilities.h"
-#include "app.h"
+#include "lang/lang_file_parser.h"
+#include "lang/lang_instance.h"
+#include "messenger.h"
+#include "mtproto/mtp_instance.h"
+#include "storage/localstorage.h"
 
 namespace Lang {
 
-CloudManager::CloudManager(Instance &langpack, not_null<MTP::Instance*> mtproto) : MTP::Sender()
-, _langpack(langpack) {
+CloudManager::CloudManager(Instance &langpack, not_null<MTP::Instance *> mtproto)
+    : MTP::Sender()
+    , _langpack(langpack) {
 	requestLangPackDifference();
 }
 
@@ -46,25 +47,26 @@ void CloudManager::requestLangPackDifference() {
 
 	auto version = _langpack.version();
 	if (version > 0) {
-		_langPackRequestId = request(MTPlangpack_GetDifference(MTP_int(version))).done([this](const MTPLangPackDifference &result) {
-			_langPackRequestId = 0;
-			applyLangPackDifference(result);
-		}).fail([this](const RPCError &error) {
-			_langPackRequestId = 0;
-		}).send();
+		_langPackRequestId = request(MTPlangpack_GetDifference(MTP_int(version)))
+		                         .done([this](const MTPLangPackDifference &result) {
+			                         _langPackRequestId = 0;
+			                         applyLangPackDifference(result);
+		                         })
+		                         .fail([this](const RPCError &error) { _langPackRequestId = 0; })
+		                         .send();
 	} else {
-		_langPackRequestId = request(MTPlangpack_GetLangPack(MTP_string(_langpack.cloudLangCode()))).done([this](const MTPLangPackDifference &result) {
-			_langPackRequestId = 0;
-			applyLangPackDifference(result);
-		}).fail([this](const RPCError &error) {
-			_langPackRequestId = 0;
-		}).send();
+		_langPackRequestId = request(MTPlangpack_GetLangPack(MTP_string(_langpack.cloudLangCode())))
+		                         .done([this](const MTPLangPackDifference &result) {
+			                         _langPackRequestId = 0;
+			                         applyLangPackDifference(result);
+		                         })
+		                         .fail([this](const RPCError &error) { _langPackRequestId = 0; })
+		                         .send();
 	}
 }
 
 void CloudManager::setSuggestedLanguage(const QString &langCode) {
-	if (!langCode.isEmpty()
-		&& langCode != Lang::DefaultLanguageId()) {
+	if (!langCode.isEmpty() && langCode != Lang::DefaultLanguageId()) {
 		_suggestedLanguage = langCode;
 	} else {
 		_suggestedLanguage = QString();
@@ -109,26 +111,30 @@ void CloudManager::applyLangPackDifference(const MTPLangPackDifference &differen
 			App::restart();
 		}
 	} else {
-		LOG(("Lang Warning: Ignoring update for '%1' because our language is '%2'").arg(langpackId).arg(_langpack.id()));
+		LOG(("Lang Warning: Ignoring update for '%1' because our language is '%2'")
+		        .arg(langpackId)
+		        .arg(_langpack.id()));
 	}
 }
 
 void CloudManager::requestLanguageList() {
-	_languagesRequestId = request(MTPlangpack_GetLanguages()).done([this](const MTPVector<MTPLangPackLanguage> &result) {
-		auto languages = Languages();
-		for_const (auto &langData, result.v) {
-			Assert(langData.type() == mtpc_langPackLanguage);
-			auto &language = langData.c_langPackLanguage();
-			languages.push_back({ qs(language.vlang_code), qs(language.vname), qs(language.vnative_name) });
-		}
-		if (_languages != languages) {
-			_languages = languages;
-			_languagesChanged.notify();
-		}
-		_languagesRequestId = 0;
-	}).fail([this](const RPCError &error) {
-		_languagesRequestId = 0;
-	}).send();
+	_languagesRequestId =
+	    request(MTPlangpack_GetLanguages())
+	        .done([this](const MTPVector<MTPLangPackLanguage> &result) {
+		        auto languages = Languages();
+		        for_const (auto &langData, result.v) {
+			        Assert(langData.type() == mtpc_langPackLanguage);
+			        auto &language = langData.c_langPackLanguage();
+			        languages.push_back({qs(language.vlang_code), qs(language.vname), qs(language.vnative_name)});
+		        }
+		        if (_languages != languages) {
+			        _languages = languages;
+			        _languagesChanged.notify();
+		        }
+		        _languagesRequestId = 0;
+	        })
+	        .fail([this](const RPCError &error) { _languagesRequestId = 0; })
+	        .send();
 }
 
 bool CloudManager::needToApplyLangPack(const QString &id) {
@@ -146,9 +152,7 @@ void CloudManager::offerSwitchLangPack() {
 	Expects(_offerSwitchToId != DefaultLanguageId());
 
 	if (!showOfferSwitchBox()) {
-		subscribe(languageListChanged(), [this] {
-			showOfferSwitchBox();
-		});
+		subscribe(languageListChanged(), [this] { showOfferSwitchBox(); });
 		requestLanguageList();
 	}
 }
@@ -168,17 +172,22 @@ bool CloudManager::showOfferSwitchBox() {
 		return false;
 	}
 
-	Ui::show(Box<ConfirmBox>("Do you want to switch your language to " + name + "? You can always change your language in Settings.", "Change", lang(lng_cancel), [this] {
-		Ui::hideLayer();
-		if (_offerSwitchToId.isEmpty()) {
-			return;
-		}
-		performSwitchAndRestart(_offerSwitchToId);
-	}, [this] {
-		Ui::hideLayer();
-		changeIdAndReInitConnection(DefaultLanguageId());
-		Local::writeLangPack();
-	}), KeepOtherLayers);
+	Ui::show(Box<ConfirmBox>("Do you want to switch your language to " + name +
+	                             "? You can always change your language in Settings.",
+	                         "Change", lang(lng_cancel),
+	                         [this] {
+		                         Ui::hideLayer();
+		                         if (_offerSwitchToId.isEmpty()) {
+			                         return;
+		                         }
+		                         performSwitchAndRestart(_offerSwitchToId);
+	                         },
+	                         [this] {
+		                         Ui::hideLayer();
+		                         changeIdAndReInitConnection(DefaultLanguageId());
+		                         Local::writeLangPack();
+	                         }),
+	         KeepOtherLayers);
 	return true;
 }
 
@@ -226,19 +235,21 @@ void CloudManager::switchToLanguage(QString id) {
 		keys.push_back(MTP_string("lng_sure_save_language"));
 		keys.push_back(MTP_string("lng_box_ok"));
 		keys.push_back(MTP_string("lng_cancel"));
-		_switchingToLanguageRequest = request(MTPlangpack_GetStrings(MTP_string(id), MTP_vector<MTPstring>(std::move(keys)))).done([this, id](const MTPVector<MTPLangPackString> &result) {
-			auto values = Instance::ParseStrings(result);
-			auto getValue = [&values](LangKey key) {
-				auto it = values.find(key);
-				return (it == values.cend()) ? GetOriginalValue(key) : it->second;
-			};
-			auto text = getValue(lng_sure_save_language);
-			auto save = getValue(lng_box_ok);
-			auto cancel = getValue(lng_cancel);
-			Ui::show(Box<ConfirmBox>(text, save, cancel, [this, id] {
-				performSwitchAndRestart(id);
-			}), KeepOtherLayers);
-		}).send();
+		_switchingToLanguageRequest =
+		    request(MTPlangpack_GetStrings(MTP_string(id), MTP_vector<MTPstring>(std::move(keys))))
+		        .done([this, id](const MTPVector<MTPLangPackString> &result) {
+			        auto values = Instance::ParseStrings(result);
+			        auto getValue = [&values](LangKey key) {
+				        auto it = values.find(key);
+				        return (it == values.cend()) ? GetOriginalValue(key) : it->second;
+			        };
+			        auto text = getValue(lng_sure_save_language);
+			        auto save = getValue(lng_box_ok);
+			        auto cancel = getValue(lng_cancel);
+			        Ui::show(Box<ConfirmBox>(text, save, cancel, [this, id] { performSwitchAndRestart(id); }),
+			                 KeepOtherLayers);
+		        })
+		        .send();
 	}
 }
 
@@ -251,7 +262,7 @@ void CloudManager::performSwitchToCustom() {
 		}
 
 		auto filePath = result.paths.front();
-		Lang::FileParser loader(filePath, { lng_sure_save_language, lng_box_ok, lng_cancel });
+		Lang::FileParser loader(filePath, {lng_sure_save_language, lng_box_ok, lng_cancel});
 		if (loader.errors().isEmpty()) {
 			weak->request(weak->_switchingToLanguageRequest).cancel();
 			if (weak->canApplyWithoutRestart(qsl("custom"))) {
@@ -265,10 +276,12 @@ void CloudManager::performSwitchToCustom() {
 				auto text = getValue(lng_sure_save_language);
 				auto save = getValue(lng_box_ok);
 				auto cancel = getValue(lng_cancel);
-				Ui::show(Box<ConfirmBox>(text, save, cancel, [weak, filePath] {
-					weak->_langpack.switchToCustomFile(filePath);
-					App::restart();
-				}), KeepOtherLayers);
+				Ui::show(Box<ConfirmBox>(text, save, cancel,
+				                         [weak, filePath] {
+					                         weak->_langpack.switchToCustomFile(filePath);
+					                         App::restart();
+				                         }),
+				         KeepOtherLayers);
 			}
 		} else {
 			Ui::show(Box<InformBox>("Custom lang failed :(\n\nError: " + loader.errors()), KeepOtherLayers);
diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.h b/Telegram/SourceFiles/lang/lang_cloud_manager.h
index 709272641..6794a8666 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.h
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/observer.h"
-#include "mtproto/sender.h"
 #include "base/weak_unique_ptr.h"
+#include "mtproto/sender.h"
 
 namespace MTP {
 class Instance;
@@ -34,7 +34,7 @@ class Instance;
 
 class CloudManager : public base::enable_weak_from_this, private MTP::Sender, private base::Subscriber {
 public:
-	CloudManager(Instance &langpack, not_null<MTP::Instance*> mtproto);
+	CloudManager(Instance &langpack, not_null<MTP::Instance *> mtproto);
 
 	struct Language {
 		QString id;
@@ -92,7 +92,6 @@ private:
 	base::Observable<void> _firstLanguageSuggestion;
 
 	mtpRequestId _switchingToLanguageRequest = 0;
-
 };
 
 inline bool operator==(const CloudManager::Language &a, const CloudManager::Language &b) {
diff --git a/Telegram/SourceFiles/lang/lang_file_parser.cpp b/Telegram/SourceFiles/lang/lang_file_parser.cpp
index 9950a2fb7..3f1d6cb9d 100644
--- a/Telegram/SourceFiles/lang/lang_file_parser.cpp
+++ b/Telegram/SourceFiles/lang/lang_file_parser.cpp
@@ -18,9 +18,9 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QTextStream>
 #include "lang/lang_file_parser.h"
 #include "base/parse_helper.h"
+#include <QTextStream>
 
 namespace Lang {
 namespace {
@@ -30,14 +30,15 @@ constexpr auto kLangFileLimit = 1024 * 1024;
 } // namespace
 
 FileParser::FileParser(const QString &file, const std::set<LangKey> &request)
-: _content(base::parse::stripComments(ReadFile(file, file)))
-, _request(request) {
+    : _content(base::parse::stripComments(ReadFile(file, file)))
+    , _request(request) {
 	parse();
 }
 
-FileParser::FileParser(const QByteArray &content, base::lambda<void(QLatin1String key, const QByteArray &value)> callback)
-: _content(base::parse::stripComments(content))
-, _callback(std::move(callback)) {
+FileParser::FileParser(const QByteArray &content,
+                       base::lambda<void(QLatin1String key, const QByteArray &value)> callback)
+    : _content(base::parse::stripComments(content))
+    , _callback(std::move(callback)) {
 	parse();
 }
 
@@ -78,7 +79,8 @@ bool FileParser::readKeyValue(const char *&from, const char *end) {
 	}
 	++from;
 	const char *nameStart = from;
-	while (from < end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') || *from == '_' || (*from >= '0' && *from <= '9') || *from == '#')) {
+	while (from < end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') || *from == '_' ||
+	                      (*from >= '0' && *from <= '9') || *from == '#')) {
 		++from;
 	}
 
@@ -110,7 +112,7 @@ bool FileParser::readKeyValue(const char *&from, const char *end) {
 	}
 
 	auto value = QByteArray();
-	auto appendValue = [&value, skipping](auto&&... args) {
+	auto appendValue = [&value, skipping](auto &&... args) {
 		if (!skipping) {
 			value.append(std::forward<decltype(args)>(args)...);
 		}
@@ -194,7 +196,8 @@ QByteArray FileParser::ReadFile(const QString &absolutePath, const QString &rela
 		}
 		return string.toUtf8();
 	};
-	if ((codecMagic.at(0) == '\xFF' && codecMagic.at(1) == '\xFE') || (codecMagic.at(0) == '\xFE' && codecMagic.at(1) == '\xFF') || (codecMagic.at(1) == 0)) {
+	if ((codecMagic.at(0) == '\xFF' && codecMagic.at(1) == '\xFE') ||
+	    (codecMagic.at(0) == '\xFE' && codecMagic.at(1) == '\xFF') || (codecMagic.at(1) == 0)) {
 		return readUtf16Stream(QTextStream(&file));
 	} else if (codecMagic.at(0) == 0) {
 		auto utf16WithBOM = "\xFE\xFF" + file.readAll();
diff --git a/Telegram/SourceFiles/lang/lang_file_parser.h b/Telegram/SourceFiles/lang/lang_file_parser.h
index 84ca01495..b69841d61 100644
--- a/Telegram/SourceFiles/lang/lang_file_parser.h
+++ b/Telegram/SourceFiles/lang/lang_file_parser.h
@@ -60,7 +60,6 @@ private:
 	const base::lambda<void(QLatin1String key, const QByteArray &value)> _callback;
 
 	Result _result;
-
 };
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/lang/lang_instance.cpp b/Telegram/SourceFiles/lang/lang_instance.cpp
index 08a7f75f7..a9669bcd0 100644
--- a/Telegram/SourceFiles/lang/lang_instance.cpp
+++ b/Telegram/SourceFiles/lang/lang_instance.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "lang/lang_instance.h"
 
-#include "messenger.h"
-#include "storage/serialize_common.h"
-#include "storage/localstorage.h"
-#include "platform/platform_specific.h"
+#include "base/qthelp_regex.h"
 #include "boxes/confirm_box.h"
 #include "lang/lang_file_parser.h"
-#include "base/qthelp_regex.h"
+#include "messenger.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"
+#include "storage/serialize_common.h"
 
 namespace Lang {
 namespace {
@@ -65,17 +65,15 @@ private:
 
 	QString _result;
 	OrderedSet<ushort> _tagsUsed;
-
 };
 
 ValueParser::ValueParser(const QByteArray &key, LangKey keyIndex, const QByteArray &value)
-: _key(key)
-, _keyIndex(keyIndex)
-, _currentTag("")
-, _begin(value.constData())
-, _ch(_begin)
-, _end(_begin + value.size()) {
-}
+    : _key(key)
+    , _keyIndex(keyIndex)
+    , _currentTag("")
+    , _begin(value.constData())
+    , _ch(_begin)
+    , _end(_begin + value.size()) {}
 
 void ValueParser::appendToResult(const char *nextBegin) {
 	if (_ch > _begin) _result.append(QString::fromUtf8(_begin, _ch - _begin));
@@ -332,7 +330,8 @@ void Instance::loadFromContent(const QByteArray &content) {
 	}
 }
 
-void Instance::loadFromCustomContent(const QString &absolutePath, const QString &relativePath, const QByteArray &content) {
+void Instance::loadFromCustomContent(const QString &absolutePath, const QString &relativePath,
+                                     const QByteArray &content) {
 	_id = qsl("custom");
 	_version = 0;
 	_customFilePathAbsolute = absolutePath;
@@ -360,7 +359,7 @@ void Instance::fillFromLegacy(int legacyId, const QString &legacyPath) {
 		//
 		// The old available languages (de/it/nl/ko/es/pt_BR) won't be
 		// suggested anyway, because everyone saw the suggestion in intro.
-		_id = QString();// str_const_toString(kLegacyLanguages[legacyId]);
+		_id = QString(); // str_const_toString(kLegacyLanguages[legacyId]);
 	} else if (legacyId == kLegacyCustomLanguage) {
 		auto absolutePath = QFileInfo(legacyPath).absoluteFilePath();
 		auto relativePath = QDir().relativeFilePath(absolutePath);
@@ -407,7 +406,7 @@ void Instance::HandleString(const MTPLangPackString &mtpString, SetCallback setC
 		auto &string = mtpString.c_langPackStringDeleted();
 		auto key = qba(string.vkey);
 		resetCallback(key);
-		for (auto plural : { "#zero", "#one", "#two", "#few", "#many", "#other" }) {
+		for (auto plural : {"#zero", "#one", "#two", "#few", "#many", "#other"}) {
 			resetCallback(key + plural);
 		}
 	} break;
@@ -424,11 +423,8 @@ void Instance::applyDifference(const MTPDlangPackDifference &difference) {
 
 	_version = difference.vversion.v;
 	for_const (auto &mtpString, difference.vstrings.v) {
-		HandleString(mtpString, [this](auto &&key, auto &&value) {
-			applyValue(key, value);
-		}, [this](auto &&key) {
-			resetValue(key);
-		});
+		HandleString(mtpString, [this](auto &&key, auto &&value) { applyValue(key, value); },
+		             [this](auto &&key) { resetValue(key); });
 	}
 	_updated.notify();
 }
@@ -436,14 +432,13 @@ void Instance::applyDifference(const MTPDlangPackDifference &difference) {
 std::map<LangKey, QString> Instance::ParseStrings(const MTPVector<MTPLangPackString> &strings) {
 	auto result = std::map<LangKey, QString>();
 	for (auto &mtpString : strings.v) {
-		HandleString(mtpString, [&result](auto &&key, auto &&value) {
-			ParseKeyValue(key, value, result);
-		}, [&result](auto &&key) {
-			auto keyIndex = GetKeyIndex(QLatin1String(key));
-			if (keyIndex != kLangKeysCount) {
-				result.erase(keyIndex);
-			}
-		});
+		HandleString(mtpString, [&result](auto &&key, auto &&value) { ParseKeyValue(key, value, result); },
+		             [&result](auto &&key) {
+			             auto keyIndex = GetKeyIndex(QLatin1String(key));
+			             if (keyIndex != kLangKeysCount) {
+				             result.erase(keyIndex);
+			             }
+		             });
 	}
 	return result;
 }
diff --git a/Telegram/SourceFiles/lang/lang_instance.h b/Telegram/SourceFiles/lang/lang_instance.h
index 6202b818f..343516827 100644
--- a/Telegram/SourceFiles/lang/lang_instance.h
+++ b/Telegram/SourceFiles/lang/lang_instance.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "lang_auto.h"
-#include "base/weak_unique_ptr.h"
 #include "base/observer.h"
+#include "base/weak_unique_ptr.h"
 #include "core/basic_types.h"
 #include "core/utils.h"
+#include "lang_auto.h"
 #include "scheme.h"
 
 namespace Lang {
@@ -34,13 +34,7 @@ constexpr auto kLegacyCustomLanguage = -1;
 constexpr auto kLegacyDefaultLanguage = 0;
 
 constexpr str_const kLegacyLanguages[] = {
-	"en",
-	"it",
-	"es",
-	"de",
-	"nl",
-	"pt_BR",
-	"ko",
+    "en", "it", "es", "de", "nl", "pt_BR", "ko",
 };
 
 inline QString ConvertLegacyLanguageId(const QString &languageId) {
@@ -96,7 +90,8 @@ public:
 	bool isNonDefaultPlural(LangKey key) {
 		Expects(key >= 0 && key < kLangKeysCount);
 		Expects(_nonDefaultSet.size() == kLangKeysCount);
-		return _nonDefaultSet[key] || _nonDefaultSet[key + 1] || _nonDefaultSet[key + 2] || _nonDefaultSet[key + 3] || _nonDefaultSet[key + 4] || _nonDefaultSet[key + 5];
+		return _nonDefaultSet[key] || _nonDefaultSet[key + 1] || _nonDefaultSet[key + 2] || _nonDefaultSet[key + 3] ||
+		       _nonDefaultSet[key + 4] || _nonDefaultSet[key + 5];
 	}
 
 private:
@@ -132,7 +127,6 @@ private:
 	std::vector<QString> _values;
 	std::vector<uchar> _nonDefaultSet;
 	std::map<QByteArray, QByteArray> _nonDefaultValues;
-
 };
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/lang/lang_keys.h b/Telegram/SourceFiles/lang/lang_keys.h
index cbc130ba7..0171722a9 100644
--- a/Telegram/SourceFiles/lang/lang_keys.h
+++ b/Telegram/SourceFiles/lang/lang_keys.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QDate>
 #include "base/lambda.h"
 #include "lang/lang_instance.h"
+#include <QDate>
 
 inline QString lang(LangKey key) {
 	return Lang::Current().getValue(key);
@@ -43,17 +43,13 @@ inline QString langDateMaybeWithYear(QDate date, WithYear withYear, WithoutYear
 	auto currentYear = current.year();
 	auto currentMonth = current.month();
 	if (year != currentYear) {
-		auto yearIsMuchGreater = [](int year, int otherYear) {
-			return (year > otherYear + 1);
-		};
+		auto yearIsMuchGreater = [](int year, int otherYear) { return (year > otherYear + 1); };
 		auto monthIsMuchGreater = [](int year, int month, int otherYear, int otherMonth) {
 			return (year == otherYear + 1) && (month + 12 > otherMonth + 3);
 		};
-		if (false
-			|| yearIsMuchGreater(year, currentYear)
-			|| yearIsMuchGreater(currentYear, year)
-			|| monthIsMuchGreater(year, month, currentYear, currentMonth)
-			|| monthIsMuchGreater(currentYear, currentMonth, year, month)) {
+		if (false || yearIsMuchGreater(year, currentYear) || yearIsMuchGreater(currentYear, year) ||
+		    monthIsMuchGreater(year, month, currentYear, currentMonth) ||
+		    monthIsMuchGreater(currentYear, currentMonth, year, month)) {
 			return withYear(month, year);
 		}
 	}
@@ -62,44 +58,50 @@ inline QString langDateMaybeWithYear(QDate date, WithYear withYear, WithoutYear
 
 inline QString langDayOfMonth(const QDate &date) {
 	auto day = date.day();
-	return langDateMaybeWithYear(date, [day](int month, int year) {
-		return lng_month_day_year(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_day, QString::number(day), lt_year, QString::number(year));
-	}, [day](int month, int year) {
-		return lng_month_day(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_day, QString::number(day));
-	});
+	return langDateMaybeWithYear(
+	    date,
+	    [day](int month, int year) {
+		    return lng_month_day_year(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_day,
+		                              QString::number(day), lt_year, QString::number(year));
+	    },
+	    [day](int month, int year) {
+		    return lng_month_day(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_day, QString::number(day));
+	    });
 }
 
 inline QString langDayOfMonthFull(const QDate &date) {
 	auto day = date.day();
-	return langDateMaybeWithYear(date, [day](int month, int year) {
-		return lng_month_day_year(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day, QString::number(day), lt_year, QString::number(year));
-	}, [day](int month, int year) {
-		return lng_month_day(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day, QString::number(day));
-	});
+	return langDateMaybeWithYear(date,
+	                             [day](int month, int year) {
+		                             return lng_month_day_year(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day,
+		                                                       QString::number(day), lt_year, QString::number(year));
+	                             },
+	                             [day](int month, int year) {
+		                             return lng_month_day(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_day,
+		                                                  QString::number(day));
+	                             });
 }
 
 inline QString langMonthOfYear(int month, int year) {
-	return (month > 0 && month <= 12) ? lng_month_year(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_year, QString::number(year)) : qsl("MONTH_ERR");
+	return (month > 0 && month <= 12) ?
+	           lng_month_year(lt_month, lang(LangKey(lng_month1_small + month - 1)), lt_year, QString::number(year)) :
+	           qsl("MONTH_ERR");
 }
 
 inline QString langMonth(const QDate &date) {
-	return langDateMaybeWithYear(date, [](int month, int year) {
-		return langMonthOfYear(month, year);
-	}, [](int month, int year) {
-		return lang(LangKey(lng_month1_small + month - 1));
-	});
+	return langDateMaybeWithYear(date, [](int month, int year) { return langMonthOfYear(month, year); },
+	                             [](int month, int year) { return lang(LangKey(lng_month1_small + month - 1)); });
 }
 
 inline QString langMonthOfYearFull(int month, int year) {
-	return (month > 0 && month <= 12) ? lng_month_year(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_year, QString::number(year)) : qsl("MONTH_ERR");
+	return (month > 0 && month <= 12) ?
+	           lng_month_year(lt_month, lang(LangKey(lng_month1 + month - 1)), lt_year, QString::number(year)) :
+	           qsl("MONTH_ERR");
 }
 
 inline QString langMonthFull(const QDate &date) {
-	return langDateMaybeWithYear(date, [](int month, int year) {
-		return langMonthOfYearFull(month, year);
-	}, [](int month, int year) {
-		return lang(LangKey(lng_month1 + month - 1));
-	});
+	return langDateMaybeWithYear(date, [](int month, int year) { return langMonthOfYearFull(month, year); },
+	                             [](int month, int year) { return lang(LangKey(lng_month1 + month - 1)); });
 }
 
 inline QString langDayOfWeek(int index) {
@@ -115,7 +117,8 @@ inline QString langDateTime(const QDateTime &date) {
 }
 
 inline QString langDateTimeFull(const QDateTime &date) {
-	return lng_mediaview_date_time(lt_date, langDayOfMonthFull(date.date()), lt_time, date.time().toString(cTimeFormat()));
+	return lng_mediaview_date_time(lt_date, langDayOfMonthFull(date.date()), lt_time,
+	                               date.time().toString(cTimeFormat()));
 }
 
 bool langFirstNameGoesSecond();
diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index 0d99f9680..540afa50a 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -29,11 +29,11 @@ namespace {
 // http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html
 //
 
-constexpr auto kShiftZero  = ushort(0);
-constexpr auto kShiftOne   = ushort(1);
-constexpr auto kShiftTwo   = ushort(2);
-constexpr auto kShiftFew   = ushort(3);
-constexpr auto kShiftMany  = ushort(4);
+constexpr auto kShiftZero = ushort(0);
+constexpr auto kShiftOne = ushort(1);
+constexpr auto kShiftTwo = ushort(2);
+constexpr auto kShiftFew = ushort(3);
+constexpr auto kShiftMany = ushort(4);
 constexpr auto kShiftOther = ushort(5);
 
 //
@@ -108,18 +108,18 @@ ushort ChoosePluralRu(int n, int i, int v, int w, int f, int t) {
 			return kShiftMany;
 		}
 	}
-	return kShiftMany;// kShiftOther;
+	return kShiftMany; // kShiftOther;
 }
 
 QMap<QString, ChoosePluralMethod> GeneratePluralRulesMap() {
 	auto result = QMap<QString, ChoosePluralMethod>();
 	result.insert(qsl("ar"), ChoosePluralAr);
-//	result.insert(qsl("de"), ChoosePluralEn);
-//	result.insert(qsl("en"), ChoosePluralEn); // En is default, so we don't fill it inside the map.
+	//	result.insert(qsl("de"), ChoosePluralEn);
+	//	result.insert(qsl("en"), ChoosePluralEn); // En is default, so we don't fill it inside the map.
 	result.insert(qsl("es"), ChoosePluralEs);
-//	result.insert(qsl("it"), ChoosePluralEn);
+	//	result.insert(qsl("it"), ChoosePluralEn);
 	result.insert(qsl("ko"), ChoosePluralKo);
-//	result.insert(qsl("nl"), ChoosePluralEn);
+	//	result.insert(qsl("nl"), ChoosePluralEn);
 	result.insert(qsl("pt"), ChoosePluralPt);
 	result.insert(qsl("ru"), ChoosePluralRu);
 	return result;
@@ -132,7 +132,8 @@ ChoosePluralMethod ChoosePlural = ChoosePluralEn;
 int FindTagReplacementPosition(const QString &original, ushort tag) {
 	for (auto s = original.constData(), ch = s, e = ch + original.size(); ch != e;) {
 		if (*ch == TextCommand) {
-			if (ch + kTagReplacementSize <= e && (ch + 1)->unicode() == TextCommandLangTag && *(ch + 3) == TextCommand) {
+			if (ch + kTagReplacementSize <= e && (ch + 1)->unicode() == TextCommandLangTag &&
+			    *(ch + 3) == TextCommand) {
 				if ((ch + 2)->unicode() == 0x0020 + tag) {
 					return ch - s;
 				} else {
@@ -151,7 +152,6 @@ int FindTagReplacementPosition(const QString &original, ushort tag) {
 		}
 	}
 	return -1;
-
 }
 
 PluralResult Plural(ushort keyBase, double value) {
@@ -169,9 +169,9 @@ PluralResult Plural(ushort keyBase, double value) {
 	auto shift = (useNonDefaultPlural ? ChoosePlural : ChoosePluralEn)((integer ? i : -1), i, v, w, f, t);
 	auto string = langpack.getValue(LangKey(keyBase + shift));
 	if (i == std::ceil(n)) {
-		return { string, QString::number(std::round(value)) };
+		return {string, QString::number(std::round(value))};
 	}
-	return { string, QString::number(value) };
+	return {string, QString::number(value)};
 }
 
 void UpdatePluralRules(const QString &languageId) {
diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h
index 6aced425f..6ed5537de 100644
--- a/Telegram/SourceFiles/lang/lang_tag.h
+++ b/Telegram/SourceFiles/lang/lang_tag.h
@@ -35,21 +35,17 @@ struct PluralResult {
 PluralResult Plural(ushort keyBase, double value);
 void UpdatePluralRules(const QString &languageId);
 
-template <typename ResultString>
-struct StartReplacements;
+template <typename ResultString> struct StartReplacements;
 
-template <>
-struct StartReplacements<QString> {
+template <> struct StartReplacements<QString> {
 	static inline QString Call(QString &&langString) {
 		return std::move(langString);
 	}
 };
 
-template <typename ResultString>
-struct ReplaceTag;
+template <typename ResultString> struct ReplaceTag;
 
-template <>
-struct ReplaceTag<QString> {
+template <> struct ReplaceTag<QString> {
 	static inline QString Call(QString &&original, ushort tag, const QString &replacement) {
 		auto replacementPosition = FindTagReplacementPosition(original, tag);
 		if (replacementPosition < 0) {
@@ -58,7 +54,6 @@ struct ReplaceTag<QString> {
 		return Replace(std::move(original), replacement, replacementPosition);
 	}
 	static QString Replace(QString &&original, const QString &replacement, int start);
-
 };
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/lang/lang_translator.cpp b/Telegram/SourceFiles/lang/lang_translator.cpp
index 4a54db885..c34ae3a73 100644
--- a/Telegram/SourceFiles/lang/lang_translator.cpp
+++ b/Telegram/SourceFiles/lang/lang_translator.cpp
@@ -36,8 +36,16 @@ QString Translator::translate(const char *context, const char *sourceText, const
 		return QString();
 	}
 	if (qstr("QWidgetTextControl") == context || qstr("QLineEdit") == context) {
-		if (qstr("&Undo") == sourceText) return lang((cPlatform() == dbipWindows) ? lng_wnd_menu_undo : ((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_mac_menu_undo : lng_linux_menu_undo));
-		if (qstr("&Redo") == sourceText) return lang((cPlatform() == dbipWindows) ? lng_wnd_menu_redo : ((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_mac_menu_redo : lng_linux_menu_redo));
+		if (qstr("&Undo") == sourceText)
+			return lang(
+			    (cPlatform() == dbipWindows) ?
+			        lng_wnd_menu_undo :
+			        ((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_mac_menu_undo : lng_linux_menu_undo));
+		if (qstr("&Redo") == sourceText)
+			return lang(
+			    (cPlatform() == dbipWindows) ?
+			        lng_wnd_menu_redo :
+			        ((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_mac_menu_redo : lng_linux_menu_redo));
 		if (qstr("Cu&t") == sourceText) return lang(lng_mac_menu_cut);
 		if (qstr("&Copy") == sourceText) return lang(lng_mac_menu_copy);
 		if (qstr("&Paste") == sourceText) return lang(lng_mac_menu_paste);
diff --git a/Telegram/SourceFiles/lang/lang_translator.h b/Telegram/SourceFiles/lang/lang_translator.h
index 165e02ae2..3b0d0a747 100644
--- a/Telegram/SourceFiles/lang/lang_translator.h
+++ b/Telegram/SourceFiles/lang/lang_translator.h
@@ -26,8 +26,8 @@ namespace Lang {
 
 class Translator : public QTranslator {
 public:
-	QString translate(const char *context, const char *sourceText, const char *disambiguation = 0, int n = -1) const override;
-
+	QString translate(const char *context, const char *sourceText, const char *disambiguation = 0,
+	                  int n = -1) const override;
 };
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp
index 22172fe9e..7949e2970 100644
--- a/Telegram/SourceFiles/layerwidget.cpp
+++ b/Telegram/SourceFiles/layerwidget.cpp
@@ -20,21 +20,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "lang/lang_keys.h"
 
-#include "media/media_clip_reader.h"
-#include "boxes/abstract_box.h"
-#include "layerwidget.h"
 #include "application.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "core/file_utilities.h"
-#include "styles/style_boxes.h"
-#include "styles/style_widgets.h"
-#include "styles/style_chat_helpers.h"
-#include "ui/widgets/shadow.h"
-#include "window/window_main_menu.h"
 #include "auth_session.h"
+#include "boxes/abstract_box.h"
 #include "chat_helpers/stickers.h"
+#include "core/file_utilities.h"
+#include "layerwidget.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_clip_reader.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_widgets.h"
+#include "ui/widgets/shadow.h"
 #include "window/window_controller.h"
+#include "window/window_main_menu.h"
 
 namespace {
 
@@ -44,15 +44,16 @@ constexpr int kStickerPreviewEmojiLimit = 10;
 
 class LayerStackWidget::BackgroundWidget : public TWidget {
 public:
-	BackgroundWidget(QWidget *parent) : TWidget(parent) {
-	}
+	BackgroundWidget(QWidget *parent)
+	    : TWidget(parent) {}
 
 	void setDoneCallback(base::lambda<void()> callback) {
 		_doneCallback = std::move(callback);
 	}
 
 	void setLayerBoxes(const QRect &specialLayerBox, const QRect &layerBox);
-	void setCacheImages(QPixmap &&bodyCache, QPixmap &&mainMenuCache, QPixmap &&specialLayerCache, QPixmap &&layerCache);
+	void setCacheImages(QPixmap &&bodyCache, QPixmap &&mainMenuCache, QPixmap &&specialLayerCache,
+	                    QPixmap &&layerCache);
 	void startAnimation(Action action);
 	void finishAnimation();
 
@@ -96,10 +97,10 @@ private:
 	bool _mainMenuShown = false;
 	bool _specialLayerShown = false;
 	bool _layerShown = false;
-
 };
 
-void LayerStackWidget::BackgroundWidget::setCacheImages(QPixmap &&bodyCache, QPixmap &&mainMenuCache, QPixmap &&specialLayerCache, QPixmap &&layerCache) {
+void LayerStackWidget::BackgroundWidget::setCacheImages(QPixmap &&bodyCache, QPixmap &&mainMenuCache,
+                                                        QPixmap &&specialLayerCache, QPixmap &&layerCache) {
 	_bodyCache = std::move(bodyCache);
 	_mainMenuCache = std::move(mainMenuCache);
 	_specialLayerCache = std::move(specialLayerCache);
@@ -145,7 +146,8 @@ void LayerStackWidget::BackgroundWidget::setMainMenuShown(bool shown) {
 	auto wasShown = isShown();
 	if (_mainMenuShown != shown) {
 		_mainMenuShown = shown;
-		_a_mainMenuShown.start([this] { animationCallback(); }, _mainMenuShown ? 0. : 1., _mainMenuShown ? 1. : 0., st::boxDuration, anim::easeOutCirc);
+		_a_mainMenuShown.start([this] { animationCallback(); }, _mainMenuShown ? 0. : 1., _mainMenuShown ? 1. : 0.,
+		                       st::boxDuration, anim::easeOutCirc);
 	}
 	_mainMenuCacheWidth = (_mainMenuCache.width() / cIntRetinaFactor()) - st::boxRoundShadow.extend.right();
 	_mainMenuRight = _mainMenuShown ? _mainMenuCacheWidth : 0;
@@ -156,7 +158,8 @@ void LayerStackWidget::BackgroundWidget::setSpecialLayerShown(bool shown) {
 	auto wasShown = isShown();
 	if (_specialLayerShown != shown) {
 		_specialLayerShown = shown;
-		_a_specialLayerShown.start([this] { animationCallback(); }, _specialLayerShown ? 0. : 1., _specialLayerShown ? 1. : 0., st::boxDuration);
+		_a_specialLayerShown.start([this] { animationCallback(); }, _specialLayerShown ? 0. : 1.,
+		                           _specialLayerShown ? 1. : 0., st::boxDuration);
 	}
 	checkWasShown(wasShown);
 }
@@ -165,14 +168,16 @@ void LayerStackWidget::BackgroundWidget::setLayerShown(bool shown) {
 	auto wasShown = isShown();
 	if (_layerShown != shown) {
 		_layerShown = shown;
-		_a_layerShown.start([this] { animationCallback(); }, _layerShown ? 0. : 1., _layerShown ? 1. : 0., st::boxDuration);
+		_a_layerShown.start([this] { animationCallback(); }, _layerShown ? 0. : 1., _layerShown ? 1. : 0.,
+		                    st::boxDuration);
 	}
 	checkWasShown(wasShown);
 }
 
 void LayerStackWidget::BackgroundWidget::checkWasShown(bool wasShown) {
 	if (isShown() != wasShown) {
-		_a_shown.start([this] { animationCallback(); }, wasShown ? 1. : 0., wasShown ? 0. : 1., st::boxDuration, anim::easeOutCirc);
+		_a_shown.start([this] { animationCallback(); }, wasShown ? 1. : 0., wasShown ? 0. : 1., st::boxDuration,
+		               anim::easeOutCirc);
 	}
 }
 
@@ -200,7 +205,10 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 
 	auto ms = getms();
 	auto mainMenuProgress = _a_mainMenuShown.current(ms, -1);
-	auto mainMenuRight = (_mainMenuCache.isNull() || mainMenuProgress < 0) ? _mainMenuRight : (mainMenuProgress < 0) ? _mainMenuRight : anim::interpolate(0, _mainMenuCacheWidth, mainMenuProgress);
+	auto mainMenuRight =
+	    (_mainMenuCache.isNull() || mainMenuProgress < 0) ?
+	        _mainMenuRight :
+	        (mainMenuProgress < 0) ? _mainMenuRight : anim::interpolate(0, _mainMenuCacheWidth, mainMenuProgress);
 	if (mainMenuRight) {
 		// Move showing boxes to the right while main menu is hiding.
 		if (!_specialLayerCache.isNull()) {
@@ -240,7 +248,9 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 			sides |= RectPart::Bottom;
 		}
 		if (topCorners || bottomCorners) {
-			p.setClipRegion(QRegion(rect()) - specialLayerBox.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)) - specialLayerBox.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)));
+			p.setClipRegion(QRegion(rect()) -
+			                specialLayerBox.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)) -
+			                specialLayerBox.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)));
 		}
 		Ui::Shadow::paint(p, specialLayerBox, width(), st::boxRoundShadow, sides);
 
@@ -248,8 +258,8 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 			// In case of painting the shadow above the special layer we get
 			// glitches in the corners, so we need to paint the corners once more.
 			p.setClipping(false);
-			auto parts = (topCorners ? (RectPart::TopLeft | RectPart::TopRight) : RectPart::None)
-				| (bottomCorners ? (RectPart::BottomLeft | RectPart::BottomRight) : RectPart::None);
+			auto parts = (topCorners ? (RectPart::TopLeft | RectPart::TopRight) : RectPart::None) |
+			             (bottomCorners ? (RectPart::BottomLeft | RectPart::BottomRight) : RectPart::None);
 			App::roundRect(p, specialLayerBox, st::boxBg, BoxCorners, nullptr, parts);
 		}
 	}
@@ -289,13 +299,15 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 	}
 	if (!_layerCache.isNull() && layerOpacity > 0) {
 		p.setOpacity(layerOpacity);
-		p.drawPixmapLeft(layerBox.topLeft() - QPoint(st::boxRoundShadow.extend.left(), st::boxRoundShadow.extend.top()), width(), _layerCache);
+		p.drawPixmapLeft(layerBox.topLeft() - QPoint(st::boxRoundShadow.extend.left(), st::boxRoundShadow.extend.top()),
+		                 width(), _layerCache);
 	}
 	if (!_mainMenuCache.isNull() && mainMenuRight > 0) {
 		p.setOpacity(1.);
 		auto shownWidth = mainMenuRight + st::boxRoundShadow.extend.right();
 		auto sourceWidth = shownWidth * cIntRetinaFactor();
-		auto sourceRect = rtlrect(_mainMenuCache.width() - sourceWidth, 0, sourceWidth, _mainMenuCache.height(), _mainMenuCache.width());
+		auto sourceRect = rtlrect(_mainMenuCache.width() - sourceWidth, 0, sourceWidth, _mainMenuCache.height(),
+		                          _mainMenuCache.width());
 		p.drawPixmapLeft(0, 0, shownWidth, height(), width(), _mainMenuCache, sourceRect);
 	}
 }
@@ -313,9 +325,10 @@ void LayerStackWidget::BackgroundWidget::animationCallback() {
 	checkIfDone();
 }
 
-LayerStackWidget::LayerStackWidget(QWidget *parent, Window::Controller *controller) : TWidget(parent)
-, _controller(controller)
-, _background(this) {
+LayerStackWidget::LayerStackWidget(QWidget *parent, Window::Controller *controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _background(this) {
 	setGeometry(parentWidget()->rect());
 	hide();
 	_background->setDoneCallback([this] { animationDone(); });
@@ -359,17 +372,17 @@ void LayerStackWidget::hideCurrent() {
 }
 
 void LayerStackWidget::hideLayers() {
-	startAnimation([] {}, [this] {
-		clearLayers();
-	}, Action::HideLayer);
+	startAnimation([] {}, [this] { clearLayers(); }, Action::HideLayer);
 }
 
 void LayerStackWidget::hideAll() {
-	startAnimation([] {}, [this] {
-		clearLayers();
-		clearSpecialLayer();
-		_mainMenu.destroyDelayed();
-	}, Action::HideAll);
+	startAnimation([] {},
+	               [this] {
+		               clearLayers();
+		               clearSpecialLayer();
+		               _mainMenu.destroyDelayed();
+	               },
+	               Action::HideAll);
 }
 
 void LayerStackWidget::hideTopLayer() {
@@ -413,7 +426,8 @@ void LayerStackWidget::setCacheImages() {
 	}
 	setAttribute(Qt::WA_OpaquePaintEvent, !bodyCache.isNull());
 	updateLayerBoxes();
-	_background->setCacheImages(std::move(bodyCache), std::move(mainMenuCache), std::move(specialLayerCache), std::move(layerCache));
+	_background->setCacheImages(std::move(bodyCache), std::move(mainMenuCache), std::move(specialLayerCache),
+	                            std::move(layerCache));
 }
 
 void LayerStackWidget::onLayerClosed(LayerWidget *layer) {
@@ -459,9 +473,7 @@ void LayerStackWidget::updateLayerBoxes() {
 		}
 		return QRect();
 	};
-	auto getSpecialLayerBox = [this]() {
-		return _specialLayer ? _specialLayer->geometry() : QRect();
-	};
+	auto getSpecialLayerBox = [this]() { return _specialLayer ? _specialLayer->geometry() : QRect(); };
 	_background->setLayerBoxes(getSpecialLayerBox(), getLayerBox());
 	update();
 }
@@ -593,25 +605,31 @@ void LayerStackWidget::showFinished() {
 }
 
 void LayerStackWidget::showSpecialLayer(object_ptr<LayerWidget> layer) {
-	startAnimation([this, layer = std::move(layer)]() mutable {
-		_specialLayer.destroyDelayed();
-		_specialLayer = std::move(layer);
-		initChildLayer(_specialLayer);
-	}, [this] {
-		clearLayers();
-		_mainMenu.destroyDelayed();
-	}, Action::ShowSpecialLayer);
+	startAnimation(
+	    [this, layer = std::move(layer)]() mutable {
+		    _specialLayer.destroyDelayed();
+		    _specialLayer = std::move(layer);
+		    initChildLayer(_specialLayer);
+	    },
+	    [this] {
+		    clearLayers();
+		    _mainMenu.destroyDelayed();
+	    },
+	    Action::ShowSpecialLayer);
 }
 
 void LayerStackWidget::showMainMenu() {
-	startAnimation([this] {
-		_mainMenu.create(this);
-		_mainMenu->setGeometryToLeft(0, 0, _mainMenu->width(), height());
-		_mainMenu->setParent(this);
-	}, [this] {
-		clearLayers();
-		_specialLayer.destroyDelayed();
-	}, Action::ShowMainMenu);
+	startAnimation(
+	    [this] {
+		    _mainMenu.create(this);
+		    _mainMenu->setGeometryToLeft(0, 0, _mainMenu->width(), height());
+		    _mainMenu->setParent(this);
+	    },
+	    [this] {
+		    clearLayers();
+		    _specialLayer.destroyDelayed();
+	    },
+	    Action::ShowMainMenu);
 }
 
 void LayerStackWidget::appendBox(object_ptr<BoxContent> box) {
@@ -634,9 +652,7 @@ LayerWidget *LayerStackWidget::pushBox(object_ptr<BoxContent> box) {
 			showFinished();
 		}
 	} else {
-		startAnimation([] {}, [this] {
-			_mainMenu.destroyDelayed();
-		}, Action::ShowLayer);
+		startAnimation([] {}, [this] { _mainMenu.destroyDelayed(); }, Action::ShowLayer);
 	}
 
 	return layer.data();
@@ -672,7 +688,7 @@ void LayerStackWidget::initChildLayer(LayerWidget *layer) {
 	layer->setParent(this);
 	layer->setClosedCallback([this, layer] { onLayerClosed(layer); });
 	layer->setResizedCallback([this] { onLayerResized(); });
-	connect(layer, SIGNAL(destroyed(QObject*)), this, SLOT(onLayerDestroyed(QObject*)));
+	connect(layer, SIGNAL(destroyed(QObject *)), this, SLOT(onLayerDestroyed(QObject *)));
 	layer->parentResized();
 }
 
@@ -730,9 +746,10 @@ LayerStackWidget::~LayerStackWidget() {
 	if (App::wnd()) App::wnd()->noLayerStack(this);
 }
 
-MediaPreviewWidget::MediaPreviewWidget(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller)
-, _emojiSize(Ui::Emoji::Size(Ui::Emoji::Index() + 1) / cIntRetinaFactor()) {
+MediaPreviewWidget::MediaPreviewWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _emojiSize(Ui::Emoji::Size(Ui::Emoji::Index() + 1) / cIntRetinaFactor()) {
 	setAttribute(Qt::WA_TransparentForMouseEvents);
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 }
@@ -767,7 +784,8 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) {
 		auto emojiLeft = (width() - emojiWidth) / 2;
 		auto esize = Ui::Emoji::Size(Ui::Emoji::Index() + 1);
 		for (auto emoji : _emojiList) {
-			p.drawPixmapLeft(emojiLeft, (height() - h) / 2 - (_emojiSize * 2), width(), App::emojiLarge(), QRect(emoji->x() * esize, emoji->y() * esize, esize, esize));
+			p.drawPixmapLeft(emojiLeft, (height() - h) / 2 - (_emojiSize * 2), width(), App::emojiLarge(),
+			                 QRect(emoji->x() * esize, emoji->y() * esize, esize, esize));
 			emojiLeft += _emojiSize + st::stickerEmojiSkip;
 		}
 	}
@@ -912,17 +930,18 @@ QPixmap MediaPreviewWidget::currentImage() const {
 			_document->automaticLoad(nullptr);
 			if (_document->loaded()) {
 				if (!_gif && !_gif.isBad()) {
-					auto that = const_cast<MediaPreviewWidget*>(this);
-					that->_gif = Media::Clip::MakeReader(_document, FullMsgId(), [this, that](Media::Clip::Notification notification) {
-						that->clipCallback(notification);
-					});
+					auto that = const_cast<MediaPreviewWidget *>(this);
+					that->_gif = Media::Clip::MakeReader(
+					    _document, FullMsgId(),
+					    [this, that](Media::Clip::Notification notification) { that->clipCallback(notification); });
 					if (_gif) _gif->setAutoplay();
 				}
 			}
 			if (_gif && _gif->started()) {
 				auto s = currentDimensions();
 				auto paused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::MediaPreview);
-				return _gif->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, ImageRoundCorner::None, paused ? 0 : getms());
+				return _gif->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None,
+				                     ImageRoundCorner::None, paused ? 0 : getms());
 			}
 			if (_cacheStatus != CacheThumbLoaded && _document->thumb->loaded()) {
 				QSize s = currentDimensions();
@@ -946,7 +965,6 @@ QPixmap MediaPreviewWidget::currentImage() const {
 				_photo->full->load();
 			}
 		}
-
 	}
 	return _cache;
 }
@@ -975,5 +993,4 @@ void MediaPreviewWidget::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
-MediaPreviewWidget::~MediaPreviewWidget() {
-}
+MediaPreviewWidget::~MediaPreviewWidget() {}
diff --git a/Telegram/SourceFiles/layerwidget.h b/Telegram/SourceFiles/layerwidget.h
index 55cd4239f..ffb9eb92d 100644
--- a/Telegram/SourceFiles/layerwidget.h
+++ b/Telegram/SourceFiles/layerwidget.h
@@ -23,9 +23,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <QMouseEvent>
 
 #include "base/lambda.h"
-#include "ui/twidget.h"
-#include "ui/animation.h"
 #include "structs.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
 
 class BoxContent;
 
@@ -41,8 +41,7 @@ public:
 	using TWidget::TWidget;
 
 	virtual void parentResized() = 0;
-	virtual void showFinished() {
-	}
+	virtual void showFinished() {}
 	void setInnerFocus();
 	bool setClosing() {
 		if (!_closing) {
@@ -79,14 +78,12 @@ protected:
 	virtual void doSetInnerFocus() {
 		setFocus();
 	}
-	virtual void closeHook() {
-	}
+	virtual void closeHook() {}
 
 private:
 	bool _closing = false;
 	base::lambda<void()> _closedCallback;
 	base::lambda<void()> _resizedCallback;
-
 };
 
 class LayerStackWidget : public TWidget {
@@ -159,26 +156,25 @@ private:
 		return _layers.empty() ? nullptr : _layers.back();
 	}
 	const LayerWidget *currentLayer() const {
-		return const_cast<LayerStackWidget*>(this)->currentLayer();
+		return const_cast<LayerStackWidget *>(this)->currentLayer();
 	}
 
 	Window::Controller *_controller = nullptr;
 
-	QList<LayerWidget*> _layers;
+	QList<LayerWidget *> _layers;
 
-	object_ptr<LayerWidget> _specialLayer = { nullptr };
-	object_ptr<Window::MainMenu> _mainMenu = { nullptr };
+	object_ptr<LayerWidget> _specialLayer = {nullptr};
+	object_ptr<Window::MainMenu> _mainMenu = {nullptr};
 
 	class BackgroundWidget;
 	object_ptr<BackgroundWidget> _background;
-
 };
 
 class MediaPreviewWidget : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	MediaPreviewWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	MediaPreviewWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	void showPreview(DocumentData *document);
 	void showPreview(PhotoData *photo);
@@ -197,7 +193,7 @@ private:
 	void fillEmojiString();
 	void resetGifAndCache();
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	Animation _a_shown;
 	bool _hiding = false;
@@ -218,11 +214,9 @@ private:
 	mutable CacheStatus _cacheStatus = CacheNotLoaded;
 	mutable QPixmap _cache;
 	mutable QSize _cachedSize;
-
 };
 
-template <typename BoxType, typename ...Args>
-inline object_ptr<BoxType> Box(Args&&... args) {
-	auto parent = static_cast<QWidget*>(nullptr);
+template <typename BoxType, typename... Args> inline object_ptr<BoxType> Box(Args &&... args) {
+	auto parent = static_cast<QWidget *>(nullptr);
 	return object_ptr<BoxType>(parent, std::forward<Args>(args)...);
 }
diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp
index df6cd033b..ac3a727c7 100644
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@@ -20,56 +20,61 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "layout.h"
 
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
 #include "application.h"
-#include "storage/file_upload.h"
-#include "mainwindow.h"
-#include "core/file_utilities.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "media/media_audio.h"
+#include "storage/file_upload.h"
 #include "storage/localstorage.h"
 
 TextParseOptions _textNameOptions = {
-	0, // flags
-	4096, // maxw
-	1, // maxh
-	Qt::LayoutDirectionAuto, // lang-dependent
+    0, // flags
+    4096, // maxw
+    1, // maxh
+    Qt::LayoutDirectionAuto, // lang-dependent
 };
 TextParseOptions _textDlgOptions = {
-	TextParseRichText, // flags
-	0, // maxw is style-dependent
-	1, // maxh
-	Qt::LayoutDirectionAuto, // lang-dependent
+    TextParseRichText, // flags
+    0, // maxw is style-dependent
+    1, // maxh
+    Qt::LayoutDirectionAuto, // lang-dependent
 };
 TextParseOptions _historyTextOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText | TextParseMarkdown, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText |
+        TextParseMarkdown, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _historyBotOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands | TextParseMultiline | TextParseRichText | TextParseMarkdown, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands | TextParseMultiline |
+        TextParseRichText | TextParseMarkdown, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _historyTextNoMonoOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _historyBotNoMonoOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands | TextParseMultiline |
+        TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 const TextParseOptions &itemTextOptions(History *h, PeerData *f) {
-	if ((h->peer->isUser() && h->peer->asUser()->botInfo) || (f->isUser() && f->asUser()->botInfo) || (h->peer->isChat() && h->peer->asChat()->botStatus >= 0) || (h->peer->isMegagroup() && h->peer->asChannel()->mgInfo->botStatus >= 0)) {
+	if ((h->peer->isUser() && h->peer->asUser()->botInfo) || (f->isUser() && f->asUser()->botInfo) ||
+	    (h->peer->isChat() && h->peer->asChat()->botStatus >= 0) ||
+	    (h->peer->isMegagroup() && h->peer->asChannel()->mgInfo->botStatus >= 0)) {
 		return _historyBotOptions;
 	}
 	return _historyTextOptions;
@@ -80,7 +85,9 @@ const TextParseOptions &itemTextOptions(const HistoryItem *item) {
 }
 
 const TextParseOptions &itemTextNoMonoOptions(History *h, PeerData *f) {
-	if ((h->peer->isUser() && h->peer->asUser()->botInfo) || (f->isUser() && f->asUser()->botInfo) || (h->peer->isChat() && h->peer->asChat()->botStatus >= 0) || (h->peer->isMegagroup() && h->peer->asChannel()->mgInfo->botStatus >= 0)) {
+	if ((h->peer->isUser() && h->peer->asUser()->botInfo) || (f->isUser() && f->asUser()->botInfo) ||
+	    (h->peer->isChat() && h->peer->asChat()->botStatus >= 0) ||
+	    (h->peer->isMegagroup() && h->peer->asChannel()->mgInfo->botStatus >= 0)) {
 		return _historyBotNoMonoOptions;
 	}
 	return _historyTextNoMonoOptions;
@@ -124,7 +131,8 @@ QString formatDownloadText(qint64 ready, qint64 total) {
 
 QString formatDurationText(qint64 duration) {
 	qint64 hours = (duration / 3600), minutes = (duration % 3600) / 60, seconds = duration % 60;
-	return (hours ? QString::number(hours) + ':' : QString()) + (minutes >= 10 ? QString() : QString('0')) + QString::number(minutes) + ':' + (seconds >= 10 ? QString() : QString('0')) + QString::number(seconds);
+	return (hours ? QString::number(hours) + ':' : QString()) + (minutes >= 10 ? QString() : QString('0')) +
+	       QString::number(minutes) + ':' + (seconds >= 10 ? QString() : QString('0')) + QString::number(seconds);
 }
 
 QString formatDurationWords(qint64 duration) {
@@ -153,38 +161,27 @@ QString formatPlayedText(qint64 played, qint64 duration) {
 qint32 documentColorIndex(DocumentData *document, QString &ext) {
 	qint32 colorIndex = 0;
 
-	QString name = document ? (document->name.isEmpty() ? (document->sticker() ? lang(lng_in_dlg_sticker) : qsl("Unknown File")) : document->name) : lang(lng_message_empty);
+	QString name =
+	    document ? (document->name.isEmpty() ? (document->sticker() ? lang(lng_in_dlg_sticker) : qsl("Unknown File")) :
+	                                           document->name) :
+	               lang(lng_message_empty);
 	name = name.toLower();
 	qint32 lastDot = name.lastIndexOf('.');
 	QString mime = document ? document->mime.toLower() : QString();
-	if (name.endsWith(qstr(".doc")) ||
-		name.endsWith(qstr(".txt")) ||
-		name.endsWith(qstr(".psd")) ||
-		mime.startsWith(qstr("text/"))
-		) {
+	if (name.endsWith(qstr(".doc")) || name.endsWith(qstr(".txt")) || name.endsWith(qstr(".psd")) ||
+	    mime.startsWith(qstr("text/"))) {
 		colorIndex = 0;
-	} else if (
-		name.endsWith(qstr(".xls")) ||
-		name.endsWith(qstr(".csv"))
-		) {
+	} else if (name.endsWith(qstr(".xls")) || name.endsWith(qstr(".csv"))) {
 		colorIndex = 1;
-	} else if (
-		name.endsWith(qstr(".pdf")) ||
-		name.endsWith(qstr(".ppt")) ||
-		name.endsWith(qstr(".key"))
-		) {
+	} else if (name.endsWith(qstr(".pdf")) || name.endsWith(qstr(".ppt")) || name.endsWith(qstr(".key"))) {
 		colorIndex = 2;
-	} else if (
-		name.endsWith(qstr(".zip")) ||
-		name.endsWith(qstr(".rar")) ||
-		name.endsWith(qstr(".ai")) ||
-		name.endsWith(qstr(".mp3")) ||
-		name.endsWith(qstr(".mov")) ||
-		name.endsWith(qstr(".avi"))
-		) {
+	} else if (name.endsWith(qstr(".zip")) || name.endsWith(qstr(".rar")) || name.endsWith(qstr(".ai")) ||
+	           name.endsWith(qstr(".mp3")) || name.endsWith(qstr(".mov")) || name.endsWith(qstr(".avi"))) {
 		colorIndex = 3;
 	} else {
-		QChar ch = (lastDot >= 0 && lastDot + 1 < name.size()) ? name.at(lastDot + 1) : (name.isEmpty() ? (mime.isEmpty() ? '0' : mime.at(0)) : name.at(0));
+		QChar ch = (lastDot >= 0 && lastDot + 1 < name.size()) ?
+		               name.at(lastDot + 1) :
+		               (name.isEmpty() ? (mime.isEmpty() ? '0' : mime.at(0)) : name.at(0));
 		colorIndex = (ch.unicode() % 4);
 	}
 
@@ -194,42 +191,23 @@ qint32 documentColorIndex(DocumentData *document, QString &ext) {
 }
 
 style::color documentColor(qint32 colorIndex) {
-	const style::color colors[] = {
-		st::msgFile1Bg,
-		st::msgFile2Bg,
-		st::msgFile3Bg,
-		st::msgFile4Bg
-	};
+	const style::color colors[] = {st::msgFile1Bg, st::msgFile2Bg, st::msgFile3Bg, st::msgFile4Bg};
 	return colors[colorIndex & 3];
 }
 
 style::color documentDarkColor(qint32 colorIndex) {
-	static style::color colors[] = {
-		st::msgFile1BgDark,
-		st::msgFile2BgDark,
-		st::msgFile3BgDark,
-		st::msgFile4BgDark
-	};
+	static style::color colors[] = {st::msgFile1BgDark, st::msgFile2BgDark, st::msgFile3BgDark, st::msgFile4BgDark};
 	return colors[colorIndex & 3];
 }
 
 style::color documentOverColor(qint32 colorIndex) {
-	static style::color colors[] = {
-		st::msgFile1BgOver,
-		st::msgFile2BgOver,
-		st::msgFile3BgOver,
-		st::msgFile4BgOver
-	};
+	static style::color colors[] = {st::msgFile1BgOver, st::msgFile2BgOver, st::msgFile3BgOver, st::msgFile4BgOver};
 	return colors[colorIndex & 3];
 }
 
 style::color documentSelectedColor(qint32 colorIndex) {
-	static style::color colors[] = {
-		st::msgFile1BgSelected,
-		st::msgFile2BgSelected,
-		st::msgFile3BgSelected,
-		st::msgFile4BgSelected
-	};
+	static style::color colors[] = {st::msgFile1BgSelected, st::msgFile2BgSelected, st::msgFile3BgSelected,
+	                                st::msgFile4BgSelected};
 	return colors[colorIndex & 3];
 }
 
@@ -248,7 +226,8 @@ wtv 8svx 16svx iff aiff aif aifc au bwf cdda raw wav flac la pac m4a ape ofr ofs
 shn tak tta wv brstm dts dtshd dtsma ast amr mp3 spx gsm aac mpc vqf ra ots swa vox voc \
 dwd smp aup cust mid mus sib sid ly gym vgm psf nsf mod ptb s3m xm it mt2 minipsf psflib \
 2sf dsf gsf psf2 qsf ssf usf rmj spc niff mxl xml txm ym jam mp1 mscz\
-").split(' ');
+")
+		              .split(' ');
 		return result.release();
 	})());
 
@@ -263,16 +242,19 @@ bool documentIsExecutableName(const QString &filename) {
 #ifdef Q_OS_MAC
 		*result = qsl("\
 action app bin command csh osx workflow\
-").split(' ');
+")
+		              .split(' ');
 #elif defined Q_OS_LINUX // Q_OS_MAC
 		*result = qsl("\
 bin csh ksh out run\
-").split(' ');
+")
+		              .split(' ');
 #else // Q_OS_MAC || Q_OS_LINUX
 		*result = qsl("\
 bat bin cmd com cpl exe gadget inf ins inx isu job jse lnk msc msi \
 msp mst paf pif ps1 reg rgs sct shb shs u3p vb vbe vbs vbscript ws wsf\
-").split(' ');
+")
+		              .split(' ');
 #endif // !Q_OS_MAC && !Q_OS_LINUX
 		return result.release();
 	})());
diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h
index 75653ffa0..10f5f1128 100644
--- a/Telegram/SourceFiles/layout.h
+++ b/Telegram/SourceFiles/layout.h
@@ -21,12 +21,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/runtime_composer.h"
-#include "ui/text/text.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "ui/style/style_core_types.h"
+#include "ui/text/text.h"
 
-constexpr auto FullSelection = TextSelection { 0xFFFF, 0xFFFF };
+constexpr auto FullSelection = TextSelection{0xFFFF, 0xFFFF};
 
 extern TextParseOptions _textNameOptions, _textDlgOptions;
 extern TextParseOptions _historyTextOptions, _historyBotOptions, _historyTextNoMonoOptions, _historyBotNoMonoOptions;
@@ -95,17 +95,16 @@ bool documentIsExecutableName(const QString &filename);
 
 class PaintContextBase {
 public:
-	PaintContextBase(TimeMs ms, bool selecting) : ms(ms), selecting(selecting) {
-	}
+	PaintContextBase(TimeMs ms, bool selecting)
+	    : ms(ms)
+	    , selecting(selecting) {}
 	TimeMs ms;
 	bool selecting;
-
 };
 
 class LayoutItemBase : public RuntimeComposer, public ClickHandlerHost {
 public:
-	LayoutItemBase() {
-	}
+	LayoutItemBase() {}
 
 	LayoutItemBase(const LayoutItemBase &other) = delete;
 	LayoutItemBase &operator=(const LayoutItemBase &other) = delete;
@@ -144,13 +143,11 @@ public:
 		return QRect(0, 0, width(), height()).contains(point);
 	}
 
-	virtual ~LayoutItemBase() {
-	}
+	virtual ~LayoutItemBase() {}
 
 protected:
 	int _width = 0;
 	int _height = 0;
 	int _maxw = 0;
 	int _minh = 0;
-
 };
diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 37985ea29..50fa7e481 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "logs.h"
 
-#include <signal.h>
-#include <new>
 #include <QMutex>
+#include <new>
+#include <signal.h>
 
-#include "platform/platform_specific.h"
 #include "mtproto/connection.h"
+#include "platform/platform_specific.h"
 
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
 
@@ -33,7 +33,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #ifdef Q_OS_WIN
 
 #pragma warning(push)
-#pragma warning(disable:4091)
+#pragma warning(disable : 4091)
 #include "client/windows/handler/exception_handler.h"
 #pragma warning(pop)
 
@@ -89,15 +89,17 @@ QString _logsEntryStart() {
 	static qint32 index = 0;
 	QDateTime tm(QDateTime::currentDateTime());
 
-	auto thread = qobject_cast<MTP::internal::Thread*>(QThread::currentThread());
+	auto thread = qobject_cast<MTP::internal::Thread *>(QThread::currentThread());
 	auto threadId = thread ? thread->getThreadIndex() : 0;
 
-	return QString("[%1 %2-%3]").arg(tm.toString("hh:mm:ss.zzz")).arg(QString("%1").arg(threadId, 2, 10, QChar('0'))).arg(++index, 7, 10, QChar('0'));
+	return QString("[%1 %2-%3]")
+	    .arg(tm.toString("hh:mm:ss.zzz"))
+	    .arg(QString("%1").arg(threadId, 2, 10, QChar('0')))
+	    .arg(++index, 7, 10, QChar('0'));
 }
 
 class LogsDataFields {
 public:
-
 	LogsDataFields() {
 		for (qint32 i = 0; i < LogDataCount; ++i) {
 			files[i].reset(new QFile());
@@ -142,7 +144,6 @@ public:
 	}
 
 private:
-
 	QSharedPointer<QFile> files[LogDataCount];
 	QTextStream streams[LogDataCount];
 
@@ -171,7 +172,9 @@ private:
 					return false;
 				}
 				if (!QFile(files[type]->fileName()).copy(to->fileName())) { // don't close files[type] yet
-					LOG(("Could not copy '%1' to '%2' to start new logging!").arg(files[type]->fileName()).arg(to->fileName()));
+					LOG(("Could not copy '%1' to '%2' to start new logging!")
+					        .arg(files[type]->fileName())
+					        .arg(to->fileName()));
 					return false;
 				}
 				if (to->open(mode | QIODevice::Append)) {
@@ -187,7 +190,8 @@ private:
 					QStringList oldlogs = working.entryList(QStringList("log_start*.txt"), QDir::Files);
 					for (QStringList::const_iterator i = oldlogs.cbegin(), e = oldlogs.cend(); i != e; ++i) {
 						QString oldlog = cWorkingDir() + *i, oldlogend = i->mid(qstr("log_start").size());
-						if (oldlogend.size() == 1 + qstr(".txt").size() && oldlogend.at(0).isDigit() && oldlogend.midRef(1) == qstr(".txt")) {
+						if (oldlogend.size() == 1 + qstr(".txt").size() && oldlogend.at(0).isDigit() &&
+						    oldlogend.midRef(1) == qstr(".txt")) {
 							bool removed = QFile(*i).remove();
 							LOG(("Old start log '%1' found, deleted: %2").arg(*i).arg(Logs::b(removed)));
 						}
@@ -238,7 +242,12 @@ private:
 			streams[type].setCodec("UTF-8");
 
 			if (type != LogDataMain) {
-				streams[type] << ((mode & QIODevice::Append) ? qsl("----------------------------------------------------------------\nNEW LOGGING INSTANCE STARTED!!!\n----------------------------------------------------------------\n") : qsl("%1\n").arg(dayIndex));
+				streams[type]
+				    << ((mode & QIODevice::Append) ?
+				            qsl("----------------------------------------------------------------\nNEW LOGGING "
+				                "INSTANCE "
+				                "STARTED!!!\n----------------------------------------------------------------\n") :
+				            qsl("%1\n").arg(dayIndex));
 				streams[type].flush();
 			}
 
@@ -261,18 +270,19 @@ private:
 		part = newPart;
 
 		qint32 dayIndex = (tm.tm_year + 1900) * 10000 + (tm.tm_mon + 1) * 100 + tm.tm_mday;
-		QString postfix = QString("_%4_%5").arg((part * switchEach) / 60, 2, 10, QChar('0')).arg((part * switchEach) % 60, 2, 10, QChar('0'));
+		QString postfix = QString("_%4_%5")
+		                      .arg((part * switchEach) / 60, 2, 10, QChar('0'))
+		                      .arg((part * switchEach) % 60, 2, 10, QChar('0'));
 
 		reopen(LogDataDebug, dayIndex, postfix);
 		reopen(LogDataTcp, dayIndex, postfix);
 		reopen(LogDataMtp, dayIndex, postfix);
 	}
-
 };
 
 LogsDataFields *LogsData = 0;
 
-typedef QList<QPair<LogDataType, QString> > LogsInMemoryList;
+typedef QList<QPair<LogDataType, QString>> LogsInMemoryList;
 LogsInMemoryList *LogsInMemory = 0;
 LogsInMemoryList *DeletedLogsInMemory = SharedMemoryLocation<LogsInMemoryList, 0>();
 
@@ -296,274 +306,287 @@ void _logsWrite(LogDataType type, const QString &msg) {
 void _moveOldDataFiles(const QString &from);
 
 namespace SignalHandlers {
-	void StartCrashHandler();
-	void FinishCrashHandler();
-}
+void StartCrashHandler();
+void FinishCrashHandler();
+} // namespace SignalHandlers
 
 namespace Logs {
 
-	void start() {
-		Assert(LogsData == 0);
+void start() {
+	Assert(LogsData == 0);
 
-		if (!Sandbox::CheckBetaVersionDir()) {
-			return;
-		}
-		bool workingDirChosen = cBetaVersion();
+	if (!Sandbox::CheckBetaVersionDir()) {
+		return;
+	}
+	bool workingDirChosen = cBetaVersion();
 
-		QString initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/', moveOldDataFrom;
-		if (cBetaVersion()) {
-			cSetDebug(true);
+	QString initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/', moveOldDataFrom;
+	if (cBetaVersion()) {
+		cSetDebug(true);
 #if defined Q_OS_MAC || defined Q_OS_LINUX
-		} else {
+	} else {
 #ifdef _DEBUG
-			cForceWorkingDir(cExeDir());
+		cForceWorkingDir(cExeDir());
 #else // _DEBUG
-			if (cWorkingDir().isEmpty()) {
-				cForceWorkingDir(psAppDataPath());
-			}
+		if (cWorkingDir().isEmpty()) {
+			cForceWorkingDir(psAppDataPath());
+		}
 #endif // else for _DEBUG
-			workingDirChosen = true;
+		workingDirChosen = true;
 
 #if defined Q_OS_LINUX && !defined _DEBUG // fix first version
-			moveOldDataFrom = initialWorkingDir;
+		moveOldDataFrom = initialWorkingDir;
 #endif // Q_OS_LINUX && !_DEBUG
 
 #elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX
-		} else {
-			cForceWorkingDir(psAppDataPath());
-			workingDirChosen = true;
+	} else {
+		cForceWorkingDir(psAppDataPath());
+		workingDirChosen = true;
 #elif defined OS_WIN_STORE
 #ifdef _DEBUG
-			cForceWorkingDir(cExeDir());
+		cForceWorkingDir(cExeDir());
 #else // _DEBUG
-			cForceWorkingDir(psAppDataPath());
+		cForceWorkingDir(psAppDataPath());
 #endif // else for _DEBUG
 #endif // OS_WIN_STORE
-		}
+	}
 
-		LogsData = new LogsDataFields();
-		if (!workingDirChosen) {
-			cForceWorkingDir(cWorkingDir());
+	LogsData = new LogsDataFields();
+	if (!workingDirChosen) {
+		cForceWorkingDir(cWorkingDir());
+		if (!LogsData->openMain()) {
+			cForceWorkingDir(cExeDir());
 			if (!LogsData->openMain()) {
-				cForceWorkingDir(cExeDir());
-				if (!LogsData->openMain()) {
-					cForceWorkingDir(psAppDataPath());
-				}
+				cForceWorkingDir(psAppDataPath());
 			}
 		}
+	}
 
-		cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/');
+	cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/');
 // WinRT build requires the working dir to stay the same for plugin loading.
 #ifndef Q_OS_WINRT
-		QDir().setCurrent(cWorkingDir());
+	QDir().setCurrent(cWorkingDir());
 #endif // !Q_OS_WINRT
-		QDir().mkpath(cWorkingDir() + qstr("tdata"));
+	QDir().mkpath(cWorkingDir() + qstr("tdata"));
 
-		Sandbox::WorkingDirReady();
-		SignalHandlers::StartCrashHandler();
+	Sandbox::WorkingDirReady();
+	SignalHandlers::StartCrashHandler();
 
-		if (!LogsData->openMain()) {
-			delete LogsData;
-			LogsData = 0;
-		}
-
-		LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(cDebug())).arg(Logs::b(cTestMode())));
-		LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName()));
-		LOG(("Initial working dir: %1").arg(initialWorkingDir));
-		LOG(("Working dir: %1").arg(cWorkingDir()));
-		LOG(("Command line: %1").arg(cArguments()));
-
-		if (!LogsData) {
-			LOG(("FATAL: Could not open '%1' for writing log!").arg(_logsFilePath(LogDataMain, qsl("_startXX"))));
-			return;
-		}
-
-		if (!moveOldDataFrom.isEmpty()) {
-			_moveOldDataFiles(moveOldDataFrom);
-		}
-
-		if (LogsInMemory) {
-			Assert(LogsInMemory != DeletedLogsInMemory);
-			LogsInMemoryList list = *LogsInMemory;
-			for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) {
-				if (i->first == LogDataMain) {
-					_logsWrite(i->first, i->second);
-				}
-			}
-		}
-
-		LOG(("Logs started"));
-	}
-
-	void finish() {
+	if (!LogsData->openMain()) {
 		delete LogsData;
 		LogsData = 0;
-
-		if (LogsInMemory && LogsInMemory != DeletedLogsInMemory) {
-			delete LogsInMemory;
-		}
-		LogsInMemory = DeletedLogsInMemory;
-
-		_logsMutex(LogDataMain, true);
-
-		SignalHandlers::FinishCrashHandler();
 	}
 
-	bool started() {
-		return LogsData != 0;
+	LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5")
+	        .arg(AppVersion)
+	        .arg(Logs::b(cAlphaVersion()))
+	        .arg(cBetaVersion())
+	        .arg(Logs::b(cDebug()))
+	        .arg(Logs::b(cTestMode())));
+	LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName()));
+	LOG(("Initial working dir: %1").arg(initialWorkingDir));
+	LOG(("Working dir: %1").arg(cWorkingDir()));
+	LOG(("Command line: %1").arg(cArguments()));
+
+	if (!LogsData) {
+		LOG(("FATAL: Could not open '%1' for writing log!").arg(_logsFilePath(LogDataMain, qsl("_startXX"))));
+		return;
 	}
 
-	bool instanceChecked() {
-		if (!LogsData) return false;
+	if (!moveOldDataFrom.isEmpty()) {
+		_moveOldDataFiles(moveOldDataFrom);
+	}
 
-		if (!LogsData->instanceChecked()) {
-			LogsBeforeSingleInstanceChecked = Logs::full();
-
-			delete LogsData;
-			LogsData = 0;
-			LOG(("FATAL: Could not move logging to '%1'!").arg(_logsFilePath(LogDataMain)));
-			return false;
-		}
-
-		if (LogsInMemory) {
-			Assert(LogsInMemory != DeletedLogsInMemory);
-			LogsInMemoryList list = *LogsInMemory;
-			for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) {
-				if (i->first != LogDataMain) {
-					_logsWrite(i->first, i->second);
-				}
+	if (LogsInMemory) {
+		Assert(LogsInMemory != DeletedLogsInMemory);
+		LogsInMemoryList list = *LogsInMemory;
+		for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) {
+			if (i->first == LogDataMain) {
+				_logsWrite(i->first, i->second);
 			}
 		}
-		if (LogsInMemory) {
-			Assert(LogsInMemory != DeletedLogsInMemory);
-			delete LogsInMemory;
-		}
-		LogsInMemory = DeletedLogsInMemory;
-
-		DEBUG_LOG(("Debug logs started."));
-		LogsBeforeSingleInstanceChecked.clear();
-		return true;
 	}
 
-	void multipleInstances() {
-		if (LogsInMemory) {
-			Assert(LogsInMemory != DeletedLogsInMemory);
-			delete LogsInMemory;
-		}
-		LogsInMemory = DeletedLogsInMemory;
+	LOG(("Logs started"));
+}
 
-		if (cDebug()) {
-			LOG(("WARNING: debug logs are not written in multiple instances mode!"));
-		}
-		LogsBeforeSingleInstanceChecked.clear();
+void finish() {
+	delete LogsData;
+	LogsData = 0;
+
+	if (LogsInMemory && LogsInMemory != DeletedLogsInMemory) {
+		delete LogsInMemory;
+	}
+	LogsInMemory = DeletedLogsInMemory;
+
+	_logsMutex(LogDataMain, true);
+
+	SignalHandlers::FinishCrashHandler();
+}
+
+bool started() {
+	return LogsData != 0;
+}
+
+bool instanceChecked() {
+	if (!LogsData) return false;
+
+	if (!LogsData->instanceChecked()) {
+		LogsBeforeSingleInstanceChecked = Logs::full();
+
+		delete LogsData;
+		LogsData = 0;
+		LOG(("FATAL: Could not move logging to '%1'!").arg(_logsFilePath(LogDataMain)));
+		return false;
 	}
 
-	void closeMain() {
-		LOG(("Explicitly closing main log and finishing crash handlers."));
-		if (LogsData) {
-			LogsData->closeMain();
+	if (LogsInMemory) {
+		Assert(LogsInMemory != DeletedLogsInMemory);
+		LogsInMemoryList list = *LogsInMemory;
+		for (LogsInMemoryList::const_iterator i = list.cbegin(), e = list.cend(); i != e; ++i) {
+			if (i->first != LogDataMain) {
+				_logsWrite(i->first, i->second);
+			}
 		}
 	}
+	if (LogsInMemory) {
+		Assert(LogsInMemory != DeletedLogsInMemory);
+		delete LogsInMemory;
+	}
+	LogsInMemory = DeletedLogsInMemory;
 
-	void writeMain(const QString &v) {
-		time_t t = time(NULL);
-		struct tm tm;
-		mylocaltime(&tm, &t);
+	DEBUG_LOG(("Debug logs started."));
+	LogsBeforeSingleInstanceChecked.clear();
+	return true;
+}
 
-		QString msg(QString("[%1.%2.%3 %4:%5:%6] %7\n").arg(tm.tm_year + 1900).arg(tm.tm_mon + 1, 2, 10, QChar('0')).arg(tm.tm_mday, 2, 10, QChar('0')).arg(tm.tm_hour, 2, 10, QChar('0')).arg(tm.tm_min, 2, 10, QChar('0')).arg(tm.tm_sec, 2, 10, QChar('0')).arg(v));
-		_logsWrite(LogDataMain, msg);
+void multipleInstances() {
+	if (LogsInMemory) {
+		Assert(LogsInMemory != DeletedLogsInMemory);
+		delete LogsInMemory;
+	}
+	LogsInMemory = DeletedLogsInMemory;
 
-		QString debugmsg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v));
-		_logsWrite(LogDataDebug, debugmsg);
+	if (cDebug()) {
+		LOG(("WARNING: debug logs are not written in multiple instances mode!"));
+	}
+	LogsBeforeSingleInstanceChecked.clear();
+}
+
+void closeMain() {
+	LOG(("Explicitly closing main log and finishing crash handlers."));
+	if (LogsData) {
+		LogsData->closeMain();
+	}
+}
+
+void writeMain(const QString &v) {
+	time_t t = time(NULL);
+	struct tm tm;
+	mylocaltime(&tm, &t);
+
+	QString msg(QString("[%1.%2.%3 %4:%5:%6] %7\n")
+	                .arg(tm.tm_year + 1900)
+	                .arg(tm.tm_mon + 1, 2, 10, QChar('0'))
+	                .arg(tm.tm_mday, 2, 10, QChar('0'))
+	                .arg(tm.tm_hour, 2, 10, QChar('0'))
+	                .arg(tm.tm_min, 2, 10, QChar('0'))
+	                .arg(tm.tm_sec, 2, 10, QChar('0'))
+	                .arg(v));
+	_logsWrite(LogDataMain, msg);
+
+	QString debugmsg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v));
+	_logsWrite(LogDataDebug, debugmsg);
+}
+
+void writeDebug(const char *file, qint32 line, const QString &v) {
+	const char *last = strstr(file, "/"), *found = 0;
+	while (last) {
+		found = last;
+		last = strstr(last + 1, "/");
+	}
+	last = strstr(file, "\\");
+	while (last) {
+		found = last;
+		last = strstr(last + 1, "\\");
+	}
+	if (found) {
+		file = found + 1;
 	}
 
-	void writeDebug(const char *file, qint32 line, const QString &v) {
-		const char *last = strstr(file, "/"), *found = 0;
-		while (last) {
-			found = last;
-			last = strstr(last + 1, "/");
-		}
-		last = strstr(file, "\\");
-		while (last) {
-			found = last;
-			last = strstr(last + 1, "\\");
-		}
-		if (found) {
-			file = found + 1;
-		}
-
-		QString msg(QString("%1 %2 (%3 : %4)\n").arg(_logsEntryStart()).arg(v).arg(file).arg(line));
-		_logsWrite(LogDataDebug, msg);
+	QString msg(QString("%1 %2 (%3 : %4)\n").arg(_logsEntryStart()).arg(v).arg(file).arg(line));
+	_logsWrite(LogDataDebug, msg);
 
 #ifdef Q_OS_WIN
-		//OutputDebugString(reinterpret_cast<const wchar_t *>(msg.utf16()));
+	// OutputDebugString(reinterpret_cast<const wchar_t *>(msg.utf16()));
 #elif defined Q_OS_MAC
-		//objc_outputDebugString(msg);
+	// objc_outputDebugString(msg);
 #elif defined Q_OS_LINUX && defined _DEBUG
-		//std::cout << msg.toUtf8().constData();
+	// std::cout << msg.toUtf8().constData();
 #endif
-	}
-
-	void writeTcp(const QString &v) {
-		QString msg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v));
-		_logsWrite(LogDataTcp, msg);
-	}
-
-	void writeMtp(qint32 dc, const QString &v) {
-		QString msg(QString("%1 (dc:%2) %3\n").arg(_logsEntryStart()).arg(dc).arg(v));
-		_logsWrite(LogDataMtp, msg);
-	}
-
-	QString full() {
-		if (LogsData) {
-			return LogsData->full();
-		}
-		if (!LogsInMemory || LogsInMemory == DeletedLogsInMemory) {
-			return LogsBeforeSingleInstanceChecked;
-		}
-
-		qint32 size = LogsBeforeSingleInstanceChecked.size();
-		for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) {
-			if (i->first == LogDataMain) {
-				size += i->second.size();
-			}
-		}
-		QString result;
-		result.reserve(size);
-		if (!LogsBeforeSingleInstanceChecked.isEmpty()) {
-			result.append(LogsBeforeSingleInstanceChecked);
-		}
-		for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) {
-			if (i->first == LogDataMain) {
-				result += i->second;
-			}
-		}
-		return result;
-	}
-
-	QString vector(const QVector<MTPlong> &ids) {
-		if (!ids.size()) return "[]";
-		QString idsStr = QString("[%1").arg(ids.cbegin()->v);
-		for (QVector<MTPlong>::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) {
-			idsStr += QString(", %2").arg(i->v);
-		}
-		return idsStr + "]";
-	}
-
-	QString vector(const QVector<quint64> &ids) {
-		if (!ids.size()) return "[]";
-		QString idsStr = QString("[%1").arg(*ids.cbegin());
-		for (QVector<quint64>::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) {
-			idsStr += QString(", %2").arg(*i);
-		}
-		return idsStr + "]";
-	}
-
 }
 
+void writeTcp(const QString &v) {
+	QString msg(QString("%1 %2\n").arg(_logsEntryStart()).arg(v));
+	_logsWrite(LogDataTcp, msg);
+}
+
+void writeMtp(qint32 dc, const QString &v) {
+	QString msg(QString("%1 (dc:%2) %3\n").arg(_logsEntryStart()).arg(dc).arg(v));
+	_logsWrite(LogDataMtp, msg);
+}
+
+QString full() {
+	if (LogsData) {
+		return LogsData->full();
+	}
+	if (!LogsInMemory || LogsInMemory == DeletedLogsInMemory) {
+		return LogsBeforeSingleInstanceChecked;
+	}
+
+	qint32 size = LogsBeforeSingleInstanceChecked.size();
+	for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) {
+		if (i->first == LogDataMain) {
+			size += i->second.size();
+		}
+	}
+	QString result;
+	result.reserve(size);
+	if (!LogsBeforeSingleInstanceChecked.isEmpty()) {
+		result.append(LogsBeforeSingleInstanceChecked);
+	}
+	for (LogsInMemoryList::const_iterator i = LogsInMemory->cbegin(), e = LogsInMemory->cend(); i != e; ++i) {
+		if (i->first == LogDataMain) {
+			result += i->second;
+		}
+	}
+	return result;
+}
+
+QString vector(const QVector<MTPlong> &ids) {
+	if (!ids.size()) return "[]";
+	QString idsStr = QString("[%1").arg(ids.cbegin()->v);
+	for (QVector<MTPlong>::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) {
+		idsStr += QString(", %2").arg(i->v);
+	}
+	return idsStr + "]";
+}
+
+QString vector(const QVector<quint64> &ids) {
+	if (!ids.size()) return "[]";
+	QString idsStr = QString("[%1").arg(*ids.cbegin());
+	for (QVector<quint64>::const_iterator i = ids.cbegin() + 1, e = ids.cend(); i != e; ++i) {
+		idsStr += QString(", %2").arg(*i);
+	}
+	return idsStr + "]";
+}
+
+} // namespace Logs
+
 void _moveOldDataFiles(const QString &wasDir) {
 	QFile data(wasDir + "data"), dataConfig(wasDir + "data_config"), tdataConfig(wasDir + "tdata/config");
-	if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() && !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir
+	if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() &&
+	    !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir
 		LOG(("Copying data to home dir '%1' from '%2'").arg(cWorkingDir()).arg(wasDir));
 		if (data.copy(cWorkingDir() + "data")) {
 			LOG(("Copied 'data' to home dir"));
@@ -624,531 +647,522 @@ void _moveOldDataFiles(const QString &wasDir) {
 namespace SignalHandlers {
 
 namespace internal {
-	using Annotations = std::map<std::string, std::string>;
-	using AnnotationRefs = std::map<std::string, const QString*>;
+using Annotations = std::map<std::string, std::string>;
+using AnnotationRefs = std::map<std::string, const QString *>;
 
-	Annotations ProcessAnnotations;
-	AnnotationRefs ProcessAnnotationRefs;
+Annotations ProcessAnnotations;
+AnnotationRefs ProcessAnnotationRefs;
 
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
 
-	QString ReportPath;
-	FILE *ReportFile = nullptr;
-	int ReportFileNo = 0;
-	char LaunchedDateTimeStr[32] = { 0 };
-	char LaunchedBinaryName[256] = { 0 };
+QString ReportPath;
+FILE *ReportFile = nullptr;
+int ReportFileNo = 0;
+char LaunchedDateTimeStr[32] = {0};
+char LaunchedBinaryName[256] = {0};
 
-	void writeChar(char ch) {
-		fwrite(&ch, 1, 1, ReportFile);
+void writeChar(char ch) {
+	fwrite(&ch, 1, 1, ReportFile);
+}
+
+template <bool Unsigned, typename Type> struct writeNumberSignAndRemoveIt {
+	static void call(Type &number) {
+		if (number < 0) {
+			writeChar('-');
+			number = -number;
+		}
 	}
+};
+template <typename Type> struct writeNumberSignAndRemoveIt<true, Type> {
+	static void call(Type &number) {}
+};
 
-	template <bool Unsigned, typename Type>
-	struct writeNumberSignAndRemoveIt {
-		static void call(Type &number) {
-			if (number < 0) {
-				writeChar('-');
-				number = -number;
-			}
-		}
-	};
-	template <typename Type>
-	struct writeNumberSignAndRemoveIt<true, Type> {
-		static void call(Type &number) {
-		}
-	};
+template <typename Type> const dump &writeNumber(const dump &stream, Type number) {
+	if (!ReportFile) return stream;
 
-	template <typename Type>
-	const dump &writeNumber(const dump &stream, Type number) {
-		if (!ReportFile) return stream;
-
-		writeNumberSignAndRemoveIt<(Type(-1) > Type(0)), Type>::call(number);
-		Type upper = 1, prev = number / 10;
-		while (prev >= upper) {
-			upper *= 10;
-		}
-		while (upper > 0) {
-			int digit = (number / upper);
-			internal::writeChar('0' + digit);
-			number -= digit * upper;
-			upper /= 10;
-		}
-		return stream;
+	writeNumberSignAndRemoveIt<(Type(-1) > Type(0)), Type>::call(number);
+	Type upper = 1, prev = number / 10;
+	while (prev >= upper) {
+		upper *= 10;
 	}
+	while (upper > 0) {
+		int digit = (number / upper);
+		internal::writeChar('0' + digit);
+		number -= digit * upper;
+		upper /= 10;
+	}
+	return stream;
+}
 
 } // namespace internal
 
-	dump::~dump() {
-		if (internal::ReportFile) {
-			fflush(internal::ReportFile);
+dump::~dump() {
+	if (internal::ReportFile) {
+		fflush(internal::ReportFile);
+	}
+}
+
+const dump &operator<<(const dump &stream, const char *str) {
+	if (!internal::ReportFile) return stream;
+
+	fwrite(str, 1, strlen(str), internal::ReportFile);
+	return stream;
+}
+
+const dump &operator<<(const dump &stream, const wchar_t *str) {
+	if (!internal::ReportFile) return stream;
+
+	for (int i = 0, l = wcslen(str); i < l; ++i) {
+		if (str[i] >= 0 && str[i] < 128) {
+			internal::writeChar(char(str[i]));
+		} else {
+			internal::writeChar('?');
 		}
 	}
+	return stream;
+}
 
-	const dump &operator<<(const dump &stream, const char *str) {
-		if (!internal::ReportFile) return stream;
+const dump &operator<<(const dump &stream, int num) {
+	return internal::writeNumber(stream, num);
+}
 
-		fwrite(str, 1, strlen(str), internal::ReportFile);
-		return stream;
+const dump &operator<<(const dump &stream, unsigned int num) {
+	return internal::writeNumber(stream, num);
+}
+
+const dump &operator<<(const dump &stream, unsigned long num) {
+	return internal::writeNumber(stream, num);
+}
+
+const dump &operator<<(const dump &stream, unsigned long long num) {
+	return internal::writeNumber(stream, num);
+}
+
+const dump &operator<<(const dump &stream, double num) {
+	if (num < 0) {
+		internal::writeChar('-');
+		num = -num;
 	}
-
-    const dump &operator<<(const dump &stream, const wchar_t *str) {
-        if (!internal::ReportFile) return stream;
-
-        for (int i = 0, l = wcslen(str); i < l; ++i) {
-            if (str[i] >= 0 && str[i] < 128) {
-				internal::writeChar(char(str[i]));
-            } else {
-				internal::writeChar('?');
-            }
-        }
-        return stream;
-    }
-
-	const dump &operator<<(const dump &stream, int num) {
-		return internal::writeNumber(stream, num);
-	}
-
-	const dump &operator<<(const dump &stream, unsigned int num) {
-		return internal::writeNumber(stream, num);
-	}
-
-	const dump &operator<<(const dump &stream, unsigned long num) {
-		return internal::writeNumber(stream, num);
-	}
-
-	const dump &operator<<(const dump &stream, unsigned long long num) {
-		return internal::writeNumber(stream, num);
-	}
-
-	const dump &operator<<(const dump &stream, double num) {
-		if (num < 0) {
-			internal::writeChar('-');
-			num = -num;
-		}
-		internal::writeNumber(stream, quint64(floor(num)));
-		internal::writeChar('.');
-		num -= floor(num);
-		for (int i = 0; i < 4; ++i) {
-			num *= 10;
-			int digit = int(floor(num));
-			internal::writeChar('0' + digit);
-			num -= digit;
-		}
-		return stream;
+	internal::writeNumber(stream, quint64(floor(num)));
+	internal::writeChar('.');
+	num -= floor(num);
+	for (int i = 0; i < 4; ++i) {
+		num *= 10;
+		int digit = int(floor(num));
+		internal::writeChar('0' + digit);
+		num -= digit;
 	}
+	return stream;
+}
 
 namespace internal {
 
-	using ReservedMemoryChunk = std::array<gsl::byte, 1024 * 1024>;
-	std::unique_ptr<ReservedMemoryChunk> ReservedMemory;
+using ReservedMemoryChunk = std::array<gsl::byte, 1024 * 1024>;
+std::unique_ptr<ReservedMemoryChunk> ReservedMemory;
 
-	void InstallOperatorNewHandler() {
-		ReservedMemory = std::make_unique<ReservedMemoryChunk>();
-		std::set_new_handler([] {
-			std::set_new_handler(nullptr);
-			ReservedMemory.reset();
-			Unexpected("Could not allocate!");
-		});
-	}
+void InstallOperatorNewHandler() {
+	ReservedMemory = std::make_unique<ReservedMemoryChunk>();
+	std::set_new_handler([] {
+		std::set_new_handler(nullptr);
+		ReservedMemory.reset();
+		Unexpected("Could not allocate!");
+	});
+}
 
-	Qt::HANDLE ReportingThreadId = nullptr;
-	bool ReportingHeaderWritten = false;
-	QMutex ReportingMutex;
+Qt::HANDLE ReportingThreadId = nullptr;
+bool ReportingHeaderWritten = false;
+QMutex ReportingMutex;
 
-	const char *BreakpadDumpPath = nullptr;
-	const wchar_t *BreakpadDumpPathW = nullptr;
+const char *BreakpadDumpPath = nullptr;
+const wchar_t *BreakpadDumpPathW = nullptr;
 
 #if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64
-	struct sigaction SIG_def[32];
+struct sigaction SIG_def[32];
 
-	void Handler(int signum, siginfo_t *info, void *ucontext) {
-		if (signum > 0) {
-			sigaction(signum, &SIG_def[signum], 0);
-		}
+void Handler(int signum, siginfo_t *info, void *ucontext) {
+	if (signum > 0) {
+		sigaction(signum, &SIG_def[signum], 0);
+	}
 
 #else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64
-	void Handler(int signum) {
+void Handler(int signum) {
 #endif // else for Q_OS_MAC || Q_OS_LINUX || Q_OS_LINUX64
 
-		const char* name = 0;
-		switch (signum) {
-		case SIGABRT: name = "SIGABRT"; break;
-		case SIGSEGV: name = "SIGSEGV"; break;
-		case SIGILL: name = "SIGILL"; break;
-		case SIGFPE: name = "SIGFPE"; break;
+	const char *name = 0;
+	switch (signum) {
+	case SIGABRT: name = "SIGABRT"; break;
+	case SIGSEGV: name = "SIGSEGV"; break;
+	case SIGILL: name = "SIGILL"; break;
+	case SIGFPE: name = "SIGFPE"; break;
 #ifndef Q_OS_WIN
-		case SIGBUS: name = "SIGBUS"; break;
-		case SIGSYS: name = "SIGSYS"; break;
+	case SIGBUS: name = "SIGBUS"; break;
+	case SIGSYS: name = "SIGSYS"; break;
 #endif // !Q_OS_WIN
-		}
-
-		Qt::HANDLE thread = QThread::currentThreadId();
-		if (thread == ReportingThreadId) return;
-
-		QMutexLocker lock(&ReportingMutex);
-		ReportingThreadId = thread;
-
-		if (!ReportingHeaderWritten) {
-			ReportingHeaderWritten = true;
-			auto dec2hex = [](int value) -> char {
-				if (value >= 0 && value < 10) {
-					return '0' + value;
-				} else if (value >= 10 && value < 16) {
-					return 'a' + (value - 10);
-				}
-				return '#';
-			};
-
-			for (const auto &i : ProcessAnnotationRefs) {
-				QByteArray utf8 = i.second->toUtf8();
-				std::string wrapped;
-				wrapped.reserve(4 * utf8.size());
-				for (auto ch : utf8) {
-					auto uch = static_cast<uchar>(ch);
-					wrapped.append("\\x", 2).append(1, dec2hex(uch >> 4)).append(1, dec2hex(uch & 0x0F));
-				}
-				ProcessAnnotations[i.first] = wrapped;
-			}
-
-			const Annotations c_ProcessAnnotations(ProcessAnnotations);
-			for (const auto &i : c_ProcessAnnotations) {
-				dump() << i.first.c_str() << ": " << i.second.c_str() << "\n";
-			}
-			psWriteDump();
-			dump() << "\n";
-		}
-		if (name) {
-			dump() << "Caught signal " << signum << " (" << name << ") in thread " << quint64(thread) << "\n";
-		} else if (signum == -1) {
-            dump() << "Google Breakpad caught a crash, minidump written in thread " << quint64(thread) << "\n";
-            if (BreakpadDumpPath) {
-                dump() << "Minidump: " << BreakpadDumpPath << "\n";
-            } else if (BreakpadDumpPathW) {
-                dump() << "Minidump: " << BreakpadDumpPathW << "\n";
-            }
-        } else {
-			dump() << "Caught signal " << signum << " in thread " << quint64(thread) << "\n";
-		}
-
-		// see https://github.com/benbjohnson/bandicoot
-#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64
-		ucontext_t *uc = (ucontext_t*)ucontext;
-
-		void *caller = 0;
-		if (uc) {
-#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
-			/* OSX < 10.6 */
-#if defined(__x86_64__)
-			caller = (void*)uc->uc_mcontext->__ss.__rip;
-#elif defined(__i386__)
-			caller = (void*)uc->uc_mcontext->__ss.__eip;
-#else
-			caller = (void*)uc->uc_mcontext->__ss.__srr0;
-#endif
-#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
-			/* OSX >= 10.6 */
-#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
-			caller = (void*)uc->uc_mcontext->__ss.__rip;
-#else
-			caller = (void*)uc->uc_mcontext->__ss.__eip;
-#endif
-#elif defined(__linux__)
-			/* Linux */
-#if defined(__i386__)
-			caller = (void*)uc->uc_mcontext.gregs[14]; /* Linux 32 */
-#elif defined(__X86_64__) || defined(__x86_64__)
-			caller = (void*)uc->uc_mcontext.gregs[16]; /* Linux 64 */
-#elif defined(__ia64__) /* Linux IA64 */
-			caller = (void*)uc->uc_mcontext.sc_ip;
-#endif
-
-#endif
-		}
-
-        void *addresses[132] = { 0 };
-		size_t size = backtrace(addresses, 128);
-
-		/* overwrite sigaction with caller's address */
-        if (caller) {
-            for (int i = size; i > 1; --i) {
-                addresses[i + 3] = addresses[i];
-            }
-            addresses[2] = (void*)0x1;
-            addresses[3] = caller;
-            addresses[4] = (void*)0x1;
-        }
-
-#ifdef Q_OS_MAC
-		dump() << "\nBase image addresses:\n";
-		for (size_t i = 0; i < size; ++i) {
-			Dl_info info;
-			dump() << i << " ";
-			if (dladdr(addresses[i], &info)) {
-				dump() << quint64(info.dli_fbase) << " (" << info.dli_fname << ")\n";
-			} else {
-				dump() << "_unknown_module_\n";
-			}
-		}
-#endif // Q_OS_MAC
-
-		dump() << "\nBacktrace:\n";
-
-		backtrace_symbols_fd(addresses, size, ReportFileNo);
-
-#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64
-		dump() << "\nBacktrace:\n";
-
-		psWriteStackTrace();
-#endif // else for Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64
-
-		dump() << "\n";
-
-		ReportingThreadId = nullptr;
 	}
 
-	bool SetSignalHandlers = true;
-	bool CrashLogged = false;
+	Qt::HANDLE thread = QThread::currentThreadId();
+	if (thread == ReportingThreadId) return;
+
+	QMutexLocker lock(&ReportingMutex);
+	ReportingThreadId = thread;
+
+	if (!ReportingHeaderWritten) {
+		ReportingHeaderWritten = true;
+		auto dec2hex = [](int value) -> char {
+			if (value >= 0 && value < 10) {
+				return '0' + value;
+			} else if (value >= 10 && value < 16) {
+				return 'a' + (value - 10);
+			}
+			return '#';
+		};
+
+		for (const auto &i : ProcessAnnotationRefs) {
+			QByteArray utf8 = i.second->toUtf8();
+			std::string wrapped;
+			wrapped.reserve(4 * utf8.size());
+			for (auto ch : utf8) {
+				auto uch = static_cast<uchar>(ch);
+				wrapped.append("\\x", 2).append(1, dec2hex(uch >> 4)).append(1, dec2hex(uch & 0x0F));
+			}
+			ProcessAnnotations[i.first] = wrapped;
+		}
+
+		const Annotations c_ProcessAnnotations(ProcessAnnotations);
+		for (const auto &i : c_ProcessAnnotations) {
+			dump() << i.first.c_str() << ": " << i.second.c_str() << "\n";
+		}
+		psWriteDump();
+		dump() << "\n";
+	}
+	if (name) {
+		dump() << "Caught signal " << signum << " (" << name << ") in thread " << quint64(thread) << "\n";
+	} else if (signum == -1) {
+		dump() << "Google Breakpad caught a crash, minidump written in thread " << quint64(thread) << "\n";
+		if (BreakpadDumpPath) {
+			dump() << "Minidump: " << BreakpadDumpPath << "\n";
+		} else if (BreakpadDumpPathW) {
+			dump() << "Minidump: " << BreakpadDumpPathW << "\n";
+		}
+	} else {
+		dump() << "Caught signal " << signum << " in thread " << quint64(thread) << "\n";
+	}
+
+	// see https://github.com/benbjohnson/bandicoot
+#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64
+	ucontext_t *uc = (ucontext_t *)ucontext;
+
+	void *caller = 0;
+	if (uc) {
+#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
+		/* OSX < 10.6 */
+#if defined(__x86_64__)
+		caller = (void *)uc->uc_mcontext->__ss.__rip;
+#elif defined(__i386__)
+		caller = (void *)uc->uc_mcontext->__ss.__eip;
+#else
+		caller = (void *)uc->uc_mcontext->__ss.__srr0;
+#endif
+#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
+		/* OSX >= 10.6 */
+#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
+		caller = (void *)uc->uc_mcontext->__ss.__rip;
+#else
+		caller = (void *)uc->uc_mcontext->__ss.__eip;
+#endif
+#elif defined(__linux__)
+		/* Linux */
+#if defined(__i386__)
+		caller = (void *)uc->uc_mcontext.gregs[14]; /* Linux 32 */
+#elif defined(__X86_64__) || defined(__x86_64__)
+		caller = (void *)uc->uc_mcontext.gregs[16]; /* Linux 64 */
+#elif defined(__ia64__) /* Linux IA64 */
+		caller = (void *)uc->uc_mcontext.sc_ip;
+#endif
+
+#endif
+	}
+
+	void *addresses[132] = {0};
+	size_t size = backtrace(addresses, 128);
+
+	/* overwrite sigaction with caller's address */
+	if (caller) {
+		for (int i = size; i > 1; --i) {
+			addresses[i + 3] = addresses[i];
+		}
+		addresses[2] = (void *)0x1;
+		addresses[3] = caller;
+		addresses[4] = (void *)0x1;
+	}
+
+#ifdef Q_OS_MAC
+	dump() << "\nBase image addresses:\n";
+	for (size_t i = 0; i < size; ++i) {
+		Dl_info info;
+		dump() << i << " ";
+		if (dladdr(addresses[i], &info)) {
+			dump() << quint64(info.dli_fbase) << " (" << info.dli_fname << ")\n";
+		} else {
+			dump() << "_unknown_module_\n";
+		}
+	}
+#endif // Q_OS_MAC
+
+	dump() << "\nBacktrace:\n";
+
+	backtrace_symbols_fd(addresses, size, ReportFileNo);
+
+#else // Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64
+	dump() << "\nBacktrace:\n";
+
+	psWriteStackTrace();
+#endif // else for Q_OS_MAC || Q_OS_LINUX32 || Q_OS_LINUX64
+
+	dump() << "\n";
+
+	ReportingThreadId = nullptr;
+} // namespace internal
+
+bool SetSignalHandlers = true;
+bool CrashLogged = false;
 #if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD
-	google_breakpad::ExceptionHandler* BreakpadExceptionHandler = 0;
+google_breakpad::ExceptionHandler *BreakpadExceptionHandler = 0;
 
 #ifdef Q_OS_WIN
-	bool DumpCallback(const wchar_t* _dump_dir, const wchar_t* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success)
+bool DumpCallback(const wchar_t *_dump_dir, const wchar_t *_minidump_id, void *context, EXCEPTION_POINTERS *exinfo,
+                  MDRawAssertionInfo *assertion, bool success)
 #elif defined Q_OS_MAC // Q_OS_WIN
-	bool DumpCallback(const char* _dump_dir, const char* _minidump_id, void *context, bool success)
+bool DumpCallback(const char *_dump_dir, const char *_minidump_id, void *context, bool success)
 #elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_MAC
-	bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success)
+bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success)
 #endif // Q_OS_LINUX64 || Q_OS_LINUX32
-	{
-		if (CrashLogged) return success;
-		CrashLogged = true;
+{
+	if (CrashLogged) return success;
+	CrashLogged = true;
 
 #ifdef Q_OS_WIN
-        BreakpadDumpPathW = _minidump_id;
-        Handler(-1);
+	BreakpadDumpPathW = _minidump_id;
+	Handler(-1);
 #else // Q_OS_WIN
 
 #ifdef Q_OS_MAC
-        BreakpadDumpPath = _minidump_id;
+	BreakpadDumpPath = _minidump_id;
 #else // Q_OS_MAC
-        BreakpadDumpPath = md.path();
+	BreakpadDumpPath = md.path();
 #endif // else for Q_OS_MAC
-		Handler(-1, 0, 0);
+	Handler(-1, 0, 0);
 #endif // else for Q_OS_WIN
-		return success;
-	}
+	return success;
+}
 #endif // !Q_OS_MAC || MAC_USE_BREAKPAD
 
 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS
 
-} // namespace internal
+} // namespace SignalHandlers
 
-	void StartCrashHandler() {
+void StartCrashHandler() {
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
-		using internal::ProcessAnnotations;
+	using internal::ProcessAnnotations;
 
-		ProcessAnnotations["Binary"] = cExeName().toUtf8().constData();
-		ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData();
-		ProcessAnnotations["Version"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) : (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion)).toUtf8().constData();
-		ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData();
-		ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData();
-		ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData();
+	ProcessAnnotations["Binary"] = cExeName().toUtf8().constData();
+	ProcessAnnotations["ApiId"] = QString::number(ApiId).toUtf8().constData();
+	ProcessAnnotations["Version"] = (cBetaVersion() ? qsl("%1 beta").arg(cBetaVersion()) :
+	                                                  (cAlphaVersion() ? qsl("%1 alpha") : qsl("%1")).arg(AppVersion))
+	                                    .toUtf8()
+	                                    .constData();
+	ProcessAnnotations["Launched"] = QDateTime::currentDateTime().toString("dd.MM.yyyy hh:mm:ss").toUtf8().constData();
+	ProcessAnnotations["Platform"] = cPlatformString().toUtf8().constData();
+	ProcessAnnotations["UserTag"] = QString::number(Sandbox::UserTag(), 16).toUtf8().constData();
 
-		QString dumpspath = cWorkingDir() + qsl("tdata/dumps");
-		QDir().mkpath(dumpspath);
+	QString dumpspath = cWorkingDir() + qsl("tdata/dumps");
+	QDir().mkpath(dumpspath);
 
 #ifdef Q_OS_WIN
-		internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler(
-			dumpspath.toStdWString(),
-			google_breakpad::ExceptionHandler::FilterCallback(nullptr),
-			internal::DumpCallback,
-			(void*)nullptr, // callback_context
-			google_breakpad::ExceptionHandler::HANDLER_ALL,
-			MINIDUMP_TYPE(MiniDumpNormal),
-			// MINIDUMP_TYPE(MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithProcessThreadData | MiniDumpWithFullMemoryInfo | MiniDumpWithUnloadedModules | MiniDumpWithFullAuxiliaryState | MiniDumpIgnoreInaccessibleMemory | MiniDumpWithTokenInformation),
-			(const wchar_t*)nullptr, // pipe_name
-			(const google_breakpad::CustomClientInfo*)nullptr
-		);
+	internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler(
+	    dumpspath.toStdWString(), google_breakpad::ExceptionHandler::FilterCallback(nullptr), internal::DumpCallback,
+	    (void *)nullptr, // callback_context
+	    google_breakpad::ExceptionHandler::HANDLER_ALL, MINIDUMP_TYPE(MiniDumpNormal),
+	    // MINIDUMP_TYPE(MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithThreadInfo |
+	    // MiniDumpWithProcessThreadData | MiniDumpWithFullMemoryInfo | MiniDumpWithUnloadedModules |
+	    // MiniDumpWithFullAuxiliaryState | MiniDumpIgnoreInaccessibleMemory | MiniDumpWithTokenInformation),
+	    (const wchar_t *)nullptr, // pipe_name
+	    (const google_breakpad::CustomClientInfo *)nullptr);
 #elif defined Q_OS_MAC // Q_OS_WIN
 
 #ifdef MAC_USE_BREAKPAD
 #ifndef _DEBUG
-		internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler(
-			QFile::encodeName(dumpspath).toStdString(),
-			/*FilterCallback*/ 0,
-			internal::DumpCallback,
-			/*context*/ 0,
-			true,
-			0
-		);
+	internal::BreakpadExceptionHandler =
+	    new google_breakpad::ExceptionHandler(QFile::encodeName(dumpspath).toStdString(),
+	                                          /*FilterCallback*/ 0, internal::DumpCallback,
+	                                          /*context*/ 0, true, 0);
 #endif // !_DEBUG
-		internal::SetSignalHandlers = false;
+	internal::SetSignalHandlers = false;
 #else // MAC_USE_BREAKPAD
-		//crashpad::CrashpadClient crashpad_client;
-		std::string handler = (cExeDir() + cExeName() + qsl("/Contents/Helpers/crashpad_handler")).toUtf8().constData();
-		std::string database = QFile::encodeName(dumpspath).constData();
-		/*if (crashpad_client.StartHandler(base::FilePath(handler),
-		                                 base::FilePath(database),
-		                                 std::string(),
-		                                 ProcessAnnotations,
-		                                 std::vector<std::string>(),
-		                                 false)) {
-			crashpad_client.UseHandler();
-		}*/
+      // crashpad::CrashpadClient crashpad_client;
+	std::string handler = (cExeDir() + cExeName() + qsl("/Contents/Helpers/crashpad_handler")).toUtf8().constData();
+	std::string database = QFile::encodeName(dumpspath).constData();
+	/*if (crashpad_client.StartHandler(base::FilePath(handler),
+	                                 base::FilePath(database),
+	                                 std::string(),
+	                                 ProcessAnnotations,
+	                                 std::vector<std::string>(),
+	                                 false)) {
+	    crashpad_client.UseHandler();
+	}*/
 #endif // else for MAC_USE_BREAKPAD
 #elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32
-		internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler(
-			google_breakpad::MinidumpDescriptor(QFile::encodeName(dumpspath).toStdString()),
-			/*FilterCallback*/ 0,
-			internal::DumpCallback,
-			/*context*/ 0,
-			true,
-			-1
-		);
+	internal::BreakpadExceptionHandler = new google_breakpad::ExceptionHandler(
+	    google_breakpad::MinidumpDescriptor(QFile::encodeName(dumpspath).toStdString()),
+	    /*FilterCallback*/ 0, internal::DumpCallback,
+	    /*context*/ 0, true, -1);
 #endif // Q_OS_LINUX64 || Q_OS_LINUX32
 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS
-	}
+}
 
-	void FinishCrashHandler() {
+void FinishCrashHandler() {
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
 
 #if !defined Q_OS_MAC || defined MAC_USE_BREAKPAD
-		if (internal::BreakpadExceptionHandler) {
-			delete base::take(internal::BreakpadExceptionHandler);
-		}
+	if (internal::BreakpadExceptionHandler) {
+		delete base::take(internal::BreakpadExceptionHandler);
+	}
 #endif // !Q_OS_MAC || MAC_USE_BREAKPAD
 
 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS
-	}
+}
 
-	Status start() {
+Status start() {
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
-		using internal::ReportPath;
-		ReportPath = cWorkingDir() + qsl("tdata/working");
+	using internal::ReportPath;
+	ReportPath = cWorkingDir() + qsl("tdata/working");
 
 #ifdef Q_OS_WIN
-		FILE *f = nullptr;
-		if (_wfopen_s(&f, ReportPath.toStdWString().c_str(), L"rb") != 0) {
-			f = nullptr;
-		} else {
+	FILE *f = nullptr;
+	if (_wfopen_s(&f, ReportPath.toStdWString().c_str(), L"rb") != 0) {
+		f = nullptr;
+	} else {
 #else // !Q_OS_WIN
-		if (FILE *f = fopen(QFile::encodeName(ReportPath).constData(), "rb")) {
+	if (FILE *f = fopen(QFile::encodeName(ReportPath).constData(), "rb")) {
 #endif // else for !Q_OS_WIN
-			QByteArray lastdump;
-			char buffer[256 * 1024] = { 0 };
-			qint32 read = fread(buffer, 1, 256 * 1024, f);
-			if (read > 0) {
-				lastdump.append(buffer, read);
-			}
-			fclose(f);
-
-			Sandbox::SetLastCrashDump(lastdump);
-
-			LOG(("Opened '%1' for reading, the previous Kepka launch was not finished properly :( Crash log size: %2").arg(ReportPath).arg(lastdump.size()));
-
-			return LastCrashed;
+		QByteArray lastdump;
+		char buffer[256 * 1024] = {0};
+		qint32 read = fread(buffer, 1, 256 * 1024, f);
+		if (read > 0) {
+			lastdump.append(buffer, read);
 		}
+		fclose(f);
+
+		Sandbox::SetLastCrashDump(lastdump);
+
+		LOG(("Opened '%1' for reading, the previous Kepka launch was not finished properly :( Crash log size: %2")
+		        .arg(ReportPath)
+		        .arg(lastdump.size()));
+
+		return LastCrashed;
+	}
 
 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS
-		return restart();
-	}
+	return restart();
+}
 
-	Status restart() {
+Status restart() {
 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
-		if (internal::ReportFile) {
-			return Started;
-		}
-
-#ifdef Q_OS_WIN
-		if (_wfopen_s(&internal::ReportFile, internal::ReportPath.toStdWString().c_str(), L"wb") != 0) {
-			internal::ReportFile = nullptr;
-		}
-#else // Q_OS_WIN
-		internal::ReportFile = fopen(QFile::encodeName(internal::ReportPath).constData(), "wb");
-#endif // else for Q_OS_WIN
-		if (internal::ReportFile) {
-#ifdef Q_OS_WIN
-			internal::ReportFileNo = _fileno(internal::ReportFile);
-#else // Q_OS_WIN
-			internal::ReportFileNo = fileno(internal::ReportFile);
-#endif // else for Q_OS_WIN
-			if (internal::SetSignalHandlers) {
-#ifndef Q_OS_WIN
-				struct sigaction sigact;
-
-				sigact.sa_sigaction = SignalHandlers::internal::Handler;
-				sigemptyset(&sigact.sa_mask);
-				sigact.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
-
-				sigaction(SIGABRT, &sigact, &internal::SIG_def[SIGABRT]);
-				sigaction(SIGSEGV, &sigact, &internal::SIG_def[SIGSEGV]);
-				sigaction(SIGILL, &sigact, &internal::SIG_def[SIGILL]);
-				sigaction(SIGFPE, &sigact, &internal::SIG_def[SIGFPE]);
-				sigaction(SIGBUS, &sigact, &internal::SIG_def[SIGBUS]);
-				sigaction(SIGSYS, &sigact, &internal::SIG_def[SIGSYS]);
-#else // !Q_OS_WIN
-				signal(SIGABRT, SignalHandlers::internal::Handler);
-				signal(SIGSEGV, SignalHandlers::internal::Handler);
-				signal(SIGILL, SignalHandlers::internal::Handler);
-				signal(SIGFPE, SignalHandlers::internal::Handler);
-#endif // else for !Q_OS_WIN
-			}
-
-			SignalHandlers::internal::InstallOperatorNewHandler();
-
-			return Started;
-		}
-
-		LOG(("FATAL: Could not open '%1' for writing!").arg(internal::ReportPath));
-
-		return CantOpen;
-#else // !TDESKTOP_DISABLE_CRASH_REPORTS
+	if (internal::ReportFile) {
 		return Started;
-#endif // else for !TDESKTOP_DISABLE_CRASH_REPORTS
 	}
 
-	void finish() {
-#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
-		FinishCrashHandler();
-		if (internal::ReportFile) {
-			fclose(internal::ReportFile);
-			internal::ReportFile = nullptr;
-
 #ifdef Q_OS_WIN
-			_wunlink(internal::ReportPath.toStdWString().c_str());
+	if (_wfopen_s(&internal::ReportFile, internal::ReportPath.toStdWString().c_str(), L"wb") != 0) {
+		internal::ReportFile = nullptr;
+	}
 #else // Q_OS_WIN
-			unlink(internal::ReportPath.toUtf8().constData());
+	internal::ReportFile = fopen(QFile::encodeName(internal::ReportPath).constData(), "wb");
 #endif // else for Q_OS_WIN
+	if (internal::ReportFile) {
+#ifdef Q_OS_WIN
+		internal::ReportFileNo = _fileno(internal::ReportFile);
+#else // Q_OS_WIN
+		internal::ReportFileNo = fileno(internal::ReportFile);
+#endif // else for Q_OS_WIN
+		if (internal::SetSignalHandlers) {
+#ifndef Q_OS_WIN
+			struct sigaction sigact;
+
+			sigact.sa_sigaction = SignalHandlers::internal::Handler;
+			sigemptyset(&sigact.sa_mask);
+			sigact.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
+
+			sigaction(SIGABRT, &sigact, &internal::SIG_def[SIGABRT]);
+			sigaction(SIGSEGV, &sigact, &internal::SIG_def[SIGSEGV]);
+			sigaction(SIGILL, &sigact, &internal::SIG_def[SIGILL]);
+			sigaction(SIGFPE, &sigact, &internal::SIG_def[SIGFPE]);
+			sigaction(SIGBUS, &sigact, &internal::SIG_def[SIGBUS]);
+			sigaction(SIGSYS, &sigact, &internal::SIG_def[SIGSYS]);
+#else // !Q_OS_WIN
+			signal(SIGABRT, SignalHandlers::internal::Handler);
+			signal(SIGSEGV, SignalHandlers::internal::Handler);
+			signal(SIGILL, SignalHandlers::internal::Handler);
+			signal(SIGFPE, SignalHandlers::internal::Handler);
+#endif // else for !Q_OS_WIN
 		}
+
+		SignalHandlers::internal::InstallOperatorNewHandler();
+
+		return Started;
+	}
+
+	LOG(("FATAL: Could not open '%1' for writing!").arg(internal::ReportPath));
+
+	return CantOpen;
+#else // !TDESKTOP_DISABLE_CRASH_REPORTS
+	return Started;
+#endif // else for !TDESKTOP_DISABLE_CRASH_REPORTS
+}
+
+void finish() {
+#ifndef TDESKTOP_DISABLE_CRASH_REPORTS
+	FinishCrashHandler();
+	if (internal::ReportFile) {
+		fclose(internal::ReportFile);
+		internal::ReportFile = nullptr;
+
+#ifdef Q_OS_WIN
+		_wunlink(internal::ReportPath.toStdWString().c_str());
+#else // Q_OS_WIN
+		unlink(internal::ReportPath.toUtf8().constData());
+#endif // else for Q_OS_WIN
+	}
 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS
-	}
+}
 
-	void setCrashAnnotation(const std::string &key, const QString &value) {
-		if (!value.trimmed().isEmpty()) {
-			internal::ProcessAnnotations[key] = value.toUtf8().constData();
-		} else {
-			internal::ProcessAnnotations.erase(key);
-		}
-	}
-
-	void setCrashAnnotationRef(const std::string &key, const QString *valuePtr) {
-		if (valuePtr) {
-			internal::ProcessAnnotationRefs[key] = valuePtr;
-		} else {
-			internal::ProcessAnnotationRefs.erase(key);
-		}
+void setCrashAnnotation(const std::string &key, const QString &value) {
+	if (!value.trimmed().isEmpty()) {
+		internal::ProcessAnnotations[key] = value.toUtf8().constData();
+	} else {
+		internal::ProcessAnnotations.erase(key);
 	}
 }
 
+void setCrashAnnotationRef(const std::string &key, const QString *valuePtr) {
+	if (valuePtr) {
+		internal::ProcessAnnotationRefs[key] = valuePtr;
+	} else {
+		internal::ProcessAnnotationRefs.erase(key);
+	}
+}
+} // namespace SignalHandlers
+
 #ifdef TDESKTOP_DISABLE_CRASH_REPORTS
 
 namespace SignalHandlers {
-	dump::~dump() {
-	}
-	const dump &operator<<(const dump &stream, const char *str) {
-		return stream;
-	}
-	const dump &operator<<(const dump &stream, double num) {
-		return stream;
-	}
+dump::~dump() {}
+const dump &operator<<(const dump &stream, const char *str) {
+	return stream;
 }
+const dump &operator<<(const dump &stream, double num) {
+	return stream;
+}
+} // namespace SignalHandlers
 
 #endif // TDESKTOP_DISABLE_CRASH_REPORTS
diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h
index ca1ae6da6..c73534e5f 100644
--- a/Telegram/SourceFiles/logs.h
+++ b/Telegram/SourceFiles/logs.h
@@ -28,101 +28,107 @@ extern inline bool cDebug();
 class MTPlong;
 namespace Logs {
 
-	void start();
-	bool started();
-	void finish();
+void start();
+bool started();
+void finish();
 
-	bool instanceChecked();
-	void multipleInstances();
+bool instanceChecked();
+void multipleInstances();
 
-	void closeMain();
+void closeMain();
 
-	void writeMain(const QString &v);
+void writeMain(const QString &v);
 
-	void writeDebug(const char *file, qint32 line, const QString &v);
-	void writeTcp(const QString &v);
-	void writeMtp(qint32 dc, const QString &v);
+void writeDebug(const char *file, qint32 line, const QString &v);
+void writeTcp(const QString &v);
+void writeMtp(qint32 dc, const QString &v);
 
-	QString full();
-
-	inline const char *b(bool v) {
-		return v ? "[TRUE]" : "[FALSE]";
-	}
-
-	struct MemoryBuffer {
-		MemoryBuffer(const void *ptr, quint32 size) : p(ptr), s(size) {
-		}
-		QString str() const {
-			QString result;
-			const uchar *buf((const uchar*)p);
-			const char *hex = "0123456789ABCDEF";
-			result.reserve(s * 3);
-			for (quint32 i = 0; i < s; ++i) {
-				result += hex[(buf[i] >> 4)];
-				result += hex[buf[i] & 0x0F];
-				result += ' ';
-			}
-			result.chop(1);
-			return result;
-		}
-
-		const void *p;
-		quint32 s;
-	};
-
-	inline MemoryBuffer mb(const void *ptr, quint32 size) {
-		return MemoryBuffer(ptr, size);
-	}
-
-	QString vector(const QVector<MTPlong> &ids);
-	QString vector(const QVector<quint64> &ids);
+QString full();
 
+inline const char *b(bool v) {
+	return v ? "[TRUE]" : "[FALSE]";
 }
 
+struct MemoryBuffer {
+	MemoryBuffer(const void *ptr, quint32 size)
+	    : p(ptr)
+	    , s(size) {}
+	QString str() const {
+		QString result;
+		const uchar *buf((const uchar *)p);
+		const char *hex = "0123456789ABCDEF";
+		result.reserve(s * 3);
+		for (quint32 i = 0; i < s; ++i) {
+			result += hex[(buf[i] >> 4)];
+			result += hex[buf[i] & 0x0F];
+			result += ' ';
+		}
+		result.chop(1);
+		return result;
+	}
+
+	const void *p;
+	quint32 s;
+};
+
+inline MemoryBuffer mb(const void *ptr, quint32 size) {
+	return MemoryBuffer(ptr, size);
+}
+
+QString vector(const QVector<MTPlong> &ids);
+QString vector(const QVector<quint64> &ids);
+
+} // namespace Logs
+
 #define LOG(msg) (Logs::writeMain(QString msg))
-//usage LOG(("log: %1 %2").arg(1).arg(2))
+// usage LOG(("log: %1 %2").arg(1).arg(2))
 
-#define DEBUG_LOG(msg) { if (cDebug() || !Logs::started()) Logs::writeDebug(__FILE__, __LINE__, QString msg); }
-//usage DEBUG_LOG(("log: %1 %2").arg(1).arg(2))
+#define DEBUG_LOG(msg)                                                                                                 \
+	{                                                                                                                  \
+		if (cDebug() || !Logs::started()) Logs::writeDebug(__FILE__, __LINE__, QString msg);                           \
+	}
+// usage DEBUG_LOG(("log: %1 %2").arg(1).arg(2))
 
-#define TCP_LOG(msg) { if (cDebug() || !Logs::started()) Logs::writeTcp(QString msg); }
-//usage TCP_LOG(("log: %1 %2").arg(1).arg(2))
+#define TCP_LOG(msg)                                                                                                   \
+	{                                                                                                                  \
+		if (cDebug() || !Logs::started()) Logs::writeTcp(QString msg);                                                 \
+	}
+// usage TCP_LOG(("log: %1 %2").arg(1).arg(2))
 
-#define MTP_LOG(dc, msg) { if (cDebug() || !Logs::started()) Logs::writeMtp(dc, QString msg); }
-//usage MTP_LOG(dc, ("log: %1 %2").arg(1).arg(2))
+#define MTP_LOG(dc, msg)                                                                                               \
+	{                                                                                                                  \
+		if (cDebug() || !Logs::started()) Logs::writeMtp(dc, QString msg);                                             \
+	}
+// usage MTP_LOG(dc, ("log: %1 %2").arg(1).arg(2))
 
 namespace SignalHandlers {
 
-	struct dump {
-		~dump();
-	};
-	const dump &operator<<(const dump &stream, const char *str);
-    const dump &operator<<(const dump &stream, const wchar_t *str);
-	const dump &operator<<(const dump &stream, int num);
-	const dump &operator<<(const dump &stream, unsigned int num);
-	const dump &operator<<(const dump &stream, unsigned long num);
-	const dump &operator<<(const dump &stream, unsigned long long num);
-	const dump &operator<<(const dump &stream, double num);
-	enum Status {
-		CantOpen,
-		LastCrashed,
-		Started
-	};
-	Status start();
-	Status restart(); // can be only CantOpen or Started
-	void finish();
+struct dump {
+	~dump();
+};
+const dump &operator<<(const dump &stream, const char *str);
+const dump &operator<<(const dump &stream, const wchar_t *str);
+const dump &operator<<(const dump &stream, int num);
+const dump &operator<<(const dump &stream, unsigned int num);
+const dump &operator<<(const dump &stream, unsigned long num);
+const dump &operator<<(const dump &stream, unsigned long long num);
+const dump &operator<<(const dump &stream, double num);
+enum Status { CantOpen, LastCrashed, Started };
+Status start();
+Status restart(); // can be only CantOpen or Started
+void finish();
 
-	void setCrashAnnotation(const std::string &key, const QString &value);
-
-	// Remembers value pointer and tries to add the value to the crash report.
-	// Attention! You should call clearCrashAnnotationRef(key) before destroying value.
-	void setCrashAnnotationRef(const std::string &key, const QString *valuePtr);
-	inline void clearCrashAnnotationRef(const std::string &key) {
-		setCrashAnnotationRef(key, nullptr);
-	}
+void setCrashAnnotation(const std::string &key, const QString &value);
 
+// Remembers value pointer and tries to add the value to the crash report.
+// Attention! You should call clearCrashAnnotationRef(key) before destroying value.
+void setCrashAnnotationRef(const std::string &key, const QString *valuePtr);
+inline void clearCrashAnnotationRef(const std::string &key) {
+	setCrashAnnotationRef(key, nullptr);
 }
 
+} // namespace SignalHandlers
+
 namespace base {
 namespace assertion {
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 79f336f48..bcf83df4d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -20,60 +20,60 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mainwidget.h"
 
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "base/flat_set.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/download_path_box.h"
+#include "boxes/mute_settings_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/sticker_set_box.h"
+#include "calls/calls_instance.h"
+#include "calls/calls_top_bar.h"
+#include "chat_helpers/message_field.h"
+#include "chat_helpers/stickers.h"
+#include "core/file_utilities.h"
+#include "data/data_drafts.h"
+#include "dialogs/dialogs_widget.h"
+#include "history/history_media.h"
+#include "history/history_message.h"
+#include "history/history_service_layout.h"
+#include "history/history_widget.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "media/media_audio.h"
+#include "media/player/media_player_float.h"
+#include "media/player/media_player_instance.h"
+#include "media/player/media_player_panel.h"
+#include "media/player/media_player_volume_controller.h"
+#include "media/player/media_player_widget.h"
+#include "messenger.h"
+#include "mtproto/dc_options.h"
+#include "observer_peer.h"
+#include "overviewwidget.h"
+#include "shortcuts.h"
+#include "storage/file_upload.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_history.h"
 #include "ui/special_buttons.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/shadow.h"
+#include "window/notifications_manager.h"
+#include "window/player_wrap_widget.h"
 #include "window/section_memento.h"
 #include "window/section_widget.h"
-#include "window/top_bar_widget.h"
-#include "data/data_drafts.h"
-#include "ui/widgets/dropdown_menu.h"
-#include "chat_helpers/message_field.h"
-#include "chat_helpers/stickers.h"
-#include "observer_peer.h"
-#include "apiwrap.h"
-#include "dialogs/dialogs_widget.h"
-#include "history/history_widget.h"
-#include "history/history_message.h"
-#include "history/history_media.h"
-#include "history/history_service_layout.h"
-#include "overviewwidget.h"
-#include "lang/lang_keys.h"
-#include "lang/lang_cloud_manager.h"
-#include "boxes/add_contact_box.h"
-#include "storage/file_upload.h"
-#include "messenger.h"
-#include "application.h"
-#include "mainwindow.h"
-#include "inline_bots/inline_bot_layout_item.h"
-#include "boxes/confirm_box.h"
-#include "boxes/sticker_set_box.h"
-#include "boxes/mute_settings_box.h"
-#include "boxes/peer_list_controllers.h"
-#include "boxes/download_path_box.h"
-#include "storage/localstorage.h"
-#include "shortcuts.h"
-#include "media/media_audio.h"
-#include "media/player/media_player_panel.h"
-#include "media/player/media_player_widget.h"
-#include "media/player/media_player_volume_controller.h"
-#include "media/player/media_player_instance.h"
-#include "media/player/media_player_float.h"
-#include "base/qthelp_regex.h"
-#include "base/qthelp_url.h"
-#include "base/flat_set.h"
 #include "window/themes/window_theme.h"
-#include "window/player_wrap_widget.h"
-#include "styles/style_boxes.h"
-#include "mtproto/dc_options.h"
-#include "core/file_utilities.h"
-#include "auth_session.h"
-#include "window/notifications_manager.h"
+#include "window/top_bar_widget.h"
 #include "window/window_controller.h"
-#include "calls/calls_instance.h"
-#include "calls/calls_top_bar.h"
 
 #include <QAction>
 #include <QWindow>
@@ -99,34 +99,30 @@ MTPMessagesFilter TypeToMediaFilter(MediaOverviewType &type) {
 
 } // namespace
 
-StackItemSection::StackItemSection(std::unique_ptr<Window::SectionMemento> &&memento) : StackItem(nullptr)
-, _memento(std::move(memento)) {
-}
+StackItemSection::StackItemSection(std::unique_ptr<Window::SectionMemento> &&memento)
+    : StackItem(nullptr)
+    , _memento(std::move(memento)) {}
 
-StackItemSection::~StackItemSection() {
-}
+StackItemSection::~StackItemSection() {}
 
 template <typename ToggleCallback, typename DraggedCallback>
 MainWidget::Float::Float(QWidget *parent, HistoryItem *item, ToggleCallback toggle, DraggedCallback dragged)
-: animationSide(RectPart::Right)
-, column(Window::Column::Second)
-, corner(RectPart::TopRight)
-, widget(parent, item, [this, toggle = std::move(toggle)](bool visible) {
-	toggle(this, visible);
-}, [this, dragged = std::move(dragged)](bool closed) {
-	dragged(this, closed);
-}) {
-}
+    : animationSide(RectPart::Right)
+    , column(Window::Column::Second)
+    , corner(RectPart::TopRight)
+    , widget(parent, item, [this, toggle = std::move(toggle)](bool visible) { toggle(this, visible); },
+             [this, dragged = std::move(dragged)](bool closed) { dragged(this, closed); }) {}
 
-MainWidget::MainWidget(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller)
-, _dialogsWidth(st::dialogsWidthMin)
-, _sideShadow(this, st::shadowFg)
-, _sideResizeArea(this)
-, _dialogs(this, _controller)
-, _history(this, _controller)
-, _playerPlaylist(this, Media::Player::Panel::Layout::OnlyPlaylist)
-, _playerPanel(this, Media::Player::Panel::Layout::Full) {
+MainWidget::MainWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _dialogsWidth(st::dialogsWidthMin)
+    , _sideShadow(this, st::shadowFg)
+    , _sideResizeArea(this)
+    , _dialogs(this, _controller)
+    , _history(this, _controller)
+    , _playerPlaylist(this, Media::Player::Panel::Layout::OnlyPlaylist)
+    , _playerPanel(this, Media::Player::Panel::Layout::Full) {
 	Messenger::Instance().mtp()->setUpdatesHandler(rpcDone(&MainWidget::updateReceived));
 	Messenger::Instance().mtp()->setGlobalFailHandler(rpcFail(&MainWidget::updateFail));
 
@@ -144,7 +140,7 @@ MainWidget::MainWidget(QWidget *parent, not_null<Window::Controller*> controller
 	connect(&_byPtsTimer, SIGNAL(timeout()), this, SLOT(onGetDifferenceTimeByPts()));
 	connect(&_byMinChannelTimer, SIGNAL(timeout()), this, SLOT(getDifference()));
 	connect(&_failDifferenceTimer, SIGNAL(timeout()), this, SLOT(onGetDifferenceTimeAfterFail()));
-	connect(_history, SIGNAL(historyShown(History*,MsgId)), this, SLOT(onHistoryShown(History*,MsgId)));
+	connect(_history, SIGNAL(historyShown(History *, MsgId)), this, SLOT(onHistoryShown(History *, MsgId)));
 	connect(&updateNotifySettingTimer, SIGNAL(timeout()), this, SLOT(onUpdateNotifySettings()));
 	subscribe(Media::Player::Updated(), [this](const AudioMsgId &audioId) {
 		if (audioId.type() != AudioMsgId::Type::Video) {
@@ -152,18 +148,10 @@ MainWidget::MainWidget(QWidget *parent, not_null<Window::Controller*> controller
 		}
 	});
 	subscribe(Auth().calls().currentCallChanged(), [this](Calls::Call *call) { setCurrentCall(call); });
-	subscribe(_controller->dialogsListFocused(), [this](bool) {
-		updateDialogsWidthAnimated();
-	});
-	subscribe(_controller->dialogsListDisplayForced(), [this](bool) {
-		updateDialogsWidthAnimated();
-	});
-	subscribe(_controller->dialogsWidthRatio(), [this](double) {
-		updateControlsGeometry();
-	});
-	subscribe(_controller->floatPlayerAreaUpdated(), [this] {
-		checkFloatPlayerVisibility();
-	});
+	subscribe(_controller->dialogsListFocused(), [this](bool) { updateDialogsWidthAnimated(); });
+	subscribe(_controller->dialogsListDisplayForced(), [this](bool) { updateDialogsWidthAnimated(); });
+	subscribe(_controller->dialogsWidthRatio(), [this](double) { updateControlsGeometry(); });
+	subscribe(_controller->floatPlayerAreaUpdated(), [this] { checkFloatPlayerVisibility(); });
 
 	QCoreApplication::instance()->installEventFilter(this);
 
@@ -222,9 +210,9 @@ MainWidget::MainWidget(QWidget *parent, not_null<Window::Controller*> controller
 	subscribe(Adaptive::Changed(), [this]() { handleAdaptiveLayoutUpdate(); });
 
 	auto observeEvents = Notify::PeerUpdate::Flag::SharedMediaChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		mediaOverviewUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { mediaOverviewUpdated(update); }));
 
 	_dialogs->show();
 	if (Adaptive::OneColumn()) {
@@ -250,12 +238,15 @@ void MainWidget::checkCurrentFloatPlayer() {
 			if (auto media = item->getMedia()) {
 				if (auto document = media->getDocument()) {
 					if (document->isRoundVideo()) {
-						_playerFloats.push_back(std::make_unique<Float>(this, item, [this](not_null<Float*> instance, bool visible) {
-							instance->hiddenByWidget = !visible;
-							toggleFloatPlayer(instance);
-						}, [this](not_null<Float*> instance, bool closed) {
-							finishFloatPlayerDrag(instance, closed);
-						}));
+						_playerFloats.push_back(
+						    std::make_unique<Float>(this, item,
+						                            [this](not_null<Float *> instance, bool visible) {
+							                            instance->hiddenByWidget = !visible;
+							                            toggleFloatPlayer(instance);
+						                            },
+						                            [this](not_null<Float *> instance, bool closed) {
+							                            finishFloatPlayerDrag(instance, closed);
+						                            }));
 						currentFloatPlayer()->column = Auth().data().floatPlayerColumn();
 						currentFloatPlayer()->corner = Auth().data().floatPlayerCorner();
 						checkFloatPlayerVisibility();
@@ -266,7 +257,7 @@ void MainWidget::checkCurrentFloatPlayer() {
 	}
 }
 
-void MainWidget::toggleFloatPlayer(not_null<Float*> instance) {
+void MainWidget::toggleFloatPlayer(not_null<Float *> instance) {
 	auto visible = !instance->hiddenByHistory && !instance->hiddenByWidget && instance->widget->isReady();
 	if (instance->visible != visible) {
 		instance->widget->resetMouseState();
@@ -275,9 +266,9 @@ void MainWidget::toggleFloatPlayer(not_null<Float*> instance) {
 			auto finalRect = QRect(getFloatPlayerPosition(instance), instance->widget->size());
 			instance->animationSide = getFloatPlayerSide(finalRect.center());
 		}
-		instance->visibleAnimation.start([this, instance] {
-			updateFloatPlayerPosition(instance);
-		}, visible ? 0. : 1., visible ? 1. : 0., st::slideDuration, visible ? anim::easeOutCirc : anim::linear);
+		instance->visibleAnimation.start([this, instance] { updateFloatPlayerPosition(instance); }, visible ? 0. : 1.,
+		                                 visible ? 1. : 0., st::slideDuration,
+		                                 visible ? anim::easeOutCirc : anim::linear);
 		updateFloatPlayerPosition(instance);
 	}
 }
@@ -290,21 +281,19 @@ void MainWidget::checkFloatPlayerVisibility() {
 
 	auto amVisible = false;
 	if (auto item = instance->widget->item()) {
-		Auth().data().queryItemVisibility().notify({ item, &amVisible }, true);
+		Auth().data().queryItemVisibility().notify({item, &amVisible}, true);
 	}
 	instance->hiddenByHistory = amVisible;
 	toggleFloatPlayer(instance);
 	updateFloatPlayerPosition(instance);
 }
 
-void MainWidget::updateFloatPlayerPosition(not_null<Float*> instance) {
+void MainWidget::updateFloatPlayerPosition(not_null<Float *> instance) {
 	auto visible = instance->visibleAnimation.current(instance->visible ? 1. : 0.);
 	if (visible == 0. && !instance->visible) {
 		instance->widget->hide();
 		if (instance->widget->detached()) {
-			InvokeQueued(instance->widget, [this, instance] {
-				removeFloatPlayer(instance);
-			});
+			InvokeQueued(instance->widget, [this, instance] { removeFloatPlayer(instance); });
 		}
 		return;
 	}
@@ -318,12 +307,14 @@ void MainWidget::updateFloatPlayerPosition(not_null<Float*> instance) {
 		auto position = QPoint();
 		if (instance->hiddenByDrag) {
 			instance->widget->setOpacity(instance->widget->countOpacityByParent());
-			position = getFloatPlayerHiddenPosition(instance->dragFrom, instance->widget->size(), instance->animationSide);
+			position =
+			    getFloatPlayerHiddenPosition(instance->dragFrom, instance->widget->size(), instance->animationSide);
 		} else {
 			instance->widget->setOpacity(visible * visible);
 			position = getFloatPlayerPosition(instance);
 			if (visible < 1.) {
-				auto hiddenPosition = getFloatPlayerHiddenPosition(position, instance->widget->size(), instance->animationSide);
+				auto hiddenPosition =
+				    getFloatPlayerHiddenPosition(position, instance->widget->size(), instance->animationSide);
 				position.setX(anim::interpolate(hiddenPosition.x(), position.x(), visible));
 				position.setY(anim::interpolate(hiddenPosition.y(), position.y(), visible));
 			}
@@ -346,7 +337,7 @@ QPoint MainWidget::getFloatPlayerHiddenPosition(QPoint position, QSize size, Rec
 	Unexpected("Bad side in MainWidget::getFloatPlayerHiddenPosition().");
 }
 
-QPoint MainWidget::getFloatPlayerPosition(not_null<Float*> instance) const {
+QPoint MainWidget::getFloatPlayerPosition(not_null<Float *> instance) const {
 	auto column = instance->column;
 	auto section = getFloatPlayerSection(&column);
 	auto rect = section->rectForFloatPlayer(column, instance->column);
@@ -375,11 +366,10 @@ RectPart MainWidget::getFloatPlayerSide(QPoint center) const {
 	return RectPart::Bottom;
 }
 
-void MainWidget::removeFloatPlayer(not_null<Float*> instance) {
+void MainWidget::removeFloatPlayer(not_null<Float *> instance) {
 	auto widget = std::move(instance->widget);
-	auto i = std::find_if(_playerFloats.begin(), _playerFloats.end(), [instance](auto &item) {
-		return (item.get() == instance);
-	});
+	auto i = std::find_if(_playerFloats.begin(), _playerFloats.end(),
+	                      [instance](auto &item) { return (item.get() == instance); });
 	Assert(i != _playerFloats.end());
 	_playerFloats.erase(i);
 
@@ -390,7 +380,7 @@ void MainWidget::removeFloatPlayer(not_null<Float*> instance) {
 	widget.destroy();
 }
 
-Window::AbstractSectionWidget *MainWidget::getFloatPlayerSection(not_null<Window::Column*> column) const {
+Window::AbstractSectionWidget *MainWidget::getFloatPlayerSection(not_null<Window::Column *> column) const {
 	if (!Adaptive::Normal()) {
 		*column = Adaptive::OneColumn() ? Window::Column::First : Window::Column::Second;
 		if (Adaptive::OneColumn() && selectingPeer()) {
@@ -422,7 +412,9 @@ void MainWidget::updateFloatPlayerColumnCorner(QPoint center) {
 	auto min = INT_MAX;
 	auto column = Auth().data().floatPlayerColumn();
 	auto corner = Auth().data().floatPlayerCorner();
-	auto checkSection = [this, center, size, &min, &column, &corner](Window::AbstractSectionWidget *widget, Window::Column myColumn, Window::Column playerColumn) {
+	auto checkSection = [this, center, size, &min, &column, &corner](Window::AbstractSectionWidget *widget,
+	                                                                 Window::Column myColumn,
+	                                                                 Window::Column playerColumn) {
 		auto rect = mapFromGlobal(widget->rectForFloatPlayer(myColumn, playerColumn));
 		auto left = rect.x() + (size.width() / 2);
 		auto right = rect.x() + rect.width() - (size.width() / 2);
@@ -475,7 +467,7 @@ void MainWidget::updateFloatPlayerColumnCorner(QPoint center) {
 	}
 }
 
-void MainWidget::finishFloatPlayerDrag(not_null<Float*> instance, bool closed) {
+void MainWidget::finishFloatPlayerDrag(not_null<Float *> instance, bool closed) {
 	instance->dragFrom = instance->widget->pos();
 	auto center = instance->widget->geometry().center();
 	if (closed) {
@@ -487,7 +479,8 @@ void MainWidget::finishFloatPlayerDrag(not_null<Float*> instance, bool closed) {
 	instance->corner = Auth().data().floatPlayerCorner();
 
 	instance->draggedAnimation.finish();
-	instance->draggedAnimation.start([this, instance] { updateFloatPlayerPosition(instance); }, 0., 1., st::slideDuration, anim::sineInOut);
+	instance->draggedAnimation.start([this, instance] { updateFloatPlayerPosition(instance); }, 0., 1.,
+	                                 st::slideDuration, anim::sineInOut);
 	updateFloatPlayerPosition(instance);
 
 	if (closed) {
@@ -506,7 +499,7 @@ bool MainWidget::setForwardDraft(PeerId peerId, ForwardWhatMessages what) {
 	if (what == ForwardSelectedMessages) {
 		toForward = _overview ? _overview->getSelectedItems() : _history->getSelectedItems();
 	} else {
-		auto item = (HistoryItem*)nullptr;
+		auto item = (HistoryItem *)nullptr;
 		if (what == ForwardContextMessage) {
 			item = App::contextItem();
 		} else if (what == ForwardPressedMessage) {
@@ -551,13 +544,14 @@ bool MainWidget::setForwardDraft(PeerId peerId, const SelectedItemSet &items) {
 
 bool MainWidget::onShareUrl(const PeerId &peer, const QString &url, const QString &text) {
 	PeerData *p = App::peer(peer);
-	if (!peer || (p->isChannel() && !p->asChannel()->canPublish() && p->asChannel()->isBroadcast()) || (p->isChat() && !p->asChat()->canWrite()) || (p->isUser() && p->asUser()->isInaccessible())) {
+	if (!peer || (p->isChannel() && !p->asChannel()->canPublish() && p->asChannel()->isBroadcast()) ||
+	    (p->isChat() && !p->asChat()->canWrite()) || (p->isUser() && p->asUser()->isInaccessible())) {
 		Ui::show(Box<InformBox>(lang(lng_share_cant)));
 		return false;
 	}
 	History *h = App::history(peer);
-	TextWithTags textWithTags = { url + '\n' + text, TextWithTags::Tags() };
-	MessageCursor cursor = { url.size() + 1, url.size() + 1 + text.size(), QFIXED_MAX };
+	TextWithTags textWithTags = {url + '\n' + text, TextWithTags::Tags()};
+	MessageCursor cursor = {url.size() + 1, url.size() + 1 + text.size(), QFIXED_MAX};
 	h->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
 	h->clearEditDraft();
 	bool opened = _history->peer() && (_history->peer()->id == peer);
@@ -571,13 +565,14 @@ bool MainWidget::onShareUrl(const PeerId &peer, const QString &url, const QStrin
 
 bool MainWidget::onInlineSwitchChosen(const PeerId &peer, const QString &botAndQuery) {
 	PeerData *p = App::peer(peer);
-	if (!peer || (p->isChannel() && !p->asChannel()->canPublish() && p->asChannel()->isBroadcast()) || (p->isChat() && !p->asChat()->canWrite()) || (p->isUser() && p->asUser()->isInaccessible())) {
+	if (!peer || (p->isChannel() && !p->asChannel()->canPublish() && p->asChannel()->isBroadcast()) ||
+	    (p->isChat() && !p->asChat()->canWrite()) || (p->isUser() && p->asUser()->isInaccessible())) {
 		Ui::show(Box<InformBox>(lang(lng_inline_switch_cant)));
 		return false;
 	}
 	History *h = App::history(peer);
-	TextWithTags textWithTags = { botAndQuery, TextWithTags::Tags() };
-	MessageCursor cursor = { botAndQuery.size(), botAndQuery.size(), QFIXED_MAX };
+	TextWithTags textWithTags = {botAndQuery, TextWithTags::Tags()};
+	MessageCursor cursor = {botAndQuery.size(), botAndQuery.size(), QFIXED_MAX};
 	h->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
 	h->clearEditDraft();
 	bool opened = _history->peer() && (_history->peer()->id == peer);
@@ -630,14 +625,19 @@ void MainWidget::finishForwarding(History *history, bool silent) {
 				if (auto message = i.value()->toHistoryMessage()) {
 					auto newId = FullMsgId(peerToChannel(history->peer->id), clientMsgId());
 					auto messageFromId = channelPost ? 0 : Auth().userId();
-					auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
-					history->addNewForwarded(newId.msg, flags, date(MTP_int(unixtime())), messageFromId, messagePostAuthor, message);
+					auto messagePostAuthor =
+					    channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
+					history->addNewForwarded(newId.msg, flags, date(MTP_int(unixtime())), messageFromId,
+					                         messagePostAuthor, message);
 					App::historyRegRandom(randomId, newId);
 				}
 			}
 			if (forwardFrom != i.value()->history()->peer) {
 				if (forwardFrom) {
-					history->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector<MTPint>(ids), MTP_vector<MTPlong>(randomIds), history->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId);
+					history->sendRequestId = MTP::send(
+					    MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector<MTPint>(ids),
+					                                MTP_vector<MTPlong>(randomIds), history->peer->input),
+					    rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId);
 					ids.resize(0);
 					randomIds.resize(0);
 				}
@@ -646,7 +646,10 @@ void MainWidget::finishForwarding(History *history, bool silent) {
 			ids.push_back(MTP_int(i.value()->id));
 			randomIds.push_back(MTP_long(randomId));
 		}
-		history->sendRequestId = MTP::send(MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector<MTPint>(ids), MTP_vector<MTPlong>(randomIds), history->peer->input), rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId);
+		history->sendRequestId =
+		    MTP::send(MTPmessages_ForwardMessages(MTP_flags(sendFlags), forwardFrom->input, MTP_vector<MTPint>(ids),
+		                                          MTP_vector<MTPlong>(randomIds), history->peer->input),
+		              rpcDone(&MainWidget::sentUpdatesReceived), RPCFailHandlerPtr(), 0, 0, history->sendRequestId);
 
 		if (_history->peer() == history->peer) {
 			_history->peerMessagesUpdated();
@@ -677,9 +680,7 @@ void MainWidget::webPagesOrGamesUpdate() {
 		for_const (auto webPageId, _webPagesUpdated) {
 			auto j = items.constFind(App::webPage(webPageId));
 			if (j != items.cend()) {
-				for_const (auto item, j.value()) {
-					item->setPendingInitDimensions();
-				}
+				for_const (auto item, j.value()) { item->setPendingInitDimensions(); }
 			}
 		}
 		_webPagesUpdated.clear();
@@ -689,9 +690,7 @@ void MainWidget::webPagesOrGamesUpdate() {
 		for_const (auto gameId, _gamesUpdated) {
 			auto j = items.constFind(App::game(gameId));
 			if (j != items.cend()) {
-				for_const (auto item, j.value()) {
-					item->setPendingInitDimensions();
-				}
+				for_const (auto item, j.value()) { item->setPendingInitDimensions(); }
 			}
 		}
 		_gamesUpdated.clear();
@@ -764,7 +763,8 @@ void MainWidget::notify_inlineKeyboardMoved(const HistoryItem *item, int oldKeyb
 	_history->notify_inlineKeyboardMoved(item, oldKeyboardTop, newKeyboardTop);
 }
 
-bool MainWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
+bool MainWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot,
+                                                      MsgId samePeerReplyTo) {
 	return _history->notify_switchInlineBotButtonReceived(query, samePeerBot, samePeerReplyTo);
 }
 
@@ -780,9 +780,7 @@ void MainWidget::notify_userIsContactChanged(UserData *user, bool fromThisApp) {
 	const SharedContactItems &items(App::sharedContactItems());
 	SharedContactItems::const_iterator i = items.constFind(peerToUser(user->id));
 	if (i != items.cend()) {
-		for_const (auto item, i.value()) {
-			item->setPendingInitDimensions();
-		}
+		for_const (auto item, i.value()) { item->setPendingInitDimensions(); }
 	}
 
 	if (user->contact > 0 && fromThisApp) {
@@ -794,7 +792,7 @@ void MainWidget::notify_migrateUpdated(PeerData *peer) {
 	_history->notify_migrateUpdated(peer);
 }
 
-void MainWidget::ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
+void MainWidget::ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
 	if (item->isLogEntry()) {
 		Auth().data().repaintLogEntry().notify(item, true);
 	} else {
@@ -940,40 +938,43 @@ void MainWidget::cancelUploadLayer() {
 	}
 
 	Auth().uploader().pause(item->fullId());
-	Ui::show(Box<ConfirmBox>(lang(lng_selected_cancel_sure_this), lang(lng_selected_upload_stop), lang(lng_continue), base::lambda_guarded(this, [this] {
-		if (_overview) {
-			_overview->deleteContextItem(false);
-		} else {
-			_history->deleteContextItem(false);
-		}
-		Auth().uploader().unpause();
-	}), base::lambda_guarded(this, [] {
-		Auth().uploader().unpause();
-	})));
+	Ui::show(Box<ConfirmBox>(lang(lng_selected_cancel_sure_this), lang(lng_selected_upload_stop), lang(lng_continue),
+	                         base::lambda_guarded(this,
+	                                              [this] {
+		                                              if (_overview) {
+			                                              _overview->deleteContextItem(false);
+		                                              } else {
+			                                              _history->deleteContextItem(false);
+		                                              }
+		                                              Auth().uploader().unpause();
+	                                              }),
+	                         base::lambda_guarded(this, [] { Auth().uploader().unpause(); })));
 }
 
 void MainWidget::deletePhotoLayer(PhotoData *photo) {
 	if (!photo) return;
-	Ui::show(Box<ConfirmBox>(lang(lng_delete_photo_sure), lang(lng_box_delete), base::lambda_guarded(this, [this, photo] {
-		Ui::hideLayer();
+	Ui::show(
+	    Box<ConfirmBox>(lang(lng_delete_photo_sure), lang(lng_box_delete), base::lambda_guarded(this, [this, photo] {
+		                    Ui::hideLayer();
 
-		auto me = App::self();
-		if (!me) return;
+		                    auto me = App::self();
+		                    if (!me) return;
 
-		if (me->photoId == photo->id) {
-			Messenger::Instance().peerClearPhoto(me->id);
-		} else if (photo->peer && !photo->peer->isUser() && photo->peer->photoId == photo->id) {
-			Messenger::Instance().peerClearPhoto(photo->peer->id);
-		} else {
-			for (int i = 0, l = me->photos.size(); i != l; ++i) {
-				if (me->photos.at(i) == photo) {
-					me->photos.removeAt(i);
-					MTP::send(MTPphotos_DeletePhotos(MTP_vector<MTPInputPhoto>(1, MTP_inputPhoto(MTP_long(photo->id), MTP_long(photo->access)))));
-					break;
-				}
-			}
-		}
-	})));
+		                    if (me->photoId == photo->id) {
+			                    Messenger::Instance().peerClearPhoto(me->id);
+		                    } else if (photo->peer && !photo->peer->isUser() && photo->peer->photoId == photo->id) {
+			                    Messenger::Instance().peerClearPhoto(photo->peer->id);
+		                    } else {
+			                    for (int i = 0, l = me->photos.size(); i != l; ++i) {
+				                    if (me->photos.at(i) == photo) {
+					                    me->photos.removeAt(i);
+					                    MTP::send(MTPphotos_DeletePhotos(MTP_vector<MTPInputPhoto>(
+					                        1, MTP_inputPhoto(MTP_long(photo->id), MTP_long(photo->access)))));
+					                    break;
+				                    }
+			                    }
+		                    }
+	                    })));
 }
 
 void MainWidget::shareContactLayer(UserData *contact) {
@@ -1003,13 +1004,17 @@ bool MainWidget::selectingPeerForInlineSwitch() {
 void MainWidget::offerPeer(PeerId peer) {
 	Ui::hideLayer();
 	if (_hider->offerPeer(peer) && Adaptive::OneColumn()) {
-		_forwardConfirm = Ui::show(Box<ConfirmBox>(_hider->offeredText(), lang(lng_forward_send), base::lambda_guarded(this, [this] {
-			_hider->forward();
-			if (_forwardConfirm) _forwardConfirm->closeBox();
-			if (_hider) _hider->offerPeer(0);
-		}), base::lambda_guarded(this, [this] {
-			if (_hider && _forwardConfirm) _hider->offerPeer(0);
-		})));
+		_forwardConfirm = Ui::show(Box<ConfirmBox>(_hider->offeredText(), lang(lng_forward_send),
+		                                           base::lambda_guarded(this,
+		                                                                [this] {
+			                                                                _hider->forward();
+			                                                                if (_forwardConfirm)
+				                                                                _forwardConfirm->closeBox();
+			                                                                if (_hider) _hider->offerPeer(0);
+		                                                                }),
+		                                           base::lambda_guarded(this, [this] {
+			                                           if (_hider && _forwardConfirm) _hider->offerPeer(0);
+		                                           })));
 	}
 }
 
@@ -1024,7 +1029,8 @@ DragState MainWidget::getDragState(const QMimeData *mime) {
 bool MainWidget::leaveChatFailed(PeerData *peer, const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	if (error.type() == qstr("USER_NOT_PARTICIPANT") || error.type() == qstr("CHAT_ID_INVALID") || error.type() == qstr("PEER_ID_INVALID")) { // left this chat already
+	if (error.type() == qstr("USER_NOT_PARTICIPANT") || error.type() == qstr("CHAT_ID_INVALID") ||
+	    error.type() == qstr("PEER_ID_INVALID")) { // left this chat already
 		deleteConversation(peer);
 		return true;
 	}
@@ -1057,18 +1063,21 @@ void MainWidget::deleteHistoryPart(DeleteHistoryRequest request, const MTPmessag
 	if (request.justClearHistory) {
 		flags |= MTPmessages_DeleteHistory::Flag::f_just_clear;
 	}
-	MTP::send(MTPmessages_DeleteHistory(MTP_flags(flags), peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, request));
+	MTP::send(MTPmessages_DeleteHistory(MTP_flags(flags), peer->input, MTP_int(0)),
+	          rpcDone(&MainWidget::deleteHistoryPart, request));
 }
 
 void MainWidget::deleteMessages(PeerData *peer, const QVector<MTPint> &ids, bool forEveryone) {
 	if (peer->isChannel()) {
-		MTP::send(MTPchannels_DeleteMessages(peer->asChannel()->inputChannel, MTP_vector<MTPint>(ids)), rpcDone(&MainWidget::messagesAffected, peer));
+		MTP::send(MTPchannels_DeleteMessages(peer->asChannel()->inputChannel, MTP_vector<MTPint>(ids)),
+		          rpcDone(&MainWidget::messagesAffected, peer));
 	} else {
 		auto flags = MTPmessages_DeleteMessages::Flags(0);
 		if (forEveryone) {
 			flags |= MTPmessages_DeleteMessages::Flag::f_revoke;
 		}
-		MTP::send(MTPmessages_DeleteMessages(MTP_flags(flags), MTP_vector<MTPint>(ids)), rpcDone(&MainWidget::messagesAffected, peer));
+		MTP::send(MTPmessages_DeleteMessages(MTP_flags(flags), MTP_vector<MTPint>(ids)),
+		          rpcDone(&MainWidget::messagesAffected, peer));
 	}
 }
 
@@ -1106,14 +1115,16 @@ void MainWidget::deleteConversation(PeerData *peer, bool deleteHistory) {
 		peer->asChannel()->ptsWaitingForShortPoll(-1);
 	}
 	if (deleteHistory) {
-		DeleteHistoryRequest request = { peer, false };
-		MTP::send(MTPmessages_DeleteHistory(MTP_flags(0), peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, request));
+		DeleteHistoryRequest request = {peer, false};
+		MTP::send(MTPmessages_DeleteHistory(MTP_flags(0), peer->input, MTP_int(0)),
+		          rpcDone(&MainWidget::deleteHistoryPart, request));
 	}
 }
 
 void MainWidget::deleteAndExit(ChatData *chat) {
 	PeerData *peer = chat;
-	MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, App::self()->inputUser), rpcDone(&MainWidget::deleteHistoryAfterLeave, peer), rpcFail(&MainWidget::leaveChatFailed, peer));
+	MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, App::self()->inputUser),
+	          rpcDone(&MainWidget::deleteHistoryAfterLeave, peer), rpcFail(&MainWidget::leaveChatFailed, peer));
 }
 
 void MainWidget::deleteAllFromUser(ChannelData *channel, UserData *from) {
@@ -1134,7 +1145,8 @@ void MainWidget::deleteAllFromUser(ChannelData *channel, UserData *from) {
 			}
 		}
 	}
-	MTP::send(MTPchannels_DeleteUserHistory(channel->inputChannel, from->inputUser), rpcDone(&MainWidget::deleteAllFromUserPart, { channel, from }));
+	MTP::send(MTPchannels_DeleteUserHistory(channel->inputChannel, from->inputUser),
+	          rpcDone(&MainWidget::deleteAllFromUserPart, {channel, from}));
 }
 
 void MainWidget::deleteAllFromUserPart(DeleteAllFromUserParams params, const MTPmessages_AffectedHistory &result) {
@@ -1143,7 +1155,8 @@ void MainWidget::deleteAllFromUserPart(DeleteAllFromUserParams params, const MTP
 
 	auto offset = d.voffset.v;
 	if (offset > 0) {
-		MTP::send(MTPchannels_DeleteUserHistory(params.channel->inputChannel, params.from->inputUser), rpcDone(&MainWidget::deleteAllFromUserPart, params));
+		MTP::send(MTPchannels_DeleteUserHistory(params.channel->inputChannel, params.from->inputUser),
+		          rpcDone(&MainWidget::deleteAllFromUserPart, params));
 	} else if (auto h = App::historyLoaded(params.channel)) {
 		if (!h->lastMsg) {
 			checkPeerHistory(params.channel);
@@ -1160,15 +1173,18 @@ void MainWidget::clearHistory(PeerData *peer) {
 		h->newLoaded = h->oldLoaded = true;
 	}
 	auto flags = MTPmessages_DeleteHistory::Flag::f_just_clear;
-	DeleteHistoryRequest request = { peer, true };
-	MTP::send(MTPmessages_DeleteHistory(MTP_flags(flags), peer->input, MTP_int(0)), rpcDone(&MainWidget::deleteHistoryPart, request));
+	DeleteHistoryRequest request = {peer, true};
+	MTP::send(MTPmessages_DeleteHistory(MTP_flags(flags), peer->input, MTP_int(0)),
+	          rpcDone(&MainWidget::deleteHistoryPart, request));
 }
 
-void MainWidget::addParticipants(PeerData *chatOrChannel, const std::vector<not_null<UserData*>> &users) {
+void MainWidget::addParticipants(PeerData *chatOrChannel, const std::vector<not_null<UserData *>> &users) {
 	if (chatOrChannel->isChat()) {
 		auto chat = chatOrChannel->asChat();
 		for_const (auto user, users) {
-			MTP::send(MTPmessages_AddChatUser(chat->inputChat, user->inputUser, MTP_int(ForwardOnAdd)), rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::addParticipantFail, { user, chat }), 0, 5);
+			MTP::send(MTPmessages_AddChatUser(chat->inputChat, user->inputUser, MTP_int(ForwardOnAdd)),
+			          rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::addParticipantFail, {user, chat}),
+			          0, 5);
 		}
 	} else if (chatOrChannel->isChannel()) {
 		QVector<MTPInputUser> inputUsers;
@@ -1176,12 +1192,18 @@ void MainWidget::addParticipants(PeerData *chatOrChannel, const std::vector<not_
 		for (auto i = users.cbegin(), e = users.cend(); i != e; ++i) {
 			inputUsers.push_back((*i)->inputUser);
 			if (inputUsers.size() == MaxUsersPerInvite) {
-				MTP::send(MTPchannels_InviteToChannel(chatOrChannel->asChannel()->inputChannel, MTP_vector<MTPInputUser>(inputUsers)), rpcDone(&MainWidget::inviteToChannelDone, chatOrChannel->asChannel()), rpcFail(&MainWidget::addParticipantsFail, chatOrChannel->asChannel()), 0, 5);
+				MTP::send(MTPchannels_InviteToChannel(chatOrChannel->asChannel()->inputChannel,
+				                                      MTP_vector<MTPInputUser>(inputUsers)),
+				          rpcDone(&MainWidget::inviteToChannelDone, chatOrChannel->asChannel()),
+				          rpcFail(&MainWidget::addParticipantsFail, chatOrChannel->asChannel()), 0, 5);
 				inputUsers.clear();
 			}
 		}
 		if (!inputUsers.isEmpty()) {
-			MTP::send(MTPchannels_InviteToChannel(chatOrChannel->asChannel()->inputChannel, MTP_vector<MTPInputUser>(inputUsers)), rpcDone(&MainWidget::inviteToChannelDone, chatOrChannel->asChannel()), rpcFail(&MainWidget::addParticipantsFail, chatOrChannel->asChannel()), 0, 5);
+			MTP::send(MTPchannels_InviteToChannel(chatOrChannel->asChannel()->inputChannel,
+			                                      MTP_vector<MTPInputUser>(inputUsers)),
+			          rpcDone(&MainWidget::inviteToChannelDone, chatOrChannel->asChannel()),
+			          rpcFail(&MainWidget::addParticipantsFail, chatOrChannel->asChannel()), 0, 5);
 		}
 	}
 }
@@ -1195,12 +1217,14 @@ bool MainWidget::addParticipantFail(UserAndPeer data, const RPCError &error) {
 		text = lang(lng_cant_invite_banned);
 	} else if (error.type() == qstr("USER_PRIVACY_RESTRICTED")) {
 		text = lang(lng_cant_invite_privacy);
-	} else if (error.type() == qstr("USER_NOT_MUTUAL_CONTACT")) { // trying to return user who does not have me in contacts
+	} else if (error.type() ==
+	           qstr("USER_NOT_MUTUAL_CONTACT")) { // trying to return user who does not have me in contacts
 		text = lang(lng_failed_add_not_mutual);
 	} else if (error.type() == qstr("USER_ALREADY_PARTICIPANT") && data.user->botInfo) {
 		text = lang(lng_bot_already_in_group);
 	} else if (error.type() == qstr("PEER_FLOOD")) {
-		text = PeerFloodErrorText((data.peer->isChat() || data.peer->isMegagroup()) ? PeerFloodType::InviteGroup : PeerFloodType::InviteChannel);
+		text = PeerFloodErrorText((data.peer->isChat() || data.peer->isMegagroup()) ? PeerFloodType::InviteGroup :
+		                                                                              PeerFloodType::InviteChannel);
 	}
 	Ui::show(Box<InformBox>(text));
 	return false;
@@ -1215,7 +1239,8 @@ bool MainWidget::addParticipantsFail(ChannelData *channel, const RPCError &error
 		text = lang(lng_cant_invite_banned);
 	} else if (error.type() == qstr("USER_PRIVACY_RESTRICTED")) {
 		text = lang(channel->isMegagroup() ? lng_cant_invite_privacy : lng_cant_invite_privacy_channel);
-	} else if (error.type() == qstr("USER_NOT_MUTUAL_CONTACT")) { // trying to return user who does not have me in contacts
+	} else if (error.type() ==
+	           qstr("USER_NOT_MUTUAL_CONTACT")) { // trying to return user who does not have me in contacts
 		text = lang(channel->isMegagroup() ? lng_failed_add_not_mutual : lng_failed_add_not_mutual_channel);
 	} else if (error.type() == qstr("PEER_FLOOD")) {
 		text = PeerFloodErrorText(PeerFloodType::InviteGroup);
@@ -1225,7 +1250,8 @@ bool MainWidget::addParticipantsFail(ChannelData *channel, const RPCError &error
 }
 
 void MainWidget::kickParticipant(ChatData *chat, UserData *user) {
-	MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, user->inputUser), rpcDone(&MainWidget::sentUpdatesReceived), rpcFail(&MainWidget::kickParticipantFail, chat));
+	MTP::send(MTPmessages_DeleteChatUser(chat->inputChat, user->inputUser), rpcDone(&MainWidget::sentUpdatesReceived),
+	          rpcFail(&MainWidget::kickParticipantFail, chat));
 	Ui::showPeerHistory(chat->id, ShowAtTheEndMsgId);
 }
 
@@ -1237,7 +1263,9 @@ bool MainWidget::kickParticipantFail(ChatData *chat, const RPCError &error) {
 }
 
 void MainWidget::checkPeerHistory(PeerData *peer) {
-	MTP::send(MTPmessages_GetHistory(peer->input, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(1), MTP_int(0), MTP_int(0)), rpcDone(&MainWidget::checkedHistory, peer));
+	MTP::send(
+	    MTPmessages_GetHistory(peer->input, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(1), MTP_int(0), MTP_int(0)),
+	    rpcDone(&MainWidget::checkedHistory, peer));
 }
 
 void MainWidget::checkedHistory(PeerData *peer, const MTPmessages_Messages &result) {
@@ -1262,7 +1290,9 @@ void MainWidget::checkedHistory(PeerData *peer, const MTPmessages_Messages &resu
 		if (peer && peer->isChannel()) {
 			peer->asChannel()->ptsReceived(d.vpts.v);
 		} else {
-			LOG(("API Error: received messages.channelMessages when no channel was passed! (MainWidget::checkedHistory)"));
+			LOG(
+			    ("API Error: received messages.channelMessages when no channel was passed! "
+			     "(MainWidget::checkedHistory)"));
 		}
 		App::feedUsers(d.vusers);
 		App::feedChats(d.vchats);
@@ -1294,7 +1324,8 @@ void MainWidget::checkedHistory(PeerData *peer, const MTPmessages_Messages &resu
 			h->addNewMessage((*v)[0], NewMessageLast);
 		}
 		if (!h->lastMsgDate.isNull() && h->loadedAtBottom()) {
-			if (peer->isChannel() && peer->asChannel()->inviter > 0 && h->lastMsgDate <= peer->asChannel()->inviteDate && peer->asChannel()->amIn()) {
+			if (peer->isChannel() && peer->asChannel()->inviter > 0 &&
+			    h->lastMsgDate <= peer->asChannel()->inviteDate && peer->asChannel()->amIn()) {
 				if (UserData *from = App::userLoaded(peer->asChannel()->inviter)) {
 					h->asChannelHistory()->insertJoinedMessage(true);
 					_history->peerMessagesUpdated(h->peer->id);
@@ -1322,8 +1353,9 @@ void MainWidget::onCacheBackground() {
 	if (Window::Theme::Background()->tile()) {
 		auto &bg = Window::Theme::Background()->pixmapForTiled();
 
-		auto result = QImage(_willCacheFor.width() * cIntRetinaFactor(), _willCacheFor.height() * cIntRetinaFactor(), QImage::Format_RGB32);
-        result.setDevicePixelRatio(cRetinaFactor());
+		auto result = QImage(_willCacheFor.width() * cIntRetinaFactor(), _willCacheFor.height() * cIntRetinaFactor(),
+		                     QImage::Format_RGB32);
+		result.setDevicePixelRatio(cRetinaFactor());
 		{
 			QPainter p(&result);
 			auto left = 0;
@@ -1352,7 +1384,9 @@ void MainWidget::onCacheBackground() {
 		Window::Theme::ComputeBackgroundRects(_willCacheFor, bg.size(), to, from);
 		_cachedX = to.x();
 		_cachedY = to.y();
-		_cachedBackground = App::pixmapFromImageInPlace(bg.toImage().copy(from).scaled(to.width() * cIntRetinaFactor(), to.height() * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+		_cachedBackground = App::pixmapFromImageInPlace(
+		    bg.toImage().copy(from).scaled(to.width() * cIntRetinaFactor(), to.height() * cIntRetinaFactor(),
+		                                   Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 		_cachedBackground.setDevicePixelRatio(cRetinaFactor());
 	}
 	_cachedFor = _willCacheFor;
@@ -1407,7 +1441,7 @@ void MainWidget::sendMessage(const MessageToSend &message) {
 	saveRecentHashtags(textWithTags.text);
 
 	auto sending = TextWithEntities();
-	auto left = TextWithEntities { textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags) };
+	auto left = TextWithEntities{textWithTags.text, ConvertTextTagsToEntities(textWithTags.tags)};
 	auto prepareFlags = itemTextOptions(history, App::self()).flags;
 	TextUtilities::PrepareForSending(left, prepareFlags);
 
@@ -1463,8 +1497,16 @@ void MainWidget::sendMessage(const MessageToSend &message) {
 		}
 		auto messageFromId = channelPost ? 0 : Auth().userId();
 		auto messagePostAuthor = channelPost ? (Auth().user()->firstName + ' ' + Auth().user()->lastName) : QString();
-		lastMessage = history->addNewMessage(MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(history->peer->id), MTPnullFwdHeader, MTPint(), MTP_int(replyTo), MTP_int(unixtime()), msgText, media, MTPnullMarkup, localEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)), NewMessageUnread);
-		history->sendRequestId = MTP::send(MTPmessages_SendMessage(MTP_flags(sendFlags), history->peer->input, MTP_int(replyTo), msgText, MTP_long(randomId), MTPnullMarkup, sentEntities), rpcDone(&MainWidget::sentUpdatesReceived, randomId), rpcFail(&MainWidget::sendMessageFail), 0, 0, history->sendRequestId);
+		lastMessage = history->addNewMessage(
+		    MTP_message(MTP_flags(flags), MTP_int(newId.msg), MTP_int(messageFromId), peerToMTP(history->peer->id),
+		                MTPnullFwdHeader, MTPint(), MTP_int(replyTo), MTP_int(unixtime()), msgText, media,
+		                MTPnullMarkup, localEntities, MTP_int(1), MTPint(), MTP_string(messagePostAuthor)),
+		    NewMessageUnread);
+		history->sendRequestId =
+		    MTP::send(MTPmessages_SendMessage(MTP_flags(sendFlags), history->peer->input, MTP_int(replyTo), msgText,
+		                                      MTP_long(randomId), MTPnullMarkup, sentEntities),
+		              rpcDone(&MainWidget::sentUpdatesReceived, randomId), rpcFail(&MainWidget::sendMessageFail), 0, 0,
+		              history->sendRequestId);
 	}
 
 	history->lastSentMsg = lastMessage;
@@ -1528,7 +1570,7 @@ void MainWidget::unreadCountChanged(History *history) {
 	_history->unreadCountChanged(history);
 }
 
-TimeMs MainWidget::highlightStartTime(not_null<const HistoryItem*> item) const {
+TimeMs MainWidget::highlightStartTime(not_null<const HistoryItem *> item) const {
 	return _history->highlightStartTime(item);
 }
 
@@ -1540,7 +1582,8 @@ void MainWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) {
 	_history->hideSingleUseKeyboard(peer, replyTo);
 }
 
-void MainWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, const HistoryItem *msg, int row, int col) {
+void MainWidget::app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, const HistoryItem *msg, int row,
+                                     int col) {
 	_history->app_sendBotCallback(button, msg, row, col);
 }
 
@@ -1569,7 +1612,12 @@ bool MainWidget::preloadOverview(PeerData *peer, MediaOverviewType type) {
 		return false;
 	}
 
-	_overviewPreload[type].insert(peer, MTP::send(MTPmessages_Search(MTP_flags(0), peer->input, MTP_string(""), MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0)), rpcDone(&MainWidget::overviewPreloaded, peer), rpcFail(&MainWidget::overviewFailed, peer), 0, 10));
+	_overviewPreload[type].insert(
+	    peer,
+	    MTP::send(MTPmessages_Search(MTP_flags(0), peer->input, MTP_string(""), MTP_inputUserEmpty(), filter,
+	                                 MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0),
+	                                 MTP_int(0)),
+	              rpcDone(&MainWidget::overviewPreloaded, peer), rpcFail(&MainWidget::overviewFailed, peer), 0, 10));
 	return true;
 }
 
@@ -1599,7 +1647,8 @@ void MainWidget::mediaOverviewUpdated(const Notify::PeerUpdate &update) {
 }
 
 void MainWidget::itemEdited(HistoryItem *item) {
-	if (_history->peer() == item->history()->peer || (_history->peer() && _history->peer() == item->history()->peer->migrateTo())) {
+	if (_history->peer() == item->history()->peer ||
+	    (_history->peer() && _history->peer() == item->history()->peer->migrateTo())) {
 		_history->itemEdited(item);
 	}
 }
@@ -1627,13 +1676,18 @@ void MainWidget::loadMediaBack(PeerData *peer, MediaOverviewType type, bool many
 	}
 
 	auto minId = history->overviewMinId(type);
-	auto limit = (many || history->overview(type).size() > MediaOverviewStartPerPage) ? SearchPerPage : MediaOverviewStartPerPage;
+	auto limit = (many || history->overview(type).size() > MediaOverviewStartPerPage) ? SearchPerPage :
+	                                                                                    MediaOverviewStartPerPage;
 	auto filter = TypeToMediaFilter(type);
 	if (filter.type() == mtpc_inputMessagesFilterEmpty) {
 		return;
 	}
 
-	_overviewLoad[type].insert(peer, MTP::send(MTPmessages_Search(MTP_flags(0), peer->input, MTPstring(), MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(minId), MTP_int(0), MTP_int(limit), MTP_int(0), MTP_int(0)), rpcDone(&MainWidget::overviewLoaded, history)));
+	_overviewLoad[type].insert(
+	    peer,
+	    MTP::send(MTPmessages_Search(MTP_flags(0), peer->input, MTPstring(), MTP_inputUserEmpty(), filter, MTP_int(0),
+	                                 MTP_int(0), MTP_int(minId), MTP_int(0), MTP_int(limit), MTP_int(0), MTP_int(0)),
+	              rpcDone(&MainWidget::overviewLoaded, history)));
 }
 
 void MainWidget::checkLastUpdate(bool afterSleep) {
@@ -1644,7 +1698,7 @@ void MainWidget::checkLastUpdate(bool afterSleep) {
 	}
 }
 
-void MainWidget::overviewLoaded(not_null<History*> history, const MTPmessages_Messages &result, mtpRequestId req) {
+void MainWidget::overviewLoaded(not_null<History *> history, const MTPmessages_Messages &result, mtpRequestId req) {
 	OverviewsPreload::iterator it;
 	MediaOverviewType type = OverviewCount;
 	for (qint32 i = 0; i < OverviewCount; ++i) {
@@ -1664,9 +1718,16 @@ void MainWidget::overviewLoaded(not_null<History*> history, const MTPmessages_Me
 
 void MainWidget::sendReadRequest(PeerData *peer, MsgId upTo) {
 	if (peer->isChannel()) {
-		_readRequests.insert(peer, qMakePair(MTP::send(MTPchannels_ReadHistory(peer->asChannel()->inputChannel, MTP_int(upTo)), rpcDone(&MainWidget::channelReadDone, peer), rpcFail(&MainWidget::readRequestFail, peer)), upTo));
+		_readRequests.insert(
+		    peer, qMakePair(MTP::send(MTPchannels_ReadHistory(peer->asChannel()->inputChannel, MTP_int(upTo)),
+		                              rpcDone(&MainWidget::channelReadDone, peer),
+		                              rpcFail(&MainWidget::readRequestFail, peer)),
+		                    upTo));
 	} else {
-		_readRequests.insert(peer, qMakePair(MTP::send(MTPmessages_ReadHistory(peer->input, MTP_int(upTo)), rpcDone(&MainWidget::historyReadDone, peer), rpcFail(&MainWidget::readRequestFail, peer)), upTo));
+		_readRequests.insert(peer, qMakePair(MTP::send(MTPmessages_ReadHistory(peer->input, MTP_int(upTo)),
+		                                               rpcDone(&MainWidget::historyReadDone, peer),
+		                                               rpcFail(&MainWidget::readRequestFail, peer)),
+		                                     upTo));
 	}
 }
 
@@ -1738,7 +1799,8 @@ void MainWidget::handleAudioUpdate(const AudioMsgId &audioId) {
 		}
 	}
 
-	if (state.id == audioId && (audioId.type() == AudioMsgId::Type::Song || audioId.type() == AudioMsgId::Type::Voice)) {
+	if (state.id == audioId &&
+	    (audioId.type() == AudioMsgId::Type::Song || audioId.type() == AudioMsgId::Type::Voice)) {
 		if (!Media::Player::IsStoppedOrStopping(state.state)) {
 			createPlayer();
 		}
@@ -1865,7 +1927,8 @@ void MainWidget::setCurrentCall(Calls::Call *call) {
 
 void MainWidget::createCallTopBar() {
 	Expects(_currentCall != nullptr);
-	_callTopBar.create(this, object_ptr<Calls::TopBar>(this, _currentCall), style::margins(0, 0, 0, 0), [this] { callTopBarHeightUpdated(); });
+	_callTopBar.create(this, object_ptr<Calls::TopBar>(this, _currentCall), style::margins(0, 0, 0, 0),
+	                   [this] { callTopBarHeightUpdated(); });
 	orderWidgets();
 	if (_a_show.animating()) {
 		_callTopBar->showFast();
@@ -1910,9 +1973,7 @@ void MainWidget::documentLoadProgress(DocumentData *document) {
 	auto &items = App::documentItems();
 	auto i = items.constFind(document);
 	if (i != items.cend()) {
-		for_const (auto item, i.value()) {
-			Ui::repaintHistoryItem(item);
-		}
+		for_const (auto item, i.value()) { Ui::repaintHistoryItem(item); }
 	}
 	Auth().documentUpdated.notify(document, true);
 
@@ -1928,17 +1989,19 @@ void MainWidget::documentLoadFailed(FileLoader *loader, bool started) {
 	auto document = App::document(documentId);
 	if (started) {
 		auto failedFileName = loader->fileName();
-		Ui::show(Box<ConfirmBox>(lang(lng_download_finish_failed), base::lambda_guarded(this, [this, document, failedFileName] {
-			Ui::hideLayer();
-			if (document) document->save(failedFileName);
-		})));
+		Ui::show(Box<ConfirmBox>(lang(lng_download_finish_failed),
+		                         base::lambda_guarded(this, [this, document, failedFileName] {
+			                         Ui::hideLayer();
+			                         if (document) document->save(failedFileName);
+		                         })));
 	} else {
-		Ui::show(Box<ConfirmBox>(lang(lng_download_path_failed), lang(lng_download_path_settings), base::lambda_guarded(this, [this] {
-			Global::SetDownloadPath(QString());
-			Global::SetDownloadPathBookmark(QByteArray());
-			Ui::show(Box<DownloadPathBox>());
-			Global::RefDownloadPathChanged().notify();
-		})));
+		Ui::show(Box<ConfirmBox>(lang(lng_download_path_failed), lang(lng_download_path_settings),
+		                         base::lambda_guarded(this, [this] {
+			                         Global::SetDownloadPath(QString());
+			                         Global::SetDownloadPathBookmark(QByteArray());
+			                         Ui::show(Box<DownloadPathBox>());
+			                         Global::RefDownloadPathChanged().notify();
+		                         })));
 	}
 
 	if (document) {
@@ -1948,24 +2011,24 @@ void MainWidget::documentLoadFailed(FileLoader *loader, bool started) {
 }
 
 void MainWidget::inlineResultLoadProgress(FileLoader *loader) {
-	//InlineBots::Result *result = InlineBots::resultFromLoader(loader);
-	//if (!result) return;
+	// InlineBots::Result *result = InlineBots::resultFromLoader(loader);
+	// if (!result) return;
 
-	//result->loaded();
+	// result->loaded();
 
-	//Ui::repaintInlineItem();
+	// Ui::repaintInlineItem();
 }
 
 void MainWidget::inlineResultLoadFailed(FileLoader *loader, bool started) {
-	//InlineBots::Result *result = InlineBots::resultFromLoader(loader);
-	//if (!result) return;
+	// InlineBots::Result *result = InlineBots::resultFromLoader(loader);
+	// if (!result) return;
 
-	//result->loaded();
+	// result->loaded();
 
-	//Ui::repaintInlineItem();
+	// Ui::repaintInlineItem();
 }
 
-void MainWidget::mediaMarkRead(not_null<DocumentData*> data) {
+void MainWidget::mediaMarkRead(not_null<DocumentData *> data) {
 	auto &items = App::documentItems();
 	auto i = items.constFind(data);
 	if (i != items.cend()) {
@@ -1975,7 +2038,7 @@ void MainWidget::mediaMarkRead(not_null<DocumentData*> data) {
 
 void MainWidget::mediaMarkRead(const HistoryItemsMap &items) {
 	QVector<MTPint> markedIds;
-	QMap<ChannelData*, QVector<MTPint>> channelMarkedIds;
+	QMap<ChannelData *, QVector<MTPint>> channelMarkedIds;
 	markedIds.reserve(items.size());
 	for_const (auto item, items) {
 		if ((!item->out() || item->mentionsMe()) && item->isMediaUnread()) {
@@ -1990,21 +2053,24 @@ void MainWidget::mediaMarkRead(const HistoryItemsMap &items) {
 		}
 	}
 	if (!markedIds.isEmpty()) {
-		MTP::send(MTPmessages_ReadMessageContents(MTP_vector<MTPint>(markedIds)), rpcDone(&MainWidget::messagesAffected, (PeerData*)0));
+		MTP::send(MTPmessages_ReadMessageContents(MTP_vector<MTPint>(markedIds)),
+		          rpcDone(&MainWidget::messagesAffected, (PeerData *)0));
 	}
 	for (auto i = channelMarkedIds.cbegin(), e = channelMarkedIds.cend(); i != e; ++i) {
 		MTP::send(MTPchannels_ReadMessageContents(i.key()->inputChannel, MTP_vector<MTPint>(i.value())));
 	}
 }
 
-void MainWidget::mediaMarkRead(not_null<HistoryItem*> item) {
+void MainWidget::mediaMarkRead(not_null<HistoryItem *> item) {
 	if ((!item->out() || item->mentionsMe()) && item->isMediaUnread()) {
 		item->markMediaRead();
 		if (item->id > 0) {
 			if (auto channel = item->history()->peer->asChannel()) {
-				MTP::send(MTPchannels_ReadMessageContents(channel->inputChannel, MTP_vector<MTPint>(1, MTP_int(item->id))));
+				MTP::send(
+				    MTPchannels_ReadMessageContents(channel->inputChannel, MTP_vector<MTPint>(1, MTP_int(item->id))));
 			} else {
-				MTP::send(MTPmessages_ReadMessageContents(MTP_vector<MTPint>(1, MTP_int(item->id))), rpcDone(&MainWidget::messagesAffected, (PeerData*)0));
+				MTP::send(MTPmessages_ReadMessageContents(MTP_vector<MTPint>(1, MTP_int(item->id))),
+				          rpcDone(&MainWidget::messagesAffected, (PeerData *)0));
 			}
 		}
 	}
@@ -2031,13 +2097,19 @@ void MainWidget::dialogsCancelled() {
 	_history->activate();
 }
 
-void MainWidget::insertCheckedServiceNotification(const TextWithEntities &message, const MTPMessageMedia &media, qint32 date) {
-	auto flags = MTPDmessage::Flag::f_entities | MTPDmessage::Flag::f_from_id | MTPDmessage_ClientFlag::f_clientside_unread;
+void MainWidget::insertCheckedServiceNotification(const TextWithEntities &message, const MTPMessageMedia &media,
+                                                  qint32 date) {
+	auto flags =
+	    MTPDmessage::Flag::f_entities | MTPDmessage::Flag::f_from_id | MTPDmessage_ClientFlag::f_clientside_unread;
 	auto sending = TextWithEntities(), left = message;
 	HistoryItem *item = nullptr;
 	while (TextUtilities::CutPart(sending, left, MaxMessageSize)) {
 		auto localEntities = TextUtilities::EntitiesToMTP(sending.entities);
-		item = App::histories().addNewMessage(MTP_message(MTP_flags(flags), MTP_int(clientMsgId()), MTP_int(ServiceUserId), MTP_peerUser(MTP_int(Auth().userId())), MTPnullFwdHeader, MTPint(), MTPint(), MTP_int(date), MTP_string(sending.text), media, MTPnullMarkup, localEntities, MTPint(), MTPint(), MTPstring()), NewMessageUnread);
+		item = App::histories().addNewMessage(
+		    MTP_message(MTP_flags(flags), MTP_int(clientMsgId()), MTP_int(ServiceUserId),
+		                MTP_peerUser(MTP_int(Auth().userId())), MTPnullFwdHeader, MTPint(), MTPint(), MTP_int(date),
+		                MTP_string(sending.text), media, MTPnullMarkup, localEntities, MTPint(), MTPint(), MTPstring()),
+		    NewMessageUnread);
 	}
 	if (item) {
 		_history->peerMessagesUpdated(item->history()->peer->id);
@@ -2128,9 +2200,8 @@ void MainWidget::checkChatBackground() {
 		if (_background->full->loaded()) {
 			if (_background->full->isNull()) {
 				Window::Theme::Background()->setImage(Window::Theme::kDefaultBackground);
-			} else if (false
-				|| _background->id == Window::Theme::kInitialBackground
-				|| _background->id == Window::Theme::kDefaultBackground) {
+			} else if (false || _background->id == Window::Theme::kInitialBackground ||
+			           _background->id == Window::Theme::kDefaultBackground) {
 				Window::Theme::Background()->setImage(_background->id);
 			} else {
 				Window::Theme::Background()->setImage(_background->id, _background->full->pix().toImage());
@@ -2198,84 +2269,92 @@ void MainWidget::scheduleViewIncrement(HistoryItem *item) {
 	j.value().insert(item->id, true);
 }
 
-void MainWidget::fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QString &text, base::lambda<void()> handler)> callback, bool pinToggle) {
+void MainWidget::fillPeerMenu(PeerData *peer,
+                              base::lambda<QAction *(const QString &text, base::lambda<void()> handler)> callback,
+                              bool pinToggle) {
 	if (pinToggle) {
 		auto isPinned = false;
 		if (auto history = App::historyLoaded(peer)) {
 			isPinned = history->isPinnedDialog();
 		}
 		auto pinSubscription = MakeShared<base::Subscription>();
-		auto pinAction = callback(lang(isPinned ? lng_context_unpin_from_top : lng_context_pin_to_top), [peer, pinSubscription] {
-			auto history = App::history(peer);
-			auto isPinned = !history->isPinnedDialog();
-			if (isPinned && App::histories().pinnedCount() >= Global::PinnedDialogsCountMax()) {
-				// Some old chat, that was converted to supergroup, maybe is still pinned.
-				auto findWastedPin = []() -> History* {
-					auto order = App::histories().getPinnedOrder();
-					for_const (auto pinned, order) {
-						if (pinned->peer->isChat()
-							&& pinned->peer->asChat()->isDeactivated()
-							&& !pinned->inChatList(Dialogs::Mode::All)) {
-							return pinned;
-						}
-					}
-					return nullptr;
-				};
-				if (auto wasted = findWastedPin()) {
-					wasted->setPinnedDialog(false);
-					history->setPinnedDialog(isPinned);
-					App::histories().savePinnedToServer();
-				} else {
-					Ui::show(Box<InformBox>(lng_error_pinned_max(lt_count, Global::PinnedDialogsCountMax())));
-				}
-				return;
-			}
+		auto pinAction =
+		    callback(lang(isPinned ? lng_context_unpin_from_top : lng_context_pin_to_top), [peer, pinSubscription] {
+			    auto history = App::history(peer);
+			    auto isPinned = !history->isPinnedDialog();
+			    if (isPinned && App::histories().pinnedCount() >= Global::PinnedDialogsCountMax()) {
+				    // Some old chat, that was converted to supergroup, maybe is still pinned.
+				    auto findWastedPin = []() -> History * {
+					    auto order = App::histories().getPinnedOrder();
+					    for_const (auto pinned, order) {
+						    if (pinned->peer->isChat() && pinned->peer->asChat()->isDeactivated() &&
+						        !pinned->inChatList(Dialogs::Mode::All)) {
+							    return pinned;
+						    }
+					    }
+					    return nullptr;
+				    };
+				    if (auto wasted = findWastedPin()) {
+					    wasted->setPinnedDialog(false);
+					    history->setPinnedDialog(isPinned);
+					    App::histories().savePinnedToServer();
+				    } else {
+					    Ui::show(Box<InformBox>(lng_error_pinned_max(lt_count, Global::PinnedDialogsCountMax())));
+				    }
+				    return;
+			    }
 
-			history->setPinnedDialog(isPinned);
-			auto flags = MTPmessages_ToggleDialogPin::Flags(0);
-			if (isPinned) {
-				flags |= MTPmessages_ToggleDialogPin::Flag::f_pinned;
-			}
-			MTP::send(MTPmessages_ToggleDialogPin(MTP_flags(flags), peer->input));
-			if (isPinned) {
-				if (auto main = App::main()) {
-					main->dialogsToUp();
-				}
-			}
-		});
-		auto pinChangedHandler = Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::PinnedChanged, [pinAction, peer](const Notify::PeerUpdate &update) {
-			if (update.peer != peer) return;
-			pinAction->setText(lang(App::history(peer)->isPinnedDialog() ? lng_context_unpin_from_top : lng_context_pin_to_top));
-		});
+			    history->setPinnedDialog(isPinned);
+			    auto flags = MTPmessages_ToggleDialogPin::Flags(0);
+			    if (isPinned) {
+				    flags |= MTPmessages_ToggleDialogPin::Flag::f_pinned;
+			    }
+			    MTP::send(MTPmessages_ToggleDialogPin(MTP_flags(flags), peer->input));
+			    if (isPinned) {
+				    if (auto main = App::main()) {
+					    main->dialogsToUp();
+				    }
+			    }
+		    });
+		auto pinChangedHandler = Notify::PeerUpdatedHandler(
+		    Notify::PeerUpdate::Flag::PinnedChanged, [pinAction, peer](const Notify::PeerUpdate &update) {
+			    if (update.peer != peer) return;
+			    pinAction->setText(
+			        lang(App::history(peer)->isPinnedDialog() ? lng_context_unpin_from_top : lng_context_pin_to_top));
+		    });
 		*pinSubscription = Notify::PeerUpdated().add_subscription(std::move(pinChangedHandler));
 	}
-	callback(lang((peer->isChat() || peer->isMegagroup()) ? lng_context_view_group : (peer->isUser() ? lng_context_view_profile : lng_context_view_channel)), [peer] {
-		Ui::showPeerProfile(peer);
-	});
+	callback(lang((peer->isChat() || peer->isMegagroup()) ?
+	                  lng_context_view_group :
+	                  (peer->isUser() ? lng_context_view_profile : lng_context_view_channel)),
+	         [peer] { Ui::showPeerProfile(peer); });
 	auto muteSubscription = MakeShared<base::Subscription>();
-    auto muteAction = callback(!peer->isMuted() ? lang(lng_disable_notifications_from_tray) : lang(lng_enable_notifications_from_tray), [peer, muteSubscription] {
-		// We have to capture the muteSubscription pointer in this lambda for
-		// real time updates of the action when an user changes mute status of
-		// the peer on his (her) another device. Otherwise, the subscription
-		// will be destroyed ahead of time.
-		if (!peer->isMuted()) {
-			Ui::show(Box<MuteSettingsBox>(peer));
-		} else {
-			App::main()->updateNotifySetting(peer, NotifySettingSetNotify);
-		}
-	});
-	auto muteChangedHandler = Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::NotificationsEnabled, [muteAction, peer](const Notify::PeerUpdate &update) {
-		if (update.peer != peer) return;
-		muteAction->setText(lang(peer->isMuted() ? lng_enable_notifications_from_tray : lng_disable_notifications_from_tray));
-	});
+	auto muteAction = callback(!peer->isMuted() ? lang(lng_disable_notifications_from_tray) :
+	                                              lang(lng_enable_notifications_from_tray),
+	                           [peer, muteSubscription] {
+		                           // We have to capture the muteSubscription pointer in this lambda for
+		                           // real time updates of the action when an user changes mute status of
+		                           // the peer on his (her) another device. Otherwise, the subscription
+		                           // will be destroyed ahead of time.
+		                           if (!peer->isMuted()) {
+			                           Ui::show(Box<MuteSettingsBox>(peer));
+		                           } else {
+			                           App::main()->updateNotifySetting(peer, NotifySettingSetNotify);
+		                           }
+	                           });
+	auto muteChangedHandler = Notify::PeerUpdatedHandler(
+	    Notify::PeerUpdate::Flag::NotificationsEnabled, [muteAction, peer](const Notify::PeerUpdate &update) {
+		    if (update.peer != peer) return;
+		    muteAction->setText(
+		        lang(peer->isMuted() ? lng_enable_notifications_from_tray : lng_disable_notifications_from_tray));
+	    });
 	*muteSubscription = Notify::PeerUpdated().add_subscription(std::move(muteChangedHandler));
 
-	callback(lang(lng_profile_search_messages), [peer] {
-		App::main()->searchInPeer(peer);
-	});
+	callback(lang(lng_profile_search_messages), [peer] { App::main()->searchInPeer(peer); });
 
 	auto clearHistoryHandler = [peer] {
-		auto text = peer->isUser() ? lng_sure_delete_history(lt_contact, peer->name) : lng_sure_delete_group_history(lt_group, peer->name);
+		auto text = peer->isUser() ? lng_sure_delete_history(lt_contact, peer->name) :
+		                             lng_sure_delete_group_history(lt_group, peer->name);
 		Ui::show(Box<ConfirmBox>(text, lang(lng_box_delete), st::attentionBoxButton, [peer] {
 			if (!App::main()) return;
 
@@ -2285,8 +2364,9 @@ void MainWidget::fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QStrin
 	};
 	auto deleteAndLeaveHandler = [peer] {
 		auto warningText = peer->isUser() ? lng_sure_delete_history(lt_contact, peer->name) :
-			peer->isChat() ? lng_sure_delete_and_exit(lt_group, peer->name) :
-			lang(peer->isMegagroup() ? lng_sure_leave_group : lng_sure_leave_channel);
+		                                    peer->isChat() ?
+		                                    lng_sure_delete_and_exit(lt_group, peer->name) :
+		                                    lang(peer->isMegagroup() ? lng_sure_leave_group : lng_sure_leave_channel);
 		auto confirmText = lang(peer->isUser() ? lng_box_delete : lng_box_leave);
 		auto &confirmStyle = peer->isChannel() ? st::defaultBoxButton : st::attentionBoxButton;
 		Ui::show(Box<ConfirmBox>(warningText, confirmText, confirmStyle, [peer] {
@@ -2297,12 +2377,15 @@ void MainWidget::fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QStrin
 			if (peer->isUser()) {
 				App::main()->deleteConversation(peer);
 			} else if (peer->isChat()) {
-				MTP::send(MTPmessages_DeleteChatUser(peer->asChat()->inputChat, App::self()->inputUser), App::main()->rpcDone(&MainWidget::deleteHistoryAfterLeave, peer), App::main()->rpcFail(&MainWidget::leaveChatFailed, peer));
+				MTP::send(MTPmessages_DeleteChatUser(peer->asChat()->inputChat, App::self()->inputUser),
+				          App::main()->rpcDone(&MainWidget::deleteHistoryAfterLeave, peer),
+				          App::main()->rpcFail(&MainWidget::leaveChatFailed, peer));
 			} else if (peer->isChannel()) {
 				if (peer->migrateFrom()) {
 					App::main()->deleteConversation(peer->migrateFrom());
 				}
-				MTP::send(MTPchannels_LeaveChannel(peer->asChannel()->inputChannel), App::main()->rpcDone(&MainWidget::sentUpdatesReceived));
+				MTP::send(MTPchannels_LeaveChannel(peer->asChannel()->inputChannel),
+				          App::main()->rpcDone(&MainWidget::sentUpdatesReceived));
 			}
 		}));
 	};
@@ -2311,21 +2394,29 @@ void MainWidget::fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QStrin
 		callback(lang(lng_profile_clear_history), std::move(clearHistoryHandler));
 		if (!user->isInaccessible() && user != App::self()) {
 			auto blockSubscription = MakeShared<base::Subscription>();
-			auto blockAction = callback(lang(user->isBlocked() ? (user->botInfo ? lng_profile_unblock_bot : lng_profile_unblock_user) : (user->botInfo ? lng_profile_block_bot : lng_profile_block_user)), [user, blockSubscription] {
-				auto willBeBlocked = !user->isBlocked();
-				auto handler = ::rpcDone([user, willBeBlocked](const MTPBool &result) {
-					user->setBlockStatus(willBeBlocked ? UserData::BlockStatus::Blocked : UserData::BlockStatus::NotBlocked);
-				});
-				if (willBeBlocked) {
-					MTP::send(MTPcontacts_Block(user->inputUser), std::move(handler));
-				} else {
-					MTP::send(MTPcontacts_Unblock(user->inputUser), std::move(handler));
-				}
-			});
-			auto blockChangedHandler = Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserIsBlocked, [blockAction, peer](const Notify::PeerUpdate &update) {
-				if (update.peer != peer) return;
-				blockAction->setText(lang(peer->asUser()->isBlocked() ? (peer->asUser()->botInfo ? lng_profile_unblock_bot : lng_profile_unblock_user) : (peer->asUser()->botInfo ? lng_profile_block_bot : lng_profile_block_user)));
-			});
+			auto blockAction =
+			    callback(lang(user->isBlocked() ? (user->botInfo ? lng_profile_unblock_bot : lng_profile_unblock_user) :
+			                                      (user->botInfo ? lng_profile_block_bot : lng_profile_block_user)),
+			             [user, blockSubscription] {
+				             auto willBeBlocked = !user->isBlocked();
+				             auto handler = ::rpcDone([user, willBeBlocked](const MTPBool &result) {
+					             user->setBlockStatus(willBeBlocked ? UserData::BlockStatus::Blocked :
+					                                                  UserData::BlockStatus::NotBlocked);
+				             });
+				             if (willBeBlocked) {
+					             MTP::send(MTPcontacts_Block(user->inputUser), std::move(handler));
+				             } else {
+					             MTP::send(MTPcontacts_Unblock(user->inputUser), std::move(handler));
+				             }
+			             });
+			auto blockChangedHandler = Notify::PeerUpdatedHandler(
+			    Notify::PeerUpdate::Flag::UserIsBlocked, [blockAction, peer](const Notify::PeerUpdate &update) {
+				    if (update.peer != peer) return;
+				    blockAction->setText(
+				        lang(peer->asUser()->isBlocked() ?
+				                 (peer->asUser()->botInfo ? lng_profile_unblock_bot : lng_profile_unblock_user) :
+				                 (peer->asUser()->botInfo ? lng_profile_block_bot : lng_profile_block_user)));
+			    });
 			*blockSubscription = Notify::PeerUpdated().add_subscription(std::move(blockChangedHandler));
 
 			if (user->blockStatus() == UserData::BlockStatus::Unknown) {
@@ -2336,7 +2427,8 @@ void MainWidget::fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QStrin
 		callback(lang(lng_profile_clear_and_exit), std::move(deleteAndLeaveHandler));
 		callback(lang(lng_profile_clear_history), std::move(clearHistoryHandler));
 	} else if (peer->isChannel() && peer->asChannel()->amIn() && !peer->asChannel()->amCreator()) {
-		callback(lang(peer->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel), std::move(deleteAndLeaveHandler));
+		callback(lang(peer->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel),
+		         std::move(deleteAndLeaveHandler));
 	}
 }
 
@@ -2352,7 +2444,9 @@ void MainWidget::onViewsIncrement() {
 		for (ViewsIncrementMap::const_iterator j = i.value().cbegin(), end = i.value().cend(); j != end; ++j) {
 			ids.push_back(MTP_int(j.key()));
 		}
-		auto req = MTP::send(MTPmessages_GetMessagesViews(i.key()->input, MTP_vector<MTPint>(ids), MTP_bool(true)), rpcDone(&MainWidget::viewsIncrementDone, ids), rpcFail(&MainWidget::viewsIncrementFail), 0, 5);
+		auto req =
+		    MTP::send(MTPmessages_GetMessagesViews(i.key()->input, MTP_vector<MTPint>(ids), MTP_bool(true)),
+		              rpcDone(&MainWidget::viewsIncrementDone, ids), rpcFail(&MainWidget::viewsIncrementFail), 0, 5);
 		_viewsIncrementRequests.insert(i.key(), req);
 		i = _viewsToIncrement.erase(i);
 	}
@@ -2361,7 +2455,8 @@ void MainWidget::onViewsIncrement() {
 void MainWidget::viewsIncrementDone(QVector<MTPint> ids, const MTPVector<MTPint> &result, mtpRequestId req) {
 	auto &v = result.v;
 	if (ids.size() == v.size()) {
-		for (ViewsIncrementRequests::iterator i = _viewsIncrementRequests.begin(); i != _viewsIncrementRequests.cend(); ++i) {
+		for (ViewsIncrementRequests::iterator i = _viewsIncrementRequests.begin(); i != _viewsIncrementRequests.cend();
+		     ++i) {
 			if (i.value() == req) {
 				PeerData *peer = i.key();
 				ChannelId channel = peerToChannel(peer->id);
@@ -2383,7 +2478,8 @@ void MainWidget::viewsIncrementDone(QVector<MTPint> ids, const MTPVector<MTPint>
 bool MainWidget::viewsIncrementFail(const RPCError &error, mtpRequestId req) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	for (ViewsIncrementRequests::iterator i = _viewsIncrementRequests.begin(); i != _viewsIncrementRequests.cend(); ++i) {
+	for (ViewsIncrementRequests::iterator i = _viewsIncrementRequests.begin(); i != _viewsIncrementRequests.cend();
+	     ++i) {
 		if (i.value() == req) {
 			_viewsIncrementRequests.erase(i);
 			break;
@@ -2438,9 +2534,7 @@ void MainWidget::ui_showPeerHistory(quint64 peerId, qint32 showAtMsgId, Ui::Show
 	bool back = (way == Ui::ShowWay::Backward || !peerId);
 	bool foundInStack = !peerId;
 	if (foundInStack || (way == Ui::ShowWay::ClearStack)) {
-		for_const (auto &item, _stack) {
-			clearBotStartToken(item->peer);
-		}
+		for_const (auto &item, _stack) { clearBotStartToken(item->peer); }
 		_stack.clear();
 	} else {
 		for (auto i = 0, s = int(_stack.size()); i < s; ++i) {
@@ -2547,7 +2641,8 @@ void MainWidget::ui_showPeerHistory(quint64 peerId, qint32 showAtMsgId, Ui::Show
 		if (Adaptive::OneColumn() && !_dialogs->isHidden()) _dialogs->hide();
 		if (!_a_show.animating()) {
 			if (!animationParams.oldContentCache.isNull()) {
-				_history->showAnimated(back ? Window::SlideDirection::FromLeft : Window::SlideDirection::FromRight, animationParams);
+				_history->showAnimated(back ? Window::SlideDirection::FromLeft : Window::SlideDirection::FromRight,
+				                       animationParams);
 			} else {
 				_history->show();
 				if (App::wnd()) {
@@ -2556,7 +2651,7 @@ void MainWidget::ui_showPeerHistory(quint64 peerId, qint32 showAtMsgId, Ui::Show
 			}
 		}
 	}
-	//if (wasActivePeer && wasActivePeer->isChannel() && activePeer() != wasActivePeer) {
+	// if (wasActivePeer && wasActivePeer->isChannel() && activePeer() != wasActivePeer) {
 	//	wasActivePeer->asChannel()->ptsWaitingForShortPoll(false);
 	//}
 
@@ -2618,7 +2713,8 @@ bool MainWidget::showMediaTypeSwitch() const {
 
 void MainWidget::saveSectionInStack() {
 	if (_overview) {
-		_stack.push_back(std::make_unique<StackItemOverview>(_overview->peer(), _overview->type(), _overview->lastWidth(), _overview->lastScrollTop()));
+		_stack.push_back(std::make_unique<StackItemOverview>(_overview->peer(), _overview->type(),
+		                                                     _overview->lastWidth(), _overview->lastScrollTop()));
 	} else if (_wideSection) {
 		_stack.push_back(std::make_unique<StackItemSection>(_wideSection->createMemento()));
 	} else if (_history->peer()) {
@@ -2683,7 +2779,8 @@ void MainWidget::showMediaOverview(PeerData *peer, MediaOverviewType type, bool
 
 	_overview->setLastScrollTop(lastScrollTop);
 	if (!animationParams.oldContentCache.isNull()) {
-		_overview->showAnimated(back ? Window::SlideDirection::FromLeft : Window::SlideDirection::FromRight, animationParams);
+		_overview->showAnimated(back ? Window::SlideDirection::FromLeft : Window::SlideDirection::FromRight,
+		                        animationParams);
 	} else {
 		_overview->fastShow();
 	}
@@ -2760,7 +2857,8 @@ Window::SectionSlideParams MainWidget::prepareShowAnimation(bool willHaveTopBarS
 			result.oldContentCache = myGrab(this, QRect(0, sectionTop, _dialogsWidth, height() - sectionTop));
 		} else {
 			_sideShadow->hide();
-			result.oldContentCache = myGrab(this, QRect(_dialogsWidth, sectionTop, width() - _dialogsWidth, height() - sectionTop));
+			result.oldContentCache =
+			    myGrab(this, QRect(_dialogsWidth, sectionTop, width() - _dialogsWidth, height() - sectionTop));
 			_sideShadow->show();
 		}
 		if (_overview) _overview->grabFinish();
@@ -2886,21 +2984,21 @@ void MainWidget::showBackFromStack() {
 		_msgIdInStack = 0;
 		for (auto i = _stack.size(); i > 0;) {
 			if (_stack[--i]->type() == HistoryStackItem) {
-				auto historyItem = static_cast<StackItemHistory*>(_stack[i].get());
+				auto historyItem = static_cast<StackItemHistory *>(_stack[i].get());
 				_peerInStack = historyItem->peer;
 				_msgIdInStack = historyItem->msgId;
 				dlgUpdated();
 				break;
 			}
 		}
-		auto historyItem = static_cast<StackItemHistory*>(item.get());
+		auto historyItem = static_cast<StackItemHistory *>(item.get());
 		Ui::showPeerHistory(historyItem->peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Backward);
 		_history->setReplyReturns(historyItem->peer->id, historyItem->replyReturns);
 	} else if (item->type() == SectionStackItem) {
-		auto sectionItem = static_cast<StackItemSection*>(item.get());
+		auto sectionItem = static_cast<StackItemSection *>(item.get());
 		showNewWideSection(std::move(*sectionItem->memento()), true, false);
 	} else if (item->type() == OverviewStackItem) {
-		auto overviewItem = static_cast<StackItemOverview*>(item.get());
+		auto overviewItem = static_cast<StackItemOverview *>(item.get());
 		showMediaOverview(overviewItem->peer, overviewItem->mediaType, true, overviewItem->lastScrollTop);
 	}
 }
@@ -3014,7 +3112,7 @@ void MainWidget::sentUpdatesReceived(quint64 randomId, const MTPUpdates &result)
 bool MainWidget::deleteChannelFailed(const RPCError &error) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	//if (error.type() == qstr("CHANNEL_TOO_LARGE")) {
+	// if (error.type() == qstr("CHANNEL_TOO_LARGE")) {
 	//	Ui::show(Box<InformBox>(lang(lng_cant_delete_channel)));
 	//}
 
@@ -3073,11 +3171,14 @@ void MainWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	auto progress = _a_show.current(getms(), 1.);
 	if (_a_show.animating()) {
-		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
+		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) :
+		                              anim::interpolate(0, -st::slideShift, progress);
 		auto coordOver = _showBack ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
 		auto shadow = _showBack ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
+			p.drawPixmap(
+			    QRect(0, 0, coordOver, height()), _cacheUnder,
+			    QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
 			p.setOpacity(1);
@@ -3121,13 +3222,20 @@ void MainWidget::showAll() {
 		if (_hider) {
 			_hider->hide();
 			if (!_forwardConfirm && _hider->wasOffered()) {
-				_forwardConfirm = Ui::show(Box<ConfirmBox>(_hider->offeredText(), lang(lng_forward_send), base::lambda_guarded(this, [this] {
-					_hider->forward();
-					if (_forwardConfirm) _forwardConfirm->closeBox();
-					if (_hider) _hider->offerPeer(0);
-				}), base::lambda_guarded(this, [this] {
-					if (_hider && _forwardConfirm) _hider->offerPeer(0);
-				})), ForceFastShowLayer);
+				_forwardConfirm = Ui::show(Box<ConfirmBox>(_hider->offeredText(), lang(lng_forward_send),
+				                                           base::lambda_guarded(this,
+				                                                                [this] {
+					                                                                _hider->forward();
+					                                                                if (_forwardConfirm)
+						                                                                _forwardConfirm->closeBox();
+					                                                                if (_hider) _hider->offerPeer(0);
+				                                                                }),
+				                                           base::lambda_guarded(this,
+				                                                                [this] {
+					                                                                if (_hider && _forwardConfirm)
+						                                                                _hider->offerPeer(0);
+				                                                                })),
+				                           ForceFastShowLayer);
 			}
 		}
 		if (selectingPeer()) {
@@ -3267,7 +3375,8 @@ void MainWidget::updateDialogsWidthAnimated() {
 	updateWindowAdaptiveLayout();
 	if (Adaptive::SmallColumn() && (_dialogsWidth != dialogsWidth || _a_dialogsWidth.animating())) {
 		_dialogs->startWidthAnimation();
-		_a_dialogsWidth.start([this] { updateControlsGeometry(); }, dialogsWidth, _dialogsWidth, st::dialogsWidthDuration, anim::easeOutCirc);
+		_a_dialogsWidth.start([this] { updateControlsGeometry(); }, dialogsWidth, _dialogsWidth,
+		                      st::dialogsWidthDuration, anim::easeOutCirc);
 		updateControlsGeometry();
 	}
 }
@@ -3277,7 +3386,8 @@ void MainWidget::updateMediaPlayerPosition() {
 	if (_player && _playerVolume) {
 		auto relativePosition = _player->entity()->getPositionForVolumeWidget();
 		auto playerMargins = _playerVolume->getMargin();
-		_playerVolume->moveToLeft(_player->x() + relativePosition.x() - playerMargins.left(), _player->y() + relativePosition.y() - playerMargins.top());
+		_playerVolume->moveToLeft(_player->x() + relativePosition.x() - playerMargins.left(),
+		                          _player->y() + relativePosition.y() - playerMargins.top());
 	}
 }
 
@@ -3300,15 +3410,12 @@ int MainWidget::contentScrollAddToY() const {
 	return _contentScrollAddToY;
 }
 
-void MainWidget::keyPressEvent(QKeyEvent *e) {
-}
+void MainWidget::keyPressEvent(QKeyEvent *e) {}
 
 bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 	if (o == _sideResizeArea) {
-		auto mouseLeft = [this, e] {
-			return mapFromGlobal(static_cast<QMouseEvent*>(e)->globalPos()).x();
-		};
-		if (e->type() == QEvent::MouseButtonPress && static_cast<QMouseEvent*>(e)->button() == Qt::LeftButton) {
+		auto mouseLeft = [this, e] { return mapFromGlobal(static_cast<QMouseEvent *>(e)->globalPos()).x(); };
+		if (e->type() == QEvent::MouseButtonPress && static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton) {
 			_resizingSide = true;
 			_resizingSideShift = mouseLeft() - (Adaptive::OneColumn() ? 0 : _dialogsWidth);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
@@ -3323,17 +3430,17 @@ bool MainWidget::eventFilter(QObject *o, QEvent *e) {
 			_controller->dialogsWidthRatio().set(double(newWidth) / width(), true);
 		}
 	} else if (e->type() == QEvent::FocusIn) {
-		if (auto widget = qobject_cast<QWidget*>(o)) {
-			if (_history == widget || _history->isAncestorOf(widget)
-				|| (_overview && (_overview == widget || _overview->isAncestorOf(widget)))
-				|| (_wideSection && (_wideSection == widget || _wideSection->isAncestorOf(widget)))) {
+		if (auto widget = qobject_cast<QWidget *>(o)) {
+			if (_history == widget || _history->isAncestorOf(widget) ||
+			    (_overview && (_overview == widget || _overview->isAncestorOf(widget))) ||
+			    (_wideSection && (_wideSection == widget || _wideSection->isAncestorOf(widget)))) {
 				_controller->dialogsListFocused().set(false);
 			} else if (_dialogs == widget || _dialogs->isAncestorOf(widget)) {
 				_controller->dialogsListFocused().set(true);
 			}
 		}
 	} else if (e->type() == QEvent::MouseButtonPress) {
-		if (static_cast<QMouseEvent*>(e)->button() == Qt::BackButton) {
+		if (static_cast<QMouseEvent *>(e)->button() == Qt::BackButton) {
 			showBackFromStack();
 			return true;
 		}
@@ -3365,8 +3472,8 @@ void MainWidget::updateWindowAdaptiveLayout() {
 	// for the normal layout. If so, switch to the normal layout.
 	if (layout.windowLayout == Adaptive::WindowLayout::OneColumn) {
 		auto chatWidth = layout.chatWidth;
-		if (Auth().data().tabbedSelectorSectionEnabled()
-			&& chatWidth >= _history->minimalWidthForTabbedSelectorSection()) {
+		if (Auth().data().tabbedSelectorSectionEnabled() &&
+		    chatWidth >= _history->minimalWidthForTabbedSelectorSection()) {
 			chatWidth -= _history->tabbedSelectorSectionWidth();
 		}
 		if (chatWidth >= st::dialogsWidthMin + st::windowMinWidth) {
@@ -3381,8 +3488,7 @@ void MainWidget::updateWindowAdaptiveLayout() {
 	// Check if we are going to create the third column and shrink the
 	// dialogs widget to provide a wide enough chat history column.
 	// Don't shrink the column on the first call, when window is inited.
-	if (layout.windowLayout == Adaptive::WindowLayout::Normal
-		&& _started && _controller->window()->positionInited()) {
+	if (layout.windowLayout == Adaptive::WindowLayout::Normal && _started && _controller->window()->positionInited()) {
 		auto chatWidth = layout.chatWidth;
 		if (_history->willSwitchToTabbedSelectorWithWidth(chatWidth)) {
 			auto thirdColumnWidth = _history->tabbedSelectorSectionWidth();
@@ -3459,7 +3565,11 @@ void MainWidget::onUpdateNotifySettings() {
 		if (peer->notify == UnknownNotifySettings || peer->notify == EmptyNotifySettings) {
 			peer->notify = new NotifySettings();
 		}
-		MTP::send(MTPaccount_UpdateNotifySettings(MTP_inputNotifyPeer(peer->input), MTP_inputPeerNotifySettings(MTP_flags(mtpCastFlags(peer->notify->flags)), MTP_int(peer->notify->mute), MTP_string(peer->notify->sound))), RPCResponseHandler(), 0, updateNotifySettingPeers.isEmpty() ? 0 : 10);
+		MTP::send(MTPaccount_UpdateNotifySettings(
+		              MTP_inputNotifyPeer(peer->input),
+		              MTP_inputPeerNotifySettings(MTP_flags(mtpCastFlags(peer->notify->flags)),
+		                                          MTP_int(peer->notify->mute), MTP_string(peer->notify->sound))),
+		          RPCResponseHandler(), 0, updateNotifySettingPeers.isEmpty() ? 0 : 10);
 	}
 }
 
@@ -3574,21 +3684,28 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 			switch (msg.type()) {
 			case mtpc_message: {
 				const auto &d(msg.c_message());
-				if (App::checkEntitiesAndViewsUpdate(d)) { // new message, index my forwarded messages to links _overview, already in blocks
+				if (App::checkEntitiesAndViewsUpdate(
+				        d)) { // new message, index my forwarded messages to links _overview, already in blocks
 					LOG(("Skipping message, because it is already in blocks!"));
 				} else {
 					msgsIds.insert((quint64(quint32(d.vid.v)) << 32) | quint64(i), i + 1);
 				}
 			} break;
-			case mtpc_messageEmpty: msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i + 1); break;
-			case mtpc_messageService: msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i + 1); break;
+			case mtpc_messageEmpty:
+				msgsIds.insert((quint64(quint32(msg.c_messageEmpty().vid.v)) << 32) | quint64(i), i + 1);
+				break;
+			case mtpc_messageService:
+				msgsIds.insert((quint64(quint32(msg.c_messageService().vid.v)) << 32) | quint64(i), i + 1);
+				break;
 			}
 		}
 		for_const (auto msgIndex, msgsIds) {
 			if (msgIndex > 0) { // add message
 				auto &msg = vmsgs.at(msgIndex - 1);
 				if (channel->id != peerFromMessage(msg)) {
-					LOG(("API Error: message with invalid peer returned in channelDifference, channelId: %1, peer: %2").arg(peerToChannel(channel->id)).arg(peerFromMessage(msg)));
+					LOG(("API Error: message with invalid peer returned in channelDifference, channelId: %1, peer: %2")
+					        .arg(peerToChannel(channel->id))
+					        .arg(peerFromMessage(msg)));
 					continue; // wtf
 				}
 				h->addNewMessage(msg, NewMessageUnread);
@@ -3607,7 +3724,8 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 	channel->ptsSetRequesting(false);
 
 	if (!isFinal) {
-		MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received }%1").arg(cTestMode() ? " TESTMODE" : ""));
+		MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received }%1")
+		               .arg(cTestMode() ? " TESTMODE" : ""));
 		getChannelDifference(channel);
 	} else if (activePeer() == channel) {
 		channel->ptsWaitingForShortPoll(timeout ? (timeout * 1000) : WaitForChannelGetDifference);
@@ -3653,7 +3771,9 @@ void MainWidget::gotRangeDifference(ChannelData *channel, const MTPupdates_Chann
 
 	if (!isFinal) {
 		if (History *h = App::historyLoaded(channel->id)) {
-			MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received, validating history part }%1").arg(cTestMode() ? " TESTMODE" : ""));
+			MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received, validating "
+			            "history part }%1")
+			               .arg(cTestMode() ? " TESTMODE" : ""));
 			h->asChannelHistory()->getRangeDifferenceNext(nextRequestPts);
 		}
 	}
@@ -3701,7 +3821,8 @@ void MainWidget::gotDifference(const MTPupdates_Difference &difference) {
 
 		_ptsWaiter.setRequesting(false);
 
-		MTP_LOG(0, ("getDifference { good - after a slice of difference was received }%1").arg(cTestMode() ? " TESTMODE" : ""));
+		MTP_LOG(0, ("getDifference { good - after a slice of difference was received }%1")
+		               .arg(cTestMode() ? " TESTMODE" : ""));
 		getDifference();
 	} break;
 	case mtpc_updates_difference: {
@@ -3717,7 +3838,8 @@ void MainWidget::gotDifference(const MTPupdates_Difference &difference) {
 	};
 }
 
-bool MainWidget::getDifferenceTimeChanged(ChannelData *channel, qint32 ms, ChannelGetDifferenceTime &channelCurTime, TimeMs &curTime) {
+bool MainWidget::getDifferenceTimeChanged(ChannelData *channel, qint32 ms, ChannelGetDifferenceTime &channelCurTime,
+                                          TimeMs &curTime) {
 	if (channel) {
 		if (ms <= 0) {
 			ChannelGetDifferenceTime::iterator i = channelCurTime.find(channel);
@@ -3798,7 +3920,8 @@ bool MainWidget::ptsUpdateAndApply(qint32 pts, qint32 ptsCount) {
 	return _ptsWaiter.updateAndApply(nullptr, pts, ptsCount);
 }
 
-void MainWidget::feedDifference(const MTPVector<MTPUser> &users, const MTPVector<MTPChat> &chats, const MTPVector<MTPMessage> &msgs, const MTPVector<MTPUpdate> &other) {
+void MainWidget::feedDifference(const MTPVector<MTPUser> &users, const MTPVector<MTPChat> &chats,
+                                const MTPVector<MTPMessage> &msgs, const MTPVector<MTPUpdate> &other) {
 	Auth().checkAutoLock();
 	App::feedUsers(users);
 	App::feedChats(chats);
@@ -3825,7 +3948,8 @@ void MainWidget::onGetDifferenceTimeByPts() {
 			getDifference();
 		}
 	}
-	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeByPts.begin(); i != _channelGetDifferenceTimeByPts.cend();) {
+	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeByPts.begin();
+	     i != _channelGetDifferenceTimeByPts.cend();) {
 		if (i.value() > now) {
 			wait = wait ? std::min(wait, i.value() - now) : (i.value() - now);
 			++i;
@@ -3883,7 +4007,9 @@ void MainWidget::getDifference() {
 
 	_ptsWaiter.setRequesting(true);
 
-	MTP::send(MTPupdates_GetDifference(MTP_flags(0), MTP_int(_ptsWaiter.current()), MTPint(), MTP_int(updDate), MTP_int(updQts)), rpcDone(&MainWidget::gotDifference), rpcFail(&MainWidget::failDifference));
+	MTP::send(MTPupdates_GetDifference(MTP_flags(0), MTP_int(_ptsWaiter.current()), MTPint(), MTP_int(updDate),
+	                                   MTP_int(updQts)),
+	          rpcDone(&MainWidget::gotDifference), rpcFail(&MainWidget::failDifference));
 }
 
 void MainWidget::getChannelDifference(ChannelData *channel, ChannelDifferenceRequest from) {
@@ -3908,7 +4034,10 @@ void MainWidget::getChannelDifference(ChannelData *channel, ChannelDifferenceReq
 			flags = 0; // No force flag when requesting for short poll.
 		}
 	}
-	MTP::send(MTPupdates_GetChannelDifference(MTP_flags(flags), channel->inputChannel, filter, MTP_int(channel->pts()), MTP_int(MTPChannelGetDifferenceLimit)), rpcDone(&MainWidget::gotChannelDifference, channel), rpcFail(&MainWidget::failChannelDifference, channel));
+	MTP::send(MTPupdates_GetChannelDifference(MTP_flags(flags), channel->inputChannel, filter, MTP_int(channel->pts()),
+	                                          MTP_int(MTPChannelGetDifferenceLimit)),
+	          rpcDone(&MainWidget::gotChannelDifference, channel),
+	          rpcFail(&MainWidget::failChannelDifference, channel));
 }
 
 void MainWidget::mtpPing() {
@@ -3962,7 +4091,8 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
 				Ui::showPeerHistoryAsync(peer->id, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
 			}
 		} else if (msgId == ShowAtProfileMsgId && !peer->isChannel()) {
-			if (peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->cantJoinGroups && !startToken.isEmpty()) {
+			if (peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->cantJoinGroups &&
+			    !startToken.isEmpty()) {
 				peer->asUser()->botInfo->startGroupToken = startToken;
 				AddBotToGroupBoxController::Start(peer->asUser());
 			} else if (peer->isUser() && peer->asUser()->botInfo) {
@@ -3972,7 +4102,8 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
 				Ui::showPeerProfile(peer);
 			}
 		} else {
-			if (msgId == ShowAtProfileMsgId || !peer->isChannel()) { // show specific posts only in channels / supergroups
+			if (msgId == ShowAtProfileMsgId ||
+			    !peer->isChannel()) { // show specific posts only in channels / supergroups
 				msgId = ShowAtUnreadMsgId;
 			}
 			if (peer->isUser() && peer->asUser()->botInfo) {
@@ -3985,13 +4116,16 @@ void MainWidget::openPeerByName(const QString &username, MsgId msgId, const QStr
 			Ui::showPeerHistoryAsync(peer->id, msgId, Ui::ShowWay::Forward);
 		}
 	} else {
-		MTP::send(MTPcontacts_ResolveUsername(MTP_string(username)), rpcDone(&MainWidget::usernameResolveDone, qMakePair(msgId, startToken)), rpcFail(&MainWidget::usernameResolveFail, username));
+		MTP::send(MTPcontacts_ResolveUsername(MTP_string(username)),
+		          rpcDone(&MainWidget::usernameResolveDone, qMakePair(msgId, startToken)),
+		          rpcFail(&MainWidget::usernameResolveFail, username));
 	}
 }
 
 void MainWidget::joinGroupByHash(const QString &hash) {
 	Messenger::Instance().hideMediaView();
-	MTP::send(MTPmessages_CheckChatInvite(MTP_string(hash)), rpcDone(&MainWidget::inviteCheckDone, hash), rpcFail(&MainWidget::inviteCheckFail));
+	MTP::send(MTPmessages_CheckChatInvite(MTP_string(hash)), rpcDone(&MainWidget::inviteCheckDone, hash),
+	          rpcFail(&MainWidget::inviteCheckFail));
 }
 
 void MainWidget::stickersBox(const MTPInputStickerSet &set) {
@@ -4024,11 +4158,9 @@ void MainWidget::onSelfParticipantUpdated(ChannelData *channel) {
 }
 
 bool MainWidget::contentOverlapped(const QRect &globalRect) {
-	return (_history->contentOverlapped(globalRect)
-			|| (_overview && _overview->contentOverlapped(globalRect))
-			|| _playerPanel->overlaps(globalRect)
-			|| _playerPlaylist->overlaps(globalRect)
-			|| (_playerVolume && _playerVolume->overlaps(globalRect)));
+	return (_history->contentOverlapped(globalRect) || (_overview && _overview->contentOverlapped(globalRect)) ||
+	        _playerPanel->overlaps(globalRect) || _playerPlaylist->overlaps(globalRect) ||
+	        (_playerVolume && _playerVolume->overlaps(globalRect)));
 }
 
 void MainWidget::usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, const MTPcontacts_ResolvedPeer &result) {
@@ -4045,7 +4177,8 @@ void MainWidget::usernameResolveDone(QPair<MsgId, QString> msgIdAndStartToken, c
 	MsgId msgId = msgIdAndStartToken.first;
 	QString startToken = msgIdAndStartToken.second;
 	if (msgId == ShowAtProfileMsgId && !peer->isChannel()) {
-		if (peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->cantJoinGroups && !startToken.isEmpty()) {
+		if (peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->cantJoinGroups &&
+		    !startToken.isEmpty()) {
 			peer->asUser()->botInfo->startGroupToken = startToken;
 			AddBotToGroupBoxController::Start(peer->asUser());
 		} else if (peer->isUser() && peer->asUser()->botInfo) {
@@ -4083,7 +4216,7 @@ void MainWidget::inviteCheckDone(QString hash, const MTPChatInvite &invite) {
 	case mtpc_chatInvite: {
 		auto &d = invite.c_chatInvite();
 
-		QVector<UserData*> participants;
+		QVector<UserData *> participants;
 		if (d.has_participants()) {
 			auto &v = d.vparticipants.v;
 			participants.reserve(v.size());
@@ -4119,7 +4252,8 @@ bool MainWidget::inviteCheckFail(const RPCError &error) {
 
 void MainWidget::onInviteImport() {
 	if (_inviteHash.isEmpty()) return;
-	MTP::send(MTPmessages_ImportChatInvite(MTP_string(_inviteHash)), rpcDone(&MainWidget::inviteImportDone), rpcFail(&MainWidget::inviteImportFail));
+	MTP::send(MTPmessages_ImportChatInvite(MTP_string(_inviteHash)), rpcDone(&MainWidget::inviteImportDone),
+	          rpcFail(&MainWidget::inviteImportFail));
 }
 
 void MainWidget::inviteImportDone(const MTPUpdates &updates) {
@@ -4147,7 +4281,8 @@ bool MainWidget::inviteImportFail(const RPCError &error) {
 	if (error.type() == qstr("CHANNELS_TOO_MUCH")) {
 		Ui::show(Box<InformBox>(lang(lng_join_channel_error)));
 	} else if (error.code() == 400) {
-		Ui::show(Box<InformBox>(lang(error.type() == qstr("USERS_TOO_MUCH") ? lng_group_invite_no_room : lng_group_invite_bad_link)));
+		Ui::show(Box<InformBox>(
+		    lang(error.type() == qstr("USERS_TOO_MUCH") ? lng_group_invite_no_room : lng_group_invite_bad_link)));
 	}
 
 	return true;
@@ -4186,7 +4321,7 @@ void MainWidget::applyNotifySetting(const MTPNotifyPeer &peer, const MTPPeerNoti
 			}
 		} break;
 		}
-	break;
+		break;
 	case mtpc_peerNotifySettings: {
 		const auto &d(settings.c_peerNotifySettings());
 		NotifySettingsPtr setTo = UnknownNotifySettings;
@@ -4237,7 +4372,8 @@ void MainWidget::applyNotifySetting(const MTPNotifyPeer &peer, const MTPPeerNoti
 	}
 }
 
-void MainWidget::updateNotifySetting(PeerData *peer, NotifySettingStatus notify, SilentNotifiesStatus silent, int muteFor) {
+void MainWidget::updateNotifySetting(PeerData *peer, NotifySettingStatus notify, SilentNotifiesStatus silent,
+                                     int muteFor) {
 	if (notify == NotifySettingDontChange && silent == SilentNotifiesDontChange) return;
 
 	updateNotifySettingPeers.insert(peer);
@@ -4282,7 +4418,9 @@ void MainWidget::incrementSticker(DocumentData *sticker) {
 	auto it = sets.find(Stickers::CloudRecentSetId);
 	if (it == sets.cend()) {
 		if (it == sets.cend()) {
-			it = sets.insert(Stickers::CloudRecentSetId, Stickers::Set(Stickers::CloudRecentSetId, 0, lang(lng_recent_stickers), QString(), 0, 0, MTPDstickerSet_ClientFlag::f_special | 0));
+			it = sets.insert(Stickers::CloudRecentSetId,
+			                 Stickers::Set(Stickers::CloudRecentSetId, 0, lang(lng_recent_stickers), QString(), 0, 0,
+			                               MTPDstickerSet_ClientFlag::f_special | 0));
 		} else {
 			it->title = lang(lng_recent_stickers);
 		}
@@ -4347,7 +4485,7 @@ void MainWidget::activate() {
 			} else {
 				_dialogs->activate();
 			}
-        } else if (App::wnd() && !Ui::isLayerShown()) {
+		} else if (App::wnd() && !Ui::isLayerShown()) {
 			if (!cSendPaths().isEmpty()) {
 				showSendPathsLayer();
 			} else if (_history->peer()) {
@@ -4422,7 +4560,8 @@ void MainWidget::updateOnline(bool gotOtherOffline) {
 		}
 	}
 	auto ms = getms(true);
-	if (isOnline != _lastWasOnline || (isOnline && _lastSetOnline + Global::OnlineUpdatePeriod() <= ms) || (isOnline && gotOtherOffline)) {
+	if (isOnline != _lastWasOnline || (isOnline && _lastSetOnline + Global::OnlineUpdatePeriod() <= ms) ||
+	    (isOnline && gotOtherOffline)) {
 		if (_onlineRequest) {
 			MTP::cancel(_onlineRequest);
 			_onlineRequest = 0;
@@ -4473,7 +4612,8 @@ void MainWidget::writeDrafts(History *history) {
 	MessageCursor localCursor, editCursor;
 	if (auto localDraft = history->localDraft()) {
 		if (!Data::draftsAreEqual(localDraft, history->cloudDraft())) {
-			storedLocalDraft = Local::MessageDraft(localDraft->msgId, localDraft->textWithTags, localDraft->previewCancelled);
+			storedLocalDraft =
+			    Local::MessageDraft(localDraft->msgId, localDraft->textWithTags, localDraft->previewCancelled);
 			localCursor = localDraft->cursor;
 		}
 	}
@@ -4673,11 +4813,12 @@ void MainWidget::feedUpdates(const MTPUpdates &updates, quint64 randomId) {
 
 	case mtpc_updateShortMessage: {
 		auto &d = updates.c_updateShortMessage();
-		if (!App::userLoaded(d.vuser_id.v)
-			|| (d.has_via_bot_id() && !App::userLoaded(d.vvia_bot_id.v))
-			|| (d.has_entities() && !mentionUsersLoaded(d.ventities))
-			|| (d.has_fwd_from() && !fwdInfoDataLoaded(d.vfwd_from))) {
-			MTP_LOG(0, ("getDifference { good - getting user for updateShortMessage }%1").arg(cTestMode() ? " TESTMODE" : ""));
+		if (!App::userLoaded(d.vuser_id.v) || (d.has_via_bot_id() && !App::userLoaded(d.vvia_bot_id.v)) ||
+		    (d.has_entities() && !mentionUsersLoaded(d.ventities)) ||
+		    (d.has_fwd_from() && !fwdInfoDataLoaded(d.vfwd_from))) {
+			MTP_LOG(
+			    0,
+			    ("getDifference { good - getting user for updateShortMessage }%1").arg(cTestMode() ? " TESTMODE" : ""));
 			return getDifference();
 		}
 		if (ptsUpdateAndApply(d.vpts.v, d.vpts_count.v, updates)) {
@@ -4693,12 +4834,11 @@ void MainWidget::feedUpdates(const MTPUpdates &updates, quint64 randomId) {
 	case mtpc_updateShortChatMessage: {
 		auto &d = updates.c_updateShortChatMessage();
 		bool noFrom = !App::userLoaded(d.vfrom_id.v);
-		if (!App::chatLoaded(d.vchat_id.v)
-			|| noFrom
-			|| (d.has_via_bot_id() && !App::userLoaded(d.vvia_bot_id.v))
-			|| (d.has_entities() && !mentionUsersLoaded(d.ventities))
-			|| (d.has_fwd_from() && !fwdInfoDataLoaded(d.vfwd_from))) {
-			MTP_LOG(0, ("getDifference { good - getting user for updateShortChatMessage }%1").arg(cTestMode() ? " TESTMODE" : ""));
+		if (!App::chatLoaded(d.vchat_id.v) || noFrom || (d.has_via_bot_id() && !App::userLoaded(d.vvia_bot_id.v)) ||
+		    (d.has_entities() && !mentionUsersLoaded(d.ventities)) ||
+		    (d.has_fwd_from() && !fwdInfoDataLoaded(d.vfwd_from))) {
+			MTP_LOG(0, ("getDifference { good - getting user for updateShortChatMessage }%1")
+			               .arg(cTestMode() ? " TESTMODE" : ""));
 			if (noFrom) {
 				Auth().api().requestFullPeer(App::chatLoaded(d.vchat_id.v));
 			}
@@ -4725,10 +4865,11 @@ void MainWidget::feedUpdates(const MTPUpdates &updates, quint64 randomId) {
 			if (peerId) {
 				if (auto item = App::histItemById(peerToChannel(peerId), d.vid.v)) {
 					if (d.has_entities() && !mentionUsersLoaded(d.ventities)) {
-						Auth().api().requestMessageData(item->history()->peer->asChannel(), item->id, ApiWrap::RequestMessageDataCallback());
+						Auth().api().requestMessageData(item->history()->peer->asChannel(), item->id,
+						                                ApiWrap::RequestMessageDataCallback());
 					}
 					auto entities = d.has_entities() ? TextUtilities::EntitiesFromMTP(d.ventities.v) : EntitiesInText();
-					item->setText({ text, entities });
+					item->setText({text, entities});
 					item->updateMedia(d.has_media() ? (&d.vmedia) : nullptr);
 					item->addToOverview(AddToOverviewNew);
 				}
@@ -4750,14 +4891,14 @@ void MainWidget::feedUpdates(const MTPUpdates &updates, quint64 randomId) {
 
 void MainWidget::feedUpdate(const MTPUpdate &update) {
 	switch (update.type()) {
-
 	// New messages.
 	case mtpc_updateNewMessage: {
 		auto &d = update.c_updateNewMessage();
 
 		DataIsLoadedResult isDataLoaded = allDataLoadedForMessage(d.vmessage);
 		if (!requestingDifference() && isDataLoaded != DataIsLoadedResult::Ok) {
-			MTP_LOG(0, ("getDifference { good - after not all data loaded in updateNewMessage }%1").arg(cTestMode() ? " TESTMODE" : ""));
+			MTP_LOG(0, ("getDifference { good - after not all data loaded in updateNewMessage }%1")
+			               .arg(cTestMode() ? " TESTMODE" : ""));
 
 			// This can be if this update was created by grouping
 			// some short message update into an updates vector.
@@ -4776,12 +4917,15 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 		auto channel = App::channelLoaded(peerToChannel(peerFromMessage(d.vmessage)));
 		auto isDataLoaded = allDataLoadedForMessage(d.vmessage);
 		if (!requestingDifference() && (!channel || isDataLoaded != DataIsLoadedResult::Ok)) {
-			MTP_LOG(0, ("getDifference { good - after not all data loaded in updateNewChannelMessage }%1").arg(cTestMode() ? " TESTMODE" : ""));
+			MTP_LOG(0, ("getDifference { good - after not all data loaded in updateNewChannelMessage }%1")
+			               .arg(cTestMode() ? " TESTMODE" : ""));
 
 			// Request last active supergroup participants if the 'from' user was not loaded yet.
 			// This will optimize similar getDifference() calls for almost all next messages.
 			if (isDataLoaded == DataIsLoadedResult::FromNotLoaded && channel && channel->isMegagroup()) {
-				if (channel->mgInfo->lastParticipants.size() < Global::ChatSizeMax() && (channel->mgInfo->lastParticipants.isEmpty() || channel->mgInfo->lastParticipants.size() < channel->membersCount())) {
+				if (channel->mgInfo->lastParticipants.size() < Global::ChatSizeMax() &&
+				    (channel->mgInfo->lastParticipants.isEmpty() ||
+				     channel->mgInfo->lastParticipants.size() < channel->membersCount())) {
 					Auth().api().requestLastParticipants(channel);
 				}
 			}
@@ -4823,7 +4967,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 					_history->peerMessagesUpdated();
 				} else {
 					App::historyUnregItem(msgRow);
-					Auth().messageIdChanging.notify({ msgRow, d.vid.v }, true);
+					Auth().messageIdChanging.notify({msgRow, d.vid.v}, true);
 					msgRow->setId(d.vid.v);
 					if (msgRow->history()->peer->isSelf()) {
 						msgRow->history()->unregSendAction(App::self());
@@ -5035,7 +5179,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 				if (user->onlineTill > -10) { // don't modify pseudo-online
 					user->onlineTill = -2;
 				}
-			break;
+				break;
 			case mtpc_userStatusLastWeek: user->onlineTill = -3; break;
 			case mtpc_userStatusLastMonth: user->onlineTill = -4; break;
 			case mtpc_userStatusOffline: user->onlineTill = d.vstatus.c_userStatusOffline().vwas_online.v; break;
@@ -5059,9 +5203,11 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 		auto &d = update.c_updateUserName();
 		if (auto user = App::userLoaded(d.vuser_id.v)) {
 			if (user->contact <= 0) {
-				user->setName(TextUtilities::SingleLine(qs(d.vfirst_name)), TextUtilities::SingleLine(qs(d.vlast_name)), user->nameOrPhone, TextUtilities::SingleLine(qs(d.vusername)));
+				user->setName(TextUtilities::SingleLine(qs(d.vfirst_name)), TextUtilities::SingleLine(qs(d.vlast_name)),
+				              user->nameOrPhone, TextUtilities::SingleLine(qs(d.vusername)));
 			} else {
-				user->setName(TextUtilities::SingleLine(user->firstName), TextUtilities::SingleLine(user->lastName), user->nameOrPhone, TextUtilities::SingleLine(qs(d.vusername)));
+				user->setName(TextUtilities::SingleLine(user->firstName), TextUtilities::SingleLine(user->lastName),
+				              user->nameOrPhone, TextUtilities::SingleLine(qs(d.vusername)));
 			}
 		}
 	} break;
@@ -5091,7 +5237,8 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 		auto &d = update.c_updateContactRegistered();
 		if (auto user = App::userLoaded(d.vuser_id.v)) {
 			if (App::history(user->id)->loadedAtBottom()) {
-				App::history(user->id)->addNewService(clientMsgId(), date(d.vdate), lng_action_user_registered(lt_from, user->name), 0);
+				App::history(user->id)->addNewService(clientMsgId(), date(d.vdate),
+				                                      lng_action_user_registered(lt_from, user->name), 0);
 			}
 		}
 	} break;
@@ -5121,7 +5268,11 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 			auto newPhone = qs(d.vphone);
 			if (newPhone != user->phone()) {
 				user->setPhone(newPhone);
-				user->setName(user->firstName, user->lastName, (user->contact || isServiceUser(user->id) || user->isSelf() || user->phone().isEmpty()) ? QString() : App::formatPhone(user->phone()), user->username);
+				user->setName(user->firstName, user->lastName,
+				              (user->contact || isServiceUser(user->id) || user->isSelf() || user->phone().isEmpty()) ?
+				                  QString() :
+				                  App::formatPhone(user->phone()),
+				              user->username);
 
 				Notify::peerUpdatedDelayed(user, Notify::PeerUpdate::Flag::UserPhoneChanged);
 			}
@@ -5151,7 +5302,8 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updateUserBlocked: {
 		auto &d = update.c_updateUserBlocked();
 		if (auto user = App::userLoaded(d.vuser_id.v)) {
-			user->setBlockStatus(mtpIsTrue(d.vblocked) ? UserData::BlockStatus::Blocked : UserData::BlockStatus::NotBlocked);
+			user->setBlockStatus(mtpIsTrue(d.vblocked) ? UserData::BlockStatus::Blocked :
+			                                             UserData::BlockStatus::NotBlocked);
 		}
 	} break;
 
@@ -5160,7 +5312,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 		if (d.is_popup()) {
 			Ui::show(Box<InformBox>(qs(d.vmessage)));
 		} else {
-			App::wnd()->serviceNotification({ qs(d.vmessage), TextUtilities::EntitiesFromMTP(d.ventities.v) }, d.vmedia);
+			App::wnd()->serviceNotification({qs(d.vmessage), TextUtilities::EntitiesFromMTP(d.ventities.v)}, d.vmedia);
 			emit App::wnd()->checkNewAuthorization();
 		}
 	} break;
@@ -5261,7 +5413,9 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 					auto &sets = Global::RefStickerSets();
 					auto it = sets.find(s.vid.v);
 					if (it == sets.cend()) {
-						it = sets.insert(s.vid.v, Stickers::Set(s.vid.v, s.vaccess_hash.v, Stickers::GetSetTitle(s), qs(s.vshort_name), s.vcount.v, s.vhash.v, s.vflags.v | MTPDstickerSet::Flag::f_installed));
+						it = sets.insert(s.vid.v, Stickers::Set(s.vid.v, s.vaccess_hash.v, Stickers::GetSetTitle(s),
+						                                        qs(s.vshort_name), s.vcount.v, s.vhash.v,
+						                                        s.vflags.v | MTPDstickerSet::Flag::f_installed));
 					} else {
 						it->flags |= MTPDstickerSet::Flag::f_installed;
 						if (it->flags & MTPDstickerSet::Flag::f_archived) {
@@ -5405,6 +5559,5 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updateLangPackTooLong: {
 		Lang::CurrentCloudManager().requestLangPackDifference();
 	} break;
-
 	}
 }
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 51105b200..a6c1543a1 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "storage/localimageloader.h"
-#include "history/history_common.h"
-#include "core/single_timer.h"
-#include "base/weak_unique_ptr.h"
-#include "history/history.h"
 #include "app.h"
+#include "base/weak_unique_ptr.h"
+#include "core/single_timer.h"
 #include "facades.h"
+#include "history/history.h"
+#include "history/history_common.h"
+#include "storage/localimageloader.h"
 
 namespace Notify {
 struct PeerUpdate;
@@ -48,8 +48,7 @@ class Float;
 namespace Ui {
 class PlainShadow;
 class DropdownMenu;
-template <typename Widget>
-class WidgetSlideWrap;
+template <typename Widget> class WidgetSlideWrap;
 } // namespace Ui
 
 namespace Window {
@@ -83,20 +82,19 @@ enum StackItemType {
 
 class StackItem {
 public:
-	StackItem(PeerData *peer) : peer(peer) {
-	}
+	StackItem(PeerData *peer)
+	    : peer(peer) {}
 	virtual StackItemType type() const = 0;
-	virtual ~StackItem() {
-	}
+	virtual ~StackItem() {}
 	PeerData *peer;
 };
 
 class StackItemHistory : public StackItem {
 public:
-	StackItemHistory(PeerData *peer, MsgId msgId, QList<MsgId> replyReturns) : StackItem(peer)
-		, msgId(msgId)
-		, replyReturns(replyReturns) {
-	}
+	StackItemHistory(PeerData *peer, MsgId msgId, QList<MsgId> replyReturns)
+	    : StackItem(peer)
+	    , msgId(msgId)
+	    , replyReturns(replyReturns) {}
 	StackItemType type() const {
 		return HistoryStackItem;
 	}
@@ -118,16 +116,15 @@ public:
 
 private:
 	std::unique_ptr<Window::SectionMemento> _memento;
-
 };
 
 class StackItemOverview : public StackItem {
 public:
-	StackItemOverview(PeerData *peer, MediaOverviewType mediaType, qint32 lastWidth, qint32 lastScrollTop) : StackItem(peer)
-		, mediaType(mediaType)
-		, lastWidth(lastWidth)
-		, lastScrollTop(lastScrollTop) {
-	}
+	StackItemOverview(PeerData *peer, MediaOverviewType mediaType, qint32 lastWidth, qint32 lastScrollTop)
+	    : StackItem(peer)
+	    , mediaType(mediaType)
+	    , lastWidth(lastWidth)
+	    , lastScrollTop(lastScrollTop) {}
 	StackItemType type() const {
 		return OverviewStackItem;
 	}
@@ -156,7 +153,7 @@ class MainWidget : public TWidget, public RPCSender, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	MainWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	MainWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	bool isSectionShown() const;
 
@@ -178,7 +175,8 @@ public:
 	bool started();
 	void applyNotifySetting(const MTPNotifyPeer &peer, const MTPPeerNotifySettings &settings, History *history = 0);
 
-	void updateNotifySetting(PeerData *peer, NotifySettingStatus notify, SilentNotifiesStatus silent = SilentNotifiesDontChange, int muteFor = 86400 * 365);
+	void updateNotifySetting(PeerData *peer, NotifySettingStatus notify,
+	                         SilentNotifiesStatus silent = SilentNotifiesDontChange, int muteFor = 86400 * 365);
 
 	void incrementSticker(DocumentData *sticker);
 
@@ -274,7 +272,7 @@ public:
 	void clearHistory(PeerData *peer);
 	void deleteAllFromUser(ChannelData *channel, UserData *from);
 
-	void addParticipants(PeerData *chatOrChannel, const std::vector<not_null<UserData*>> &users);
+	void addParticipants(PeerData *chatOrChannel, const std::vector<not_null<UserData *>> &users);
 	struct UserAndPeer {
 		UserData *user;
 		PeerData *peer;
@@ -309,16 +307,16 @@ public:
 	void sendMessage(const MessageToSend &message);
 	void saveRecentHashtags(const QString &text);
 
-    void readServerHistory(History *history, ReadServerHistoryChecks checks = ReadServerHistoryChecks::OnlyIfUnread);
+	void readServerHistory(History *history, ReadServerHistoryChecks checks = ReadServerHistoryChecks::OnlyIfUnread);
 	void unreadCountChanged(History *history);
 
-	TimeMs highlightStartTime(not_null<const HistoryItem*> item) const;
+	TimeMs highlightStartTime(not_null<const HistoryItem *> item) const;
 
 	void sendBotCommand(PeerData *peer, UserData *bot, const QString &cmd, MsgId replyTo);
 	void hideSingleUseKeyboard(PeerData *peer, MsgId replyTo);
 	bool insertBotCommand(const QString &cmd);
 
-	void jumpToDate(not_null<PeerData*> peer, const QDate &date);
+	void jumpToDate(not_null<PeerData *> peer, const QDate &date);
 	void searchMessages(const QString &query, PeerData *inPeer);
 	bool preloadOverview(PeerData *peer, MediaOverviewType type);
 	void itemEdited(HistoryItem *item);
@@ -350,9 +348,9 @@ public:
 	void cancelForwarding(History *history);
 	void finishForwarding(History *history, bool silent); // send them
 
-	void mediaMarkRead(not_null<DocumentData*> data);
+	void mediaMarkRead(not_null<DocumentData *> data);
 	void mediaMarkRead(const HistoryItemsMap &items);
-	void mediaMarkRead(not_null<HistoryItem*> item);
+	void mediaMarkRead(not_null<HistoryItem *> item);
 
 	void webPageUpdated(WebPageData *page);
 	void gameUpdated(GameData *game);
@@ -370,7 +368,9 @@ public:
 
 	void scheduleViewIncrement(HistoryItem *item);
 
-	void fillPeerMenu(PeerData *peer, base::lambda<QAction*(const QString &text, base::lambda<void()> handler)> callback, bool pinToggle);
+	void fillPeerMenu(PeerData *peer,
+	                  base::lambda<QAction *(const QString &text, base::lambda<void()> handler)> callback,
+	                  bool pinToggle);
 
 	void gotRangeDifference(ChannelData *channel, const MTPupdates_ChannelDifference &diff);
 	void onSelfParticipantUpdated(ChannelData *channel);
@@ -387,7 +387,7 @@ public:
 
 	void app_sendBotCallback(const HistoryMessageReplyMarkup::Button *button, const HistoryItem *msg, int row, int col);
 
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item);
 	void ui_showPeerHistory(quint64 peer, qint32 msgId, Ui::ShowWay way);
 	PeerData *ui_getPeerForMouseAction();
 
@@ -474,7 +474,7 @@ private:
 		object_ptr<Media::Player::Float> widget;
 	};
 
-	using ChannelGetDifferenceTime = QMap<ChannelData*, TimeMs>;
+	using ChannelGetDifferenceTime = QMap<ChannelData *, TimeMs>;
 	enum class ChannelDifferenceRequest {
 		Unknown,
 		PtsGapOrShortPoll,
@@ -518,7 +518,7 @@ private:
 	void readRequestDone(PeerData *peer);
 
 	void messagesAffected(PeerData *peer, const MTPmessages_AffectedMessages &result);
-	void overviewLoaded(not_null<History*> history, const MTPmessages_Messages &result, mtpRequestId req);
+	void overviewLoaded(not_null<History *> history, const MTPmessages_Messages &result, mtpRequestId req);
 	void mediaOverviewUpdated(const Notify::PeerUpdate &update);
 
 	Window::SectionSlideParams prepareShowAnimation(bool willHaveTopBarShadow, bool willHaveTabbedSection);
@@ -537,7 +537,8 @@ private:
 	void getChannelDifference(ChannelData *channel, ChannelDifferenceRequest from = ChannelDifferenceRequest::Unknown);
 	void gotDifference(const MTPupdates_Difference &diff);
 	bool failDifference(const RPCError &e);
-	void feedDifference(const MTPVector<MTPUser> &users, const MTPVector<MTPChat> &chats, const MTPVector<MTPMessage> &msgs, const MTPVector<MTPUpdate> &other);
+	void feedDifference(const MTPVector<MTPUser> &users, const MTPVector<MTPChat> &chats,
+	                    const MTPVector<MTPMessage> &msgs, const MTPVector<MTPUpdate> &other);
 	void gotState(const MTPupdates_State &state);
 	void updSetState(qint32 pts, qint32 date, qint32 qts, qint32 seq);
 	void gotChannelDifference(ChannelData *channel, const MTPupdates_ChannelDifference &diff);
@@ -571,29 +572,30 @@ private:
 
 	void clearCachedBackground();
 	void checkCurrentFloatPlayer();
-	void toggleFloatPlayer(not_null<Float*> instance);
+	void toggleFloatPlayer(not_null<Float *> instance);
 	void checkFloatPlayerVisibility();
-	void updateFloatPlayerPosition(not_null<Float*> instance);
-	void removeFloatPlayer(not_null<Float*> instance);
+	void updateFloatPlayerPosition(not_null<Float *> instance);
+	void removeFloatPlayer(not_null<Float *> instance);
 	Float *currentFloatPlayer() const {
 		return _playerFloats.empty() ? nullptr : _playerFloats.back().get();
 	}
-	Window::AbstractSectionWidget *getFloatPlayerSection(not_null<Window::Column*> column) const;
-	void finishFloatPlayerDrag(not_null<Float*> instance, bool closed);
+	Window::AbstractSectionWidget *getFloatPlayerSection(not_null<Window::Column *> column) const;
+	void finishFloatPlayerDrag(not_null<Float *> instance, bool closed);
 	void updateFloatPlayerColumnCorner(QPoint center);
-	QPoint getFloatPlayerPosition(not_null<Float*> instance) const;
+	QPoint getFloatPlayerPosition(not_null<Float *> instance) const;
 	QPoint getFloatPlayerHiddenPosition(QPoint position, QSize size, RectPart side) const;
 	RectPart getFloatPlayerSide(QPoint center) const;
 
 	bool ptsUpdateAndApply(qint32 pts, qint32 ptsCount, const MTPUpdates &updates);
 	bool ptsUpdateAndApply(qint32 pts, qint32 ptsCount, const MTPUpdate &update);
 	bool ptsUpdateAndApply(qint32 pts, qint32 ptsCount);
-	bool getDifferenceTimeChanged(ChannelData *channel, qint32 ms, ChannelGetDifferenceTime &channelCurTime, TimeMs &curTime);
+	bool getDifferenceTimeChanged(ChannelData *channel, qint32 ms, ChannelGetDifferenceTime &channelCurTime,
+	                              TimeMs &curTime);
 
 	void viewsIncrementDone(QVector<MTPint> ids, const MTPVector<MTPint> &result, mtpRequestId req);
 	bool viewsIncrementFail(const RPCError &error, mtpRequestId req);
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 	bool _started = false;
 
 	OrderedSet<WebPageId> _webPagesUpdated;
@@ -615,22 +617,22 @@ private:
 	object_ptr<TWidget> _sideResizeArea;
 	object_ptr<DialogsWidget> _dialogs;
 	object_ptr<HistoryWidget> _history;
-	object_ptr<Window::SectionWidget> _wideSection = { nullptr };
-	object_ptr<Window::SectionWidget> _thirdSection = { nullptr };
-	object_ptr<OverviewWidget> _overview = { nullptr };
+	object_ptr<Window::SectionWidget> _wideSection = {nullptr};
+	object_ptr<Window::SectionWidget> _thirdSection = {nullptr};
+	object_ptr<OverviewWidget> _overview = {nullptr};
 
 	base::weak_unique_ptr<Calls::Call> _currentCall;
-	object_ptr<Ui::WidgetSlideWrap<Calls::TopBar>> _callTopBar = { nullptr };
+	object_ptr<Ui::WidgetSlideWrap<Calls::TopBar>> _callTopBar = {nullptr};
 
-	object_ptr<Window::PlayerWrapWidget> _player = { nullptr };
-	object_ptr<Media::Player::VolumeWidget> _playerVolume = { nullptr };
+	object_ptr<Window::PlayerWrapWidget> _player = {nullptr};
+	object_ptr<Media::Player::VolumeWidget> _playerVolume = {nullptr};
 	object_ptr<Media::Player::Panel> _playerPlaylist;
 	object_ptr<Media::Player::Panel> _playerPanel;
 	bool _playerUsingPanel = false;
 	std::vector<std::unique_ptr<Float>> _playerFloats;
 
 	QPointer<ConfirmBox> _forwardConfirm; // for single column layout
-	object_ptr<HistoryHider> _hider = { nullptr };
+	object_ptr<HistoryHider> _hider = {nullptr};
 	std::vector<std::unique_ptr<StackItem>> _stack;
 	PeerData *_peerInStack = nullptr;
 	MsgId _msgIdInStack = 0;
@@ -663,20 +665,21 @@ private:
 	TimeMs _lastSetOnline = 0;
 	bool _isIdle = false;
 
-	QSet<PeerData*> updateNotifySettingPeers;
+	QSet<PeerData *> updateNotifySettingPeers;
 	SingleTimer updateNotifySettingTimer;
 
-    typedef QMap<PeerData*, QPair<mtpRequestId, MsgId> > ReadRequests;
-    ReadRequests _readRequests;
-	typedef QMap<PeerData*, MsgId> ReadRequestsPending;
+	typedef QMap<PeerData *, QPair<mtpRequestId, MsgId>> ReadRequests;
+	ReadRequests _readRequests;
+	typedef QMap<PeerData *, MsgId> ReadRequestsPending;
 	ReadRequestsPending _readRequestsPending;
 
-	typedef QMap<PeerData*, mtpRequestId> OverviewsPreload;
+	typedef QMap<PeerData *, mtpRequestId> OverviewsPreload;
 	OverviewsPreload _overviewPreload[OverviewCount], _overviewLoad[OverviewCount];
 
 	qint32 _failDifferenceTimeout = 1; // growing timeout for getDifference calls, if it fails
-	typedef QMap<ChannelData*, qint32> ChannelFailDifferenceTimeout;
-	ChannelFailDifferenceTimeout _channelFailDifferenceTimeout; // growing timeout for getChannelDifference calls, if it fails
+	typedef QMap<ChannelData *, qint32> ChannelFailDifferenceTimeout;
+	ChannelFailDifferenceTimeout
+	    _channelFailDifferenceTimeout; // growing timeout for getChannelDifference calls, if it fails
 	SingleTimer _failDifferenceTimer;
 
 	TimeMs _lastUpdateTime = 0;
@@ -688,17 +691,17 @@ private:
 	int _cachedY = 0;
 	SingleTimer _cacheBackgroundTimer;
 
-	typedef QMap<ChannelData*, bool> UpdatedChannels;
+	typedef QMap<ChannelData *, bool> UpdatedChannels;
 	UpdatedChannels _updatedChannels;
 
 	PhotoData *_deletingPhoto = nullptr;
 
 	typedef QMap<MsgId, bool> ViewsIncrementMap;
-	typedef QMap<PeerData*, ViewsIncrementMap> ViewsIncrement;
+	typedef QMap<PeerData *, ViewsIncrementMap> ViewsIncrement;
 	ViewsIncrement _viewsIncremented, _viewsToIncrement;
-	typedef QMap<PeerData*, mtpRequestId> ViewsIncrementRequests;
+	typedef QMap<PeerData *, mtpRequestId> ViewsIncrementRequests;
 	ViewsIncrementRequests _viewsIncrementRequests;
-	typedef QMap<mtpRequestId, PeerData*> ViewsIncrementByRequest;
+	typedef QMap<mtpRequestId, PeerData *> ViewsIncrementByRequest;
 	ViewsIncrementByRequest _viewsIncrementByRequest;
 	SingleTimer _viewsIncrementTimer;
 
@@ -706,5 +709,4 @@ private:
 
 	bool _resizingSide = false;
 	int _resizingSideShift = 0;
-
 };
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 8ce98eba2..328b31cfc 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -20,58 +20,56 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mainwindow.h"
 
-#include "dialogs/dialogs_layout.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_window.h"
-#include "styles/style_boxes.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/buttons.h"
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "base/task_queue.h"
 #include "base/zlib_help.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/connection_box.h"
+#include "dialogs/dialogs_layout.h"
+#include "intro/introwidget.h"
 #include "lang/lang_cloud_manager.h"
 #include "lang/lang_instance.h"
 #include "lang/lang_keys.h"
-#include "shortcuts.h"
-#include "messenger.h"
-#include "application.h"
-#include "platform/platform_specific.h"
-#include "passcodewidget.h"
-#include "intro/introwidget.h"
-#include "mainwidget.h"
 #include "layerwidget.h"
-#include "boxes/confirm_box.h"
-#include "boxes/add_contact_box.h"
-#include "boxes/connection_box.h"
-#include "observer_peer.h"
+#include "mainwidget.h"
 #include "mediaview.h"
-#include "storage/localstorage.h"
-#include "apiwrap.h"
-#include "settings/settings_widget.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "passcodewidget.h"
 #include "platform/platform_notifications_manager.h"
+#include "platform/platform_specific.h"
+#include "settings/settings_widget.h"
+#include "shortcuts.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_window.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
 #include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_warning.h"
-#include "window/window_main_menu.h"
-#include "base/task_queue.h"
-#include "auth_session.h"
 #include "window/window_controller.h"
+#include "window/window_main_menu.h"
 
-#include <QWindow>
 #include <QAction>
-#include <QScreen>
-#include <QFileDialog>
-#include <QStandardPaths>
 #include <QDesktopServices>
+#include <QFileDialog>
 #include <QHttpMultiPart>
+#include <QScreen>
+#include <QStandardPaths>
+#include <QWindow>
 
 namespace {
 
 // Code for testing languages is F7-F6-F7-F8
 void FeedLangTestingKey(int key) {
 	static auto codeState = 0;
-	if ((codeState == 0 && key == Qt::Key_F7)
-		|| (codeState == 1 && key == Qt::Key_F6)
-		|| (codeState == 2 && key == Qt::Key_F7)
-		|| (codeState == 3 && key == Qt::Key_F8)) {
+	if ((codeState == 0 && key == Qt::Key_F7) || (codeState == 1 && key == Qt::Key_F6) ||
+	    (codeState == 2 && key == Qt::Key_F7) || (codeState == 3 && key == Qt::Key_F8)) {
 		++codeState;
 	} else {
 		codeState = 0;
@@ -84,8 +82,9 @@ void FeedLangTestingKey(int key) {
 
 } // namespace
 
-ConnectingWidget::ConnectingWidget(QWidget *parent, const QString &text, const QString &reconnect) : TWidget(parent)
-, _reconnect(this, QString()) {
+ConnectingWidget::ConnectingWidget(QWidget *parent, const QString &text, const QString &reconnect)
+    : TWidget(parent)
+    , _reconnect(this, QString()) {
 	set(text, reconnect);
 	connect(_reconnect, SIGNAL(clicked()), this, SLOT(onReconnect()));
 }
@@ -99,10 +98,14 @@ void ConnectingWidget::set(const QString &text, const QString &reconnect) {
 	} else {
 		_reconnect->setText(reconnect);
 		_reconnect->show();
-		_reconnect->move(st::connectingPadding.left() + _textWidth, st::boxRoundShadow.extend.top() + st::connectingPadding.top());
+		_reconnect->move(st::connectingPadding.left() + _textWidth,
+		                 st::boxRoundShadow.extend.top() + st::connectingPadding.top());
 		_reconnectWidth = _reconnect->width();
 	}
-	resize(st::connectingPadding.left() + _textWidth + _reconnectWidth + st::connectingPadding.right() + st::boxRoundShadow.extend.right(), st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->height + st::connectingPadding.bottom());
+	resize(st::connectingPadding.left() + _textWidth + _reconnectWidth + st::connectingPadding.right() +
+	           st::boxRoundShadow.extend.right(),
+	       st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->height +
+	           st::connectingPadding.bottom());
 	update();
 }
 
@@ -110,13 +113,21 @@ void ConnectingWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	auto sides = RectPart::Top | RectPart::Right;
-	Ui::Shadow::paint(p, QRect(0, st::boxRoundShadow.extend.top(), width() - st::boxRoundShadow.extend.right(), height() - st::boxRoundShadow.extend.top()), width(), st::boxRoundShadow, sides);
+	Ui::Shadow::paint(p,
+	                  QRect(0, st::boxRoundShadow.extend.top(), width() - st::boxRoundShadow.extend.right(),
+	                        height() - st::boxRoundShadow.extend.top()),
+	                  width(), st::boxRoundShadow, sides);
 	auto parts = RectPart::Top | RectPart::TopRight | RectPart::Center | RectPart::Right;
-	App::roundRect(p, QRect(-st::boxRadius, st::boxRoundShadow.extend.top(), width() - st::boxRoundShadow.extend.right() + st::boxRadius, height() - st::boxRoundShadow.extend.top() + st::boxRadius), st::boxBg, BoxCorners, nullptr, parts);
+	App::roundRect(p,
+	               QRect(-st::boxRadius, st::boxRoundShadow.extend.top(),
+	                     width() - st::boxRoundShadow.extend.right() + st::boxRadius,
+	                     height() - st::boxRoundShadow.extend.top() + st::boxRadius),
+	               st::boxBg, BoxCorners, nullptr, parts);
 
 	p.setFont(st::normalFont);
 	p.setPen(st::windowSubTextFg);
-	p.drawText(st::connectingPadding.left(), st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->ascent, _text);
+	p.drawText(st::connectingPadding.left(),
+	           st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->ascent, _text);
 }
 
 void ConnectingWidget::onReconnect() {
@@ -144,9 +155,7 @@ MainWindow::MainWindow() {
 	setLocale(QLocale(QLocale::English, QLocale::UnitedStates));
 
 	subscribe(Global::RefSelfChanged(), [this] { updateGlobalMenu(); });
-	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) {
-		themeUpdated(data);
-	});
+	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) { themeUpdated(data); });
 	subscribe(Messenger::Instance().passcodedChanged(), [this] { updateGlobalMenu(); });
 
 	setAttribute(Qt::WA_NoSystemBackground);
@@ -169,19 +178,21 @@ void MainWindow::firstShow() {
 #endif // else for Q_OS_WIN
 
 	auto isLinux = (cPlatform() == dbipLinux32 || cPlatform() == dbipLinux64);
-	auto notificationActionText = lang(Global::DesktopNotify()
-		? lng_disable_notifications_from_tray
-		: lng_enable_notifications_from_tray);
+	auto notificationActionText =
+	    lang(Global::DesktopNotify() ? lng_disable_notifications_from_tray : lng_enable_notifications_from_tray);
 
 	if (isLinux) {
-		trayIconMenu->addAction(lng_open_from_tray(lt_appname, lang(appname)), this, SLOT(showFromTray()))->setEnabled(true);
+		trayIconMenu->addAction(lng_open_from_tray(lt_appname, lang(appname)), this, SLOT(showFromTray()))
+		    ->setEnabled(true);
 		trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true);
 		trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true);
-		trayIconMenu->addAction(lng_quit_from_tray(lt_appname, lang(appname)), this, SLOT(quitFromTray()))->setEnabled(true);
+		trayIconMenu->addAction(lng_quit_from_tray(lt_appname, lang(appname)), this, SLOT(quitFromTray()))
+		    ->setEnabled(true);
 	} else {
 		trayIconMenu->addAction(lang(lng_minimize_to_tray), this, SLOT(minimizeToTray()))->setEnabled(true);
 		trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()))->setEnabled(true);
-		trayIconMenu->addAction(lng_quit_from_tray(lt_appname, lang(appname)), this, SLOT(quitFromTray()))->setEnabled(true);
+		trayIconMenu->addAction(lng_quit_from_tray(lt_appname, lang(appname)), this, SLOT(quitFromTray()))
+		    ->setEnabled(true);
 	}
 	Global::RefWorkMode().setForced(Global::WorkMode().value(), true);
 
@@ -272,7 +283,8 @@ void MainWindow::setupIntro() {
 	}
 }
 
-void MainWindow::serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media, qint32 date, bool force) {
+void MainWindow::serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media, qint32 date,
+                                     bool force) {
 	if (date <= 0) date = unixtime();
 	auto h = (_main && App::userLoaded(ServiceUserId)) ? App::history(ServiceUserId).get() : nullptr;
 	if (!h || (!force && h->isEmpty())) {
@@ -294,10 +306,16 @@ void MainWindow::sendServiceHistoryRequest() {
 
 	UserData *user = App::userLoaded(ServiceUserId);
 	if (!user) {
-		auto userFlags = MTPDuser::Flag::f_first_name | MTPDuser::Flag::f_phone | MTPDuser::Flag::f_status | MTPDuser::Flag::f_verified;
-		user = App::feedUsers(MTP_vector<MTPUser>(1, MTP_user(MTP_flags(userFlags), MTP_int(ServiceUserId), MTPlong(), MTP_string("Telegram"), MTPstring(), MTPstring(), MTP_string("42777"), MTP_userProfilePhotoEmpty(), MTP_userStatusRecently(), MTPint(), MTPstring(), MTPstring(), MTPstring())));
+		auto userFlags = MTPDuser::Flag::f_first_name | MTPDuser::Flag::f_phone | MTPDuser::Flag::f_status |
+		                 MTPDuser::Flag::f_verified;
+		user = App::feedUsers(MTP_vector<MTPUser>(
+		    1, MTP_user(MTP_flags(userFlags), MTP_int(ServiceUserId), MTPlong(), MTP_string("Telegram"), MTPstring(),
+		                MTPstring(), MTP_string("42777"), MTP_userProfilePhotoEmpty(), MTP_userStatusRecently(),
+		                MTPint(), MTPstring(), MTPstring(), MTPstring())));
 	}
-	_serviceHistoryRequest = MTP::send(MTPmessages_GetHistory(user->input, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(1), MTP_int(0), MTP_int(0)), _main->rpcDone(&MainWidget::serviceHistoryDone), _main->rpcFail(&MainWidget::serviceHistoryFail));
+	_serviceHistoryRequest = MTP::send(
+	    MTPmessages_GetHistory(user->input, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(1), MTP_int(0), MTP_int(0)),
+	    _main->rpcDone(&MainWidget::serviceHistoryDone), _main->rpcFail(&MainWidget::serviceHistoryFail));
 }
 
 void MainWindow::setupMain(const MTPUser *self) {
@@ -385,10 +403,12 @@ void MainWindow::updateConnectingStatus() {
 	auto throughProxy = (Global::ConnectionType() != dbictAuto);
 	if (state == MTP::ConnectingState || state == MTP::DisconnectedState || (state < 0 && state > -600)) {
 		if (_main || getms() > 5000 || _connecting) {
-			showConnecting(lang(throughProxy ? lng_connecting_to_proxy : lng_connecting), throughProxy ? lang(lng_connecting_settings) : QString());
+			showConnecting(lang(throughProxy ? lng_connecting_to_proxy : lng_connecting),
+			               throughProxy ? lang(lng_connecting_settings) : QString());
 		}
 	} else if (state < 0) {
-		showConnecting(lng_reconnecting(lt_count, ((-state) / 1000) + 1), lang(throughProxy ? lng_connecting_settings : lng_reconnecting_try_now));
+		showConnecting(lng_reconnecting(lt_count, ((-state) / 1000) + 1),
+		               lang(throughProxy ? lng_connecting_settings : lng_reconnecting_try_now));
 		QTimer::singleShot((-state) % 1000, this, SLOT(updateConnectingStatus()));
 	} else {
 		hideConnecting();
@@ -558,7 +578,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *e) {
 	switch (e->type()) {
 	case QEvent::KeyPress: {
 		if (cDebug() && e->type() == QEvent::KeyPress && object == windowHandle()) {
-			auto key = static_cast<QKeyEvent*>(e)->key();
+			auto key = static_cast<QKeyEvent *>(e)->key();
 			FeedLangTestingKey(key);
 		}
 	} break;
@@ -576,17 +596,17 @@ bool MainWindow::eventFilter(QObject *object, QEvent *e) {
 
 	case QEvent::ApplicationActivate: {
 		if (object == QCoreApplication::instance()) {
-			InvokeQueued(this, [this] {
-				handleActiveChanged();
-			});
+			InvokeQueued(this, [this] { handleActiveChanged(); });
 		}
 	} break;
 
 	case QEvent::WindowStateChange: {
 		if (object == this) {
-			auto state = (windowState() & Qt::WindowMinimized) ? Qt::WindowMinimized :
-				((windowState() & Qt::WindowMaximized) ? Qt::WindowMaximized :
-				((windowState() & Qt::WindowFullScreen) ? Qt::WindowFullScreen : Qt::WindowNoState));
+			auto state = (windowState() & Qt::WindowMinimized) ?
+			                 Qt::WindowMinimized :
+			                 ((windowState() & Qt::WindowMaximized) ?
+			                      Qt::WindowMaximized :
+			                      ((windowState() & Qt::WindowFullScreen) ? Qt::WindowFullScreen : Qt::WindowNoState));
 			handleStateChanged(state);
 		}
 	} break;
@@ -603,7 +623,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *e) {
 }
 
 void MainWindow::updateTrayMenu(bool force) {
-    if (!trayIconMenu || (cPlatform() == dbipWindows && !force)) return;
+	if (!trayIconMenu || (cPlatform() == dbipWindows && !force)) return;
 
 	auto iconMenu = trayIconMenu;
 	auto actions = iconMenu->actions();
@@ -627,18 +647,17 @@ void MainWindow::updateTrayMenu(bool force) {
 		}
 	}
 	auto notificationAction = actions.at(isLinux ? 2 : 1);
-	auto notificationActionText = lang(Global::DesktopNotify()
-		? lng_disable_notifications_from_tray
-		: lng_enable_notifications_from_tray);
+	auto notificationActionText =
+	    lang(Global::DesktopNotify() ? lng_disable_notifications_from_tray : lng_enable_notifications_from_tray);
 	notificationAction->setText(notificationActionText);
 
 #ifndef Q_OS_WIN
-    if (trayIcon && trayIcon->contextMenu() != iconMenu) {
+	if (trayIcon && trayIcon->contextMenu() != iconMenu) {
 		trayIcon->setContextMenu(iconMenu);
-    }
+	}
 #endif // !Q_OS_WIN
 
-    psTrayMenuUpdated();
+	psTrayMenuUpdated();
 }
 
 void MainWindow::onShowAddContact() {
@@ -666,9 +685,8 @@ void MainWindow::onShowNewChannel() {
 void MainWindow::onLogout() {
 	if (isHidden()) showFromTray();
 
-	Ui::show(Box<ConfirmBox>(lang(lng_sure_logout), lang(lng_settings_logout), st::attentionBoxButton, [] {
-		App::logOut();
-	}));
+	Ui::show(Box<ConfirmBox>(lang(lng_sure_logout), lang(lng_settings_logout), st::attentionBoxButton,
+	                         [] { App::logOut(); }));
 }
 
 void MainWindow::quitFromTray() {
@@ -728,7 +746,7 @@ void MainWindow::showFromTray(QSystemTrayIcon::ActivationReason reason) {
 			updateTrayMenu();
 			updateGlobalMenu();
 		});
-        activate();
+		activate();
 		Notify::unreadCounterUpdated();
 	}
 }
@@ -818,7 +836,8 @@ MainWindow::TempDirState MainWindow::localStorageState() {
 	if (_clearManager && _clearManager->hasTask(Local::ClearManagerStorage)) {
 		return TempDirRemoving;
 	}
-	return (Local::hasImages() || Local::hasStickers() || Local::hasWebFiles() || Local::hasAudios()) ? TempDirExists : TempDirEmpty;
+	return (Local::hasImages() || Local::hasStickers() || Local::hasWebFiles() || Local::hasAudios()) ? TempDirExists :
+	                                                                                                    TempDirEmpty;
 }
 
 void MainWindow::tempDirDelete(int task) {
@@ -832,8 +851,8 @@ void MainWindow::tempDirDelete(int task) {
 	}
 	_clearManager = new Local::ClearManager();
 	_clearManager->addTask(task);
-	connect(_clearManager, SIGNAL(succeed(int,void*)), this, SLOT(onClearFinished(int,void*)));
-	connect(_clearManager, SIGNAL(failed(int,void*)), this, SLOT(onClearFailed(int,void*)));
+	connect(_clearManager, SIGNAL(succeed(int, void *)), this, SLOT(onClearFinished(int, void *)));
+	connect(_clearManager, SIGNAL(failed(int, void *)), this, SLOT(onClearFailed(int, void *)));
 	_clearManager->start();
 }
 
@@ -857,7 +876,8 @@ void MainWindow::app_activateClickHandler(ClickHandlerPtr handler, Qt::MouseButt
 	handler->onClick(button);
 }
 
-void MainWindow::placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) {
+void MainWindow::placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift,
+                                   style::color color) {
 	QPainter p(&img);
 
 	QString cnt = (count < 100) ? QString("%1").arg(count) : QString("..%1").arg(count % 10, 1, 10, QChar('0'));
@@ -874,7 +894,7 @@ void MainWindow::placeSmallCounter(QImage &img, int size, int count, style::colo
 	} else {
 		fontSize = (cntSize < 2) ? 22 : 22;
 	}
-	style::font f = { fontSize, 0, 0 };
+	style::font f = {fontSize, 0, 0};
 	qint32 w = f->width(cnt), d, r;
 	if (size == 16) {
 		d = (cntSize < 2) ? 2 : 1;
@@ -892,7 +912,6 @@ void MainWindow::placeSmallCounter(QImage &img, int size, int count, style::colo
 	p.setPen(color->p);
 
 	p.drawText(shift.x() + size - w - d, shift.y() + size - f->height + f->ascent, cnt);
-
 }
 
 QImage MainWindow::iconWithCounter(int size, int count, style::color bg, style::color fg, bool smallIcon) {
@@ -923,7 +942,7 @@ QImage MainWindow::iconWithCounter(int size, int count, style::color bg, style::
 			} else {
 				fontSize = (cntSize < 2) ? 22 : ((cntSize < 3) ? 20 : 16);
 			}
-			style::font f = { fontSize, 0, 0 };
+			style::font f = {fontSize, 0, 0};
 			qint32 w = f->width(cnt), d, r;
 			if (size == 16) {
 				d = (cntSize < 2) ? 5 : ((cntSize < 3) ? 2 : 1);
@@ -950,7 +969,8 @@ QImage MainWindow::iconWithCounter(int size, int count, style::color bg, style::
 		if (size != 16 && size != 32) size = 64;
 	}
 
-	QImage img(smallIcon ? ((size == 16) ? iconbig16 : (size == 32 ? iconbig32 : iconbig64)) : ((size == 16) ? icon16 : (size == 32 ? icon32 : icon64)));
+	QImage img(smallIcon ? ((size == 16) ? iconbig16 : (size == 32 ? iconbig32 : iconbig64)) :
+	                       ((size == 16) ? icon16 : (size == 32 ? icon32 : icon64)));
 	if (!count) return img;
 
 	if (smallIcon) {
@@ -1006,7 +1026,14 @@ PreLaunchWindow::PreLaunchWindow(QString title) {
 	int paddingVertical = (_size / 2);
 	int paddingHorizontal = _size;
 	int borderRadius = (_size / 5);
-	setStyleSheet(qsl("QPushButton { padding: %1px %2px; background-color: #ffffff; border-radius: %3px; }\nQPushButton#confirm:hover, QPushButton#cancel:hover { background-color: #e3f1fa; color: #2f9fea; }\nQPushButton#confirm { color: #2f9fea; }\nQPushButton#cancel { color: #aeaeae; }\nQLineEdit { border: 1px solid #e0e0e0; padding: 5px; }\nQLineEdit:focus { border: 2px solid #37a1de; padding: 4px; }").arg(paddingVertical).arg(paddingHorizontal).arg(borderRadius));
+	setStyleSheet(
+	    qsl("QPushButton { padding: %1px %2px; background-color: #ffffff; border-radius: %3px; "
+	        "}\nQPushButton#confirm:hover, QPushButton#cancel:hover { background-color: #e3f1fa; color: #2f9fea; "
+	        "}\nQPushButton#confirm { color: #2f9fea; }\nQPushButton#cancel { color: #aeaeae; }\nQLineEdit { border: "
+	        "1px solid #e0e0e0; padding: 5px; }\nQLineEdit:focus { border: 2px solid #37a1de; padding: 4px; }")
+	        .arg(paddingVertical)
+	        .arg(paddingHorizontal)
+	        .arg(borderRadius));
 	if (!PreLaunchWindowInstance) {
 		PreLaunchWindowInstance = this;
 	}
@@ -1029,10 +1056,11 @@ PreLaunchWindow::~PreLaunchWindow() {
 	}
 }
 
-PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) {
+PreLaunchLabel::PreLaunchLabel(QWidget *parent)
+    : QLabel(parent) {
 	QFont labelFont(font());
 	labelFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold")));
-	labelFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
+	labelFont.setPixelSize(static_cast<PreLaunchWindow *>(parent)->basicSize());
 	setFont(labelFont);
 
 	QPalette p(palette());
@@ -1047,10 +1075,11 @@ void PreLaunchLabel::setText(const QString &text) {
 	resize(sizeHint());
 }
 
-PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(parent) {
+PreLaunchInput::PreLaunchInput(QWidget *parent, bool password)
+    : QLineEdit(parent) {
 	QFont logFont(font());
 	logFont.setFamily(Fonts::GetOverride(qsl("Open Sans")));
-	logFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
+	logFont.setPixelSize(static_cast<PreLaunchWindow *>(parent)->basicSize());
 	setFont(logFont);
 
 	QPalette p(palette());
@@ -1065,10 +1094,11 @@ PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(paren
 	show();
 };
 
-PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) {
+PreLaunchLog::PreLaunchLog(QWidget *parent)
+    : QTextEdit(parent) {
 	QFont logFont(font());
 	logFont.setFamily(Fonts::GetOverride(qsl("Open Sans")));
-	logFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
+	logFont.setPixelSize(static_cast<PreLaunchWindow *>(parent)->basicSize());
 	setFont(logFont);
 
 	QPalette p(palette());
@@ -1083,14 +1113,15 @@ PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) {
 	show();
 };
 
-PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm) : QPushButton(parent) {
+PreLaunchButton::PreLaunchButton(QWidget *parent, bool confirm)
+    : QPushButton(parent) {
 	setFlat(true);
 
 	setObjectName(confirm ? "confirm" : "cancel");
 
 	QFont closeFont(font());
 	closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold")));
-	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
+	closeFont.setPixelSize(static_cast<PreLaunchWindow *>(parent)->basicSize());
 	setFont(closeFont);
 
 	setCursor(Qt::PointingHandCursor);
@@ -1103,13 +1134,14 @@ void PreLaunchButton::setText(const QString &text) {
 	resize(sizeHint());
 }
 
-PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent) : QCheckBox(parent) {
+PreLaunchCheckbox::PreLaunchCheckbox(QWidget *parent)
+    : QCheckBox(parent) {
 	setTristate(false);
 	setCheckState(Qt::Checked);
 
 	QFont closeFont(font());
 	closeFont.setFamily(Fonts::GetOverride(qsl("Open Sans Semibold")));
-	closeFont.setPixelSize(static_cast<PreLaunchWindow*>(parent)->basicSize());
+	closeFont.setPixelSize(static_cast<PreLaunchWindow *>(parent)->basicSize());
 	setFont(closeFont);
 
 	setCursor(Qt::PointingHandCursor);
@@ -1123,9 +1155,9 @@ void PreLaunchCheckbox::setText(const QString &text) {
 }
 
 NotStartedWindow::NotStartedWindow()
-: _label(this)
-, _log(this)
-, _close(this) {
+    : _label(this)
+    , _log(this)
+    , _close(this) {
 	_label.setText(qsl("Could not start %1!\nYou can see complete log below:").arg(str_const_toString(AppName)));
 
 	_log.setPlainText(Logs::full());
@@ -1160,35 +1192,36 @@ void NotStartedWindow::closeEvent(QCloseEvent *e) {
 void NotStartedWindow::resizeEvent(QResizeEvent *e) {
 	int padding = _size;
 	_label.setGeometry(padding, padding, width() - 2 * padding, _label.sizeHint().height());
-	_log.setGeometry(padding, padding * 2 + _label.sizeHint().height(), width() - 2 * padding, height() - 4 * padding - _label.height() - _close.height());
-	_close.setGeometry(width() - padding - _close.width(), height() - padding - _close.height(), _close.width(), _close.height());
+	_log.setGeometry(padding, padding * 2 + _label.sizeHint().height(), width() - 2 * padding,
+	                 height() - 4 * padding - _label.height() - _close.height());
+	_close.setGeometry(width() - padding - _close.width(), height() - padding - _close.height(), _close.width(),
+	                   _close.height());
 }
 
 LastCrashedWindow::LastCrashedWindow()
-: _port(80)
-, _label(this)
-, _pleaseSendReport(this)
-, _yourReportName(this)
-, _minidump(this)
-, _report(this)
-, _send(this)
-, _sendSkip(this, false)
-, _networkSettings(this)
-, _continue(this)
-, _showReport(this)
-, _saveReport(this)
-, _getApp(this)
-, _includeUsername(this)
-, _reportText(QString::fromUtf8(Sandbox::LastCrashDump()))
-, _reportShown(false)
-, _reportSaved(false)
-, _sendingState(Sandbox::LastCrashDump().isEmpty() ? SendingNoReport : SendingUpdateCheck)
-, _updating(this)
-, _sendingProgress(0)
-, _sendingTotal(0)
-, _checkReply(0)
-, _sendReply(0)
-{
+    : _port(80)
+    , _label(this)
+    , _pleaseSendReport(this)
+    , _yourReportName(this)
+    , _minidump(this)
+    , _report(this)
+    , _send(this)
+    , _sendSkip(this, false)
+    , _networkSettings(this)
+    , _continue(this)
+    , _showReport(this)
+    , _saveReport(this)
+    , _getApp(this)
+    , _includeUsername(this)
+    , _reportText(QString::fromUtf8(Sandbox::LastCrashDump()))
+    , _reportShown(false)
+    , _reportSaved(false)
+    , _sendingState(Sandbox::LastCrashDump().isEmpty() ? SendingNoReport : SendingUpdateCheck)
+    , _updating(this)
+    , _sendingProgress(0)
+    , _sendingTotal(0)
+    , _checkReply(0)
+    , _sendReply(0) {
 	excludeReportUsername();
 
 	if (!cAlphaVersion() && !cBetaVersion()) { // currently accept crash reports only from testers
@@ -1217,25 +1250,26 @@ LastCrashedWindow::LastCrashedWindow()
 		}
 		if (_minidumpFull.isEmpty()) {
 			QString maxDump, maxDumpFull;
-            QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified();
+			QDateTime maxDumpModified, workingModified = QFileInfo(cWorkingDir() + qsl("tdata/working")).lastModified();
 			QFileInfoList list = QDir(dumpspath).entryInfoList();
-            for (qint32 i = 0, l = list.size(); i < l; ++i) {
-                QString name = list.at(i).fileName();
-                if (name.endsWith(qstr(".dmp"))) {
-                    QDateTime modified = list.at(i).lastModified();
-                    if (maxDump.isEmpty() || qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) {
-                        maxDump = name;
-                        maxDumpModified = modified;
-                        maxDumpFull = list.at(i).absoluteFilePath();
-                        dumpsize = list.at(i).size();
-                    }
-                }
-            }
-            if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) {
-                _minidumpName = maxDump;
-                _minidumpFull = maxDumpFull;
-            }
-        }
+			for (qint32 i = 0, l = list.size(); i < l; ++i) {
+				QString name = list.at(i).fileName();
+				if (name.endsWith(qstr(".dmp"))) {
+					QDateTime modified = list.at(i).lastModified();
+					if (maxDump.isEmpty() ||
+					    qAbs(workingModified.secsTo(modified)) < qAbs(workingModified.secsTo(maxDumpModified))) {
+						maxDump = name;
+						maxDumpModified = modified;
+						maxDumpFull = list.at(i).absoluteFilePath();
+						dumpsize = list.at(i).size();
+					}
+				}
+			}
+			if (!maxDump.isEmpty() && qAbs(workingModified.secsTo(maxDumpModified)) < 10) {
+				_minidumpName = maxDump;
+				_minidumpFull = maxDumpFull;
+			}
+		}
 		if (_minidumpName.isEmpty()) { // currently don't accept crash reports without dumps from google libraries
 			_sendingState = SendingNoReport;
 		} else {
@@ -1265,7 +1299,9 @@ LastCrashedWindow::LastCrashedWindow()
 	}
 
 	_pleaseSendReport.setText(qsl("Please send us a crash report."));
-	_yourReportName.setText(qsl("Your Report Tag: %1\nYour User Tag: %2").arg(QString(_minidumpName).replace(".dmp", "")).arg(Sandbox::UserTag(), 0, 16));
+	_yourReportName.setText(qsl("Your Report Tag: %1\nYour User Tag: %2")
+	                            .arg(QString(_minidumpName).replace(".dmp", ""))
+	                            .arg(Sandbox::UserTag(), 0, 16));
 	_yourReportName.setCursor(style::cur_text);
 	_yourReportName.setTextInteractionFlags(Qt::TextSelectableByMouse);
 
@@ -1300,7 +1336,10 @@ void LastCrashedWindow::onViewReport() {
 }
 
 void LastCrashedWindow::onSaveReport() {
-	QString to = QFileDialog::getSaveFileName(0, qsl("%1 Crash Report").arg(str_const_toString(AppName)), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + qsl("/report.telegramcrash"), qsl("%1 crash report (*.telegramcrash)").arg(str_const_toString(AppName)));
+	QString to = QFileDialog::getSaveFileName(
+	    0, qsl("%1 Crash Report").arg(str_const_toString(AppName)),
+	    QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + qsl("/report.telegramcrash"),
+	    qsl("%1 crash report (*.telegramcrash)").arg(str_const_toString(AppName)));
 	if (!to.isEmpty()) {
 		QFile file(to);
 		if (file.open(QIODevice::WriteOnly)) {
@@ -1356,11 +1395,13 @@ QString LastCrashedWindow::getReportField(const QLatin1String &name, const QLati
 	return QString();
 }
 
-void LastCrashedWindow::addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart) {
+void LastCrashedWindow::addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix,
+                                           QHttpMultiPart *multipart) {
 	QString data = getReportField(name, prefix);
 	if (!data.isEmpty()) {
 		QHttpPart reportPart;
-		reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"%1\"").arg(name)));
+		reportPart.setHeader(QNetworkRequest::ContentDispositionHeader,
+		                     QVariant(qsl("form-data; name=\"%1\"").arg(name)));
 		reportPart.setBody(data.toUtf8());
 		multipart->append(reportPart);
 	}
@@ -1377,10 +1418,17 @@ void LastCrashedWindow::onSendReport() {
 	}
 	App::setProxySettings(_sendManager);
 
-	QString apiid = getReportField(qstr("apiid"), qstr("ApiId:")), version = getReportField(qstr("version"), qstr("Version:"));
-	_checkReply = _sendManager.get(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=query_report&apiid=%1&version=%2&dmp=%3&platform=%4").arg(apiid).arg(version).arg(minidumpFileName().isEmpty() ? 0 : 1).arg(cPlatformString())));
+	QString apiid = getReportField(qstr("apiid"), qstr("ApiId:")),
+	        version = getReportField(qstr("version"), qstr("Version:"));
+	_checkReply = _sendManager.get(
+	    QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=query_report&apiid=%1&version=%2&dmp=%3&platform=%4")
+	                        .arg(apiid)
+	                        .arg(version)
+	                        .arg(minidumpFileName().isEmpty() ? 0 : 1)
+	                        .arg(cPlatformString())));
 
-	connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError)));
+	connect(_checkReply, SIGNAL(error(QNetworkReply::NetworkError)), this,
+	        SLOT(onSendingError(QNetworkReply::NetworkError)));
 	connect(_checkReply, SIGNAL(finished()), this, SLOT(onCheckingFinished()));
 
 	_pleaseSendReport.setText(qsl("Sending crash report..."));
@@ -1392,7 +1440,7 @@ void LastCrashedWindow::onSendReport() {
 QString LastCrashedWindow::minidumpFileName() {
 	QFileInfo dmpFile(_minidumpFull);
 	if (dmpFile.exists() && dmpFile.size() > 0 && dmpFile.size() < 20 * 1024 * 1024 &&
-		QRegularExpression(qsl("^[a-zA-Z0-9\\-]{1,64}\\.dmp$")).match(dmpFile.fileName()).hasMatch()) {
+	    QRegularExpression(qsl("^[a-zA-Z0-9\\-]{1,64}\\.dmp$")).match(dmpFile.fileName()).hasMatch()) {
 		return dmpFile.fileName();
 	}
 	return QString();
@@ -1433,7 +1481,8 @@ void LastCrashedWindow::onCheckingFinished() {
 
 	QHttpPart reportPart;
 	reportPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream"));
-	reportPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"report\"; filename=\"report.telegramcrash\""));
+	reportPart.setHeader(QNetworkRequest::ContentDispositionHeader,
+	                     QVariant("form-data; name=\"report\"; filename=\"report.telegramcrash\""));
 	reportPart.setBody(getCrashReportRaw());
 	multipart->append(reportPart);
 
@@ -1448,9 +1497,10 @@ void LastCrashedWindow::onCheckingFinished() {
 
 			zlib::FileToWrite minidumpZip;
 
-			zip_fileinfo zfi = { { 0, 0, 0, 0, 0, 0 }, 0, 0, 0 };
+			zip_fileinfo zfi = {{0, 0, 0, 0, 0, 0}, 0, 0, 0};
 			QByteArray dmpNameUtf = dmpName.toUtf8();
-			minidumpZip.openNewFile(dmpNameUtf.constData(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
+			minidumpZip.openNewFile(dmpNameUtf.constData(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED,
+			                        Z_DEFAULT_COMPRESSION);
 			minidumpZip.writeInFile(minidump.constData(), minidump.size());
 			minidumpZip.closeFile();
 			minidumpZip.close();
@@ -1458,7 +1508,8 @@ void LastCrashedWindow::onCheckingFinished() {
 			if (minidumpZip.error() == ZIP_OK) {
 				QHttpPart dumpPart;
 				dumpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream"));
-				dumpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant(qsl("form-data; name=\"dump\"; filename=\"%1\"").arg(zipName)));
+				dumpPart.setHeader(QNetworkRequest::ContentDispositionHeader,
+				                   QVariant(qsl("form-data; name=\"dump\"; filename=\"%1\"").arg(zipName)));
 				dumpPart.setBody(minidumpZip.result());
 				multipart->append(dumpPart);
 
@@ -1470,9 +1521,10 @@ void LastCrashedWindow::onCheckingFinished() {
 	_sendReply = _sendManager.post(QNetworkRequest(qsl("https://tdesktop.com/crash.php?act=report")), multipart);
 	multipart->setParent(_sendReply);
 
-	connect(_sendReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSendingError(QNetworkReply::NetworkError)));
+	connect(_sendReply, SIGNAL(error(QNetworkReply::NetworkError)), this,
+	        SLOT(onSendingError(QNetworkReply::NetworkError)));
 	connect(_sendReply, SIGNAL(finished()), this, SLOT(onSendingFinished()));
-	connect(_sendReply, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(onSendingProgress(qint64,qint64)));
+	connect(_sendReply, SIGNAL(uploadProgress(qint64, qint64)), this, SLOT(onSendingProgress(qint64, qint64)));
 
 	updateControls();
 }
@@ -1506,7 +1558,8 @@ void LastCrashedWindow::updateControls() {
 			_includeUsername.show();
 		}
 		if (_reportShown) {
-			h += (_pleaseSendReport.height() * 12.5) + padding + (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding));
+			h += (_pleaseSendReport.height() * 12.5) + padding +
+			     (_minidumpName.isEmpty() ? 0 : (_minidump.height() + padding));
 			_report.show();
 			if (_minidumpName.isEmpty()) {
 				_minidump.hide();
@@ -1514,7 +1567,8 @@ void LastCrashedWindow::updateControls() {
 				_minidump.show();
 			}
 			_showReport.hide();
-			if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress || _sendingState == SendingUploading) {
+			if (_reportSaved || _sendingState == SendingFail || _sendingState == SendingProgress ||
+			    _sendingState == SendingUploading) {
 				_saveReport.hide();
 			} else {
 				_saveReport.show();
@@ -1554,7 +1608,11 @@ void LastCrashedWindow::updateControls() {
 	h += _networkSettings.height() + padding;
 
 	QRect scr(QApplication::primaryScreen()->availableGeometry());
-	QSize s(2 * padding + QFontMetrics(_label.font()).width(qsl("Last time %1 was not closed properly.").arg(str_const_toString(AppName))) + padding + _networkSettings.width(), h);
+	QSize s(2 * padding +
+	            QFontMetrics(_label.font())
+	                .width(qsl("Last time %1 was not closed properly.").arg(str_const_toString(AppName))) +
+	            padding + _networkSettings.width(),
+	        h);
 	if (s == size()) {
 		resizeEvent(0);
 	} else {
@@ -1565,7 +1623,8 @@ void LastCrashedWindow::updateControls() {
 void LastCrashedWindow::onNetworkSettings() {
 	auto &p = Sandbox::PreLaunchProxy();
 	NetworkSettingsWindow *box = new NetworkSettingsWindow(this, p.host, p.port ? p.port : 80, p.user, p.password);
-	connect(box, SIGNAL(saved(QString, quint32, QString, QString)), this, SLOT(onNetworkSettingsSaved(QString, quint32, QString, QString)));
+	connect(box, SIGNAL(saved(QString, quint32, QString, QString)), this,
+	        SLOT(onNetworkSettingsSaved(QString, quint32, QString, QString)));
 	box->show();
 }
 
@@ -1644,24 +1703,34 @@ void LastCrashedWindow::resizeEvent(QResizeEvent *e) {
 	if (_sendingState == SendingProgress || _sendingState == SendingUploading) {
 		_sendSkip.move(width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height());
 	} else {
-		_sendSkip.move(width() - padding - _send.width() - padding - _sendSkip.width(), height() - padding - _sendSkip.height());
+		_sendSkip.move(width() - padding - _send.width() - padding - _sendSkip.width(),
+		               height() - padding - _sendSkip.height());
 	}
 
-	_updating.move(padding, padding * 2 + _networkSettings.height() + (_networkSettings.height() - _updating.height()) / 2);
+	_updating.move(padding,
+	               padding * 2 + _networkSettings.height() + (_networkSettings.height() - _updating.height()) / 2);
 
 	_getApp.move((width() - _getApp.width()) / 2, _updating.y() + _updating.height() + padding);
 
-	_pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding + (_showReport.height() - _pleaseSendReport.height()) / 2);
-	_showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding);
+	_pleaseSendReport.move(padding, padding * 2 + _networkSettings.height() + _networkSettings.height() + padding +
+	                                    _getApp.height() + padding +
+	                                    (_showReport.height() - _pleaseSendReport.height()) / 2);
+	_showReport.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() +
+	                                                              _networkSettings.height() + padding +
+	                                                              _getApp.height() + padding);
 	_yourReportName.move(padding, _showReport.y() + _showReport.height() + padding);
 	_includeUsername.move(padding, _yourReportName.y() + _yourReportName.height() + padding);
 
-	_networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() + _networkSettings.height() + padding + _getApp.height() + padding);
+	_networkSettings.move(padding * 2 + _pleaseSendReport.width(), padding * 2 + _networkSettings.height() +
+	                                                                   _networkSettings.height() + padding +
+	                                                                   _getApp.height() + padding);
 
 	if (_reportUsername.isEmpty()) {
-		_report.setGeometry(padding, _yourReportName.y() + _yourReportName.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5);
+		_report.setGeometry(padding, _yourReportName.y() + _yourReportName.height() + padding, width() - 2 * padding,
+		                    _pleaseSendReport.height() * 12.5);
 	} else {
-		_report.setGeometry(padding, _includeUsername.y() + _includeUsername.height() + padding, width() - 2 * padding, _pleaseSendReport.height() * 12.5);
+		_report.setGeometry(padding, _includeUsername.y() + _includeUsername.height() + padding, width() - 2 * padding,
+		                    _pleaseSendReport.height() * 12.5);
 	}
 	_minidump.move(padding, _report.y() + _report.height() + padding);
 	_saveReport.move(_showReport.x(), _showReport.y());
@@ -1669,19 +1738,20 @@ void LastCrashedWindow::resizeEvent(QResizeEvent *e) {
 	_continue.move(width() - padding - _continue.width(), height() - padding - _continue.height());
 }
 
-NetworkSettingsWindow::NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password)
-: PreLaunchWindow(qsl("HTTP Proxy Settings"))
-, _hostLabel(this)
-, _portLabel(this)
-, _usernameLabel(this)
-, _passwordLabel(this)
-, _hostInput(this)
-, _portInput(this)
-, _usernameInput(this)
-, _passwordInput(this, true)
-, _save(this)
-, _cancel(this, false)
-, _parent(parent) {
+NetworkSettingsWindow::NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username,
+                                             QString password)
+    : PreLaunchWindow(qsl("HTTP Proxy Settings"))
+    , _hostLabel(this)
+    , _portLabel(this)
+    , _usernameLabel(this)
+    , _passwordLabel(this)
+    , _hostInput(this)
+    , _portInput(this)
+    , _usernameInput(this)
+    , _passwordInput(this, true)
+    , _save(this)
+    , _cancel(this, false)
+    , _parent(parent) {
 	setWindowModality(Qt::ApplicationModal);
 
 	_hostLabel.setText(qsl("Hostname"));
@@ -1711,20 +1781,25 @@ NetworkSettingsWindow::NetworkSettingsWindow(QWidget *parent, QString host, quin
 void NetworkSettingsWindow::resizeEvent(QResizeEvent *e) {
 	int padding = _size;
 	_hostLabel.move(padding, padding);
-	_hostInput.setGeometry(_hostLabel.x(), _hostLabel.y() + _hostLabel.height(), 2 * _hostLabel.width(), _hostInput.height());
+	_hostInput.setGeometry(_hostLabel.x(), _hostLabel.y() + _hostLabel.height(), 2 * _hostLabel.width(),
+	                       _hostInput.height());
 	_portLabel.move(padding + _hostInput.width() + padding, padding);
-	_portInput.setGeometry(_portLabel.x(), _portLabel.y() + _portLabel.height(), width() - padding - _portLabel.x(), _portInput.height());
+	_portInput.setGeometry(_portLabel.x(), _portLabel.y() + _portLabel.height(), width() - padding - _portLabel.x(),
+	                       _portInput.height());
 	_usernameLabel.move(padding, _hostInput.y() + _hostInput.height() + padding);
-	_usernameInput.setGeometry(_usernameLabel.x(), _usernameLabel.y() + _usernameLabel.height(), (width() - 3 * padding) / 2, _usernameInput.height());
+	_usernameInput.setGeometry(_usernameLabel.x(), _usernameLabel.y() + _usernameLabel.height(),
+	                           (width() - 3 * padding) / 2, _usernameInput.height());
 	_passwordLabel.move(padding + _usernameInput.width() + padding, _usernameLabel.y());
-	_passwordInput.setGeometry(_passwordLabel.x(), _passwordLabel.y() + _passwordLabel.height(), width() - padding - _passwordLabel.x(), _passwordInput.height());
+	_passwordInput.setGeometry(_passwordLabel.x(), _passwordLabel.y() + _passwordLabel.height(),
+	                           width() - padding - _passwordLabel.x(), _passwordInput.height());
 
 	_save.move(width() - padding - _save.width(), height() - padding - _save.height());
 	_cancel.move(_save.x() - padding - _cancel.width(), _save.y());
 }
 
 void NetworkSettingsWindow::onSave() {
-	QString host = _hostInput.text().trimmed(), port = _portInput.text().trimmed(), username = _usernameInput.text().trimmed(), password = _passwordInput.text().trimmed();
+	QString host = _hostInput.text().trimmed(), port = _portInput.text().trimmed(),
+	        username = _usernameInput.text().trimmed(), password = _passwordInput.text().trimmed();
 	if (!port.isEmpty() && !port.toUInt()) {
 		_portInput.setFocus();
 		return;
@@ -1736,8 +1811,7 @@ void NetworkSettingsWindow::onSave() {
 	close();
 }
 
-void NetworkSettingsWindow::closeEvent(QCloseEvent *e) {
-}
+void NetworkSettingsWindow::closeEvent(QCloseEvent *e) {}
 
 void NetworkSettingsWindow::updateControls() {
 	_hostInput.updateGeometry();
@@ -1751,7 +1825,8 @@ void NetworkSettingsWindow::updateControls() {
 
 	int padding = _size;
 	int w = 2 * padding + _hostLabel.width() * 2 + padding + _portLabel.width() * 2 + padding;
-	int h = padding + _hostLabel.height() + _hostInput.height() + padding + _usernameLabel.height() + _usernameInput.height() + padding + _save.height() + padding;
+	int h = padding + _hostLabel.height() + _hostInput.height() + padding + _usernameLabel.height() +
+	        _usernameInput.height() + padding + _save.height() + padding;
 	if (w == width() && h == height()) {
 		resizeEvent(0);
 	} else {
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 15e72f466..5917841e8 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -20,19 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QSystemTrayIcon>
-#include <QPaintEvent>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QLabel>
-#include <QCheckBox>
-#include <QNetworkReply>
-#include "platform/platform_specific.h"
-#include "platform/platform_main_window.h"
 #include "core/single_timer.h"
+#include "platform/platform_main_window.h"
+#include "platform/platform_specific.h"
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QNetworkReply>
+#include <QPaintEvent>
+#include <QPushButton>
+#include <QSystemTrayIcon>
 
-#include "ui/twidget.h"
 #include "layerwidget.h"
+#include "ui/twidget.h"
 
 class PasscodeWidget;
 class MainWidget;
@@ -75,7 +75,6 @@ private:
 	QString _text;
 	int _textWidth = 0;
 	object_ptr<Ui::LinkButton> _reconnect;
-
 };
 
 class MediaPreviewWidget;
@@ -93,7 +92,8 @@ public:
 	void clearPasscode();
 	void setupIntro();
 	void setupMain(const MTPUser *user = nullptr);
-	void serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media = MTP_messageMediaEmpty(), qint32 date = 0, bool force = false);
+	void serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media = MTP_messageMediaEmpty(),
+	                         qint32 date = 0, bool force = false);
 	void sendServiceHistoryRequest();
 	void showDelayedServiceMsgs();
 
@@ -194,12 +194,15 @@ private:
 
 	QPixmap grabInner();
 
-	void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) override;
+	void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift,
+	                       style::color color) override;
 	QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64;
 
 	struct DelayedServiceMsg {
-		DelayedServiceMsg(const TextWithEntities &message, const MTPMessageMedia &media, qint32 date) : message(message), media(media), date(date) {
-		}
+		DelayedServiceMsg(const TextWithEntities &message, const MTPMessageMedia &media, qint32 date)
+		    : message(message)
+		    , media(media)
+		    , date(date) {}
 		TextWithEntities message;
 		MTPMessageMedia media;
 		qint32 date;
@@ -207,22 +210,20 @@ private:
 	QList<DelayedServiceMsg> _delayedServiceMsgs;
 	mtpRequestId _serviceHistoryRequest = 0;
 
-	object_ptr<PasscodeWidget> _passcode = { nullptr };
-	object_ptr<Intro::Widget> _intro = { nullptr };
-	object_ptr<MainWidget> _main = { nullptr };
-	object_ptr<LayerStackWidget> _layerBg = { nullptr };
-	object_ptr<MediaPreviewWidget> _mediaPreview = { nullptr };
+	object_ptr<PasscodeWidget> _passcode = {nullptr};
+	object_ptr<Intro::Widget> _intro = {nullptr};
+	object_ptr<MainWidget> _main = {nullptr};
+	object_ptr<LayerStackWidget> _layerBg = {nullptr};
+	object_ptr<MediaPreviewWidget> _mediaPreview = {nullptr};
 
-	object_ptr<ConnectingWidget> _connecting = { nullptr };
-	object_ptr<Window::Theme::WarningWidget> _testingThemeWarning = { nullptr };
+	object_ptr<ConnectingWidget> _connecting = {nullptr};
+	object_ptr<Window::Theme::WarningWidget> _testingThemeWarning = {nullptr};
 
 	Local::ClearManager *_clearManager = nullptr;
-
 };
 
 class PreLaunchWindow : public TWidget {
 public:
-
 	PreLaunchWindow(QString title = QString());
 	void activate();
 	int basicSize() const {
@@ -233,9 +234,7 @@ public:
 	static PreLaunchWindow *instance();
 
 protected:
-
 	int _size;
-
 };
 
 class PreLaunchLabel : public QLabel {
@@ -268,29 +267,24 @@ public:
 
 class NotStartedWindow : public PreLaunchWindow {
 public:
-
 	NotStartedWindow();
 
 protected:
-
 	void closeEvent(QCloseEvent *e);
 	void resizeEvent(QResizeEvent *e);
 
 private:
-
 	void updateControls();
 
 	PreLaunchLabel _label;
 	PreLaunchLog _log;
 	PreLaunchButton _close;
-
 };
 
 class LastCrashedWindow : public PreLaunchWindow {
-	 Q_OBJECT
+	Q_OBJECT
 
 public:
-
 	LastCrashedWindow();
 
 public slots:
@@ -310,12 +304,10 @@ public slots:
 	void onSendingProgress(qint64 uploaded, qint64 total);
 
 protected:
-
 	void closeEvent(QCloseEvent *e);
 	void resizeEvent(QResizeEvent *e);
 
 private:
-
 	QString minidumpFileName();
 	void updateControls();
 
@@ -357,14 +349,12 @@ private:
 
 	QString getReportField(const QLatin1String &name, const QLatin1String &prefix);
 	void addReportFieldPart(const QLatin1String &name, const QLatin1String &prefix, QHttpMultiPart *multipart);
-
 };
 
 class NetworkSettingsWindow : public PreLaunchWindow {
 	Q_OBJECT
 
 public:
-
 	NetworkSettingsWindow(QWidget *parent, QString host, quint32 port, QString username, QString password);
 
 signals:
@@ -376,12 +366,10 @@ public slots:
 	void onSave();
 
 protected:
-
 	void closeEvent(QCloseEvent *e);
 	void resizeEvent(QResizeEvent *e);
 
 private:
-
 	void updateControls();
 
 	PreLaunchLabel _hostLabel, _portLabel, _usernameLabel, _passwordLabel;
@@ -389,21 +377,16 @@ private:
 	PreLaunchButton _save, _cancel;
 
 	QWidget *_parent;
-
 };
 
 class ShowCrashReportWindow : public PreLaunchWindow {
 public:
-
 	ShowCrashReportWindow(const QString &text);
 
 protected:
-
 	void resizeEvent(QResizeEvent *e);
-    void closeEvent(QCloseEvent *e);
+	void closeEvent(QCloseEvent *e);
 
 private:
-
 	PreLaunchLog _log;
-
 };
diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp
index 7218e5645..1408df743 100644
--- a/Telegram/SourceFiles/media/media_audio.cpp
+++ b/Telegram/SourceFiles/media/media_audio.cpp
@@ -23,13 +23,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "app.h"
 #include "facades.h"
 
+#include "base/task_queue.h"
 #include "media/media_audio.h"
 #include "media/media_audio_ffmpeg_loader.h"
-#include "media/media_child_ffmpeg_loader.h"
 #include "media/media_audio_loaders.h"
 #include "media/media_audio_track.h"
+#include "media/media_child_ffmpeg_loader.h"
 #include "platform/platform_audio.h"
-#include "base/task_queue.h"
 
 #include <AL/al.h>
 #include <AL/alc.h>
@@ -143,7 +143,7 @@ bool CreatePlaybackDevice() {
 		return false;
 	}
 
-	ALCint attributes[] = { ALC_STEREO_SOURCES, 128, 0 };
+	ALCint attributes[] = {ALC_STEREO_SOURCES, 128, 0};
 	AudioContext = alcCreateContext(AudioDevice, attributes);
 	alcMakeContextCurrent(AudioContext);
 	if (ContextErrorHappened()) {
@@ -151,7 +151,7 @@ bool CreatePlaybackDevice() {
 		return false;
 	}
 
-	ALfloat v[] = { 0.f, 0.f, -1.f, 0.f, 1.f, 0.f };
+	ALfloat v[] = {0.f, 0.f, -1.f, 0.f, 1.f, 0.f};
 	alListener3f(AL_POSITION, 0.f, 0.f, 0.f);
 	alListener3f(AL_VELOCITY, 0.f, 0.f, 0.f);
 	alListenerfv(AL_ORIENTATION, v);
@@ -176,7 +176,7 @@ void ClosePlaybackDevice() {
 
 } // namespace
 
-  // Thread: Main.
+// Thread: Main.
 void Start() {
 	Assert(AudioDevice == nullptr);
 
@@ -229,28 +229,20 @@ bool AttachToDevice() {
 		emit m->faderOnTimer();
 	}
 
-	base::TaskQueue::Main().Put([] {
-		Current().reattachTracks();
-	});
+	base::TaskQueue::Main().Put([] { Current().reattachTracks(); });
 	return true;
 }
 
 void ScheduleDetachFromDeviceSafe() {
-	base::TaskQueue::Main().Put([] {
-		Current().scheduleDetachFromDevice();
-	});
+	base::TaskQueue::Main().Put([] { Current().scheduleDetachFromDevice(); });
 }
 
 void ScheduleDetachIfNotUsedSafe() {
-	base::TaskQueue::Main().Put([] {
-		Current().scheduleDetachIfNotUsed();
-	});
+	base::TaskQueue::Main().Put([] { Current().scheduleDetachIfNotUsed(); });
 }
 
 void StopDetachIfNotUsedSafe() {
-	base::TaskQueue::Main().Put([] {
-		Current().stopDetachIfNotUsed();
-	});
+	base::TaskQueue::Main().Put([] { Current().stopDetachIfNotUsed(); });
 }
 
 } // namespace Audio
@@ -423,7 +415,10 @@ int Mixer::Track::getNotQueuedBufferIndex() {
 			}
 		}
 		if (!found) {
-			LOG(("Audio Error: Could not find the unqueued buffer! Buffer %1 in source %2 with processed count %3").arg(buffer).arg(stream.source).arg(processed));
+			LOG(("Audio Error: Could not find the unqueued buffer! Buffer %1 in source %2 with processed count %3")
+			        .arg(buffer)
+			        .arg(stream.source)
+			        .arg(processed));
 			return -1;
 		}
 	}
@@ -446,30 +441,28 @@ void Mixer::Track::resetStream() {
 Mixer::Track::~Track() = default;
 
 Mixer::Mixer()
-: _volumeVideo(kVolumeRound)
-, _volumeSong(kVolumeRound)
-, _fader(new Fader(&_faderThread))
-, _loader(new Loaders(&_loaderThread)) {
+    : _volumeVideo(kVolumeRound)
+    , _volumeSong(kVolumeRound)
+    , _fader(new Fader(&_faderThread))
+    , _loader(new Loaders(&_loaderThread)) {
 	connect(this, SIGNAL(faderOnTimer()), _fader, SLOT(onTimer()), Qt::QueuedConnection);
 	connect(this, SIGNAL(suppressSong()), _fader, SLOT(onSuppressSong()));
 	connect(this, SIGNAL(unsuppressSong()), _fader, SLOT(onUnsuppressSong()));
 	connect(this, SIGNAL(suppressAll(qint64)), _fader, SLOT(onSuppressAll(qint64)));
-	subscribe(Global::RefSongVolumeChanged(), [this] {
-		QMetaObject::invokeMethod(_fader, "onSongVolumeChanged");
-	});
-	subscribe(Global::RefVideoVolumeChanged(), [this] {
-		QMetaObject::invokeMethod(_fader, "onVideoVolumeChanged");
-	});
-	connect(this, SIGNAL(loaderOnStart(const AudioMsgId&, qint64)), _loader, SLOT(onStart(const AudioMsgId&, qint64)));
-	connect(this, SIGNAL(loaderOnCancel(const AudioMsgId&)), _loader, SLOT(onCancel(const AudioMsgId&)));
+	subscribe(Global::RefSongVolumeChanged(), [this] { QMetaObject::invokeMethod(_fader, "onSongVolumeChanged"); });
+	subscribe(Global::RefVideoVolumeChanged(), [this] { QMetaObject::invokeMethod(_fader, "onVideoVolumeChanged"); });
+	connect(this, SIGNAL(loaderOnStart(const AudioMsgId &, qint64)), _loader,
+	        SLOT(onStart(const AudioMsgId &, qint64)));
+	connect(this, SIGNAL(loaderOnCancel(const AudioMsgId &)), _loader, SLOT(onCancel(const AudioMsgId &)));
 	connect(_loader, SIGNAL(needToCheck()), _fader, SLOT(onTimer()));
-	connect(_loader, SIGNAL(error(const AudioMsgId&)), this, SLOT(onError(const AudioMsgId&)));
-	connect(_fader, SIGNAL(needToPreload(const AudioMsgId&)), _loader, SLOT(onLoad(const AudioMsgId&)));
-	connect(_fader, SIGNAL(playPositionUpdated(const AudioMsgId&)), this, SIGNAL(updated(const AudioMsgId&)));
-	connect(_fader, SIGNAL(audioStopped(const AudioMsgId&)), this, SLOT(onStopped(const AudioMsgId&)));
-	connect(_fader, SIGNAL(error(const AudioMsgId&)), this, SLOT(onError(const AudioMsgId&)));
-	connect(this, SIGNAL(stoppedOnError(const AudioMsgId&)), this, SIGNAL(updated(const AudioMsgId&)), Qt::QueuedConnection);
-	connect(this, SIGNAL(updated(const AudioMsgId&)), this, SLOT(onUpdated(const AudioMsgId&)));
+	connect(_loader, SIGNAL(error(const AudioMsgId &)), this, SLOT(onError(const AudioMsgId &)));
+	connect(_fader, SIGNAL(needToPreload(const AudioMsgId &)), _loader, SLOT(onLoad(const AudioMsgId &)));
+	connect(_fader, SIGNAL(playPositionUpdated(const AudioMsgId &)), this, SIGNAL(updated(const AudioMsgId &)));
+	connect(_fader, SIGNAL(audioStopped(const AudioMsgId &)), this, SLOT(onStopped(const AudioMsgId &)));
+	connect(_fader, SIGNAL(error(const AudioMsgId &)), this, SLOT(onError(const AudioMsgId &)));
+	connect(this, SIGNAL(stoppedOnError(const AudioMsgId &)), this, SIGNAL(updated(const AudioMsgId &)),
+	        Qt::QueuedConnection);
+	connect(this, SIGNAL(updated(const AudioMsgId &)), this, SLOT(onUpdated(const AudioMsgId &)));
 
 	_loaderThread.start();
 	_faderThread.start();
@@ -548,20 +541,23 @@ Mixer::Track *Mixer::trackForType(AudioMsgId::Type type, int index) {
 }
 
 const Mixer::Track *Mixer::trackForType(AudioMsgId::Type type, int index) const {
-	return const_cast<Mixer*>(this)->trackForType(type, index);
+	return const_cast<Mixer *>(this)->trackForType(type, index);
 }
 
 int *Mixer::currentIndex(AudioMsgId::Type type) {
 	switch (type) {
 	case AudioMsgId::Type::Voice: return &_audioCurrent;
 	case AudioMsgId::Type::Song: return &_songCurrent;
-	case AudioMsgId::Type::Video: { static int videoIndex = 0; return &videoIndex; }
+	case AudioMsgId::Type::Video: {
+		static int videoIndex = 0;
+		return &videoIndex;
+	}
 	}
 	return nullptr;
 }
 
 const int *Mixer::currentIndex(AudioMsgId::Type type) const {
-	return const_cast<Mixer*>(this)->currentIndex(type);
+	return const_cast<Mixer *>(this)->currentIndex(type);
 }
 
 void Mixer::resetFadeStartPosition(AudioMsgId::Type type, int positionInBuffered) {
@@ -613,7 +609,8 @@ bool Mixer::fadedStop(AudioMsgId::Type type, bool *fadedStart) {
 	case State::Paused:
 	case State::PausedAtEnd: {
 		setStoppedState(current);
-	} return true;
+	}
+		return true;
 	}
 	return false;
 }
@@ -651,7 +648,6 @@ void Mixer::play(const AudioMsgId &audio, std::unique_ptr<VideoSoundData> videoD
 				case State::Stopping: {
 					current->state.state = State::Pausing;
 				} break;
-
 				}
 			};
 
@@ -834,7 +830,8 @@ void Mixer::resume(const AudioMsgId &audio, bool fast) {
 				Audio::AttachToDevice();
 				if (track->state.state == State::PausedAtEnd) {
 					if (track->isStreamCreated()) {
-						alSourcei(track->stream.source, AL_SAMPLE_OFFSET, std::max(track->state.position - track->bufferedPosition, Q_INT64_C(0)));
+						alSourcei(track->stream.source, AL_SAMPLE_OFFSET,
+						          std::max(track->state.position - track->bufferedPosition, Q_INT64_C(0)));
 						if (!checkCurrentALError(type)) return;
 					}
 				}
@@ -878,7 +875,9 @@ void Mixer::seek(AudioMsgId::Type type, qint64 position) {
 
 	Audio::AttachToDevice();
 	auto streamCreated = current->isStreamCreated();
-	auto fastSeek = (position >= current->bufferedPosition && position < current->bufferedPosition + current->bufferedLength - (current->loaded ? 0 : kDefaultFrequency));
+	auto fastSeek =
+	    (position >= current->bufferedPosition &&
+	     position < current->bufferedPosition + current->bufferedLength - (current->loaded ? 0 : kDefaultFrequency));
 	if (!streamCreated) {
 		fastSeek = false;
 	} else if (IsStoppedOrStopping(current->state.state)) {
@@ -920,7 +919,8 @@ void Mixer::seek(AudioMsgId::Type type, qint64 position) {
 	case State::StoppedAtError:
 	case State::StoppedAtStart: {
 		lock.unlock();
-	} return play(audio, position);
+	}
+		return play(audio, position);
 	}
 	emit faderOnTimer();
 }
@@ -1048,8 +1048,8 @@ void Mixer::reattachIfNeeded() {
 			return (state == State::Playing) || IsFading(state);
 		};
 		for (auto i = 0; i != kTogetherLimit; ++i) {
-			if (isPlayingState(*trackForType(AudioMsgId::Type::Voice, i))
-				|| isPlayingState(*trackForType(AudioMsgId::Type::Song, i))) {
+			if (isPlayingState(*trackForType(AudioMsgId::Type::Voice, i)) ||
+			    isPlayingState(*trackForType(AudioMsgId::Type::Song, i))) {
 				return true;
 			}
 		}
@@ -1086,10 +1086,11 @@ double Mixer::getVideoVolume() const {
 	return double(_volumeVideo.loadAcquire()) / kVolumeRound;
 }
 
-Fader::Fader(QThread *thread) : QObject()
-, _timer(this)
-, _suppressVolumeAll(1., 1.)
-, _suppressVolumeSong(1., 1.) {
+Fader::Fader(QThread *thread)
+    : QObject()
+    , _timer(this)
+    , _suppressVolumeAll(1., 1.)
+    , _suppressVolumeSong(1., 1.) {
 	moveToThread(thread);
 	_timer.moveToThread(thread);
 	connect(thread, SIGNAL(started()), this, SLOT(onInit()));
@@ -1099,8 +1100,7 @@ Fader::Fader(QThread *thread) : QObject()
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(onTimer()));
 }
 
-void Fader::onInit() {
-}
+void Fader::onInit() {}
 
 void Fader::onTimer() {
 	QMutexLocker lock(&AudioMutex);
@@ -1123,7 +1123,8 @@ void Fader::onTimer() {
 					_suppressAllAnim = false;
 				}
 			} else if (ms > _suppressAllStart) {
-				_suppressVolumeAll.update((ms - _suppressAllStart) / double(st::mediaPlayerSuppressDuration), anim::linear);
+				_suppressVolumeAll.update((ms - _suppressAllStart) / double(st::mediaPlayerSuppressDuration),
+				                          anim::linear);
 			}
 			auto wasVolumeMultiplierAll = VolumeMultiplierAll;
 			VolumeMultiplierAll = _suppressVolumeAll.current();
@@ -1145,7 +1146,8 @@ void Fader::onTimer() {
 	auto hasFading = (_suppressAll || _suppressSongAnim);
 	auto hasPlaying = false;
 
-	auto updatePlayback = [this, &hasPlaying, &hasFading](AudioMsgId::Type type, int index, double volumeMultiplier, bool suppressGainChanged) {
+	auto updatePlayback = [this, &hasPlaying, &hasFading](AudioMsgId::Type type, int index, double volumeMultiplier,
+	                                                      bool suppressGainChanged) {
 		auto track = mixer()->trackForType(type, index);
 		if (IsStopped(track->state.state) || track->state.state == State::Paused || !track->isStreamCreated()) return;
 
@@ -1178,7 +1180,8 @@ void Fader::onTimer() {
 	}
 }
 
-qint32 Fader::updateOnePlayback(Mixer::Track *track, bool &hasPlaying, bool &hasFading, double volumeMultiplier, bool volumeChanged) {
+qint32 Fader::updateOnePlayback(Mixer::Track *track, bool &hasPlaying, bool &hasFading, double volumeMultiplier,
+                                bool volumeChanged) {
 	auto playing = false;
 	auto fading = false;
 
@@ -1273,7 +1276,8 @@ qint32 Fader::updateOnePlayback(Mixer::Track *track, bool &hasPlaying, bool &has
 	}
 	if (playing || track->state.state == State::Starting || track->state.state == State::Resuming) {
 		if (!track->loaded && !track->loading) {
-			auto needPreload = (track->state.position + kPreloadSamples > track->bufferedPosition + track->bufferedLength);
+			auto needPreload =
+			    (track->state.position + kPreloadSamples > track->bufferedPosition + track->bufferedLength);
 			if (needPreload) {
 				track->loading = true;
 				emitSignals |= EmitNeedToPreload;
@@ -1381,9 +1385,8 @@ void DetachFromDevice() {
 
 class FFMpegAttributesReader : public AbstractFFMpegLoader {
 public:
-
-	FFMpegAttributesReader(const FileLocation &file, const QByteArray &data) : AbstractFFMpegLoader(file, data, base::byte_vector()) {
-	}
+	FFMpegAttributesReader(const FileLocation &file, const QByteArray &data)
+	    : AbstractFFMpegLoader(file, data, base::byte_vector()) {}
 
 	bool open(qint64 &position) override {
 		if (!AbstractFFMpegLoader::open(position)) {
@@ -1391,11 +1394,15 @@ public:
 		}
 
 		int res = 0;
-		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+		char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
 		int videoStreamId = av_find_best_stream(fmtContext, AVMEDIA_TYPE_VIDEO, -1, -1, &codec, 0);
 		if (videoStreamId >= 0) {
-			DEBUG_LOG(("Audio Read Error: Found video stream in file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(videoStreamId).arg(av_make_error_string(err, sizeof(err), streamId)));
+			DEBUG_LOG(("Audio Read Error: Found video stream in file '%1', data size '%2', error %3, %4")
+			              .arg(_file.name())
+			              .arg(_data.size())
+			              .arg(videoStreamId)
+			              .arg(av_make_error_string(err, sizeof(err), streamId)));
 			return false;
 		}
 
@@ -1405,7 +1412,7 @@ public:
 				const AVPacket &packet(stream->attached_pic);
 				if (packet.size) {
 					bool animated = false;
-					QByteArray cover((const char*)packet.data, packet.size), format;
+					QByteArray cover((const char *)packet.data, packet.size), format;
 					_cover = App::readImage(cover, &format, true, &animated);
 					if (!_cover.isNull()) {
 						_coverBytes = cover;
@@ -1424,7 +1431,7 @@ public:
 
 	void trySet(QString &to, AVDictionary *dict, const char *key) {
 		if (!to.isEmpty()) return;
-		if (AVDictionaryEntry* tag = av_dict_get(dict, key, 0, 0)) {
+		if (AVDictionaryEntry *tag = av_dict_get(dict, key, 0, 0)) {
 			to = QString::fromUtf8(tag->value);
 		}
 	}
@@ -1470,15 +1477,12 @@ public:
 		return ReadResult::Error;
 	}
 
-	~FFMpegAttributesReader() {
-	}
+	~FFMpegAttributesReader() {}
 
 private:
-
 	QString _title, _performer;
 	QImage _cover;
 	QByteArray _coverBytes, _coverFormat;
-
 };
 
 namespace Media {
@@ -1502,8 +1506,8 @@ FileLoadTask::Song PrepareForSending(const QString &fname, const QByteArray &dat
 
 class FFMpegWaveformCounter : public FFMpegLoader {
 public:
-	FFMpegWaveformCounter(const FileLocation &file, const QByteArray &data) : FFMpegLoader(file, data, base::byte_vector()) {
-	}
+	FFMpegWaveformCounter(const FileLocation &file, const QByteArray &data)
+	    : FFMpegLoader(file, data, base::byte_vector()) {}
 
 	bool open(qint64 &position) override {
 		if (!FFMpegLoader::open(position)) {
@@ -1574,12 +1578,10 @@ public:
 		return result;
 	}
 
-	~FFMpegWaveformCounter() {
-	}
+	~FFMpegWaveformCounter() {}
 
 private:
 	VoiceWaveform result;
-
 };
 
 VoiceWaveform audioCountWaveform(const FileLocation &file, const QByteArray &data) {
diff --git a/Telegram/SourceFiles/media/media_audio.h b/Telegram/SourceFiles/media/media_audio.h
index 0dd68e6d7..de297fe9c 100644
--- a/Telegram/SourceFiles/media/media_audio.h
+++ b/Telegram/SourceFiles/media/media_audio.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QThread>
-#include <QTimer>
 #include "base/observer.h"
 #include "storage/localimageloader.h"
 #include "ui/animation.h"
+#include <QThread>
+#include <QTimer>
 
 struct VideoSoundData;
 struct VideoSoundPart;
@@ -47,8 +47,7 @@ void ScheduleDetachFromDeviceSafe();
 void ScheduleDetachIfNotUsedSafe();
 void StopDetachIfNotUsedSafe();
 
-template <typename Callback>
-void IterateSamples();
+template <typename Callback> void IterateSamples();
 
 } // namespace Audio
 
@@ -81,10 +80,8 @@ enum class State {
 };
 
 inline bool IsStopped(State state) {
-	return (state == State::Stopped)
-		|| (state == State::StoppedAtEnd)
-		|| (state == State::StoppedAtError)
-		|| (state == State::StoppedAtStart);
+	return (state == State::Stopped) || (state == State::StoppedAtEnd) || (state == State::StoppedAtError) ||
+	       (state == State::StoppedAtStart);
 }
 
 inline bool IsStoppedOrStopping(State state) {
@@ -96,15 +93,12 @@ inline bool IsStoppedAtEnd(State state) {
 }
 
 inline bool IsPaused(State state) {
-	return (state == State::Paused)
-		|| (state == State::PausedAtEnd);
+	return (state == State::Paused) || (state == State::PausedAtEnd);
 }
 
 inline bool IsFading(State state) {
-	return (state == State::Starting)
-		|| (state == State::Stopping)
-		|| (state == State::Pausing)
-		|| (state == State::Resuming);
+	return (state == State::Starting) || (state == State::Stopping) || (state == State::Pausing) ||
+	       (state == State::Resuming);
 }
 
 inline bool IsActive(State state) {
@@ -215,12 +209,12 @@ private:
 
 		qint32 format = 0;
 		qint32 frequency = kDefaultFrequency;
-		int samplesCount[kBuffersCount] = { 0 };
+		int samplesCount[kBuffersCount] = {0};
 		QByteArray bufferSamples[kBuffersCount];
 
 		struct Stream {
 			quint32 source = 0;
-			quint32 buffers[kBuffersCount] = { 0 };
+			quint32 buffers[kBuffersCount] = {0};
 		};
 		Stream stream;
 		std::unique_ptr<VideoSoundData> videoData;
@@ -232,7 +226,6 @@ private:
 		void createStream();
 		void destroyStream();
 		void resetStream();
-
 	};
 
 	// Thread: Any. Must be locked: AudioMutex.
@@ -260,7 +253,6 @@ private:
 	QThread _faderThread, _loaderThread;
 	Fader *_fader;
 	Loaders *_loader;
-
 };
 
 Mixer *mixer();
@@ -294,7 +286,8 @@ private:
 		EmitPositionUpdated = 0x04,
 		EmitNeedToPreload = 0x08,
 	};
-	qint32 updateOnePlayback(Mixer::Track *track, bool &hasPlaying, bool &hasFading, double volumeMultiplier, bool volumeChanged);
+	qint32 updateOnePlayback(Mixer::Track *track, bool &hasPlaying, bool &hasFading, double volumeMultiplier,
+	                         bool volumeChanged);
 	void setStoppedState(Mixer::Track *track, State state = State::Stopped);
 
 	QTimer _timer;
@@ -311,7 +304,6 @@ private:
 	TimeMs _suppressAllStart = 0;
 	TimeMs _suppressAllEnd = 0;
 	TimeMs _suppressSongStart = 0;
-
 };
 
 FileLoadTask::Song PrepareForSending(const QString &fname, const QByteArray &data);
@@ -350,7 +342,7 @@ FORCE_INLINE quint16 ReadOneSample(qint16 data) {
 
 template <typename SampleType, typename Callback>
 void IterateSamples(base::const_byte_span bytes, Callback &&callback) {
-	auto samplesPointer = reinterpret_cast<const SampleType*>(bytes.data());
+	auto samplesPointer = reinterpret_cast<const SampleType *>(bytes.data());
 	auto samplesCount = bytes.size() / sizeof(SampleType);
 	auto samplesData = gsl::make_span(samplesPointer, samplesCount);
 	for (auto sampleData : samplesData) {
diff --git a/Telegram/SourceFiles/media/media_audio_capture.cpp b/Telegram/SourceFiles/media/media_audio_capture.cpp
index 5d82fb787..e4cbe9927 100644
--- a/Telegram/SourceFiles/media/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/media_audio_capture.cpp
@@ -59,11 +59,13 @@ void Finish() {
 	delete base::take(CaptureInstance);
 }
 
-Instance::Instance() : _inner(new Inner(&_thread)) {
+Instance::Instance()
+    : _inner(new Inner(&_thread)) {
 	CaptureInstance = this;
 	connect(this, SIGNAL(start()), _inner, SLOT(onStart()));
 	connect(this, SIGNAL(stop(bool)), _inner, SLOT(onStop(bool)));
-	connect(_inner, SIGNAL(done(QByteArray, VoiceWaveform, qint32)), this, SIGNAL(done(QByteArray, VoiceWaveform, qint32)));
+	connect(_inner, SIGNAL(done(QByteArray, VoiceWaveform, qint32)), this,
+	        SIGNAL(done(QByteArray, VoiceWaveform, qint32)));
 	connect(_inner, SIGNAL(updated(quint16, qint32)), this, SIGNAL(updated(quint16, qint32)));
 	connect(_inner, SIGNAL(error()), this, SIGNAL(error()));
 	connect(&_thread, SIGNAL(started()), _inner, SLOT(onInit()));
@@ -74,7 +76,8 @@ Instance::Instance() : _inner(new Inner(&_thread)) {
 void Instance::check() {
 	_available = false;
 	if (auto defaultDevice = alcGetString(0, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)) {
-		if (auto device = alcCaptureOpenDevice(defaultDevice, kCaptureFrequency, AL_FORMAT_MONO16, kCaptureFrequency / 5)) {
+		if (auto device =
+		        alcCaptureOpenDevice(defaultDevice, kCaptureFrequency, AL_FORMAT_MONO16, kCaptureFrequency / 5)) {
 			auto error = ErrorHappened(device);
 			alcCaptureCloseDevice(device);
 			_available = !error;
@@ -124,7 +127,7 @@ struct Instance::Inner::Private {
 	QVector<uchar> waveform;
 
 	static int _read_data(void *opaque, uint8_t *buf, int buf_size) {
-		auto l = reinterpret_cast<Private*>(opaque);
+		auto l = reinterpret_cast<Private *>(opaque);
 
 		qint32 nbytes = std::min(l->data.size() - l->dataPos, qint32(buf_size));
 		if (nbytes <= 0) {
@@ -137,7 +140,7 @@ struct Instance::Inner::Private {
 	}
 
 	static int _write_data(void *opaque, uint8_t *buf, int buf_size) {
-		auto l = reinterpret_cast<Private*>(opaque);
+		auto l = reinterpret_cast<Private *>(opaque);
 
 		if (buf_size <= 0) return 0;
 		if (l->dataPos + buf_size > l->data.size()) l->data.resize(l->dataPos + buf_size);
@@ -147,7 +150,7 @@ struct Instance::Inner::Private {
 	}
 
 	static int64_t _seek_data(void *opaque, int64_t offset, int whence) {
-		auto l = reinterpret_cast<Private*>(opaque);
+		auto l = reinterpret_cast<Private *>(opaque);
 
 		qint32 newPos = -1;
 		switch (whence) {
@@ -167,7 +170,8 @@ struct Instance::Inner::Private {
 	}
 };
 
-Instance::Inner::Inner(QThread *thread) : d(new Private()) {
+Instance::Inner::Inner(QThread *thread)
+    : d(new Private()) {
 	moveToThread(thread);
 	_timer.moveToThread(thread);
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(onTimeout()));
@@ -178,11 +182,9 @@ Instance::Inner::~Inner() {
 	delete d;
 }
 
-void Instance::Inner::onInit() {
-}
+void Instance::Inner::onInit() {}
 
 void Instance::Inner::onStart() {
-
 	// Start OpenAL Capture
 	const ALCchar *dName = alcGetString(0, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
 	DEBUG_LOG(("Audio Info: Capture device name '%1'").arg(dName));
@@ -202,11 +204,12 @@ void Instance::Inner::onStart() {
 
 	// Create encoding context
 
-	d->ioBuffer = (uchar*)av_malloc(AVBlockSize);
+	d->ioBuffer = (uchar *)av_malloc(AVBlockSize);
 
-	d->ioContext = avio_alloc_context(d->ioBuffer, AVBlockSize, 1, static_cast<void*>(d), &Private::_read_data, &Private::_write_data, &Private::_seek_data);
+	d->ioContext = avio_alloc_context(d->ioBuffer, AVBlockSize, 1, static_cast<void *>(d), &Private::_read_data,
+	                                  &Private::_write_data, &Private::_seek_data);
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 	AVOutputFormat *fmt = 0;
 	while ((fmt = av_oformat_next(fmt))) {
 		if (fmt->name == qstr("opus")) {
@@ -221,7 +224,9 @@ void Instance::Inner::onStart() {
 	}
 
 	if ((res = avformat_alloc_output_context2(&d->fmtContext, fmt, 0, 0)) < 0) {
-		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -268,7 +273,9 @@ void Instance::Inner::onStart() {
 
 	// Open audio stream
 	if ((res = avcodec_open2(d->codecContext, d->codec, nullptr)) < 0) {
-		LOG(("Audio Error: Unable to avcodec_open2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avcodec_open2 for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -304,23 +311,31 @@ void Instance::Inner::onStart() {
 	av_opt_set_sample_fmt(d->swrContext, "out_sample_fmt", d->codecContext->sample_fmt, 0);
 
 	if ((res = swr_init(d->swrContext)) < 0) {
-		LOG(("Audio Error: Unable to swr_init for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to swr_init for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
 	}
 
 	d->maxDstSamples = d->srcSamples;
-	if ((res = av_samples_alloc_array_and_samples(&d->dstSamplesData, 0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0)) < 0) {
-		LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+	if ((res = av_samples_alloc_array_and_samples(&d->dstSamplesData, 0, d->codecContext->channels, d->maxDstSamples,
+	                                              d->codecContext->sample_fmt, 0)) < 0) {
+		LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
 	}
-	d->dstSamplesSize = av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
+	d->dstSamplesSize =
+	    av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
 
 	if ((res = avcodec_parameters_from_context(d->stream->codecpar, d->codecContext)) < 0) {
-		LOG(("Audio Error: Unable to avcodec_parameters_from_context for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avcodec_parameters_from_context for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -328,7 +343,9 @@ void Instance::Inner::onStart() {
 
 	// Write file header
 	if ((res = avformat_write_header(d->fmtContext, 0)) < 0) {
-		LOG(("Audio Error: Unable to avformat_write_header for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avformat_write_header for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -353,7 +370,8 @@ void Instance::Inner::onStop(bool needResult) {
 	if (!_captured.isEmpty()) {
 		auto fadeSamples = kCaptureFadeInDuration * kCaptureFrequency / 1000;
 		auto capturedSamples = static_cast<int>(_captured.size() / sizeof(short));
-		if ((_captured.size() % sizeof(short)) || (d->fullSamples + capturedSamples < kCaptureFrequency) || (capturedSamples < fadeSamples)) {
+		if ((_captured.size() % sizeof(short)) || (d->fullSamples + capturedSamples < kCaptureFrequency) ||
+		    (capturedSamples < fadeSamples)) {
 			d->fullSamples = 0;
 			d->dataPos = 0;
 			d->data.clear();
@@ -362,7 +380,8 @@ void Instance::Inner::onStop(bool needResult) {
 			d->waveform.clear();
 		} else {
 			double coef = 1. / fadeSamples, fadedFrom = 0;
-			for (short *ptr = ((short*)_captured.data()) + capturedSamples, *end = ptr - fadeSamples; ptr != end; ++fadedFrom) {
+			for (short *ptr = ((short *)_captured.data()) + capturedSamples, *end = ptr - fadeSamples; ptr != end;
+			     ++fadedFrom) {
 				--ptr;
 				*ptr = std::round(fadedFrom * coef * *ptr);
 			}
@@ -388,7 +407,10 @@ void Instance::Inner::onStop(bool needResult) {
 			}
 		}
 	}
-	DEBUG_LOG(("Audio Capture: stopping (need result: %1), size: %2, samples: %3").arg(Logs::b(needResult)).arg(d->data.size()).arg(d->fullSamples));
+	DEBUG_LOG(("Audio Capture: stopping (need result: %1), size: %2, samples: %3")
+	              .arg(Logs::b(needResult))
+	              .arg(d->data.size())
+	              .arg(d->fullSamples));
 	_captured = QByteArray();
 
 	// Finish stream
@@ -517,7 +539,8 @@ void Instance::Inner::onTimeout() {
 		auto skipSamples = kCaptureSkipDuration * kCaptureFrequency / 1000;
 		auto fadeSamples = kCaptureFadeInDuration * kCaptureFrequency / 1000;
 		auto levelindex = d->fullSamples + static_cast<int>(s / sizeof(short));
-		for (auto ptr = (const short*)(_captured.constData() + s), end = (const short*)(_captured.constData() + news); ptr < end; ++ptr, ++levelindex) {
+		for (auto ptr = (const short *)(_captured.constData() + s), end = (const short *)(_captured.constData() + news);
+		     ptr < end; ++ptr, ++levelindex) {
 			if (levelindex > skipSamples) {
 				quint16 value = qAbs(*ptr);
 				if (levelindex < skipSamples + fadeSamples) {
@@ -528,7 +551,8 @@ void Instance::Inner::onTimeout() {
 				}
 			}
 		}
-		qint32 samplesFull = d->fullSamples + _captured.size() / sizeof(short), samplesSinceUpdate = samplesFull - d->lastUpdate;
+		qint32 samplesFull = d->fullSamples + _captured.size() / sizeof(short),
+		       samplesSinceUpdate = samplesFull - d->lastUpdate;
 		if (samplesSinceUpdate > AudioVoiceMsgUpdateView * kCaptureFrequency / 1000) {
 			emit updated(d->levelMax, samplesFull);
 			d->lastUpdate = samplesFull;
@@ -564,9 +588,9 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) {
 	auto samplesCnt = static_cast<int>(framesize / sizeof(short));
 
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
-	auto srcSamplesDataChannel = (short*)(_captured.data() + offset);
+	auto srcSamplesDataChannel = (short *)(_captured.data() + offset);
 	auto srcSamplesData = &srcSamplesDataChannel;
 
 	//	memcpy(d->srcSamplesData[0], _captured.constData() + offset, framesize);
@@ -575,7 +599,8 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) {
 	if (d->fullSamples < skipSamples + fadeSamples) {
 		qint32 fadedCnt = std::min(samplesCnt, skipSamples + fadeSamples - d->fullSamples);
 		double coef = 1. / fadeSamples, fadedFrom = d->fullSamples - skipSamples;
-		short *ptr = srcSamplesDataChannel, *zeroEnd = ptr + std::clamp(skipSamples - d->fullSamples, 0, samplesCnt), *end = ptr + fadedCnt;
+		short *ptr = srcSamplesDataChannel, *zeroEnd = ptr + std::clamp(skipSamples - d->fullSamples, 0, samplesCnt),
+		      *end = ptr + fadedCnt;
 		for (; ptr != zeroEnd; ++ptr, ++fadedFrom) {
 			*ptr = 0;
 		}
@@ -599,21 +624,29 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) {
 
 	// Convert to final format
 
-	d->dstSamples = av_rescale_rnd(swr_get_delay(d->swrContext, d->codecContext->sample_rate) + d->srcSamples, d->codecContext->sample_rate, d->codecContext->sample_rate, AV_ROUND_UP);
+	d->dstSamples = av_rescale_rnd(swr_get_delay(d->swrContext, d->codecContext->sample_rate) + d->srcSamples,
+	                               d->codecContext->sample_rate, d->codecContext->sample_rate, AV_ROUND_UP);
 	if (d->dstSamples > d->maxDstSamples) {
 		d->maxDstSamples = d->dstSamples;
 		av_freep(&d->dstSamplesData[0]);
-		if ((res = av_samples_alloc(d->dstSamplesData, 0, d->codecContext->channels, d->dstSamples, d->codecContext->sample_fmt, 1)) < 0) {
-			LOG(("Audio Error: Unable to av_samples_alloc for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		if ((res = av_samples_alloc(d->dstSamplesData, 0, d->codecContext->channels, d->dstSamples,
+		                            d->codecContext->sample_fmt, 1)) < 0) {
+			LOG(("Audio Error: Unable to av_samples_alloc for capture, error %1, %2")
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			onStop(false);
 			emit error();
 			return;
 		}
-		d->dstSamplesSize = av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
+		d->dstSamplesSize =
+		    av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
 	}
 
-	if ((res = swr_convert(d->swrContext, d->dstSamplesData, d->dstSamples, (const uint8_t **)srcSamplesData, d->srcSamples)) < 0) {
-		LOG(("Audio Error: Unable to swr_convert for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+	if ((res = swr_convert(d->swrContext, d->dstSamplesData, d->dstSamples, (const uint8_t **)srcSamplesData,
+	                       d->srcSamples)) < 0) {
+		LOG(("Audio Error: Unable to swr_convert for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -624,9 +657,10 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) {
 	AVFrame *frame = av_frame_alloc();
 
 	frame->nb_samples = d->dstSamples;
-	frame->pts = av_rescale_q(d->fullSamples, AVRational { 1, d->codecContext->sample_rate }, d->codecContext->time_base);
+	frame->pts = av_rescale_q(d->fullSamples, AVRational{1, d->codecContext->sample_rate}, d->codecContext->time_base);
 
-	avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0], d->dstSamplesSize, 0);
+	avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0],
+	                         d->dstSamplesSize, 0);
 
 	writeFrame(frame);
 
@@ -637,7 +671,7 @@ void Instance::Inner::processFrame(qint32 offset, qint32 framesize) {
 
 void Instance::Inner::writeFrame(AVFrame *frame) {
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
 	res = avcodec_send_frame(d->codecContext, frame);
 	if (res == AVERROR(EAGAIN)) {
@@ -658,7 +692,9 @@ void Instance::Inner::writeFrame(AVFrame *frame) {
 		res = avcodec_send_frame(d->codecContext, frame);
 	}
 	if (res < 0) {
-		LOG(("Audio Error: Unable to avcodec_send_frame for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avcodec_send_frame for capture, error %1, %2")
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		onStop(false);
 		emit error();
 		return;
@@ -678,7 +714,7 @@ int Instance::Inner::writePackets() {
 	memset(&pkt, 0, sizeof(pkt)); // data and size must be 0;
 
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
 	int written = 0;
 	do {
@@ -689,7 +725,9 @@ int Instance::Inner::writePackets() {
 			} else if (res == AVERROR_EOF) {
 				return res;
 			}
-			LOG(("Audio Error: Unable to avcodec_receive_packet for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Audio Error: Unable to avcodec_receive_packet for capture, error %1, %2")
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			onStop(false);
 			emit error();
 			return res;
@@ -698,7 +736,9 @@ int Instance::Inner::writePackets() {
 		av_packet_rescale_ts(&pkt, d->codecContext->time_base, d->stream->time_base);
 		pkt.stream_index = d->stream->index;
 		if ((res = av_interleaved_write_frame(d->fmtContext, &pkt)) < 0) {
-			LOG(("Audio Error: Unable to av_interleaved_write_frame for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Audio Error: Unable to av_interleaved_write_frame for capture, error %1, %2")
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			onStop(false);
 			emit error();
 			return -1;
diff --git a/Telegram/SourceFiles/media/media_audio_capture.h b/Telegram/SourceFiles/media/media_audio_capture.h
index febc86e1f..d8a212197 100644
--- a/Telegram/SourceFiles/media/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/media_audio_capture.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "structs.h"
 #include <QObject>
 #include <QThread>
 #include <QTimer>
-#include "structs.h"
 
 struct AVFrame;
 
@@ -61,7 +61,6 @@ private:
 	bool _available = false;
 	QThread _thread;
 	Inner *_inner;
-
 };
 
 Instance *instance();
@@ -98,9 +97,7 @@ private:
 	Private *d;
 	QTimer _timer;
 	QByteArray _captured;
-
 };
 
 } // namespace Capture
 } // namespace Media
-
diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
index c149f126a..b59762d5c 100644
--- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.cpp
@@ -30,19 +30,24 @@ bool AbstractFFMpegLoader::open(qint64 &position) {
 	}
 
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
-	ioBuffer = (uchar*)av_malloc(AVBlockSize);
+	ioBuffer = (uchar *)av_malloc(AVBlockSize);
 	if (!_data.isEmpty()) {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void*>(this), &AbstractFFMpegLoader::_read_data, 0, &AbstractFFMpegLoader::_seek_data);
+		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this),
+		                               &AbstractFFMpegLoader::_read_data, 0, &AbstractFFMpegLoader::_seek_data);
 	} else if (!_bytes.empty()) {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void*>(this), &AbstractFFMpegLoader::_read_bytes, 0, &AbstractFFMpegLoader::_seek_bytes);
+		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this),
+		                               &AbstractFFMpegLoader::_read_bytes, 0, &AbstractFFMpegLoader::_seek_bytes);
 	} else {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void*>(this), &AbstractFFMpegLoader::_read_file, 0, &AbstractFFMpegLoader::_seek_file);
+		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this),
+		                               &AbstractFFMpegLoader::_read_file, 0, &AbstractFFMpegLoader::_seek_file);
 	}
 	fmtContext = avformat_alloc_context();
 	if (!fmtContext) {
-		DEBUG_LOG(("Audio Read Error: Unable to avformat_alloc_context for file '%1', data size '%2'").arg(_file.name()).arg(_data.size()));
+		DEBUG_LOG(("Audio Read Error: Unable to avformat_alloc_context for file '%1', data size '%2'")
+		              .arg(_file.name())
+		              .arg(_data.size()));
 		return false;
 	}
 	fmtContext->pb = ioContext;
@@ -50,19 +55,31 @@ bool AbstractFFMpegLoader::open(qint64 &position) {
 	if ((res = avformat_open_input(&fmtContext, 0, 0, 0)) < 0) {
 		ioBuffer = 0;
 
-		DEBUG_LOG(("Audio Read Error: Unable to avformat_open_input for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		DEBUG_LOG(("Audio Read Error: Unable to avformat_open_input for file '%1', data size '%2', error %3, %4")
+		              .arg(_file.name())
+		              .arg(_data.size())
+		              .arg(res)
+		              .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 	_opened = true;
 
 	if ((res = avformat_find_stream_info(fmtContext, 0)) < 0) {
-		DEBUG_LOG(("Audio Read Error: Unable to avformat_find_stream_info for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		DEBUG_LOG(("Audio Read Error: Unable to avformat_find_stream_info for file '%1', data size '%2', error %3, %4")
+		              .arg(_file.name())
+		              .arg(_data.size())
+		              .arg(res)
+		              .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 
 	streamId = av_find_best_stream(fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0);
 	if (streamId < 0) {
-		LOG(("Audio Error: Unable to av_find_best_stream for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(streamId).arg(av_make_error_string(err, sizeof(err), streamId)));
+		LOG(("Audio Error: Unable to av_find_best_stream for file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(streamId)
+		        .arg(av_make_error_string(err, sizeof(err), streamId)));
 		return false;
 	}
 
@@ -70,7 +87,9 @@ bool AbstractFFMpegLoader::open(qint64 &position) {
 	if (fmtContext->streams[streamId]->duration == AV_NOPTS_VALUE) {
 		_samplesCount = (fmtContext->duration * _samplesFrequency) / AV_TIME_BASE;
 	} else {
-		_samplesCount = (fmtContext->streams[streamId]->duration * _samplesFrequency * fmtContext->streams[streamId]->time_base.num) / fmtContext->streams[streamId]->time_base.den;
+		_samplesCount = (fmtContext->streams[streamId]->duration * _samplesFrequency *
+		                 fmtContext->streams[streamId]->time_base.num) /
+		                fmtContext->streams[streamId]->time_base.den;
 	}
 
 	return true;
@@ -90,7 +109,7 @@ AbstractFFMpegLoader::~AbstractFFMpegLoader() {
 }
 
 int AbstractFFMpegLoader::_read_data(void *opaque, uint8_t *buf, int buf_size) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
 
 	auto nbytes = std::min(l->_data.size() - l->_dataPos, qint32(buf_size));
 	if (nbytes <= 0) {
@@ -103,7 +122,7 @@ int AbstractFFMpegLoader::_read_data(void *opaque, uint8_t *buf, int buf_size) {
 }
 
 int64_t AbstractFFMpegLoader::_seek_data(void *opaque, int64_t offset, int whence) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
 
 	qint32 newPos = -1;
 	switch (whence) {
@@ -123,7 +142,7 @@ int64_t AbstractFFMpegLoader::_seek_data(void *opaque, int64_t offset, int whenc
 }
 
 int AbstractFFMpegLoader::_read_bytes(void *opaque, uint8_t *buf, int buf_size) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
 
 	auto nbytes = std::min(static_cast<int>(l->_bytes.size()) - l->_dataPos, buf_size);
 	if (nbytes <= 0) {
@@ -136,7 +155,7 @@ int AbstractFFMpegLoader::_read_bytes(void *opaque, uint8_t *buf, int buf_size)
 }
 
 int64_t AbstractFFMpegLoader::_seek_bytes(void *opaque, int64_t offset, int whence) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
 
 	qint32 newPos = -1;
 	switch (whence) {
@@ -156,12 +175,12 @@ int64_t AbstractFFMpegLoader::_seek_bytes(void *opaque, int64_t offset, int when
 }
 
 int AbstractFFMpegLoader::_read_file(void *opaque, uint8_t *buf, int buf_size) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
-	return int(l->_f.read((char*)(buf), buf_size));
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
+	return int(l->_f.read((char *)(buf), buf_size));
 }
 
 int64_t AbstractFFMpegLoader::_seek_file(void *opaque, int64_t offset, int whence) {
-	auto l = reinterpret_cast<AbstractFFMpegLoader*>(opaque);
+	auto l = reinterpret_cast<AbstractFFMpegLoader *>(opaque);
 
 	switch (whence) {
 	case SEEK_SET: return l->_f.seek(offset) ? l->_f.pos() : -1;
@@ -175,7 +194,8 @@ int64_t AbstractFFMpegLoader::_seek_file(void *opaque, int64_t offset, int whenc
 	return -1;
 }
 
-FFMpegLoader::FFMpegLoader(const FileLocation &file, const QByteArray &data, base::byte_vector &&bytes) : AbstractFFMpegLoader(file, data, std::move(bytes)) {
+FFMpegLoader::FFMpegLoader(const FileLocation &file, const QByteArray &data, base::byte_vector &&bytes)
+    : AbstractFFMpegLoader(file, data, std::move(bytes)) {
 	frame = av_frame_alloc();
 }
 
@@ -185,24 +205,34 @@ bool FFMpegLoader::open(qint64 &position) {
 	}
 
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
 	auto codecParams = fmtContext->streams[streamId]->codecpar;
 
 	codecContext = avcodec_alloc_context3(nullptr);
 	if (!codecContext) {
-		LOG(("Audio Error: Unable to avcodec_alloc_context3 for file '%1', data size '%2'").arg(_file.name()).arg(_data.size()));
+		LOG(("Audio Error: Unable to avcodec_alloc_context3 for file '%1', data size '%2'")
+		        .arg(_file.name())
+		        .arg(_data.size()));
 		return false;
 	}
 	if ((res = avcodec_parameters_to_context(codecContext, codecParams)) < 0) {
-		LOG(("Audio Error: Unable to avcodec_parameters_to_context for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avcodec_parameters_to_context for file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 	av_codec_set_pkt_timebase(codecContext, fmtContext->streams[streamId]->time_base);
 	av_opt_set_int(codecContext, "refcounted_frames", 1, 0);
 
 	if ((res = avcodec_open2(codecContext, codec, 0)) < 0) {
-		LOG(("Audio Error: Unable to avcodec_open2 for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Audio Error: Unable to avcodec_open2 for file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 
@@ -220,26 +250,38 @@ bool FFMpegLoader::open(qint64 &position) {
 	case AV_CH_LAYOUT_MONO:
 		switch (inputFormat) {
 		case AV_SAMPLE_FMT_U8:
-		case AV_SAMPLE_FMT_U8P: fmt = AL_FORMAT_MONO8; sampleSize = 1; break;
+		case AV_SAMPLE_FMT_U8P:
+			fmt = AL_FORMAT_MONO8;
+			sampleSize = 1;
+			break;
 		case AV_SAMPLE_FMT_S16:
-		case AV_SAMPLE_FMT_S16P: fmt = AL_FORMAT_MONO16; sampleSize = sizeof(quint16); break;
+		case AV_SAMPLE_FMT_S16P:
+			fmt = AL_FORMAT_MONO16;
+			sampleSize = sizeof(quint16);
+			break;
 		default:
 			sampleSize = -1; // convert needed
-		break;
+			break;
 		}
-	break;
+		break;
 	case AV_CH_LAYOUT_STEREO:
 		switch (inputFormat) {
-		case AV_SAMPLE_FMT_U8: fmt = AL_FORMAT_STEREO8; sampleSize = 2; break;
-		case AV_SAMPLE_FMT_S16: fmt = AL_FORMAT_STEREO16; sampleSize = 2 * sizeof(quint16); break;
+		case AV_SAMPLE_FMT_U8:
+			fmt = AL_FORMAT_STEREO8;
+			sampleSize = 2;
+			break;
+		case AV_SAMPLE_FMT_S16:
+			fmt = AL_FORMAT_STEREO16;
+			sampleSize = 2 * sizeof(quint16);
+			break;
 		default:
 			sampleSize = -1; // convert needed
-		break;
+			break;
 		}
-	break;
+		break;
 	default:
 		sampleSize = -1; // convert needed
-	break;
+		break;
 	}
 	if (_samplesFrequency != 44100 && _samplesFrequency != 48000) {
 		sampleSize = -1; // convert needed
@@ -254,7 +296,8 @@ bool FFMpegLoader::open(qint64 &position) {
 		int64_t src_ch_layout = layout, dst_ch_layout = AudioToChannelLayout;
 		srcRate = _samplesFrequency;
 		AVSampleFormat src_sample_fmt = inputFormat, dst_sample_fmt = AudioToFormat;
-		dstRate = (_samplesFrequency != 44100 && _samplesFrequency != 48000) ? Media::Player::kDefaultFrequency : _samplesFrequency;
+		dstRate = (_samplesFrequency != 44100 && _samplesFrequency != 48000) ? Media::Player::kDefaultFrequency :
+		                                                                       _samplesFrequency;
 
 		av_opt_set_int(swrContext, "in_channel_layout", src_ch_layout, 0);
 		av_opt_set_int(swrContext, "in_sample_rate", srcRate, 0);
@@ -264,7 +307,11 @@ bool FFMpegLoader::open(qint64 &position) {
 		av_opt_set_sample_fmt(swrContext, "out_sample_fmt", dst_sample_fmt, 0);
 
 		if ((res = swr_init(swrContext)) < 0) {
-			LOG(("Audio Error: Unable to swr_init for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Audio Error: Unable to swr_init for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return false;
 		}
 
@@ -275,13 +322,19 @@ bool FFMpegLoader::open(qint64 &position) {
 		fmt = AL_FORMAT_STEREO16;
 
 		maxResampleSamples = av_rescale_rnd(AVBlockSize / sampleSize, dstRate, srcRate, AV_ROUND_UP);
-		if ((res = av_samples_alloc_array_and_samples(&dstSamplesData, 0, AudioToChannels, maxResampleSamples, AudioToFormat, 0)) < 0) {
-			LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		if ((res = av_samples_alloc_array_and_samples(&dstSamplesData, 0, AudioToChannels, maxResampleSamples,
+		                                              AudioToFormat, 0)) < 0) {
+			LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return false;
 		}
 	}
 	if (position) {
-		qint64 ts = (position * fmtContext->streams[streamId]->time_base.den) / (_samplesFrequency * fmtContext->streams[streamId]->time_base.num);
+		qint64 ts = (position * fmtContext->streams[streamId]->time_base.den) /
+		            (_samplesFrequency * fmtContext->streams[streamId]->time_base.num);
 		if (av_seek_frame(fmtContext, streamId, ts, AVSEEK_FLAG_ANY) < 0) {
 			if (av_seek_frame(fmtContext, streamId, ts, 0) < 0) {
 			}
@@ -303,15 +356,23 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readMore(QByteArray &result, qint64
 	if (res == AVERROR_EOF) {
 		return ReadResult::EndOfFile;
 	} else if (res != AVERROR(EAGAIN)) {
-		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-		LOG(("Audio Error: Unable to avcodec_receive_frame() file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+		LOG(("Audio Error: Unable to avcodec_receive_frame() file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return ReadResult::Error;
 	}
 
 	if ((res = av_read_frame(fmtContext, &avpkt)) < 0) {
 		if (res != AVERROR_EOF) {
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Audio Error: Unable to av_read_frame() file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Audio Error: Unable to av_read_frame() file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return ReadResult::Error;
 		}
 		avcodec_send_packet(codecContext, nullptr); // drain
@@ -323,11 +384,15 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readMore(QByteArray &result, qint64
 		if (res < 0) {
 			av_packet_unref(&avpkt);
 
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Audio Error: Unable to avcodec_send_packet() file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Audio Error: Unable to avcodec_send_packet() file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			// There is a sample voice message where skipping such packet
 			// results in a crash (read_access to nullptr) in swr_convert().
-			//if (res == AVERROR_INVALIDDATA) {
+			// if (res == AVERROR_INVALIDDATA) {
 			//	return ReadResult::NotYet; // try to skip bad packet
 			//}
 			return ReadResult::Error;
@@ -341,26 +406,37 @@ AudioPlayerLoader::ReadResult FFMpegLoader::readFromReadyFrame(QByteArray &resul
 	int res = 0;
 
 	if (dstSamplesData) { // convert needed
-		int64_t dstSamples = av_rescale_rnd(swr_get_delay(swrContext, srcRate) + frame->nb_samples, dstRate, srcRate, AV_ROUND_UP);
+		int64_t dstSamples =
+		    av_rescale_rnd(swr_get_delay(swrContext, srcRate) + frame->nb_samples, dstRate, srcRate, AV_ROUND_UP);
 		if (dstSamples > maxResampleSamples) {
 			maxResampleSamples = dstSamples;
 			av_freep(&dstSamplesData[0]);
-			if ((res = av_samples_alloc(dstSamplesData, 0, AudioToChannels, maxResampleSamples, AudioToFormat, 1)) < 0) {
-				char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-				LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			if ((res = av_samples_alloc(dstSamplesData, 0, AudioToChannels, maxResampleSamples, AudioToFormat, 1)) <
+			    0) {
+				char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+				LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4")
+				        .arg(_file.name())
+				        .arg(_data.size())
+				        .arg(res)
+				        .arg(av_make_error_string(err, sizeof(err), res)));
 				return ReadResult::Error;
 			}
 		}
-		if ((res = swr_convert(swrContext, dstSamplesData, dstSamples, (const uint8_t**)frame->extended_data, frame->nb_samples)) < 0) {
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Audio Error: Unable to swr_convert for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		if ((res = swr_convert(swrContext, dstSamplesData, dstSamples, (const uint8_t **)frame->extended_data,
+		                       frame->nb_samples)) < 0) {
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Audio Error: Unable to swr_convert for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return ReadResult::Error;
 		}
 		qint32 resultLen = av_samples_get_buffer_size(0, AudioToChannels, res, AudioToFormat, 1);
-		result.append((const char*)dstSamplesData[0], resultLen);
+		result.append((const char *)dstSamplesData[0], resultLen);
 		samplesAdded += resultLen / sampleSize;
 	} else {
-		result.append((const char*)frame->extended_data[0], frame->nb_samples * sampleSize);
+		result.append((const char *)frame->extended_data[0], frame->nb_samples * sampleSize);
 		samplesAdded += frame->nb_samples;
 	}
 	return ReadResult::Ok;
diff --git a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h
index ce305a30d..1f445fba6 100644
--- a/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/media_audio_ffmpeg_loader.h
@@ -34,8 +34,8 @@ extern "C" {
 
 class AbstractFFMpegLoader : public AudioPlayerLoader {
 public:
-	AbstractFFMpegLoader(const FileLocation &file, const QByteArray &data, base::byte_vector &&bytes) : AudioPlayerLoader(file, data, std::move(bytes)) {
-	}
+	AbstractFFMpegLoader(const FileLocation &file, const QByteArray &data, base::byte_vector &&bytes)
+	    : AudioPlayerLoader(file, data, std::move(bytes)) {}
 
 	bool open(qint64 &position) override;
 
@@ -68,7 +68,6 @@ private:
 	static int64_t _seek_bytes(void *opaque, int64_t offset, int whence);
 	static int _read_file(void *opaque, uint8_t *buf, int buf_size);
 	static int64_t _seek_file(void *opaque, int64_t offset, int whence);
-
 };
 
 class FFMpegLoader : public AbstractFFMpegLoader {
@@ -103,5 +102,4 @@ private:
 	AVFrame *frame = nullptr;
 
 	SwrContext *swrContext = nullptr;
-
 };
diff --git a/Telegram/SourceFiles/media/media_audio_loader.cpp b/Telegram/SourceFiles/media/media_audio_loader.cpp
index eed7e116a..53612fc65 100644
--- a/Telegram/SourceFiles/media/media_audio_loader.cpp
+++ b/Telegram/SourceFiles/media/media_audio_loader.cpp
@@ -21,10 +21,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "media/media_audio_loader.h"
 
 AudioPlayerLoader::AudioPlayerLoader(const FileLocation &file, const QByteArray &data, base::byte_vector &&bytes)
-: _file(file)
-, _data(data)
-, _bytes(std::move(bytes)) {
-}
+    : _file(file)
+    , _data(data)
+    , _bytes(std::move(bytes)) {}
 
 AudioPlayerLoader::~AudioPlayerLoader() {
 	if (_access) {
@@ -64,14 +63,22 @@ bool AudioPlayerLoader::openFile() {
 		if (_f.isOpen()) _f.close();
 		if (!_access) {
 			if (!_file.accessEnable()) {
-				LOG(("Audio Error: could not open file access '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(_f.error()).arg(_f.errorString()));
+				LOG(("Audio Error: could not open file access '%1', data size '%2', error %3, %4")
+				        .arg(_file.name())
+				        .arg(_data.size())
+				        .arg(_f.error())
+				        .arg(_f.errorString()));
 				return false;
 			}
 			_access = true;
 		}
 		_f.setFileName(_file.name());
 		if (!_f.open(QIODevice::ReadOnly)) {
-			LOG(("Audio Error: could not open file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(_f.error()).arg(_f.errorString()));
+			LOG(("Audio Error: could not open file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(_f.error())
+			        .arg(_f.errorString()));
 			return false;
 		}
 	}
diff --git a/Telegram/SourceFiles/media/media_audio_loader.h b/Telegram/SourceFiles/media/media_audio_loader.h
index ea0fa128d..e0c34b917 100644
--- a/Telegram/SourceFiles/media/media_audio_loader.h
+++ b/Telegram/SourceFiles/media/media_audio_loader.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QByteArray>
 #include "core/utils.h"
 #include "ui/images.h"
+#include <QByteArray>
 
 namespace FFMpeg {
 struct AVPacketDataWrap;
@@ -71,5 +71,4 @@ private:
 	QByteArray _savedSamples;
 	qint64 _savedSamplesCount = 0;
 	bool _holdsSavedSamples = false;
-
 };
diff --git a/Telegram/SourceFiles/media/media_audio_loaders.cpp b/Telegram/SourceFiles/media/media_audio_loaders.cpp
index 6f09bacd3..c3ff36a24 100644
--- a/Telegram/SourceFiles/media/media_audio_loaders.cpp
+++ b/Telegram/SourceFiles/media/media_audio_loaders.cpp
@@ -27,7 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Media {
 namespace Player {
 
-Loaders::Loaders(QThread *thread) : _fromVideoNotify([this] { videoSoundAdded(); }) {
+Loaders::Loaders(QThread *thread)
+    : _fromVideoNotify([this] { videoSoundAdded(); }) {
 	moveToThread(thread);
 	_fromVideoNotify.moveToThread(thread);
 	connect(thread, SIGNAL(started()), this, SLOT(onInit()));
@@ -64,9 +65,8 @@ void Loaders::videoSoundAdded() {
 		return false;
 	};
 	for (auto i = queues.begin(), e = queues.end(); i != e; ++i) {
-		if (!tryLoader(_audio, _audioLoader, i)
-			&& !tryLoader(_song, _songLoader, i)
-			&& !tryLoader(_video, _videoLoader, i)) {
+		if (!tryLoader(_audio, _audioLoader, i) && !tryLoader(_song, _songLoader, i) &&
+		    !tryLoader(_video, _videoLoader, i)) {
 			for (auto &packetData : i.value()) {
 				AVPacket packet;
 				FFMpeg::packetFromDataWrap(packet, packetData);
@@ -95,8 +95,7 @@ void Loaders::clearFromVideoQueue() {
 	}
 }
 
-void Loaders::onInit() {
-}
+void Loaders::onInit() {}
 
 void Loaders::onStart(const AudioMsgId &audio, qint64 position) {
 	auto type = audio.type();
@@ -117,9 +116,18 @@ void Loaders::onStart(const AudioMsgId &audio, qint64 position) {
 AudioMsgId Loaders::clear(AudioMsgId::Type type) {
 	AudioMsgId result;
 	switch (type) {
-	case AudioMsgId::Type::Voice: std::swap(result, _audio); _audioLoader = nullptr; break;
-	case AudioMsgId::Type::Song: std::swap(result, _song); _songLoader = nullptr; break;
-	case AudioMsgId::Type::Video: std::swap(result, _video); _videoLoader = nullptr; break;
+	case AudioMsgId::Type::Voice:
+		std::swap(result, _audio);
+		_audioLoader = nullptr;
+		break;
+	case AudioMsgId::Type::Song:
+		std::swap(result, _song);
+		_songLoader = nullptr;
+		break;
+	case AudioMsgId::Type::Video:
+		std::swap(result, _video);
+		_videoLoader = nullptr;
+		break;
 	}
 	return result;
 }
@@ -236,7 +244,8 @@ void Loaders::loadData(AudioMsgId audio, qint64 position) {
 		track->bufferSamples[bufferIndex] = samples;
 		track->samplesCount[bufferIndex] = samplesCount;
 		track->bufferedLength += samplesCount;
-		alBufferData(track->stream.buffers[bufferIndex], track->format, samples.constData(), samples.size(), track->frequency);
+		alBufferData(track->stream.buffers[bufferIndex], track->format, samples.constData(), samples.size(),
+		             track->frequency);
 
 		alSourceQueueBuffers(track->stream.source, 1, track->stream.buffers + bufferIndex);
 
@@ -259,7 +268,8 @@ void Loaders::loadData(AudioMsgId audio, qint64 position) {
 	}
 
 	track->loading = false;
-	if (track->state.state == State::Resuming || track->state.state == State::Playing || track->state.state == State::Starting) {
+	if (track->state.state == State::Resuming || track->state.state == State::Playing ||
+	    track->state.state == State::Starting) {
 		ALint state = AL_INITIAL;
 		alGetSourcei(track->stream.source, AL_SOURCE_STATE, &state);
 		if (internal::audioCheckError()) {
@@ -307,9 +317,18 @@ AudioPlayerLoader *Loaders::setupLoader(const AudioMsgId &audio, SetupError &err
 	bool isGoodId = false;
 	AudioPlayerLoader *l = nullptr;
 	switch (audio.type()) {
-	case AudioMsgId::Type::Voice: l = _audioLoader.get(); isGoodId = (_audio == audio); break;
-	case AudioMsgId::Type::Song: l = _songLoader.get(); isGoodId = (_song == audio); break;
-	case AudioMsgId::Type::Video: l = _videoLoader.get(); isGoodId = (_video == audio); break;
+	case AudioMsgId::Type::Voice:
+		l = _audioLoader.get();
+		isGoodId = (_audio == audio);
+		break;
+	case AudioMsgId::Type::Song:
+		l = _songLoader.get();
+		isGoodId = (_song == audio);
+		break;
+	case AudioMsgId::Type::Video:
+		l = _videoLoader.get();
+		isGoodId = (_video == audio);
+		break;
 	}
 
 	if (l && (!isGoodId || !l->check(track->file, track->data))) {
@@ -320,9 +339,18 @@ AudioPlayerLoader *Loaders::setupLoader(const AudioMsgId &audio, SetupError &err
 	if (!l) {
 		std::unique_ptr<AudioPlayerLoader> *loader = nullptr;
 		switch (audio.type()) {
-		case AudioMsgId::Type::Voice: _audio = audio; loader = &_audioLoader; break;
-		case AudioMsgId::Type::Song: _song = audio; loader = &_songLoader; break;
-		case AudioMsgId::Type::Video: _video = audio; loader = &_videoLoader; break;
+		case AudioMsgId::Type::Voice:
+			_audio = audio;
+			loader = &_audioLoader;
+			break;
+		case AudioMsgId::Type::Song:
+			_song = audio;
+			loader = &_songLoader;
+			break;
+		case AudioMsgId::Type::Video:
+			_video = audio;
+			loader = &_videoLoader;
+			break;
 		}
 
 		if (audio.playId()) {
@@ -367,9 +395,18 @@ Mixer::Track *Loaders::checkLoader(AudioMsgId::Type type) {
 	auto isGoodId = false;
 	AudioPlayerLoader *l = nullptr;
 	switch (type) {
-	case AudioMsgId::Type::Voice: l = _audioLoader.get(); isGoodId = (track->state.id == _audio); break;
-	case AudioMsgId::Type::Song: l = _songLoader.get(); isGoodId = (track->state.id == _song); break;
-	case AudioMsgId::Type::Video: l = _videoLoader.get(); isGoodId = (track->state.id == _video); break;
+	case AudioMsgId::Type::Voice:
+		l = _audioLoader.get();
+		isGoodId = (track->state.id == _audio);
+		break;
+	case AudioMsgId::Type::Song:
+		l = _songLoader.get();
+		isGoodId = (track->state.id == _song);
+		break;
+	case AudioMsgId::Type::Video:
+		l = _videoLoader.get();
+		isGoodId = (track->state.id == _video);
+		break;
 	}
 	if (!l || !track) return nullptr;
 
@@ -383,9 +420,15 @@ Mixer::Track *Loaders::checkLoader(AudioMsgId::Type type) {
 
 void Loaders::onCancel(const AudioMsgId &audio) {
 	switch (audio.type()) {
-	case AudioMsgId::Type::Voice: if (_audio == audio) clear(audio.type()); break;
-	case AudioMsgId::Type::Song: if (_song == audio) clear(audio.type()); break;
-	case AudioMsgId::Type::Video: if (_video == audio) clear(audio.type()); break;
+	case AudioMsgId::Type::Voice:
+		if (_audio == audio) clear(audio.type());
+		break;
+	case AudioMsgId::Type::Song:
+		if (_song == audio) clear(audio.type());
+		break;
+	case AudioMsgId::Type::Video:
+		if (_video == audio) clear(audio.type());
+		break;
 	}
 
 	QMutexLocker lock(internal::audioPlayerMutex());
diff --git a/Telegram/SourceFiles/media/media_audio_loaders.h b/Telegram/SourceFiles/media/media_audio_loaders.h
index e3d7dfc71..7f81ba02d 100644
--- a/Telegram/SourceFiles/media/media_audio_loaders.h
+++ b/Telegram/SourceFiles/media/media_audio_loaders.h
@@ -20,7 +20,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "media/media_child_ffmpeg_loader.h"
 #include "media/media_audio.h"
 #include "media/media_child_ffmpeg_loader.h"
 
@@ -42,7 +41,7 @@ signals:
 	void error(const AudioMsgId &audio);
 	void needToCheck();
 
-	public slots:
+public slots:
 	void onInit();
 
 	void onStart(const AudioMsgId &audio, qint64 position);
@@ -75,7 +74,6 @@ private:
 	void loadData(AudioMsgId audio, qint64 position);
 	AudioPlayerLoader *setupLoader(const AudioMsgId &audio, SetupError &err, qint64 &position);
 	Mixer::Track *checkLoader(AudioMsgId::Type type);
-
 };
 
 } // namespace Player
diff --git a/Telegram/SourceFiles/media/media_audio_track.cpp b/Telegram/SourceFiles/media/media_audio_track.cpp
index 3d8c11e17..b506d5b36 100644
--- a/Telegram/SourceFiles/media/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/media_audio_track.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "media/media_audio_track.h"
 
-#include "media/media_audio_ffmpeg_loader.h"
 #include "media/media_audio.h"
+#include "media/media_audio_ffmpeg_loader.h"
 #include "messenger.h"
 
 #include <AL/al.h>
@@ -54,7 +54,8 @@ ALuint CreateBuffer() {
 
 } // namespace
 
-Track::Track(not_null<Instance*> instance) : _instance(instance) {
+Track::Track(not_null<Instance *> instance)
+    : _instance(instance) {
 	_instance->registerTrack(this);
 }
 
@@ -76,7 +77,8 @@ void Track::fillFromData(base::byte_vector &&data) {
 	_peaks.reserve(peaksCount);
 	auto peakValue = quint16(0);
 	auto peakSamples = 0;
-	auto peakEachSample = (format == AL_FORMAT_STEREO8 || format == AL_FORMAT_STEREO16) ? (_peakEachPosition * 2) : _peakEachPosition;
+	auto peakEachSample =
+	    (format == AL_FORMAT_STEREO8 || format == AL_FORMAT_STEREO16) ? (_peakEachPosition * 2) : _peakEachPosition;
 	_peakValueMin = 0x7FFF;
 	_peakValueMax = 0;
 	auto peakCallback = [this, &peakValue, &peakSamples, peakEachSample](quint16 sample) {
@@ -140,7 +142,7 @@ void Track::fillFromFile(const QString &filePath) {
 		auto size = f.size();
 		if (size > 0 && size <= kMaxFileSize) {
 			auto bytes = base::byte_vector(size);
-			if (f.read(reinterpret_cast<char*>(bytes.data()), bytes.size()) == bytes.size()) {
+			if (f.read(reinterpret_cast<char *>(bytes.data()), bytes.size()) == bytes.size()) {
 				fillFromData(std::move(bytes));
 			} else {
 				LOG(("Track Error: Could not read %1 bytes from file '%2'.").arg(bytes.size()).arg(filePath));
diff --git a/Telegram/SourceFiles/media/media_audio_track.h b/Telegram/SourceFiles/media/media_audio_track.h
index 4e412a053..ed7dcf735 100644
--- a/Telegram/SourceFiles/media/media_audio_track.h
+++ b/Telegram/SourceFiles/media/media_audio_track.h
@@ -30,7 +30,7 @@ class Instance;
 
 class Track {
 public:
-	Track(not_null<Instance*> instance);
+	Track(not_null<Instance *> instance);
 
 	void samplePeakEach(TimeMs peakDuration);
 
@@ -71,7 +71,7 @@ private:
 	void ensureSourceCreated();
 	void playWithLooping(bool looping);
 
-	not_null<Instance*> _instance;
+	not_null<Instance *> _instance;
 
 	bool _failed = false;
 	bool _active = false;
@@ -95,7 +95,6 @@ private:
 	qint64 _alPosition = 0;
 	quint32 _alSource = 0;
 	quint32 _alBuffer = 0;
-
 };
 
 class Instance {
@@ -105,7 +104,7 @@ public:
 
 	std::unique_ptr<Track> createTrack();
 
-	base::Observable<Track*> &trackFinished() {
+	base::Observable<Track *> &trackFinished() {
 		return _trackFinished;
 	}
 
@@ -127,14 +126,13 @@ private:
 	void trackFinished(Track *track);
 
 private:
-	std::set<Track*> _tracks;
-	base::Observable<Track*> _trackFinished;
+	std::set<Track *> _tracks;
+	base::Observable<Track *> _trackFinished;
 
 	base::Timer _updateTimer;
 
 	base::Timer _detachFromDeviceTimer;
 	bool _detachFromDeviceForce = false;
-
 };
 
 Instance &Current();
diff --git a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp
index b1b05d089..533b9dc8e 100644
--- a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.cpp
@@ -32,14 +32,15 @@ VideoSoundData::~VideoSoundData() {
 	}
 }
 
-ChildFFMpegLoader::ChildFFMpegLoader(std::unique_ptr<VideoSoundData> &&data) : AudioPlayerLoader(FileLocation(), QByteArray(), base::byte_vector())
-, _parentData(std::move(data)) {
+ChildFFMpegLoader::ChildFFMpegLoader(std::unique_ptr<VideoSoundData> &&data)
+    : AudioPlayerLoader(FileLocation(), QByteArray(), base::byte_vector())
+    , _parentData(std::move(data)) {
 	_frame = av_frame_alloc();
 }
 
 bool ChildFFMpegLoader::open(qint64 &position) {
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 
 	auto layout = _parentData->context->channel_layout;
 	if (!layout) {
@@ -55,26 +56,38 @@ bool ChildFFMpegLoader::open(qint64 &position) {
 	case AV_CH_LAYOUT_MONO:
 		switch (_inputFormat) {
 		case AV_SAMPLE_FMT_U8:
-		case AV_SAMPLE_FMT_U8P: _format = AL_FORMAT_MONO8; _sampleSize = 1; break;
+		case AV_SAMPLE_FMT_U8P:
+			_format = AL_FORMAT_MONO8;
+			_sampleSize = 1;
+			break;
 		case AV_SAMPLE_FMT_S16:
-		case AV_SAMPLE_FMT_S16P: _format = AL_FORMAT_MONO16; _sampleSize = sizeof(quint16); break;
+		case AV_SAMPLE_FMT_S16P:
+			_format = AL_FORMAT_MONO16;
+			_sampleSize = sizeof(quint16);
+			break;
 		default:
 			_sampleSize = -1; // convert needed
-		break;
+			break;
 		}
-	break;
+		break;
 	case AV_CH_LAYOUT_STEREO:
 		switch (_inputFormat) {
-		case AV_SAMPLE_FMT_U8: _format = AL_FORMAT_STEREO8; _sampleSize = 2; break;
-		case AV_SAMPLE_FMT_S16: _format = AL_FORMAT_STEREO16; _sampleSize = 2 * sizeof(quint16); break;
+		case AV_SAMPLE_FMT_U8:
+			_format = AL_FORMAT_STEREO8;
+			_sampleSize = 2;
+			break;
+		case AV_SAMPLE_FMT_S16:
+			_format = AL_FORMAT_STEREO16;
+			_sampleSize = 2 * sizeof(quint16);
+			break;
 		default:
 			_sampleSize = -1; // convert needed
-		break;
+			break;
 		}
-	break;
+		break;
 	default:
 		_sampleSize = -1; // convert needed
-	break;
+		break;
 	}
 	if (_parentData->frequency != 44100 && _parentData->frequency != 48000) {
 		_sampleSize = -1; // convert needed
@@ -89,7 +102,9 @@ bool ChildFFMpegLoader::open(qint64 &position) {
 		int64_t src_ch_layout = layout, dst_ch_layout = AudioToChannelLayout;
 		_srcRate = _parentData->frequency;
 		AVSampleFormat src_sample_fmt = _inputFormat, dst_sample_fmt = AudioToFormat;
-		_dstRate = (_parentData->frequency != 44100 && _parentData->frequency != 48000) ? Media::Player::kDefaultFrequency : _parentData->frequency;
+		_dstRate = (_parentData->frequency != 44100 && _parentData->frequency != 48000) ?
+		               Media::Player::kDefaultFrequency :
+		               _parentData->frequency;
 
 		av_opt_set_int(_swrContext, "in_channel_layout", src_ch_layout, 0);
 		av_opt_set_int(_swrContext, "in_sample_rate", _srcRate, 0);
@@ -99,7 +114,11 @@ bool ChildFFMpegLoader::open(qint64 &position) {
 		av_opt_set_sample_fmt(_swrContext, "out_sample_fmt", dst_sample_fmt, 0);
 
 		if ((res = swr_init(_swrContext)) < 0) {
-			LOG(("Audio Error: Unable to swr_init for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Audio Error: Unable to swr_init for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return false;
 		}
 
@@ -110,8 +129,13 @@ bool ChildFFMpegLoader::open(qint64 &position) {
 		_format = AL_FORMAT_STEREO16;
 
 		_maxResampleSamples = av_rescale_rnd(AVBlockSize / _sampleSize, _dstRate, _srcRate, AV_ROUND_UP);
-		if ((res = av_samples_alloc_array_and_samples(&_dstSamplesData, 0, AudioToChannels, _maxResampleSamples, AudioToFormat, 0)) < 0) {
-			LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		if ((res = av_samples_alloc_array_and_samples(&_dstSamplesData, 0, AudioToChannels, _maxResampleSamples,
+		                                              AudioToFormat, 0)) < 0) {
+			LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return false;
 		}
 	}
@@ -131,8 +155,12 @@ AudioPlayerLoader::ReadResult ChildFFMpegLoader::readMore(QByteArray &result, qi
 	if (res == AVERROR_EOF) {
 		return ReadResult::EndOfFile;
 	} else if (res != AVERROR(EAGAIN)) {
-		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-		LOG(("Audio Error: Unable to avcodec_receive_frame() file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+		LOG(("Audio Error: Unable to avcodec_receive_frame() file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return ReadResult::Error;
 	}
 
@@ -153,8 +181,12 @@ AudioPlayerLoader::ReadResult ChildFFMpegLoader::readMore(QByteArray &result, qi
 	if (res < 0) {
 		FFMpeg::freePacket(&packet);
 
-		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-		LOG(("Audio Error: Unable to avcodec_send_packet() file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+		LOG(("Audio Error: Unable to avcodec_send_packet() file '%1', data size '%2', error %3, %4")
+		        .arg(_file.name())
+		        .arg(_data.size())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		// There is a sample voice message where skipping such packet
 		// results in a crash (read_access to nullptr) in swr_convert().
 		if (res == AVERROR_INVALIDDATA) {
@@ -170,26 +202,37 @@ AudioPlayerLoader::ReadResult ChildFFMpegLoader::readFromReadyFrame(QByteArray &
 	int res = 0;
 
 	if (_dstSamplesData) { // convert needed
-		int64_t dstSamples = av_rescale_rnd(swr_get_delay(_swrContext, _srcRate) + _frame->nb_samples, _dstRate, _srcRate, AV_ROUND_UP);
+		int64_t dstSamples =
+		    av_rescale_rnd(swr_get_delay(_swrContext, _srcRate) + _frame->nb_samples, _dstRate, _srcRate, AV_ROUND_UP);
 		if (dstSamples > _maxResampleSamples) {
 			_maxResampleSamples = dstSamples;
 			av_freep(&_dstSamplesData[0]);
-			if ((res = av_samples_alloc(_dstSamplesData, 0, AudioToChannels, _maxResampleSamples, AudioToFormat, 1)) < 0) {
-				char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-				LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			if ((res = av_samples_alloc(_dstSamplesData, 0, AudioToChannels, _maxResampleSamples, AudioToFormat, 1)) <
+			    0) {
+				char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+				LOG(("Audio Error: Unable to av_samples_alloc for file '%1', data size '%2', error %3, %4")
+				        .arg(_file.name())
+				        .arg(_data.size())
+				        .arg(res)
+				        .arg(av_make_error_string(err, sizeof(err), res)));
 				return ReadResult::Error;
 			}
 		}
-		if ((res = swr_convert(_swrContext, _dstSamplesData, dstSamples, (const uint8_t**)_frame->extended_data, _frame->nb_samples)) < 0) {
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Audio Error: Unable to swr_convert for file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		if ((res = swr_convert(_swrContext, _dstSamplesData, dstSamples, (const uint8_t **)_frame->extended_data,
+		                       _frame->nb_samples)) < 0) {
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Audio Error: Unable to swr_convert for file '%1', data size '%2', error %3, %4")
+			        .arg(_file.name())
+			        .arg(_data.size())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return ReadResult::Error;
 		}
 		qint32 resultLen = av_samples_get_buffer_size(0, AudioToChannels, res, AudioToFormat, 1);
-		result.append((const char*)_dstSamplesData[0], resultLen);
+		result.append((const char *)_dstSamplesData[0], resultLen);
 		samplesAdded += resultLen / _sampleSize;
 	} else {
-		result.append((const char*)_frame->extended_data[0], _frame->nb_samples * _sampleSize);
+		result.append((const char *)_frame->extended_data[0], _frame->nb_samples * _sampleSize);
 		samplesAdded += _frame->nb_samples;
 	}
 	return ReadResult::Ok;
diff --git a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h
index 81f7a54aa..c1db3b8df 100644
--- a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QQueue>
-#include "media/media_audio_loader.h"
 #include "media/media_audio.h"
+#include "media/media_audio_loader.h"
+#include <QQueue>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -131,5 +131,4 @@ private:
 
 	SwrContext *_swrContext = nullptr;
 	QQueue<FFMpeg::AVPacketDataWrap> _queue;
-
 };
diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp
index d018b3678..3863c9a9e 100644
--- a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp
@@ -33,7 +33,7 @@ constexpr int kSkipInvalidDataPackets = 10;
 constexpr int kAlignImageBy = 16;
 
 void alignedImageBufferCleanupHandler(void *data) {
-	auto buffer = static_cast<uchar*>(data);
+	auto buffer = static_cast<uchar *>(data);
 	delete[] buffer;
 }
 
@@ -45,10 +45,11 @@ QImage createAlignedImage(QSize size) {
 	auto neededwidth = width + ((width % widthalign) ? (widthalign - (width % widthalign)) : 0);
 	auto bytesperline = neededwidth * 4;
 	auto buffer = new uchar[bytesperline * height + kAlignImageBy];
-	auto cleanupdata = static_cast<void*>(buffer);
+	auto cleanupdata = static_cast<void *>(buffer);
 	auto bufferval = reinterpret_cast<uintptr_t>(buffer);
 	auto alignedbuffer = buffer + ((bufferval % kAlignImageBy) ? (kAlignImageBy - (bufferval % kAlignImageBy)) : 0);
-	return QImage(alignedbuffer, width, height, bytesperline, QImage::Format_ARGB32, alignedImageBufferCleanupHandler, cleanupdata);
+	return QImage(alignedbuffer, width, height, bytesperline, QImage::Format_ARGB32, alignedImageBufferCleanupHandler,
+	              cleanupdata);
 }
 
 bool isAlignedImage(const QImage &image) {
@@ -57,8 +58,10 @@ bool isAlignedImage(const QImage &image) {
 
 } // namespace
 
-FFMpegReaderImplementation::FFMpegReaderImplementation(FileLocation *location, QByteArray *data, const AudioMsgId &audio) : ReaderImplementation(location, data)
-, _audioMsgId(audio) {
+FFMpegReaderImplementation::FFMpegReaderImplementation(FileLocation *location, QByteArray *data,
+                                                       const AudioMsgId &audio)
+    : ReaderImplementation(location, data)
+    , _audioMsgId(audio) {
 	_frame = av_frame_alloc();
 	av_init_packet(&_packetNull);
 	_packetNull.data = nullptr;
@@ -88,12 +91,16 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 				return ReadResult::Error;
 			}
 
-			if ((res = avformat_seek_file(_fmtContext, _streamId, std::numeric_limits<int64_t>::min(), 0, std::numeric_limits<int64_t>::max(), 0)) < 0) {
+			if ((res = avformat_seek_file(_fmtContext, _streamId, std::numeric_limits<int64_t>::min(), 0,
+			                              std::numeric_limits<int64_t>::max(), 0)) < 0) {
 				if ((res = av_seek_frame(_fmtContext, _streamId, 0, AVSEEK_FLAG_BYTE)) < 0) {
 					if ((res = av_seek_frame(_fmtContext, _streamId, 0, AVSEEK_FLAG_FRAME)) < 0) {
 						if ((res = av_seek_frame(_fmtContext, _streamId, 0, 0)) < 0) {
-							char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-							LOG(("Gif Error: Unable to av_seek_frame() to the start %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+							char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+							LOG(("Gif Error: Unable to av_seek_frame() to the start %1, error %2, %3")
+							        .arg(logData())
+							        .arg(res)
+							        .arg(av_make_error_string(err, sizeof(err), res)));
 							return ReadResult::Error;
 						}
 					}
@@ -107,8 +114,11 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 
 			continue;
 		} else if (res != AVERROR(EAGAIN)) {
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Gif Error: Unable to avcodec_receive_frame() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Gif Error: Unable to avcodec_receive_frame() %1, error %2, %3")
+			        .arg(logData())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return ReadResult::Error;
 		}
 
@@ -133,8 +143,11 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 		if (res < 0) {
 			finishPacket();
 
-			char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-			LOG(("Gif Error: Unable to avcodec_send_packet() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+			LOG(("Gif Error: Unable to avcodec_send_packet() %1, error %2, %3")
+			        .arg(logData())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			if (res == AVERROR_INVALIDDATA) {
 				if (++_skippedInvalidDataPackets < kSkipInvalidDataPackets) {
 					continue; // try to skip bad packet
@@ -151,7 +164,8 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 void FFMpegReaderImplementation::processReadFrame() {
 	qint64 duration = _frame->pkt_duration;
 	qint64 framePts = _frame->pts;
-	TimeMs frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
+	TimeMs frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) /
+	                 _fmtContext->streams[_streamId]->time_base.den;
 	_currentFrameDelay = _nextFrameDelay;
 	if (_frameMs + _currentFrameDelay < frameMs) {
 		_currentFrameDelay = qint32(frameMs - _frameMs);
@@ -162,7 +176,8 @@ void FFMpegReaderImplementation::processReadFrame() {
 	if (duration == AV_NOPTS_VALUE) {
 		_nextFrameDelay = 0;
 	} else {
-		_nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
+		_nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) /
+		                  _fmtContext->streams[_streamId]->time_base.den;
 	}
 	_frameMs = frameMs;
 
@@ -216,7 +231,8 @@ TimeMs FFMpegReaderImplementation::framePresentationTime() const {
 
 TimeMs FFMpegReaderImplementation::durationMs() const {
 	if (_fmtContext->streams[_streamId]->duration == AV_NOPTS_VALUE) return 0;
-	return (_fmtContext->streams[_streamId]->duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
+	return (_fmtContext->streams[_streamId]->duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) /
+	       _fmtContext->streams[_streamId]->time_base.den;
 }
 
 bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const QSize &size) {
@@ -238,7 +254,8 @@ bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const Q
 	if (to.isNull() || to.size() != toSize || !to.isDetached() || !isAlignedImage(to)) {
 		to = createAlignedImage(toSize);
 	}
-	hasAlpha = (_frame->format == AV_PIX_FMT_BGRA || (_frame->format == -1 && _codecContext->pix_fmt == AV_PIX_FMT_BGRA));
+	hasAlpha =
+	    (_frame->format == AV_PIX_FMT_BGRA || (_frame->format == -1 && _codecContext->pix_fmt == AV_PIX_FMT_BGRA));
 	if (_frame->width == toSize.width() && _frame->height == toSize.height() && hasAlpha) {
 		qint32 sbpl = _frame->linesize[0], dbpl = to.bytesPerLine(), bpl = std::min(sbpl, dbpl);
 		uchar *s = _frame->data[0], *d = to.bits();
@@ -246,16 +263,23 @@ bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const Q
 			memcpy(d + i * dbpl, s + i * sbpl, bpl);
 		}
 	} else {
-		if ((_swsSize != toSize) || (_frame->format != -1 && _frame->format != _codecContext->pix_fmt) || !_swsContext) {
+		if ((_swsSize != toSize) || (_frame->format != -1 && _frame->format != _codecContext->pix_fmt) ||
+		    !_swsContext) {
 			_swsSize = toSize;
-			_swsContext = sws_getCachedContext(_swsContext, _frame->width, _frame->height, AVPixelFormat(_frame->format), toSize.width(), toSize.height(), AV_PIX_FMT_BGRA, 0, 0, 0, 0);
+			_swsContext =
+			    sws_getCachedContext(_swsContext, _frame->width, _frame->height, AVPixelFormat(_frame->format),
+			                         toSize.width(), toSize.height(), AV_PIX_FMT_BGRA, 0, 0, 0, 0);
 		}
 		// AV_NUM_DATA_POINTERS defined in AVFrame struct
-		uint8_t *toData[AV_NUM_DATA_POINTERS] = { to.bits(), nullptr };
-		int toLinesize[AV_NUM_DATA_POINTERS] = { to.bytesPerLine(), 0 };
+		uint8_t *toData[AV_NUM_DATA_POINTERS] = {to.bits(), nullptr};
+		int toLinesize[AV_NUM_DATA_POINTERS] = {to.bytesPerLine(), 0};
 		int res;
-		if ((res = sws_scale(_swsContext, _frame->data, _frame->linesize, 0, _frame->height, toData, toLinesize)) != _swsSize.height()) {
-			LOG(("Gif Error: Unable to sws_scale to good size %1, height %2, should be %3").arg(logData()).arg(res).arg(_swsSize.height()));
+		if ((res = sws_scale(_swsContext, _frame->data, _frame->linesize, 0, _frame->height, toData, toLinesize)) !=
+		    _swsSize.height()) {
+			LOG(("Gif Error: Unable to sws_scale to good size %1, height %2, should be %3")
+			        .arg(logData())
+			        .arg(res)
+			        .arg(_swsSize.height()));
 			return false;
 		}
 	}
@@ -271,8 +295,7 @@ bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const Q
 
 	// Read some future packets for audio stream.
 	if (_audioStreamId >= 0) {
-		while (_frameMs + 5000 > _lastReadAudioMs
-			&& _frameMs + 15000 > _lastReadVideoMs) {
+		while (_frameMs + 5000 > _lastReadAudioMs && _frameMs + 15000 > _lastReadVideoMs) {
 			auto packetResult = readAndProcessPacket();
 			if (packetResult != PacketResult::Ok) {
 				break;
@@ -301,8 +324,9 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 		LOG(("Gif Error: Unable to open device %1").arg(logData()));
 		return false;
 	}
-	_ioBuffer = (uchar*)av_malloc(AVBlockSize);
-	_ioContext = avio_alloc_context(_ioBuffer, AVBlockSize, 0, static_cast<void*>(this), &FFMpegReaderImplementation::_read, 0, &FFMpegReaderImplementation::_seek);
+	_ioBuffer = (uchar *)av_malloc(AVBlockSize);
+	_ioContext = avio_alloc_context(_ioBuffer, AVBlockSize, 0, static_cast<void *>(this),
+	                                &FFMpegReaderImplementation::_read, 0, &FFMpegReaderImplementation::_seek);
 	_fmtContext = avformat_alloc_context();
 	if (!_fmtContext) {
 		LOG(("Gif Error: Unable to avformat_alloc_context %1").arg(logData()));
@@ -311,23 +335,32 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 	_fmtContext->pb = _ioContext;
 
 	int res = 0;
-	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+	char err[AV_ERROR_MAX_STRING_SIZE] = {0};
 	if ((res = avformat_open_input(&_fmtContext, 0, 0, 0)) < 0) {
 		_ioBuffer = 0;
 
-		LOG(("Gif Error: Unable to avformat_open_input %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Gif Error: Unable to avformat_open_input %1, error %2, %3")
+		        .arg(logData())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 	_opened = true;
 
 	if ((res = avformat_find_stream_info(_fmtContext, 0)) < 0) {
-		LOG(("Gif Error: Unable to avformat_find_stream_info %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Gif Error: Unable to avformat_find_stream_info %1, error %2, %3")
+		        .arg(logData())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 
 	_streamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_VIDEO, -1, -1, 0, 0);
 	if (_streamId < 0) {
-		LOG(("Gif Error: Unable to av_find_best_stream %1, error %2, %3").arg(logData()).arg(_streamId).arg(av_make_error_string(err, sizeof(err), _streamId)));
+		LOG(("Gif Error: Unable to av_find_best_stream %1, error %2, %3")
+		        .arg(logData())
+		        .arg(_streamId)
+		        .arg(av_make_error_string(err, sizeof(err), _streamId)));
 		return false;
 	}
 	_packetNull.stream_index = _streamId;
@@ -348,7 +381,10 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 		return false;
 	}
 	if ((res = avcodec_parameters_to_context(_codecContext, _fmtContext->streams[_streamId]->codecpar)) < 0) {
-		LOG(("Gif Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Gif Error: Unable to avcodec_parameters_to_context %1, error %2, %3")
+		        .arg(logData())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 	av_codec_set_pkt_timebase(_codecContext, _fmtContext->streams[_streamId]->time_base);
@@ -365,7 +401,10 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 	}
 
 	if ((res = avcodec_open2(_codecContext, _codec, 0)) < 0) {
-		LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3")
+		        .arg(logData())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return false;
 	}
 
@@ -377,7 +416,10 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 			return false;
 		}
 		if ((res = avcodec_parameters_to_context(audioContext, _fmtContext->streams[_audioStreamId]->codecpar)) < 0) {
-			LOG(("Audio Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Audio Error: Unable to avcodec_parameters_to_context %1, error %2, %3")
+			        .arg(logData())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			return false;
 		}
 		av_codec_set_pkt_timebase(audioContext, _fmtContext->streams[_audioStreamId]->time_base);
@@ -386,7 +428,10 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 		auto audioCodec = avcodec_find_decoder(audioContext->codec_id);
 		if ((res = avcodec_open2(audioContext, audioCodec, 0)) < 0) {
 			avcodec_free_context(&audioContext);
-			LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+			LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3")
+			        .arg(logData())
+			        .arg(res)
+			        .arg(av_make_error_string(err, sizeof(err), res)));
 			_audioStreamId = -1;
 		} else {
 			soundData = std::make_unique<VideoSoundData>();
@@ -395,12 +440,15 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 			if (_fmtContext->streams[_audioStreamId]->duration == AV_NOPTS_VALUE) {
 				soundData->length = (_fmtContext->duration * soundData->frequency) / AV_TIME_BASE;
 			} else {
-				soundData->length = (_fmtContext->streams[_audioStreamId]->duration * soundData->frequency * _fmtContext->streams[_audioStreamId]->time_base.num) / _fmtContext->streams[_audioStreamId]->time_base.den;
+				soundData->length = (_fmtContext->streams[_audioStreamId]->duration * soundData->frequency *
+				                     _fmtContext->streams[_audioStreamId]->time_base.num) /
+				                    _fmtContext->streams[_audioStreamId]->time_base.den;
 			}
 		}
 	}
 	if (positionMs > 0) {
-		auto ts = (positionMs * _fmtContext->streams[_streamId]->time_base.den) / (1000LL * _fmtContext->streams[_streamId]->time_base.num);
+		auto ts = (positionMs * _fmtContext->streams[_streamId]->time_base.den) /
+		          (1000LL * _fmtContext->streams[_streamId]->time_base.num);
 		if (av_seek_frame(_fmtContext, _streamId, ts, 0) < 0) {
 			if (av_seek_frame(_fmtContext, _streamId, ts, AVSEEK_FLAG_BACKWARD) < 0) {
 				return false;
@@ -428,7 +476,8 @@ bool FFMpegReaderImplementation::start(Mode mode, TimeMs &positionMs) {
 
 bool FFMpegReaderImplementation::inspectAt(TimeMs &positionMs) {
 	if (positionMs > 0) {
-		auto ts = (positionMs * _fmtContext->streams[_streamId]->time_base.den) / (1000LL * _fmtContext->streams[_streamId]->time_base.num);
+		auto ts = (positionMs * _fmtContext->streams[_streamId]->time_base.den) /
+		          (1000LL * _fmtContext->streams[_streamId]->time_base.num);
 		if (av_seek_frame(_fmtContext, _streamId, ts, 0) < 0) {
 			if (av_seek_frame(_fmtContext, _streamId, ts, AVSEEK_FLAG_BACKWARD) < 0) {
 				return false;
@@ -507,8 +556,11 @@ FFMpegReaderImplementation::PacketResult FFMpegReaderImplementation::readPacket(
 			}
 			return PacketResult::EndOfFile;
 		}
-		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-		LOG(("Gif Error: Unable to av_read_frame() %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+		char err[AV_ERROR_MAX_STRING_SIZE] = {0};
+		LOG(("Gif Error: Unable to av_read_frame() %1, error %2, %3")
+		        .arg(logData())
+		        .arg(res)
+		        .arg(av_make_error_string(err, sizeof(err), res)));
 		return PacketResult::Error;
 	}
 	return PacketResult::Ok;
@@ -538,7 +590,8 @@ void FFMpegReaderImplementation::processPacket(AVPacket *packet) {
 
 TimeMs FFMpegReaderImplementation::countPacketMs(AVPacket *packet) const {
 	qint64 packetPts = (packet->pts == AV_NOPTS_VALUE) ? packet->dts : packet->pts;
-	TimeMs packetMs = (packetPts * 1000LL * _fmtContext->streams[packet->stream_index]->time_base.num) / _fmtContext->streams[packet->stream_index]->time_base.den;
+	TimeMs packetMs = (packetPts * 1000LL * _fmtContext->streams[packet->stream_index]->time_base.num) /
+	                  _fmtContext->streams[packet->stream_index]->time_base.den;
 	return packetMs;
 }
 
@@ -584,12 +637,12 @@ void FFMpegReaderImplementation::clearPacketQueue() {
 }
 
 int FFMpegReaderImplementation::_read(void *opaque, uint8_t *buf, int buf_size) {
-	FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque);
-	return int(l->_device->read((char*)(buf), buf_size));
+	FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation *>(opaque);
+	return int(l->_device->read((char *)(buf), buf_size));
 }
 
 int64_t FFMpegReaderImplementation::_seek(void *opaque, int64_t offset, int whence) {
-	FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation*>(opaque);
+	FFMpegReaderImplementation *l = reinterpret_cast<FFMpegReaderImplementation *>(opaque);
 
 	switch (whence) {
 	case SEEK_SET: return l->_device->seek(offset) ? l->_device->pos() : -1;
diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.h b/Telegram/SourceFiles/media/media_clip_ffmpeg.h
index 459b3dfdd..de31f4dcd 100644
--- a/Telegram/SourceFiles/media/media_clip_ffmpeg.h
+++ b/Telegram/SourceFiles/media/media_clip_ffmpeg.h
@@ -26,8 +26,8 @@ extern "C" {
 
 } // extern "C"
 
-#include "media/media_clip_implementation.h"
 #include "media/media_child_ffmpeg_loader.h"
+#include "media/media_clip_implementation.h"
 
 namespace Media {
 namespace Clip {
@@ -129,7 +129,6 @@ private:
 
 	TimeMs _frameTime = 0;
 	TimeMs _frameTimeCorrection = 0;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/media/media_clip_implementation.cpp b/Telegram/SourceFiles/media/media_clip_implementation.cpp
index 2d63c443c..7fc2ee523 100644
--- a/Telegram/SourceFiles/media/media_clip_implementation.cpp
+++ b/Telegram/SourceFiles/media/media_clip_implementation.cpp
@@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "ui/images.h"
 #include "media/media_clip_implementation.h"
+#include "ui/images.h"
 
 namespace Media {
 namespace Clip {
diff --git a/Telegram/SourceFiles/media/media_clip_implementation.h b/Telegram/SourceFiles/media/media_clip_implementation.h
index f460d8424..ca3e02ed6 100644
--- a/Telegram/SourceFiles/media/media_clip_implementation.h
+++ b/Telegram/SourceFiles/media/media_clip_implementation.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include <QBuffer>
 #include <QByteArray>
 #include <QImage>
 #include <QSize>
-#include <QBuffer>
 #include <core/utils.h>
 
 class FileLocation;
@@ -35,9 +35,8 @@ namespace internal {
 class ReaderImplementation {
 public:
 	ReaderImplementation(FileLocation *location, QByteArray *data)
-		: _location(location)
-		, _data(data) {
-	}
+	    : _location(location)
+	    , _data(data) {}
 	enum class Mode {
 		Silent,
 		Normal,
@@ -64,8 +63,7 @@ public:
 
 	virtual bool start(Mode mode, TimeMs &positionMs) = 0;
 
-	virtual ~ReaderImplementation() {
-	}
+	virtual ~ReaderImplementation() {}
 	qint64 dataSize() const {
 		return _dataSize;
 	}
@@ -79,7 +77,6 @@ protected:
 	qint64 _dataSize = 0;
 
 	void initDevice();
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.cpp b/Telegram/SourceFiles/media/media_clip_qtgif.cpp
index 850bf364c..93573e254 100644
--- a/Telegram/SourceFiles/media/media_clip_qtgif.cpp
+++ b/Telegram/SourceFiles/media/media_clip_qtgif.cpp
@@ -24,8 +24,8 @@ namespace Media {
 namespace Clip {
 namespace internal {
 
-QtGifReaderImplementation::QtGifReaderImplementation(FileLocation *location, QByteArray *data) : ReaderImplementation(location, data) {
-}
+QtGifReaderImplementation::QtGifReaderImplementation(FileLocation *location, QByteArray *data)
+    : ReaderImplementation(location, data) {}
 
 ReaderImplementation::ReadResult QtGifReaderImplementation::readFramesTill(TimeMs frameMs, TimeMs systemMs) {
 	if (!_frame.isNull() && _frameTime > frameMs) {
diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.h b/Telegram/SourceFiles/media/media_clip_qtgif.h
index 9cccdf2ea..15c7fa418 100644
--- a/Telegram/SourceFiles/media/media_clip_qtgif.h
+++ b/Telegram/SourceFiles/media/media_clip_qtgif.h
@@ -29,7 +29,6 @@ namespace internal {
 
 class QtGifReaderImplementation : public ReaderImplementation {
 public:
-
 	QtGifReaderImplementation(FileLocation *location, QByteArray *data);
 
 	ReadResult readFramesTill(TimeMs frameMs, TimeMs systemMs) override;
@@ -60,7 +59,6 @@ private:
 	TimeMs _frameTime = 0;
 	int _frameDelay = 0;
 	QImage _frame;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/media/media_clip_reader.cpp b/Telegram/SourceFiles/media/media_clip_reader.cpp
index a2c112389..3d1a16d6d 100644
--- a/Telegram/SourceFiles/media/media_clip_reader.cpp
+++ b/Telegram/SourceFiles/media/media_clip_reader.cpp
@@ -18,9 +18,9 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QAbstractEventDispatcher>
 #include "media/media_clip_reader.h"
 #include "storage/file_download.h"
+#include <QAbstractEventDispatcher>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -29,17 +29,17 @@ extern "C" {
 #include <libswscale/swscale.h>
 }
 
-#include "media/media_clip_ffmpeg.h"
-#include "media/media_clip_qtgif.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
+#include "media/media_clip_ffmpeg.h"
+#include "media/media_clip_qtgif.h"
 
 namespace Media {
 namespace Clip {
 namespace {
 
-QVector<QThread*> threads;
-QVector<Manager*> managers;
+QVector<QThread *> threads;
+QVector<Manager *> managers;
 
 QImage PrepareFrameImage(const FrameRequest &request, const QImage &original, bool hasAlpha, QImage &cache) {
 	auto needResize = (original.width() != request.framew) || (original.height() != request.frameh);
@@ -59,18 +59,33 @@ QImage PrepareFrameImage(const FrameRequest &request, const QImage &original, bo
 		Painter p(&cache);
 		if (needNewCache) {
 			if (request.framew < request.outerw) {
-				p.fillRect(0, 0, (request.outerw - request.framew) / (2 * factor), cache.height() / factor, st::imageBg);
-				p.fillRect((request.outerw - request.framew) / (2 * factor) + (request.framew / factor), 0, (cache.width() / factor) - ((request.outerw - request.framew) / (2 * factor) + (request.framew / factor)), cache.height() / factor, st::imageBg);
+				p.fillRect(0, 0, (request.outerw - request.framew) / (2 * factor), cache.height() / factor,
+				           st::imageBg);
+				p.fillRect((request.outerw - request.framew) / (2 * factor) + (request.framew / factor), 0,
+				           (cache.width() / factor) -
+				               ((request.outerw - request.framew) / (2 * factor) + (request.framew / factor)),
+				           cache.height() / factor, st::imageBg);
 			}
 			if (request.frameh < request.outerh) {
-				p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)), 0, std::min(cache.width(), request.framew) / factor, (request.outerh - request.frameh) / (2 * factor), st::imageBg);
-				p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)), (request.outerh - request.frameh) / (2 * factor) + (request.frameh / factor), std::min(cache.width(), request.framew) / factor, (cache.height() / factor) - ((request.outerh - request.frameh) / (2 * factor) + (request.frameh / factor)), st::imageBg);
+				p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)), 0,
+				           std::min(cache.width(), request.framew) / factor,
+				           (request.outerh - request.frameh) / (2 * factor), st::imageBg);
+				p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)),
+				           (request.outerh - request.frameh) / (2 * factor) + (request.frameh / factor),
+				           std::min(cache.width(), request.framew) / factor,
+				           (cache.height() / factor) -
+				               ((request.outerh - request.frameh) / (2 * factor) + (request.frameh / factor)),
+				           st::imageBg);
 			}
 		}
 		if (hasAlpha) {
-			p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)), std::max(0, (request.outerh - request.frameh) / (2 * factor)), std::min(cache.width(), request.framew) / factor, std::min(cache.height(), request.frameh) / factor, st::imageBgTransparent);
+			p.fillRect(std::max(0, (request.outerw - request.framew) / (2 * factor)),
+			           std::max(0, (request.outerh - request.frameh) / (2 * factor)),
+			           std::min(cache.width(), request.framew) / factor,
+			           std::min(cache.height(), request.frameh) / factor, st::imageBgTransparent);
 		}
-		auto position = QPoint((request.outerw - request.framew) / (2 * factor), (request.outerh - request.frameh) / (2 * factor));
+		auto position =
+		    QPoint((request.outerw - request.framew) / (2 * factor), (request.outerh - request.frameh) / (2 * factor));
 		if (needResize) {
 			PainterHighQualityEnabler hq(p);
 
@@ -94,17 +109,17 @@ QPixmap PrepareFrame(const FrameRequest &request, const QImage &original, bool h
 } // namespace
 
 Reader::Reader(const QString &filepath, Callback &&callback, Mode mode, qint64 seekMs)
-: _callback(std::move(callback))
-, _mode(mode)
-, _seekPositionMs(seekMs) {
+    : _callback(std::move(callback))
+    , _mode(mode)
+    , _seekPositionMs(seekMs) {
 	init(FileLocation(filepath), QByteArray());
 }
 
-Reader::Reader(not_null<DocumentData*> document, FullMsgId msgId, Callback &&callback, Mode mode, qint64 seekMs)
-: _callback(std::move(callback))
-, _mode(mode)
-, _audioMsgId(document, msgId, (mode == Mode::Video) ? rand_value<quint32>() : 0)
-, _seekPositionMs(seekMs) {
+Reader::Reader(not_null<DocumentData *> document, FullMsgId msgId, Callback &&callback, Mode mode, qint64 seekMs)
+    : _callback(std::move(callback))
+    , _mode(mode)
+    , _audioMsgId(document, msgId, (mode == Mode::Video) ? rand_value<quint32>() : 0)
+    , _seekPositionMs(seekMs) {
 	init(document->location(), document->data());
 }
 
@@ -204,7 +219,8 @@ void Reader::callback(Reader *reader, qint32 threadIndex, Notification notificat
 	}
 }
 
-void Reader::start(qint32 framew, qint32 frameh, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners) {
+void Reader::start(qint32 framew, qint32 frameh, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+                   ImageRoundCorners corners) {
 	if (managers.size() <= _threadIndex) error();
 	if (_state == State::Error) return;
 
@@ -224,7 +240,8 @@ void Reader::start(qint32 framew, qint32 frameh, qint32 outerw, qint32 outerh, I
 	}
 }
 
-QPixmap Reader::current(qint32 framew, qint32 frameh, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners, TimeMs ms) {
+QPixmap Reader::current(qint32 framew, qint32 frameh, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+                        ImageRoundCorners corners, TimeMs ms) {
 	Expects(outerw > 0);
 	Expects(outerh > 0);
 
@@ -246,10 +263,8 @@ QPixmap Reader::current(qint32 framew, qint32 frameh, qint32 outerw, qint32 oute
 	}
 
 	auto factor = cIntRetinaFactor();
-	if (frame->pix.width() == outerw * factor
-		&& frame->pix.height() == outerh * factor
-		&& frame->request.radius == radius
-		&& frame->request.corners == corners) {
+	if (frame->pix.width() == outerw * factor && frame->pix.height() == outerh * factor &&
+	    frame->request.radius == radius && frame->request.corners == corners) {
 		moveToNextShow();
 		return frame->pix;
 	}
@@ -363,11 +378,12 @@ Reader::~Reader() {
 
 class ReaderPrivate {
 public:
-	ReaderPrivate(Reader *reader, const FileLocation &location, const QByteArray &data) : _interface(reader)
-	, _mode(reader->mode())
-	, _audioMsgId(reader->audioMsgId())
-	, _seekPositionMs(reader->seekPositionMs())
-	, _data(data) {
+	ReaderPrivate(Reader *reader, const FileLocation &location, const QByteArray &data)
+	    : _interface(reader)
+	    , _mode(reader->mode())
+	    , _audioMsgId(reader->audioMsgId())
+	    , _seekPositionMs(reader->seekPositionMs())
+	    , _data(data) {
 		if (_data.isEmpty()) {
 			_location = std::make_unique<FileLocation>(location);
 			if (!_location->accessEnable()) {
@@ -389,7 +405,8 @@ public:
 				// get the frame size and return a black frame with that size.
 
 				auto firstFramePositionMs = TimeMs(0);
-				auto reader = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data, AudioMsgId());
+				auto reader =
+				    std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data, AudioMsgId());
 				if (reader->start(internal::ReaderImplementation::Mode::Normal, firstFramePositionMs)) {
 					auto firstFrameReadResult = reader->readFramesTill(-1, ms);
 					if (firstFrameReadResult == internal::ReaderImplementation::ReadResult::Success) {
@@ -497,7 +514,7 @@ public:
 		}
 
 		_implementation = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data, _audioMsgId);
-//		_implementation = new QtGifReaderImplementation(_location, &_data);
+		//		_implementation = new QtGifReaderImplementation(_location, &_data);
 
 		auto implementationMode = [this]() {
 			using ImplementationMode = internal::ReaderImplementation::Mode;
@@ -605,10 +622,11 @@ private:
 	TimeMs _videoPausedAtMs = 0;
 
 	friend class Manager;
-
 };
 
-Manager::Manager(QThread *thread) : _processingInThread(0), _needReProcess(false) {
+Manager::Manager(QThread *thread)
+    : _processingInThread(0)
+    , _needReProcess(false) {
 	moveToThread(thread);
 	connect(thread, SIGNAL(started()), this, SLOT(process()));
 	connect(thread, SIGNAL(finished()), this, SLOT(finish()));
@@ -700,8 +718,10 @@ bool Manager::handleProcessResult(ReaderPrivate *reader, ProcessResult result, T
 		qint32 ishowing, iprevious;
 		auto showing = it.key()->frameToShow(&ishowing), previous = it.key()->frameToWriteNext(false, &iprevious);
 		Assert(previous != nullptr && showing != nullptr && ishowing >= 0 && iprevious >= 0);
-		if (reader->_frames[ishowing].when > 0 && showing->displayed.loadAcquire() <= 0) { // current frame was not shown
-			if (reader->_frames[ishowing].when + WaitBeforeGifPause < ms || (reader->_frames[iprevious].when && previous->displayed.loadAcquire() <= 0)) {
+		if (reader->_frames[ishowing].when > 0 &&
+		    showing->displayed.loadAcquire() <= 0) { // current frame was not shown
+			if (reader->_frames[ishowing].when + WaitBeforeGifPause < ms ||
+			    (reader->_frames[iprevious].when && previous->displayed.loadAcquire() <= 0)) {
 				reader->_autoPausedGif = true;
 				it.key()->_autoPausedGif.storeRelease(1);
 				result = ProcessResult::Paused;
@@ -825,7 +845,8 @@ void Manager::process() {
 			QMutexLocker lock(&_readerPointersMutex);
 			auto it = constUnsafeFindReaderPointer(reader);
 			if (it == _readerPointers.cend()) {
-				_loadLevel.fetchAndAddRelaxed(-1 * (reader->_width > 0 ? reader->_width * reader->_height : AverageGifSize));
+				_loadLevel.fetchAndAddRelaxed(-1 *
+				                              (reader->_width > 0 ? reader->_width * reader->_height : AverageGifSize));
 				delete reader;
 				i = _readers.erase(i);
 				continue;
diff --git a/Telegram/SourceFiles/media/media_clip_reader.h b/Telegram/SourceFiles/media/media_clip_reader.h
index bc7c70e3e..776e124ba 100644
--- a/Telegram/SourceFiles/media/media_clip_reader.h
+++ b/Telegram/SourceFiles/media/media_clip_reader.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "storage/localimageloader.h"
-#include "window/notifications_manager_default.h"
 #include "ui/animation.h"
+#include "window/notifications_manager_default.h"
 
 class FileLocation;
 
@@ -45,7 +45,8 @@ struct FrameRequest {
 	int outerw = 0;
 	int outerh = 0;
 	ImageRoundRadius radius = ImageRoundRadius::None;
-	ImageRoundCorners corners = ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight | ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight;
+	ImageRoundCorners corners = ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight | ImageRoundCorner::BottomLeft |
+	                            ImageRoundCorner::BottomRight;
 };
 
 enum ReaderSteps {
@@ -64,7 +65,8 @@ public:
 	};
 
 	Reader(const QString &filepath, Callback &&callback, Mode mode = Mode::Gif, TimeMs seekMs = 0);
-	Reader(not_null<DocumentData*> document, FullMsgId msgId, Callback &&callback, Mode mode = Mode::Gif, TimeMs seekMs = 0);
+	Reader(not_null<DocumentData *> document, FullMsgId msgId, Callback &&callback, Mode mode = Mode::Gif,
+	       TimeMs seekMs = 0);
 
 	static void callback(Reader *reader, int threadIndex, Notification notification); // reader can be deleted
 
@@ -83,7 +85,8 @@ public:
 	}
 
 	void start(int framew, int frameh, int outerw, int outerh, ImageRoundRadius radius, ImageRoundCorners corners);
-	QPixmap current(int framew, int frameh, int outerw, int outerh, ImageRoundRadius radius, ImageRoundCorners corners, TimeMs ms);
+	QPixmap current(int framew, int frameh, int outerw, int outerh, ImageRoundRadius radius, ImageRoundCorners corners,
+	                TimeMs ms);
 	QPixmap current();
 	QPixmap frameOriginal() const {
 		if (auto frame = frameToShow()) {
@@ -178,11 +181,9 @@ private:
 	friend class Manager;
 
 	ReaderPrivate *_private = nullptr;
-
 };
 
-template <typename ...Args>
-inline ReaderPointer MakeReader(Args&&... args) {
+template <typename... Args> inline ReaderPointer MakeReader(Args &&... args) {
 	return ReaderPointer(new Reader(std::forward<Args>(args)...));
 }
 
@@ -200,7 +201,6 @@ class Manager : public QObject {
 	Q_OBJECT
 
 public:
-
 	Manager(QThread *thread);
 	qint32 loadLevel() const {
 		return _loadLevel.load();
@@ -222,11 +222,10 @@ public slots:
 	void finish();
 
 private:
-
 	void clear();
 
 	QAtomicInt _loadLevel;
-	using ReaderPointers = QMap<Reader*, QAtomicInt>;
+	using ReaderPointers = QMap<Reader *, QAtomicInt>;
 	ReaderPointers _readerPointers;
 	mutable QMutex _readerPointersMutex;
 
@@ -242,13 +241,12 @@ private:
 	};
 	ResultHandleState handleResult(ReaderPrivate *reader, ProcessResult result, TimeMs ms);
 
-	typedef QMap<ReaderPrivate*, TimeMs> Readers;
+	typedef QMap<ReaderPrivate *, TimeMs> Readers;
 	Readers _readers;
 
 	QTimer _timer;
 	QThread *_processingInThread;
 	bool _needReProcess;
-
 };
 
 FileLoadTask::Video PrepareForSending(const QString &fname, const QByteArray &data);
diff --git a/Telegram/SourceFiles/media/player/media_player_button.cpp b/Telegram/SourceFiles/media/player/media_player_button.cpp
index d3d8dd41d..de1708447 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_button.cpp
@@ -26,9 +26,8 @@ namespace Media {
 namespace Player {
 
 PlayButtonLayout::PlayButtonLayout(const style::MediaPlayerButton &st, base::lambda<void()> callback)
-: _st(st)
-, _callback(std::move(callback)) {
-}
+    : _st(st)
+    , _callback(std::move(callback)) {}
 
 void PlayButtonLayout::setState(State state) {
 	if (_nextState == state) return;
@@ -121,30 +120,30 @@ void PlayButtonLayout::paintPlayToPause(Painter &p, const QBrush &brush, double
 	PainterHighQualityEnabler hq(p);
 
 	QPointF pathLeftPause[] = {
-		{ pauseLeft, pauseTop },
-		{ pauseLeft + pauseStroke, pauseTop },
-		{ pauseLeft + pauseStroke, pauseTop + pauseHeight },
-		{ pauseLeft, pauseTop + pauseHeight },
+	    {pauseLeft, pauseTop},
+	    {pauseLeft + pauseStroke, pauseTop},
+	    {pauseLeft + pauseStroke, pauseTop + pauseHeight},
+	    {pauseLeft, pauseTop + pauseHeight},
 	};
 	QPointF pathLeftPlay[] = {
-		{ playLeft, playTop },
-		{ playLeft + (playWidth / 2.), playTop + (playHeight / 4.) },
-		{ playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.) },
-		{ playLeft, playTop + playHeight },
+	    {playLeft, playTop},
+	    {playLeft + (playWidth / 2.), playTop + (playHeight / 4.)},
+	    {playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.)},
+	    {playLeft, playTop + playHeight},
 	};
 	p.fillPath(anim::interpolate(pathLeftPlay, pathLeftPause, progress), brush);
 
 	QPointF pathRightPause[] = {
-		{ pauseLeft + pauseWidth - pauseStroke, pauseTop },
-		{ pauseLeft + pauseWidth, pauseTop },
-		{ pauseLeft + pauseWidth, pauseTop + pauseHeight },
-		{ pauseLeft + pauseWidth - pauseStroke, pauseTop + pauseHeight },
+	    {pauseLeft + pauseWidth - pauseStroke, pauseTop},
+	    {pauseLeft + pauseWidth, pauseTop},
+	    {pauseLeft + pauseWidth, pauseTop + pauseHeight},
+	    {pauseLeft + pauseWidth - pauseStroke, pauseTop + pauseHeight},
 	};
 	QPointF pathRightPlay[] = {
-		{ playLeft + (playWidth / 2.), playTop + (playHeight / 4.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.) },
+	    {playLeft + (playWidth / 2.), playTop + (playHeight / 4.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.)},
 	};
 	p.fillPath(anim::interpolate(pathRightPlay, pathRightPause, progress), brush);
 }
@@ -167,32 +166,32 @@ void PlayButtonLayout::paintPlayToCancel(Painter &p, const QBrush &brush, double
 	PainterHighQualityEnabler hq(p);
 
 	QPointF pathPlay[] = {
-		{ playLeft, playTop },
-		{ playLeft, playTop },
-		{ playLeft + (playWidth / 2.), playTop + (playHeight / 4.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + playWidth, playTop + (playHeight / 2.) },
-		{ playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.) },
-		{ playLeft, playTop + playHeight },
-		{ playLeft, playTop + playHeight },
-		{ playLeft, playTop + (playHeight / 2.) },
+	    {playLeft, playTop},
+	    {playLeft, playTop},
+	    {playLeft + (playWidth / 2.), playTop + (playHeight / 4.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + playWidth, playTop + (playHeight / 2.)},
+	    {playLeft + (playWidth / 2.), playTop + (3 * playHeight / 4.)},
+	    {playLeft, playTop + playHeight},
+	    {playLeft, playTop + playHeight},
+	    {playLeft, playTop + (playHeight / 2.)},
 	};
 	QPointF pathCancel[] = {
-		{ cancelLeft, cancelTop + cancelStroke },
-		{ cancelLeft + cancelStroke, cancelTop },
-		{ cancelLeft + (cancelWidth / 2.), cancelTop + (cancelHeight / 2.) - cancelStroke },
-		{ cancelLeft + cancelWidth - cancelStroke, cancelTop },
-		{ cancelLeft + cancelWidth, cancelTop + cancelStroke },
-		{ cancelLeft + (cancelWidth / 2.) + cancelStroke, cancelTop + (cancelHeight / 2.) },
-		{ cancelLeft + cancelWidth, cancelTop + cancelHeight - cancelStroke },
-		{ cancelLeft + cancelWidth - cancelStroke, cancelTop + cancelHeight },
-		{ cancelLeft + (cancelWidth / 2.), cancelTop + (cancelHeight / 2.) + cancelStroke },
-		{ cancelLeft + cancelStroke, cancelTop + cancelHeight },
-		{ cancelLeft, cancelTop + cancelHeight - cancelStroke },
-		{ cancelLeft + (cancelWidth / 2.) - cancelStroke, cancelTop + (cancelHeight / 2.) },
+	    {cancelLeft, cancelTop + cancelStroke},
+	    {cancelLeft + cancelStroke, cancelTop},
+	    {cancelLeft + (cancelWidth / 2.), cancelTop + (cancelHeight / 2.) - cancelStroke},
+	    {cancelLeft + cancelWidth - cancelStroke, cancelTop},
+	    {cancelLeft + cancelWidth, cancelTop + cancelStroke},
+	    {cancelLeft + (cancelWidth / 2.) + cancelStroke, cancelTop + (cancelHeight / 2.)},
+	    {cancelLeft + cancelWidth, cancelTop + cancelHeight - cancelStroke},
+	    {cancelLeft + cancelWidth - cancelStroke, cancelTop + cancelHeight},
+	    {cancelLeft + (cancelWidth / 2.), cancelTop + (cancelHeight / 2.) + cancelStroke},
+	    {cancelLeft + cancelStroke, cancelTop + cancelHeight},
+	    {cancelLeft, cancelTop + cancelHeight - cancelStroke},
+	    {cancelLeft + (cancelWidth / 2.) - cancelStroke, cancelTop + (cancelHeight / 2.)},
 	};
 	p.fillPath(anim::interpolate(pathPlay, pathCancel, progress), brush);
 }
@@ -216,30 +215,30 @@ void PlayButtonLayout::paintPauseToCancel(Painter &p, const QBrush &brush, doubl
 	PainterHighQualityEnabler hq(p);
 
 	QPointF pathLeftPause[] = {
-		{ pauseLeft, pauseTop },
-		{ pauseLeft + pauseStroke, pauseTop },
-		{ pauseLeft + pauseStroke, pauseTop + pauseHeight },
-		{ pauseLeft, pauseTop + pauseHeight },
+	    {pauseLeft, pauseTop},
+	    {pauseLeft + pauseStroke, pauseTop},
+	    {pauseLeft + pauseStroke, pauseTop + pauseHeight},
+	    {pauseLeft, pauseTop + pauseHeight},
 	};
 	QPointF pathLeftCancel[] = {
-		{ cancelLeft, cancelTop + cancelStroke },
-		{ cancelLeft + cancelStroke, cancelTop },
-		{ cancelLeft + cancelWidth, cancelTop + cancelHeight - cancelStroke },
-		{ cancelLeft + cancelWidth - cancelStroke, cancelTop + cancelHeight },
+	    {cancelLeft, cancelTop + cancelStroke},
+	    {cancelLeft + cancelStroke, cancelTop},
+	    {cancelLeft + cancelWidth, cancelTop + cancelHeight - cancelStroke},
+	    {cancelLeft + cancelWidth - cancelStroke, cancelTop + cancelHeight},
 	};
 	p.fillPath(anim::interpolate(pathLeftPause, pathLeftCancel, progress), brush);
 
 	QPointF pathRightPause[] = {
-		{ pauseLeft + pauseWidth - pauseStroke, pauseTop },
-		{ pauseLeft + pauseWidth, pauseTop },
-		{ pauseLeft + pauseWidth, pauseTop + pauseHeight },
-		{ pauseLeft + pauseWidth - pauseStroke, pauseTop + pauseHeight },
+	    {pauseLeft + pauseWidth - pauseStroke, pauseTop},
+	    {pauseLeft + pauseWidth, pauseTop},
+	    {pauseLeft + pauseWidth, pauseTop + pauseHeight},
+	    {pauseLeft + pauseWidth - pauseStroke, pauseTop + pauseHeight},
 	};
 	QPointF pathRightCancel[] = {
-		{ cancelLeft + cancelWidth - cancelStroke, cancelTop },
-		{ cancelLeft + cancelWidth, cancelTop + cancelStroke },
-		{ cancelLeft + cancelStroke, cancelTop + cancelHeight },
-		{ cancelLeft, cancelTop + cancelHeight - cancelStroke },
+	    {cancelLeft + cancelWidth - cancelStroke, cancelTop},
+	    {cancelLeft + cancelWidth, cancelTop + cancelStroke},
+	    {cancelLeft + cancelStroke, cancelTop + cancelHeight},
+	    {cancelLeft, cancelTop + cancelHeight - cancelStroke},
 	};
 	p.fillPath(anim::interpolate(pathRightPause, pathRightCancel, progress), brush);
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h
index cfbd65fce..1f9c14172 100644
--- a/Telegram/SourceFiles/media/player/media_player_button.h
+++ b/Telegram/SourceFiles/media/player/media_player_button.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "styles/style_media_player.h"
 #include "ui/abstract_button.h"
 #include "ui/animation.h"
-#include "styles/style_media_player.h"
 
 namespace Media {
 namespace Player {
@@ -58,8 +58,7 @@ private:
 	bool _transformBackward = false;
 
 	base::lambda<void()> _callback;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp
index 1ee5b98bb..03ffd608c 100644
--- a/Telegram/SourceFiles/media/player/media_player_cover.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "facades.h"
 
-#include "media/player/media_player_cover.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "ui/widgets/buttons.h"
+#include "layout.h"
 #include "media/media_audio.h"
-#include "media/view/media_clip_playback.h"
 #include "media/player/media_player_button.h"
+#include "media/player/media_player_cover.h"
 #include "media/player/media_player_instance.h"
 #include "media/player/media_player_volume_controller.h"
+#include "media/view/media_clip_playback.h"
 #include "styles/style_media_player.h"
 #include "styles/style_mediaview.h"
-#include "layout.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
 
 namespace Media {
 namespace Player {
@@ -54,11 +54,11 @@ protected:
 
 private:
 	PlayButtonLayout _layout;
-
 };
 
-CoverWidget::PlayButton::PlayButton(QWidget *parent) : Ui::AbstractButton(parent)
-, _layout(st::mediaPlayerPanelButton, [this] { update(); }) {
+CoverWidget::PlayButton::PlayButton(QWidget *parent)
+    : Ui::AbstractButton(parent)
+    , _layout(st::mediaPlayerPanelButton, [this] { update(); }) {
 	resize(st::mediaPlayerPanelButtonSize);
 	setCursor(style::cur_pointer);
 }
@@ -70,17 +70,18 @@ void CoverWidget::PlayButton::paintEvent(QPaintEvent *e) {
 	_layout.paint(p, st::mediaPlayerActiveFg);
 }
 
-CoverWidget::CoverWidget(QWidget *parent) : TWidget(parent)
-, _nameLabel(this, st::mediaPlayerName)
-, _timeLabel(this, st::mediaPlayerTime)
-, _close(this, st::mediaPlayerPanelClose)
-, _playbackSlider(this, st::mediaPlayerPanelPlayback)
-, _playback(std::make_unique<Clip::Playback>())
-, _playPause(this)
-, _volumeToggle(this, st::mediaPlayerVolumeToggle)
-, _volumeController(this)
-, _pinPlayer(this, st::mediaPlayerPanelPinButton)
-, _repeatTrack(this, st::mediaPlayerRepeatButton) {
+CoverWidget::CoverWidget(QWidget *parent)
+    : TWidget(parent)
+    , _nameLabel(this, st::mediaPlayerName)
+    , _timeLabel(this, st::mediaPlayerTime)
+    , _close(this, st::mediaPlayerPanelClose)
+    , _playbackSlider(this, st::mediaPlayerPanelPlayback)
+    , _playback(std::make_unique<Clip::Playback>())
+    , _playPause(this)
+    , _volumeToggle(this, st::mediaPlayerVolumeToggle)
+    , _volumeController(this)
+    , _pinPlayer(this, st::mediaPlayerPanelPinButton)
+    , _repeatTrack(this, st::mediaPlayerRepeatButton) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	resize(width(), st::mediaPlayerCoverHeight);
 
@@ -89,12 +90,8 @@ CoverWidget::CoverWidget(QWidget *parent) : TWidget(parent)
 	_timeLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	setMouseTracking(true);
 
-	_playback->setInLoadingStateChangedCallback([this](bool loading) {
-		_playbackSlider->setDisabled(loading);
-	});
-	_playback->setValueChangedCallback([this](double value) {
-		_playbackSlider->setValue(value);
-	});
+	_playback->setInLoadingStateChangedCallback([this](bool loading) { _playbackSlider->setDisabled(loading); });
+	_playback->setValueChangedCallback([this](double value) { _playbackSlider->setValue(value); });
 	_playbackSlider->setChangeProgressCallback([this](double value) {
 		_playback->setValue(value, false);
 		handleSeekProgress(value);
@@ -103,14 +100,10 @@ CoverWidget::CoverWidget(QWidget *parent) : TWidget(parent)
 		_playback->setValue(value, false);
 		handleSeekFinished(value);
 	});
-	_playPause->setClickedCallback([this] {
-		instance()->playPauseCancelClicked(AudioMsgId::Type::Song);
-	});
+	_playPause->setClickedCallback([this] { instance()->playPauseCancelClicked(AudioMsgId::Type::Song); });
 
 	updateRepeatTrackIcon();
-	_repeatTrack->setClickedCallback([this] {
-		instance()->toggleRepeat(AudioMsgId::Type::Song);
-	});
+	_repeatTrack->setClickedCallback([this] { instance()->toggleRepeat(AudioMsgId::Type::Song); });
 
 	updateVolumeToggleIcon();
 	_volumeToggle->setClickedCallback([this]() {
@@ -188,13 +181,17 @@ void CoverWidget::resizeEvent(QResizeEvent *e) {
 
 	int skip = (st::mediaPlayerPanelPlayback.seekSize.width() / 2);
 	int length = (width() - 2 * st::mediaPlayerPanelPadding + st::mediaPlayerPanelPlayback.seekSize.width());
-	_playbackSlider->setGeometry(st::mediaPlayerPanelPadding - skip, st::mediaPlayerPanelPlaybackTop, length, 2 * st::mediaPlayerPanelPlaybackPadding + st::mediaPlayerPanelPlayback.width);
+	_playbackSlider->setGeometry(st::mediaPlayerPanelPadding - skip, st::mediaPlayerPanelPlaybackTop, length,
+	                             2 * st::mediaPlayerPanelPlaybackPadding + st::mediaPlayerPanelPlayback.width);
 
 	auto top = st::mediaPlayerPanelVolumeToggleTop;
 	auto right = st::mediaPlayerPanelPlayLeft;
-	_repeatTrack->moveToRight(right, top); right += _repeatTrack->width();
-	_pinPlayer->moveToRight(right, top); right += _pinPlayer->width() + st::mediaPlayerPanelVolumeSkip;
-	_volumeController->moveToRight(right, st::mediaPlayerPanelVolumeTop); right += _volumeController->width() + st::mediaPlayerPanelVolumeToggleSkip;
+	_repeatTrack->moveToRight(right, top);
+	right += _repeatTrack->width();
+	_pinPlayer->moveToRight(right, top);
+	right += _pinPlayer->width() + st::mediaPlayerPanelVolumeSkip;
+	_volumeController->moveToRight(right, st::mediaPlayerPanelVolumeTop);
+	right += _volumeController->width() + st::mediaPlayerPanelVolumeToggleSkip;
 	_volumeToggle->moveToRight(right, top);
 
 	updatePlayPrevNextPositions();
@@ -228,8 +225,10 @@ void CoverWidget::updatePlayPrevNextPositions() {
 	auto left = st::mediaPlayerPanelPlayLeft;
 	auto top = st::mediaPlayerPanelPlayTop;
 	if (_previousTrack) {
-		_previousTrack->moveToLeft(left, top); left += _previousTrack->width() + st::mediaPlayerPanelPlaySkip;
-		_playPause->moveToLeft(left, top); left += _playPause->width() + st::mediaPlayerPanelPlaySkip;
+		_previousTrack->moveToLeft(left, top);
+		left += _previousTrack->width() + st::mediaPlayerPanelPlaySkip;
+		_playPause->moveToLeft(left, top);
+		left += _playPause->width() + st::mediaPlayerPanelPlaySkip;
 		_nextTrack->moveToLeft(left, top);
 	} else {
 		_playPause->moveToLeft(left, top);
@@ -237,12 +236,15 @@ void CoverWidget::updatePlayPrevNextPositions() {
 }
 
 void CoverWidget::updateLabelPositions() {
-	_nameLabel->moveToLeft(st::mediaPlayerPanelPadding, st::mediaPlayerPanelNameTop - st::mediaPlayerName.style.font->ascent);
-	_timeLabel->moveToRight(st::mediaPlayerPanelPadding, st::mediaPlayerPanelNameTop - st::mediaPlayerTime.font->ascent);
+	_nameLabel->moveToLeft(st::mediaPlayerPanelPadding,
+	                       st::mediaPlayerPanelNameTop - st::mediaPlayerName.style.font->ascent);
+	_timeLabel->moveToRight(st::mediaPlayerPanelPadding,
+	                        st::mediaPlayerPanelNameTop - st::mediaPlayerTime.font->ascent);
 }
 
 void CoverWidget::updateRepeatTrackIcon() {
-	_repeatTrack->setIconOverride(instance()->repeatEnabled(AudioMsgId::Type::Song) ? nullptr : &st::mediaPlayerRepeatInactiveIcon);
+	_repeatTrack->setIconOverride(
+	    instance()->repeatEnabled(AudioMsgId::Type::Song) ? nullptr : &st::mediaPlayerRepeatInactiveIcon);
 }
 
 void CoverWidget::handleSongUpdate(const TrackState &state) {
@@ -257,7 +259,8 @@ void CoverWidget::handleSongUpdate(const TrackState &state) {
 	}
 
 	auto stopped = IsStoppedOrStopping(state.state);
-	auto showPause = !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+	auto showPause =
+	    !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 	if (instance()->isSeeking(AudioMsgId::Type::Song)) {
 		showPause = true;
 	}
@@ -309,7 +312,8 @@ void CoverWidget::updateTimeLabel() {
 		_timeLabel->setText(_time);
 	}
 	if (timeLabelWidth != _timeLabel->width()) {
-		_nameLabel->resizeToWidth(width() - 2 * (st::mediaPlayerPanelPadding) - _timeLabel->width() - st::normalFont->spacew);
+		_nameLabel->resizeToWidth(width() - 2 * (st::mediaPlayerPanelPadding)-_timeLabel->width() -
+		                          st::normalFont->spacew);
 		updateLabelPositions();
 	}
 }
@@ -323,11 +327,13 @@ void CoverWidget::handleSongChange() {
 
 	TextWithEntities textWithEntities;
 	if (song->performer.isEmpty()) {
-		textWithEntities.text = song->title.isEmpty() ? (current.audio()->name.isEmpty() ? qsl("Unknown Track") : current.audio()->name) : song->title;
+		textWithEntities.text = song->title.isEmpty() ?
+		                            (current.audio()->name.isEmpty() ? qsl("Unknown Track") : current.audio()->name) :
+		                            song->title;
 	} else {
 		auto title = song->title.isEmpty() ? qsl("Unknown Track") : TextUtilities::Clean(song->title);
 		textWithEntities.text = song->performer + QString::fromUtf8(" \xe2\x80\x93 ") + title;
-		textWithEntities.entities.append({ EntityInTextBold, 0, song->performer.size(), QString() });
+		textWithEntities.entities.append({EntityInTextBold, 0, song->performer.size(), QString()});
 	}
 	_nameLabel->setMarkedText(textWithEntities);
 
@@ -355,14 +361,10 @@ void CoverWidget::createPrevNextButtons() {
 	if (!_previousTrack) {
 		_previousTrack.create(this, st::mediaPlayerPanelPreviousButton);
 		_previousTrack->show();
-		_previousTrack->setClickedCallback([this]() {
-			instance()->previous();
-		});
+		_previousTrack->setClickedCallback([this]() { instance()->previous(); });
 		_nextTrack.create(this, st::mediaPlayerPanelNextButton);
 		_nextTrack->show();
-		_nextTrack->setClickedCallback([this]() {
-			instance()->next();
-		});
+		_nextTrack->setClickedCallback([this]() { instance()->next(); });
 		updatePlayPrevNextPositions();
 	}
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_cover.h b/Telegram/SourceFiles/media/player/media_player_cover.h
index 6d3b26284..5acbb79bc 100644
--- a/Telegram/SourceFiles/media/player/media_player_cover.h
+++ b/Telegram/SourceFiles/media/player/media_player_cover.h
@@ -86,15 +86,14 @@ private:
 	object_ptr<Ui::IconButton> _close;
 	object_ptr<Ui::MediaSlider> _playbackSlider;
 	std::unique_ptr<Clip::Playback> _playback;
-	object_ptr<Ui::IconButton> _previousTrack = { nullptr };
+	object_ptr<Ui::IconButton> _previousTrack = {nullptr};
 	object_ptr<PlayButton> _playPause;
-	object_ptr<Ui::IconButton> _nextTrack = { nullptr };
+	object_ptr<Ui::IconButton> _nextTrack = {nullptr};
 	object_ptr<Ui::IconButton> _volumeToggle;
 	object_ptr<VolumeController> _volumeController;
 	object_ptr<Ui::IconButton> _pinPlayer;
 	object_ptr<Ui::IconButton> _repeatTrack;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp
index feed9cb2d..69bb59210 100644
--- a/Telegram/SourceFiles/media/player/media_player_float.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_float.cpp
@@ -18,25 +18,27 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QMouseEvent>
-#include <QApplication>
-#include "facades.h"
 #include "media/player/media_player_float.h"
-#include "styles/style_media_player.h"
+#include "app.h"
+#include "facades.h"
 #include "history/history_media.h"
+#include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/view/media_clip_playback.h"
-#include "media/media_audio.h"
 #include "styles/style_history.h"
-#include "app.h"
+#include "styles/style_media_player.h"
+#include <QApplication>
+#include <QMouseEvent>
 
 namespace Media {
 namespace Player {
 
-Float::Float(QWidget *parent, HistoryItem *item, base::lambda<void(bool visible)> toggleCallback, base::lambda<void(bool closed)> draggedCallback) : TWidget(parent)
-, _item(item)
-, _toggleCallback(std::move(toggleCallback))
-, _draggedCallback(std::move(draggedCallback)) {
+Float::Float(QWidget *parent, HistoryItem *item, base::lambda<void(bool visible)> toggleCallback,
+             base::lambda<void(bool closed)> draggedCallback)
+    : TWidget(parent)
+    , _item(item)
+    , _toggleCallback(std::move(toggleCallback))
+    , _draggedCallback(std::move(draggedCallback)) {
 	auto media = _item->getMedia();
 	Assert(media != nullptr);
 
@@ -182,8 +184,8 @@ void Float::paintEvent(QPaintEvent *e) {
 			p.drawArc(inner.marginsRemoved(QMargins(stepInside, stepInside, stepInside, stepInside)), from, len);
 		}
 
-		//p.setPen(was);
-		//p.setOpacity(_opacity);
+		// p.setPen(was);
+		// p.setOpacity(_opacity);
 	}
 }
 
@@ -242,9 +244,7 @@ void Float::updatePlayback() {
 	if (_item) {
 		if (!_roundPlayback) {
 			_roundPlayback = std::make_unique<Media::Clip::Playback>();
-			_roundPlayback->setValueChangedCallback([this](double value) {
-				update();
-			});
+			_roundPlayback->setValueChangedCallback([this](double value) { update(); });
 		}
 		auto state = Media::Player::mixer()->currentState(AudioMsgId::Type::Voice);
 		if (state.id.contextId() == _item->fullId()) {
diff --git a/Telegram/SourceFiles/media/player/media_player_float.h b/Telegram/SourceFiles/media/player/media_player_float.h
index af9ac5d84..fda1e2f8a 100644
--- a/Telegram/SourceFiles/media/player/media_player_float.h
+++ b/Telegram/SourceFiles/media/player/media_player_float.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/observer.h"
-#include "ui/twidget.h"
 #include "media/media_clip_reader.h"
+#include "ui/twidget.h"
 
 class HistoryItem;
 
@@ -35,7 +35,8 @@ namespace Player {
 
 class Float : public TWidget, private base::Subscriber {
 public:
-	Float(QWidget *parent, HistoryItem *item, base::lambda<void(bool visible)> toggleCallback, base::lambda<void(bool closed)> draggedCallback);
+	Float(QWidget *parent, HistoryItem *item, base::lambda<void(bool visible)> toggleCallback,
+	      base::lambda<void(bool closed)> draggedCallback);
 
 	HistoryItem *item() const {
 		return _item;
@@ -65,7 +66,7 @@ public:
 			finishDrag(false);
 		}
 	}
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
 		if (item == _item) {
 			repaintItem();
 		}
@@ -104,7 +105,6 @@ private:
 	base::lambda<void(bool closed)> _draggedCallback;
 
 	std::unique_ptr<Clip::Playback> _roundPlayback;
-
 };
 
 } // namespace Player
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 22ef51451..b59bc28ac 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "media/player/media_player_instance.h"
 
-#include "media/media_audio.h"
-#include "media/media_audio_capture.h"
-#include "observer_peer.h"
-#include "messenger.h"
+#include "app.h"
 #include "auth_session.h"
 #include "calls/calls_instance.h"
 #include "history/history_media.h"
-#include "app.h"
+#include "media/media_audio.h"
+#include "media/media_audio_capture.h"
+#include "messenger.h"
+#include "observer_peer.h"
 
 namespace Media {
 namespace Player {
@@ -52,15 +52,13 @@ void finish() {
 }
 
 Instance::Instance()
-: _songData(AudioMsgId::Type::Song, OverviewMusicFiles)
-, _voiceData(AudioMsgId::Type::Voice, OverviewRoundVoiceFiles) {
-	subscribe(Media::Player::Updated(), [this](const AudioMsgId &audioId) {
-		handleSongUpdate(audioId);
-	});
+    : _songData(AudioMsgId::Type::Song, OverviewMusicFiles)
+    , _voiceData(AudioMsgId::Type::Voice, OverviewRoundVoiceFiles) {
+	subscribe(Media::Player::Updated(), [this](const AudioMsgId &audioId) { handleSongUpdate(audioId); });
 	auto observeEvents = Notify::PeerUpdate::Flag::SharedMediaChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 	subscribe(Global::RefSelfChanged(), [this] {
 		if (!App::self()) {
 			handleLogout();
@@ -78,9 +76,7 @@ Instance::Instance()
 			});
 		}
 	};
-	subscribe(Messenger::Instance().authSessionChanged(), [handleAuthSessionChange] {
-		handleAuthSessionChange();
-	});
+	subscribe(Messenger::Instance().authSessionChanged(), [handleAuthSessionChange] { handleAuthSessionChange(); });
 	handleAuthSessionChange();
 }
 
@@ -117,9 +113,7 @@ void Instance::checkPeerUpdate(AudioMsgId::Type type, const Notify::PeerUpdate &
 }
 
 void Instance::handleSongUpdate(const AudioMsgId &audioId) {
-	emitUpdate(audioId.type(), [&audioId](const AudioMsgId &playing) {
-		return (audioId == playing);
-	});
+	emitUpdate(audioId.type(), [&audioId](const AudioMsgId &playing) { return (audioId == playing); });
 }
 
 void Instance::setCurrent(const AudioMsgId &audioId) {
@@ -183,7 +177,7 @@ bool Instance::moveInPlaylist(Data *data, int delta, bool autonext) {
 		if (auto media = item->getMedia()) {
 			if (auto document = media->getDocument()) {
 				if (autonext) {
-					_switchToNextNotifier.notify({ data->current, msgId });
+					_switchToNextNotifier.notify({data->current, msgId});
 				}
 				DocumentOpenClickHandler::doOpen(media->getDocument(), item, ActionOnLoadPlayInline);
 				return true;
@@ -284,7 +278,8 @@ void Instance::playPauseCancelClicked(AudioMsgId::Type type) {
 
 	auto state = mixer()->currentState(type);
 	auto stopped = IsStoppedOrStopping(state.state);
-	auto showPause = !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+	auto showPause =
+	    !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 	auto audio = state.id.audio();
 	if (audio && audio->loading()) {
 		audio->cancel();
@@ -311,13 +306,11 @@ void Instance::stopSeeking(AudioMsgId::Type type) {
 }
 
 void Instance::documentLoadProgress(DocumentData *document) {
-	emitUpdate(document->song() ? AudioMsgId::Type::Song : AudioMsgId::Type::Voice, [document](const AudioMsgId &audioId) {
-		return (audioId.audio() == document);
-	});
+	emitUpdate(document->song() ? AudioMsgId::Type::Song : AudioMsgId::Type::Voice,
+	           [document](const AudioMsgId &audioId) { return (audioId.audio() == document); });
 }
 
-template <typename CheckCallback>
-void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
+template <typename CheckCallback> void Instance::emitUpdate(AudioMsgId::Type type, CheckCallback check) {
 	auto state = mixer()->currentState(type);
 	if (!state.id || !check(state.id)) {
 		return;
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h
index bce3511a7..df02dc761 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.h
+++ b/Telegram/SourceFiles/media/player/media_player_instance.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/observer.h"
-#include "structs.h"
 #include "history/history.h"
+#include "structs.h"
 
 namespace Notify {
 struct PeerUpdate;
@@ -151,8 +151,9 @@ private:
 	friend void start();
 
 	struct Data {
-		Data(AudioMsgId::Type type, MediaOverviewType overview) : type(type), overview(overview) {
-		}
+		Data(AudioMsgId::Type type, MediaOverviewType overview)
+		    : type(type)
+		    , overview(overview) {}
 
 		AudioMsgId::Type type;
 		MediaOverviewType overview;
@@ -176,8 +177,7 @@ private:
 	void preloadNext(Data *data);
 	void handleLogout();
 
-	template <typename CheckCallback>
-	void emitUpdate(AudioMsgId::Type type, CheckCallback check);
+	template <typename CheckCallback> void emitUpdate(AudioMsgId::Type type, CheckCallback check);
 
 	Data *getData(AudioMsgId::Type type) {
 		if (type == AudioMsgId::Type::Song) {
@@ -209,8 +209,7 @@ private:
 	base::Observable<AudioMsgId::Type> _playlistChangedNotifier;
 	base::Observable<AudioMsgId::Type> _trackChangedNotifier;
 	base::Observable<AudioMsgId::Type> _repeatChangedNotifier;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_list.cpp b/Telegram/SourceFiles/media/player/media_player_list.cpp
index b5c085bd7..cb3fb90fe 100644
--- a/Telegram/SourceFiles/media/player/media_player_list.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_list.cpp
@@ -18,33 +18,30 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QPaintEvent>
-#include <QMouseEvent>
+#include "media/player/media_player_list.h"
 #include "app.h"
 #include "facades.h"
-#include "media/player/media_player_list.h"
+#include "history/history_media.h"
 #include "media/player/media_player_instance.h"
 #include "overview/overview_layout.h"
 #include "styles/style_media_player.h"
-#include "history/history_media.h"
+#include <QMouseEvent>
+#include <QPaintEvent>
 
 namespace Media {
 namespace Player {
 
-ListWidget::ListWidget(QWidget *parent) : TWidget(parent) {
+ListWidget::ListWidget(QWidget *parent)
+    : TWidget(parent) {
 	setMouseTracking(true);
 	playlistUpdated();
 	subscribe(instance()->playlistChangedNotifier(), [this](AudioMsgId::Type type) { playlistUpdated(); });
-	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) {
-		itemRemoved(item);
-	});
+	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) { itemRemoved(item); });
 }
 
 ListWidget::~ListWidget() {
 	auto layouts = base::take(_layouts);
-	for_const (auto layout, layouts) {
-		delete layout;
-	}
+	for_const (auto layout, layouts) { delete layout; }
 }
 
 void ListWidget::paintEvent(QPaintEvent *e) {
@@ -121,7 +118,7 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e) {
 	}
 }
 
-void ListWidget::ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
+void ListWidget::ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
 	repaintItem(item);
 }
 
@@ -174,9 +171,7 @@ QRect ListWidget::getCurrentTrackGeometry() const {
 
 int ListWidget::resizeGetHeight(int newWidth) {
 	auto result = 0;
-	for_const (auto layout, _list) {
-		result += layout->resizeGetHeight(newWidth);
-	}
+	for_const (auto layout, _list) { result += layout->resizeGetHeight(newWidth); }
 	return (result > 0) ? (marginTop() + result) : 0;
 }
 
@@ -207,7 +202,8 @@ void ListWidget::playlistUpdated() {
 			if (auto item = App::histItemById(msgId)) {
 				if (auto media = item->getMedia()) {
 					if (media->type() == MediaTypeMusicFile) {
-						layoutIt = _layouts.insert(msgId, new Overview::Layout::Document(media->getDocument(), item, st::mediaPlayerFileLayout));
+						layoutIt = _layouts.insert(msgId, new Overview::Layout::Document(media->getDocument(), item,
+						                                                                 st::mediaPlayerFileLayout));
 						layoutIt.value()->initDimensions();
 					}
 				}
diff --git a/Telegram/SourceFiles/media/player/media_player_list.h b/Telegram/SourceFiles/media/player/media_player_list.h
index 68fc3f1e9..fe2170cff 100644
--- a/Telegram/SourceFiles/media/player/media_player_list.h
+++ b/Telegram/SourceFiles/media/player/media_player_list.h
@@ -22,8 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/observer.h"
 #include "core/basic_types.h"
-#include "ui/twidget.h"
 #include "structs.h"
+#include "ui/twidget.h"
 
 class HistoryItem;
 
@@ -40,7 +40,7 @@ class ListWidget : public TWidget, private base::Subscriber {
 public:
 	ListWidget(QWidget *parent);
 
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item);
 
 	QRect getCurrentTrackGeometry() const;
 
@@ -61,15 +61,14 @@ private:
 	void playlistUpdated();
 
 	using Layout = Overview::Layout::Document;
-	using Layouts = QMap<FullMsgId, Layout*>;
+	using Layouts = QMap<FullMsgId, Layout *>;
 	Layouts _layouts;
 
-	using List = QList<Layout*>;
+	using List = QList<Layout *>;
 	List _list;
 
 	style::cursor _cursor = style::cur_default;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 6c8557cbe..d0fa09093 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -18,27 +18,28 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
+#include "media/player/media_player_panel.h"
 #include "app.h"
 #include "facades.h"
-#include "ui/twidget.h"
-#include "media/player/media_player_panel.h"
+#include "mainwindow.h"
 #include "media/player/media_player_cover.h"
-#include "media/player/media_player_list.h"
 #include "media/player/media_player_instance.h"
+#include "media/player/media_player_list.h"
+#include "styles/style_media_player.h"
 #include "styles/style_overview.h"
 #include "styles/style_widgets.h"
-#include "styles/style_media_player.h"
-#include "ui/widgets/shadow.h"
+#include "ui/twidget.h"
 #include "ui/widgets/scroll_area.h"
-#include "mainwindow.h"
+#include "ui/widgets/shadow.h"
+#include <QWindow>
 
 namespace Media {
 namespace Player {
 
-Panel::Panel(QWidget *parent, Layout layout) : TWidget(parent)
-, _layout(layout)
-, _scroll(this, st::mediaPlayerScroll) {
+Panel::Panel(QWidget *parent, Layout layout)
+    : TWidget(parent)
+    , _layout(layout)
+    , _scroll(this, st::mediaPlayerScroll) {
 	_hideTimer.setSingleShot(true);
 	connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(onHideStart()));
 
@@ -54,7 +55,9 @@ bool Panel::overlaps(const QRect &globalRect) {
 
 	auto marginLeft = rtl() ? contentRight() : contentLeft();
 	auto marginRight = rtl() ? contentLeft() : contentRight();
-	return rect().marginsRemoved(QMargins(marginLeft, contentTop(), marginRight, contentBottom())).contains(QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size()));
+	return rect()
+	    .marginsRemoved(QMargins(marginLeft, contentTop(), marginRight, contentBottom()))
+	    .contains(QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size()));
 }
 
 void Panel::onWindowActiveChanged() {
@@ -93,14 +96,14 @@ void Panel::updateControlsGeometry() {
 	if (scrollHeight > 0) {
 		_scroll->setGeometryToRight(contentRight(), scrollTop, width, scrollHeight);
 	}
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (auto widget = static_cast<TWidget *>(_scroll->widget())) {
 		widget->resizeToWidth(width);
 		onScroll();
 	}
 }
 
-void Panel::ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
-	if (auto list = static_cast<ListWidget*>(_scroll->widget())) {
+void Panel::ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
+	if (auto list = static_cast<ListWidget *>(_scroll->widget())) {
 		list->ui_repaintHistoryItem(item);
 	}
 }
@@ -113,7 +116,7 @@ int Panel::bestPositionFor(int left) const {
 }
 
 void Panel::scrollPlaylistToCurrentTrack() {
-	if (auto list = static_cast<ListWidget*>(_scroll->widget())) {
+	if (auto list = static_cast<ListWidget *>(_scroll->widget())) {
 		auto rect = list->getCurrentTrackGeometry();
 		auto top = _scroll->scrollTop(), bottom = top + _scroll->height();
 		_scroll->scrollToY(rect.y());
@@ -121,7 +124,7 @@ void Panel::scrollPlaylistToCurrentTrack() {
 }
 
 void Panel::onScroll() {
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (auto widget = static_cast<TWidget *>(_scroll->widget())) {
 		int visibleTop = _scroll->scrollTop();
 		int visibleBottom = visibleTop + _scroll->height();
 		widget->setVisibleTopBottom(visibleTop, visibleBottom);
@@ -139,7 +142,8 @@ void Panel::updateSize() {
 		listHeight = widget->height();
 	}
 	auto scrollVisible = (listHeight > 0);
-	auto scrollHeight = scrollVisible ? (std::min(listHeight, st::mediaPlayerListHeightMax) + st::mediaPlayerListMarginBottom) : 0;
+	auto scrollHeight =
+	    scrollVisible ? (std::min(listHeight, st::mediaPlayerListHeightMax) + st::mediaPlayerListMarginBottom) : 0;
 	height += scrollHeight + contentBottom();
 	resize(width, height);
 	_scroll->setVisible(scrollVisible);
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h
index f45947f87..20622cc1a 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.h
+++ b/Telegram/SourceFiles/media/player/media_player_panel.h
@@ -54,7 +54,7 @@ public:
 	void setPinCallback(ButtonCallback &&callback);
 	void setCloseCallback(ButtonCallback &&callback);
 
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item);
 
 	int bestPositionFor(int left) const;
 
@@ -90,7 +90,8 @@ private:
 		return width() - contentLeft() - contentRight();
 	}
 	int contentHeight() const {
-		return height() - contentTop() - contentBottom();;
+		return height() - contentTop() - contentBottom();
+		;
 	}
 
 	void startAnimation();
@@ -107,11 +108,10 @@ private:
 	QTimer _hideTimer, _showTimer;
 
 	ButtonCallback _pinCallback, _closeCallback;
-	object_ptr<CoverWidget> _cover = { nullptr };
+	object_ptr<CoverWidget> _cover = {nullptr};
 	object_ptr<Ui::ScrollArea> _scroll;
-	object_ptr<Ui::Shadow> _scrollShadow = { nullptr };
-
+	object_ptr<Ui::Shadow> _scrollShadow = {nullptr};
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
index 017e682c2..443222098 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
@@ -18,28 +18,27 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
-#include "ui/twidget.h"
+#include "media/player/media_player_volume_controller.h"
 #include "app.h"
 #include "facades.h"
-#include "media/player/media_player_volume_controller.h"
+#include "mainwindow.h"
 #include "media/media_audio.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/continuous_sliders.h"
 #include "styles/style_media_player.h"
 #include "styles/style_widgets.h"
-#include "mainwindow.h"
+#include "ui/twidget.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/shadow.h"
+#include <QWindow>
 
 namespace Media {
 namespace Player {
 
-VolumeController::VolumeController(QWidget *parent) : TWidget(parent)
-, _slider(this, st::mediaPlayerPanelPlayback) {
+VolumeController::VolumeController(QWidget *parent)
+    : TWidget(parent)
+    , _slider(this, st::mediaPlayerPanelPlayback) {
 	_slider->setMoveByWheel(true);
-	_slider->setChangeProgressCallback([this](double volume) {
-		applyVolumeChange(volume);
-	});
+	_slider->setChangeProgressCallback([this](double volume) { applyVolumeChange(volume); });
 	_slider->setChangeFinishedCallback([this](double volume) {
 		if (volume > 0) {
 			Global::SetRememberedSongVolume(volume);
@@ -53,7 +52,8 @@ VolumeController::VolumeController(QWidget *parent) : TWidget(parent)
 	});
 	setVolume(Global::SongVolume());
 
-	resize(st::mediaPlayerPanelVolumeWidth, 2 * st::mediaPlayerPanelPlaybackPadding + st::mediaPlayerPanelPlayback.width);
+	resize(st::mediaPlayerPanelVolumeWidth,
+	       2 * st::mediaPlayerPanelPlaybackPadding + st::mediaPlayerPanelPlayback.width);
 }
 
 void VolumeController::setIsVertical(bool vertical) {
@@ -82,8 +82,9 @@ void VolumeController::applyVolumeChange(double volume) {
 	}
 }
 
-VolumeWidget::VolumeWidget(QWidget *parent) : TWidget(parent)
-, _controller(this) {
+VolumeWidget::VolumeWidget(QWidget *parent)
+    : TWidget(parent)
+    , _controller(this) {
 	hide();
 	_controller->setIsVertical(true);
 
@@ -99,11 +100,13 @@ VolumeWidget::VolumeWidget(QWidget *parent) : TWidget(parent)
 
 	hide();
 	auto margin = getMargin();
-	resize(margin.left() + st::mediaPlayerVolumeSize.width() + margin.right(), margin.top() + st::mediaPlayerVolumeSize.height() + margin.bottom());
+	resize(margin.left() + st::mediaPlayerVolumeSize.width() + margin.right(),
+	       margin.top() + st::mediaPlayerVolumeSize.height() + margin.bottom());
 }
 
 QMargins VolumeWidget::getMargin() const {
-	return QMargins(st::mediaPlayerVolumeMargin, st::mediaPlayerPlayback.fullWidth, st::mediaPlayerVolumeMargin, st::mediaPlayerVolumeMargin);
+	return QMargins(st::mediaPlayerVolumeMargin, st::mediaPlayerPlayback.fullWidth, st::mediaPlayerVolumeMargin,
+	                st::mediaPlayerVolumeMargin);
 }
 
 bool VolumeWidget::overlaps(const QRect &globalRect) {
@@ -120,7 +123,9 @@ void VolumeWidget::onWindowActiveChanged() {
 
 void VolumeWidget::resizeEvent(QResizeEvent *e) {
 	auto inner = rect().marginsRemoved(getMargin());
-	_controller->setGeometry(inner.x(), inner.y() - st::lineWidth, inner.width(), inner.height() + st::lineWidth - ((st::mediaPlayerVolumeSize.width() - st::mediaPlayerPanelPlayback.width) / 2));
+	_controller->setGeometry(inner.x(), inner.y() - st::lineWidth, inner.width(),
+	                         inner.height() + st::lineWidth -
+	                             ((st::mediaPlayerVolumeSize.width() - st::mediaPlayerPanelPlayback.width) / 2));
 }
 
 void VolumeWidget::paintEvent(QPaintEvent *e) {
@@ -147,7 +152,10 @@ void VolumeWidget::paintEvent(QPaintEvent *e) {
 	auto shadowedSides = RectPart::Left | RectPart::Right | RectPart::Bottom;
 	Ui::Shadow::paint(p, shadowedRect, width(), st::defaultRoundShadow, shadowedSides);
 	auto parts = RectPart::NoTopBottom | RectPart::FullBottom;
-	App::roundRect(p, QRect(shadowedRect.x(), -st::buttonRadius, shadowedRect.width(), shadowedRect.y() + shadowedRect.height() + st::buttonRadius), st::menuBg, MenuCorners, nullptr, parts);
+	App::roundRect(p,
+	               QRect(shadowedRect.x(), -st::buttonRadius, shadowedRect.width(),
+	                     shadowedRect.y() + shadowedRect.height() + st::buttonRadius),
+	               st::menuBg, MenuCorners, nullptr, parts);
 }
 
 void VolumeWidget::enterEventHook(QEvent *e) {
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.h b/Telegram/SourceFiles/media/player/media_player_volume_controller.h
index b904ea1b3..806b37157 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.h
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.h
@@ -45,7 +45,6 @@ private:
 	void applyVolumeChange(double volume);
 
 	object_ptr<Ui::MediaSlider> _slider;
-
 };
 
 class VolumeWidget : public TWidget {
@@ -87,8 +86,7 @@ private:
 	QTimer _hideTimer, _showTimer;
 
 	object_ptr<VolumeController> _controller;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp
index 6df105a6a..a65ee433e 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp
@@ -18,24 +18,24 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
-#include "ui/twidget.h"
+#include "media/player/media_player_widget.h"
 #include "app.h"
 #include "facades.h"
-#include "media/player/media_player_widget.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/buttons.h"
-#include "ui/effects/ripple_animation.h"
 #include "lang/lang_keys.h"
 #include "media/media_audio.h"
-#include "media/view/media_clip_playback.h"
 #include "media/player/media_player_button.h"
 #include "media/player/media_player_instance.h"
 #include "media/player/media_player_volume_controller.h"
+#include "media/view/media_clip_playback.h"
 #include "styles/style_media_player.h"
 #include "styles/style_mediaview.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/twidget.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include <QWindow>
 
 namespace Media {
 namespace Player {
@@ -61,11 +61,11 @@ protected:
 
 private:
 	PlayButtonLayout _layout;
-
 };
 
-Widget::PlayButton::PlayButton(QWidget *parent) : Ui::RippleButton(parent, st::mediaPlayerButton.ripple)
-, _layout(st::mediaPlayerButton, [this] { update(); }) {
+Widget::PlayButton::PlayButton(QWidget *parent)
+    : Ui::RippleButton(parent, st::mediaPlayerButton.ripple)
+    , _layout(st::mediaPlayerButton, [this] { update(); }) {
 	resize(st::mediaPlayerButtonSize);
 	setCursor(style::cur_pointer);
 }
@@ -87,16 +87,17 @@ QPoint Widget::PlayButton::prepareRippleStartPosition() const {
 	return QPoint(mapFromGlobal(QCursor::pos()) - st::mediaPlayerButton.rippleAreaPosition);
 }
 
-Widget::Widget(QWidget *parent) : TWidget(parent)
-, _nameLabel(this, st::mediaPlayerName)
-, _timeLabel(this, st::mediaPlayerTime)
-, _playPause(this)
-, _volumeToggle(this, st::mediaPlayerVolumeToggle)
-, _repeatTrack(this, st::mediaPlayerRepeatButton)
-, _close(this, st::mediaPlayerClose)
-, _shadow(this, st::shadowFg)
-, _playbackSlider(this, st::mediaPlayerPlayback)
-, _playback(std::make_unique<Clip::Playback>()) {
+Widget::Widget(QWidget *parent)
+    : TWidget(parent)
+    , _nameLabel(this, st::mediaPlayerName)
+    , _timeLabel(this, st::mediaPlayerTime)
+    , _playPause(this)
+    , _volumeToggle(this, st::mediaPlayerVolumeToggle)
+    , _repeatTrack(this, st::mediaPlayerRepeatButton)
+    , _close(this, st::mediaPlayerClose)
+    , _shadow(this, st::shadowFg)
+    , _playbackSlider(this, st::mediaPlayerPlayback)
+    , _playback(std::make_unique<Clip::Playback>()) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	setMouseTracking(true);
 	resize(width(), st::mediaPlayerHeight + st::lineWidth);
@@ -104,12 +105,8 @@ Widget::Widget(QWidget *parent) : TWidget(parent)
 	_nameLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_timeLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	_playback->setInLoadingStateChangedCallback([this](bool loading) {
-		_playbackSlider->setDisabled(loading);
-	});
-	_playback->setValueChangedCallback([this](double value) {
-		_playbackSlider->setValue(value);
-	});
+	_playback->setInLoadingStateChangedCallback([this](bool loading) { _playbackSlider->setDisabled(loading); });
+	_playback->setValueChangedCallback([this](double value) { _playbackSlider->setValue(value); });
 	_playbackSlider->setChangeProgressCallback([this](double value) {
 		if (_type != AudioMsgId::Type::Song) {
 			return; // Round video seek is not supported for now :(
@@ -124,9 +121,7 @@ Widget::Widget(QWidget *parent) : TWidget(parent)
 		_playback->setValue(value, false);
 		handleSeekFinished(value);
 	});
-	_playPause->setClickedCallback([this] {
-		instance()->playPauseCancelClicked(_type);
-	});
+	_playPause->setClickedCallback([this] { instance()->playPauseCancelClicked(_type); });
 
 	updateVolumeToggleIcon();
 	_volumeToggle->setClickedCallback([this] {
@@ -137,9 +132,7 @@ Widget::Widget(QWidget *parent) : TWidget(parent)
 	subscribe(Global::RefSongVolumeChanged(), [this] { updateVolumeToggleIcon(); });
 
 	updateRepeatTrackIcon();
-	_repeatTrack->setClickedCallback([this] {
-		instance()->toggleRepeat(AudioMsgId::Type::Song);
-	});
+	_repeatTrack->setClickedCallback([this] { instance()->toggleRepeat(AudioMsgId::Type::Song); });
 
 	subscribe(instance()->repeatChangedNotifier(), [this](AudioMsgId::Type type) {
 		if (type == _type) {
@@ -151,9 +144,7 @@ Widget::Widget(QWidget *parent) : TWidget(parent)
 			handlePlaylistUpdate();
 		}
 	});
-	subscribe(instance()->updatedNotifier(), [this](const TrackState &state) {
-		handleSongUpdate(state);
-	});
+	subscribe(instance()->updatedNotifier(), [this](const TrackState &state) { handleSongUpdate(state); });
 	subscribe(instance()->trackChangedNotifier(), [this](AudioMsgId::Type type) {
 		if (type == _type) {
 			handleSongChange();
@@ -264,13 +255,17 @@ void Widget::handleSeekFinished(double progress) {
 
 void Widget::resizeEvent(QResizeEvent *e) {
 	auto right = st::mediaPlayerCloseRight;
-	_close->moveToRight(right, st::mediaPlayerPlayTop); right += _close->width();
-	_repeatTrack->moveToRight(right, st::mediaPlayerPlayTop); right += _repeatTrack->width();
-	_volumeToggle->moveToRight(right, st::mediaPlayerPlayTop); right += _volumeToggle->width();
+	_close->moveToRight(right, st::mediaPlayerPlayTop);
+	right += _close->width();
+	_repeatTrack->moveToRight(right, st::mediaPlayerPlayTop);
+	right += _repeatTrack->width();
+	_volumeToggle->moveToRight(right, st::mediaPlayerPlayTop);
+	right += _volumeToggle->width();
 
 	updatePlayPrevNextPositions();
 
-	_playbackSlider->setGeometry(0, height() - st::mediaPlayerPlayback.fullWidth, width(), st::mediaPlayerPlayback.fullWidth);
+	_playbackSlider->setGeometry(0, height() - st::mediaPlayerPlayback.fullWidth, width(),
+	                             st::mediaPlayerPlayback.fullWidth);
 }
 
 void Widget::paintEvent(QPaintEvent *e) {
@@ -326,8 +321,10 @@ void Widget::updatePlayPrevNextPositions() {
 	auto left = st::mediaPlayerPlayLeft;
 	auto top = st::mediaPlayerPlayTop;
 	if (_previousTrack) {
-		_previousTrack->moveToLeft(left, top); left += _previousTrack->width() + st::mediaPlayerPlaySkip;
-		_playPause->moveToLeft(left, top); left += _playPause->width() + st::mediaPlayerPlaySkip;
+		_previousTrack->moveToLeft(left, top);
+		left += _previousTrack->width() + st::mediaPlayerPlaySkip;
+		_playPause->moveToLeft(left, top);
+		left += _playPause->width() + st::mediaPlayerPlaySkip;
 		_nextTrack->moveToLeft(left, top);
 	} else {
 		_playPause->moveToLeft(left, top);
@@ -367,7 +364,8 @@ void Widget::updateLabelsGeometry() {
 
 void Widget::updateRepeatTrackIcon() {
 	auto repeating = instance()->repeatEnabled(AudioMsgId::Type::Song);
-	_repeatTrack->setIconOverride(repeating ? nullptr : &st::mediaPlayerRepeatDisabledIcon, repeating ? nullptr : &st::mediaPlayerRepeatDisabledIconOver);
+	_repeatTrack->setIconOverride(repeating ? nullptr : &st::mediaPlayerRepeatDisabledIcon,
+	                              repeating ? nullptr : &st::mediaPlayerRepeatDisabledIconOver);
 	_repeatTrack->setRippleColorOverride(repeating ? nullptr : &st::mediaPlayerRepeatDisabledRippleBg);
 }
 
@@ -413,7 +411,8 @@ void Widget::handleSongUpdate(const TrackState &state) {
 	}
 
 	auto stopped = IsStoppedOrStopping(state.state);
-	auto showPause = !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+	auto showPause =
+	    !stopped && (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 	if (instance()->isSeeking(_type)) {
 		showPause = true;
 	}
@@ -494,18 +493,21 @@ void Widget::handleSongChange() {
 			};
 
 			textWithEntities.text = name + ' ' + date();
-			textWithEntities.entities.append({ EntityInTextBold, 0, name.size(), QString() });
+			textWithEntities.entities.append({EntityInTextBold, 0, name.size(), QString()});
 		} else {
 			textWithEntities.text = lang(lng_media_audio);
 		}
 	} else {
 		auto song = current.audio()->song();
 		if (!song || song->performer.isEmpty()) {
-			textWithEntities.text = (!song || song->title.isEmpty()) ? (current.audio()->name.isEmpty() ? qsl("Unknown Track") : current.audio()->name) : song->title;
+			textWithEntities.text =
+			    (!song || song->title.isEmpty()) ?
+			        (current.audio()->name.isEmpty() ? qsl("Unknown Track") : current.audio()->name) :
+			        song->title;
 		} else {
 			auto title = song->title.isEmpty() ? qsl("Unknown Track") : TextUtilities::Clean(song->title);
 			textWithEntities.text = song->performer + QString::fromUtf8(" \xe2\x80\x93 ") + title;
-			textWithEntities.entities.append({ EntityInTextBold, 0, song->performer.size(), QString() });
+			textWithEntities.entities.append({EntityInTextBold, 0, song->performer.size(), QString()});
 		}
 	}
 	_nameLabel->setMarkedText(textWithEntities);
@@ -536,14 +538,10 @@ void Widget::createPrevNextButtons() {
 	if (!_previousTrack) {
 		_previousTrack.create(this, st::mediaPlayerPreviousButton);
 		_previousTrack->show();
-		_previousTrack->setClickedCallback([this]() {
-			instance()->previous();
-		});
+		_previousTrack->setClickedCallback([this]() { instance()->previous(); });
 		_nextTrack.create(this, st::mediaPlayerNextButton);
 		_nextTrack->show();
-		_nextTrack->setClickedCallback([this]() {
-			instance()->next();
-		});
+		_nextTrack->setClickedCallback([this]() { instance()->next(); });
 		updatePlayPrevNextPositions();
 	}
 }
diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h
index 19d1ec838..2ce060ef7 100644
--- a/Telegram/SourceFiles/media/player/media_player_widget.h
+++ b/Telegram/SourceFiles/media/player/media_player_widget.h
@@ -19,8 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
-#include "structs.h"
 #include "base/observer.h"
+#include "structs.h"
 
 class AudioMsgId;
 
@@ -111,17 +111,16 @@ private:
 	class PlayButton;
 	object_ptr<Ui::FlatLabel> _nameLabel;
 	object_ptr<Ui::LabelSimple> _timeLabel;
-	object_ptr<Ui::IconButton> _previousTrack = { nullptr };
+	object_ptr<Ui::IconButton> _previousTrack = {nullptr};
 	object_ptr<PlayButton> _playPause;
-	object_ptr<Ui::IconButton> _nextTrack = { nullptr };
+	object_ptr<Ui::IconButton> _nextTrack = {nullptr};
 	object_ptr<Ui::IconButton> _volumeToggle;
 	object_ptr<Ui::IconButton> _repeatTrack;
 	object_ptr<Ui::IconButton> _close;
-	object_ptr<Ui::PlainShadow> _shadow = { nullptr };
+	object_ptr<Ui::PlainShadow> _shadow = {nullptr};
 	object_ptr<Ui::FilledSlider> _playbackSlider;
 	std::unique_ptr<Clip::Playback> _playback;
-
 };
 
-} // namespace Clip
+} // namespace Player
 } // namespace Media
diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp
index bcb31ea75..7502b23b2 100644
--- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp
+++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp
@@ -18,32 +18,33 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
-#include "ui/twidget.h"
+#include "media/view/media_clip_controller.h"
 #include "app.h"
 #include "facades.h"
-#include "media/view/media_clip_controller.h"
+#include "media/media_audio.h"
 #include "media/view/media_clip_playback.h"
 #include "media/view/media_clip_volume_controller.h"
 #include "styles/style_mediaview.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/continuous_sliders.h"
 #include "ui/effects/widget_fade_wrap.h"
+#include "ui/twidget.h"
 #include "ui/widgets/buttons.h"
-#include "media/media_audio.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include <QWindow>
 
 namespace Media {
 namespace Clip {
 
-Controller::Controller(QWidget *parent) : TWidget(parent)
-, _playPauseResume(this, st::mediaviewPlayButton)
-, _playbackSlider(this, st::mediaviewPlayback)
-, _playback(std::make_unique<Playback>())
-, _volumeController(this)
-, _fullScreenToggle(this, st::mediaviewFullScreenButton)
-, _playedAlready(this, st::mediaviewPlayProgressLabel)
-, _toPlayLeft(this, st::mediaviewPlayProgressLabel)
-, _fadeAnimation(std::make_unique<Ui::FadeAnimation>(this)) {
+Controller::Controller(QWidget *parent)
+    : TWidget(parent)
+    , _playPauseResume(this, st::mediaviewPlayButton)
+    , _playbackSlider(this, st::mediaviewPlayback)
+    , _playback(std::make_unique<Playback>())
+    , _volumeController(this)
+    , _fullScreenToggle(this, st::mediaviewFullScreenButton)
+    , _playedAlready(this, st::mediaviewPlayProgressLabel)
+    , _toPlayLeft(this, st::mediaviewPlayProgressLabel)
+    , _fadeAnimation(std::make_unique<Ui::FadeAnimation>(this)) {
 	_fadeAnimation->show();
 	_fadeAnimation->setFinishedCallback([this] { fadeFinished(); });
 	_fadeAnimation->setUpdatedCallback([this](double opacity) { fadeUpdated(opacity); });
@@ -54,12 +55,8 @@ Controller::Controller(QWidget *parent) : TWidget(parent)
 	connect(_fullScreenToggle, SIGNAL(clicked()), this, SIGNAL(toFullScreenPressed()));
 	connect(_volumeController, SIGNAL(volumeChanged(double)), this, SIGNAL(volumeChanged(double)));
 
-	_playback->setInLoadingStateChangedCallback([this](bool loading) {
-		_playbackSlider->setDisabled(loading);
-	});
-	_playback->setValueChangedCallback([this](double value) {
-		_playbackSlider->setValue(value);
-	});
+	_playback->setInLoadingStateChangedCallback([this](bool loading) { _playbackSlider->setDisabled(loading); });
+	_playback->setValueChangedCallback([this](double value) { _playbackSlider->setValue(value); });
 	_playbackSlider->setChangeProgressCallback([this](double value) {
 		_playback->setValue(value, false);
 		handleSeekProgress(value); // This may destroy Controller.
@@ -91,19 +88,14 @@ void Controller::handleSeekFinished(double progress) {
 }
 
 void Controller::showAnimated() {
-	startFading([this]() {
-		_fadeAnimation->fadeIn(st::mediaviewShowDuration);
-	});
+	startFading([this]() { _fadeAnimation->fadeIn(st::mediaviewShowDuration); });
 }
 
 void Controller::hideAnimated() {
-	startFading([this]() {
-		_fadeAnimation->fadeOut(st::mediaviewHideDuration);
-	});
+	startFading([this]() { _fadeAnimation->fadeOut(st::mediaviewHideDuration); });
 }
 
-template <typename Callback>
-void Controller::startFading(Callback start) {
+template <typename Callback> void Controller::startFading(Callback start) {
 	start();
 	_playbackSlider->show();
 }
@@ -123,13 +115,16 @@ void Controller::updatePlayback(const Player::TrackState &state) {
 }
 
 void Controller::updatePlayPauseResumeState(const Player::TrackState &state) {
-	auto showPause = (state.state == Player::State::Playing || state.state == Player::State::Resuming || _seekPositionMs >= 0);
+	auto showPause =
+	    (state.state == Player::State::Playing || state.state == Player::State::Resuming || _seekPositionMs >= 0);
 	if (showPause != _showPause) {
-		disconnect(_playPauseResume, SIGNAL(clicked()), this, _showPause ? SIGNAL(pausePressed()) : SIGNAL(playPressed()));
+		disconnect(_playPauseResume, SIGNAL(clicked()), this,
+		           _showPause ? SIGNAL(pausePressed()) : SIGNAL(playPressed()));
 		_showPause = showPause;
 		connect(_playPauseResume, SIGNAL(clicked()), this, _showPause ? SIGNAL(pausePressed()) : SIGNAL(playPressed()));
 
-		_playPauseResume->setIconOverride(_showPause ? &st::mediaviewPauseIcon : nullptr, _showPause ? &st::mediaviewPauseIconOver : nullptr);
+		_playPauseResume->setIconOverride(_showPause ? &st::mediaviewPauseIcon : nullptr,
+		                                  _showPause ? &st::mediaviewPauseIconOver : nullptr);
 	}
 }
 
@@ -180,7 +175,8 @@ void Controller::refreshTimeTexts() {
 }
 
 void Controller::setInFullScreen(bool inFullScreen) {
-	_fullScreenToggle->setIconOverride(inFullScreen ? &st::mediaviewFullScreenOutIcon : nullptr, inFullScreen ? &st::mediaviewFullScreenOutIconOver : nullptr);
+	_fullScreenToggle->setIconOverride(inFullScreen ? &st::mediaviewFullScreenOutIcon : nullptr,
+	                                   inFullScreen ? &st::mediaviewFullScreenOutIconOver : nullptr);
 	disconnect(_fullScreenToggle, SIGNAL(clicked()), this, SIGNAL(toFullScreenPressed()));
 	disconnect(_fullScreenToggle, SIGNAL(clicked()), this, SIGNAL(fromFullScreenPressed()));
 
@@ -205,14 +201,21 @@ void Controller::resizeEvent(QResizeEvent *e) {
 	int fullScreenTop = (height() - _fullScreenToggle->height()) / 2;
 	_fullScreenToggle->moveToRight(st::mediaviewFullScreenLeft, fullScreenTop);
 
-	_volumeController->moveToRight(st::mediaviewFullScreenLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2);
+	_volumeController->moveToRight(st::mediaviewFullScreenLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft,
+	                               (height() - _volumeController->height()) / 2);
 
-	auto playbackWidth = width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewFullScreenLeft;
+	auto playbackWidth = width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop -
+	                     _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() -
+	                     st::mediaviewFullScreenLeft;
 	_playbackSlider->resize(playbackWidth, st::mediaviewPlayback.seekSize.height());
-	_playbackSlider->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlaybackTop);
+	_playbackSlider->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop,
+	                            st::mediaviewPlaybackTop);
 
-	_playedAlready->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlayProgressTop);
-	_toPlayLeft->moveToRight(width() - (st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop) - playbackWidth, st::mediaviewPlayProgressTop);
+	_playedAlready->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop,
+	                           st::mediaviewPlayProgressTop);
+	_toPlayLeft->moveToRight(width() - (st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop) -
+	                             playbackWidth,
+	                         st::mediaviewPlayProgressTop);
 }
 
 void Controller::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.h b/Telegram/SourceFiles/media/view/media_clip_controller.h
index 30315b24b..e5e7434eb 100644
--- a/Telegram/SourceFiles/media/view/media_clip_controller.h
+++ b/Telegram/SourceFiles/media/view/media_clip_controller.h
@@ -73,8 +73,7 @@ private:
 	void handleSeekProgress(double progress);
 	void handleSeekFinished(double progress);
 
-	template <typename Callback>
-	void startFading(Callback start);
+	template <typename Callback> void startFading(Callback start);
 	void fadeFinished();
 	void fadeUpdated(double opacity);
 
@@ -96,7 +95,6 @@ private:
 	object_ptr<Ui::LabelSimple> _toPlayLeft;
 
 	std::unique_ptr<Ui::FadeAnimation> _fadeAnimation;
-
 };
 
 } // namespace Clip
diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.cpp b/Telegram/SourceFiles/media/view/media_clip_playback.cpp
index 0936b9b02..4dfb3ec5a 100644
--- a/Telegram/SourceFiles/media/view/media_clip_playback.cpp
+++ b/Telegram/SourceFiles/media/view/media_clip_playback.cpp
@@ -19,8 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "media/view/media_clip_playback.h"
-#include "styles/style_mediaview.h"
 #include "media/media_audio.h"
+#include "styles/style_mediaview.h"
 
 namespace Media {
 namespace Clip {
@@ -30,8 +30,8 @@ constexpr auto kPlaybackAnimationDurationMs = TimeMs(200);
 
 } // namespace
 
-Playback::Playback() : _a_value(animation(this, &Playback::step_value)) {
-}
+Playback::Playback()
+    : _a_value(animation(this, &Playback::step_value)) {}
 
 void Playback::updateState(const Player::TrackState &state) {
 	qint64 position = 0, length = state.length;
diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.h b/Telegram/SourceFiles/media/view/media_clip_playback.h
index 4fee7c332..909f621b6 100644
--- a/Telegram/SourceFiles/media/view/media_clip_playback.h
+++ b/Telegram/SourceFiles/media/view/media_clip_playback.h
@@ -64,7 +64,6 @@ private:
 	qint64 _length = 0;
 
 	bool _playing = false;
-
 };
 
 } // namespace Clip
diff --git a/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp
index 25b7ef0ff..965c7dd75 100644
--- a/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp
@@ -18,18 +18,19 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include <QWindow>
-#include <QMouseEvent>
-#include "ui/twidget.h"
+#include "media/view/media_clip_volume_controller.h"
 #include "app.h"
 #include "facades.h"
-#include "media/view/media_clip_volume_controller.h"
 #include "styles/style_mediaview.h"
+#include "ui/twidget.h"
+#include <QMouseEvent>
+#include <QWindow>
 
 namespace Media {
 namespace Clip {
 
-VolumeController::VolumeController(QWidget *parent) : TWidget(parent) {
+VolumeController::VolumeController(QWidget *parent)
+    : TWidget(parent) {
 	resize(st::mediaviewVolumeSize);
 	setCursor(style::cur_pointer);
 	setMouseTracking(true);
diff --git a/Telegram/SourceFiles/media/view/media_clip_volume_controller.h b/Telegram/SourceFiles/media/view/media_clip_volume_controller.h
index f912ed220..0ff867ae2 100644
--- a/Telegram/SourceFiles/media/view/media_clip_volume_controller.h
+++ b/Telegram/SourceFiles/media/view/media_clip_volume_controller.h
@@ -53,7 +53,6 @@ private:
 
 	bool _over = false;
 	Animation _a_over;
-
 };
 
 } // namespace Clip
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index fc40d490c..7fd7447c7 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -20,48 +20,49 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mediaview.h"
 
+#include "application.h"
+#include "auth_session.h"
+#include "base/task_queue.h"
+#include "calls/calls_instance.h"
+#include "core/file_utilities.h"
+#include "history/history_media_types.h"
+#include "history/history_message.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "application.h"
-#include "core/file_utilities.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/buttons.h"
+#include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/view/media_clip_controller.h"
-#include "styles/style_mediaview.h"
-#include "styles/style_history.h"
-#include "media/media_audio.h"
-#include "history/history_message.h"
-#include "history/history_media_types.h"
-#include "window/themes/window_theme_preview.h"
-#include "base/task_queue.h"
-#include "observer_peer.h"
-#include "auth_session.h"
 #include "messenger.h"
+#include "observer_peer.h"
 #include "storage/file_download.h"
-#include "calls/calls_instance.h"
+#include "styles/style_history.h"
+#include "styles/style_mediaview.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/themes/window_theme_preview.h"
 
 #include <QApplication>
-#include <QWidget>
-#include <QWindow>
+#include <QClipboard>
 #include <QDesktopWidget>
 #include <QImageReader>
-#include <QClipboard>
+#include <QWidget>
+#include <QWindow>
 
 namespace {
 
 TextParseOptions _captionTextOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 TextParseOptions _captionBotOptions = {
-	TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText | TextParseBotCommands, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMentions | TextParseHashtags | TextParseMultiline | TextParseRichText |
+        TextParseBotCommands, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 bool typeHasMediaOverview(MediaOverviewType type) {
@@ -79,23 +80,27 @@ bool typeHasMediaOverview(MediaOverviewType type) {
 
 } // namespace
 
-MediaView::MediaView() : TWidget(nullptr)
-, _transparentBrush(style::transparentPlaceholderBrush())
-, _animStarted(getms())
-, _docDownload(this, lang(lng_media_download), st::mediaviewFileLink)
-, _docSaveAs(this, lang(lng_mediaview_save_as), st::mediaviewFileLink)
-, _docCancel(this, lang(lng_cancel), st::mediaviewFileLink)
-, _radial(animation(this, &MediaView::step_radial))
-, _lastAction(-st::mediaviewDeltaFromLastAction, -st::mediaviewDeltaFromLastAction)
-, _a_state(animation(this, &MediaView::step_state))
-, _dropdown(this, st::mediaviewDropdownMenu)
-, _dropdownShowTimer(this) {
+MediaView::MediaView()
+    : TWidget(nullptr)
+    , _transparentBrush(style::transparentPlaceholderBrush())
+    , _animStarted(getms())
+    , _docDownload(this, lang(lng_media_download), st::mediaviewFileLink)
+    , _docSaveAs(this, lang(lng_mediaview_save_as), st::mediaviewFileLink)
+    , _docCancel(this, lang(lng_cancel), st::mediaviewFileLink)
+    , _radial(animation(this, &MediaView::step_radial))
+    , _lastAction(-st::mediaviewDeltaFromLastAction, -st::mediaviewDeltaFromLastAction)
+    , _a_state(animation(this, &MediaView::step_state))
+    , _dropdown(this, st::mediaviewDropdownMenu)
+    , _dropdownShowTimer(this) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	TextCustomTagsMap custom;
 	custom.insert(QChar('c'), qMakePair(textcmdStartLink(1), textcmdStopLink()));
 	_saveMsgText.setRichText(st::mediaviewSaveMsgStyle, lang(lng_mediaview_saved), _textDlgOptions, custom);
-	_saveMsg = QRect(0, 0, _saveMsgText.maxWidth() + st::mediaviewSaveMsgPadding.left() + st::mediaviewSaveMsgPadding.right(), st::mediaviewSaveMsgStyle.font->height + st::mediaviewSaveMsgPadding.top() + st::mediaviewSaveMsgPadding.bottom());
+	_saveMsg =
+	    QRect(0, 0, _saveMsgText.maxWidth() + st::mediaviewSaveMsgPadding.left() + st::mediaviewSaveMsgPadding.right(),
+	          st::mediaviewSaveMsgStyle.font->height + st::mediaviewSaveMsgPadding.top() +
+	              st::mediaviewSaveMsgPadding.bottom());
 	_saveMsgText.setLink(1, MakeShared<LambdaClickHandler>([this] { showSaveMsgFile(); }));
 
 	connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(onScreenResized(int)));
@@ -118,20 +123,17 @@ MediaView::MediaView() : TWidget(nullptr)
 					documentUpdated(document);
 				}
 			});
-			subscribe(Auth().messageIdChanging, [this](std::pair<HistoryItem*, MsgId> update) {
-				changingMsgId(update.first, update.second);
-			});
+			subscribe(Auth().messageIdChanging,
+			          [this](std::pair<HistoryItem *, MsgId> update) { changingMsgId(update.first, update.second); });
 		}
 	};
-	subscribe(Messenger::Instance().authSessionChanged(), [handleAuthSessionChange] {
-		handleAuthSessionChange();
-	});
+	subscribe(Messenger::Instance().authSessionChanged(), [handleAuthSessionChange] { handleAuthSessionChange(); });
 	handleAuthSessionChange();
 
 	auto observeEvents = Notify::PeerUpdate::Flag::SharedMediaChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		mediaOverviewUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { mediaOverviewUpdated(update); }));
 
 	setWindowFlags(Qt::FramelessWindowHint | Qt::BypassWindowManagerHint | Qt::Tool | Qt::NoDropShadowWindowHint);
 	moveToScreen();
@@ -169,7 +171,7 @@ void MediaView::refreshLang() {
 }
 
 void MediaView::moveToScreen() {
-	auto widgetScreen = [this](auto &&widget) -> QScreen* {
+	auto widgetScreen = [this](auto &&widget) -> QScreen * {
 		if (auto handle = widget ? widget->windowHandle() : nullptr) {
 			return handle->screen();
 		}
@@ -181,17 +183,20 @@ void MediaView::moveToScreen() {
 	if (activeWindowScreen && myScreen && myScreen != activeWindowScreen) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
-	auto available = activeWindow ? Sandbox::screenGeometry(activeWindow->geometry().center()) : QApplication::desktop()->screenGeometry();
+	auto available = activeWindow ? Sandbox::screenGeometry(activeWindow->geometry().center()) :
+	                                QApplication::desktop()->screenGeometry();
 	if (geometry() != available) {
 		setGeometry(available);
 	}
 
 	auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize;
-	_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize);
+	_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin,
+	                      st::mediaviewControlSize, st::mediaviewControlSize);
 	_closeNavIcon = centerrect(_closeNav, st::mediaviewClose);
 	_leftNav = myrtlrect(st::mediaviewControlMargin, navSkip, st::mediaviewControlSize, height() - 2 * navSkip);
 	_leftNavIcon = centerrect(_leftNav, st::mediaviewLeft);
-	_rightNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, navSkip, st::mediaviewControlSize, height() - 2 * navSkip);
+	_rightNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, navSkip,
+	                      st::mediaviewControlSize, height() - 2 * navSkip);
 	_rightNavIcon = centerrect(_rightNav, st::mediaviewRight);
 
 	_saveMsg.moveTo((width() - _saveMsg.width()) / 2, (height() - _saveMsg.height()) / 2);
@@ -210,7 +215,8 @@ void MediaView::mediaOverviewUpdated(const Notify::PeerUpdate &update) {
 		computeAdditionalChatPhoto(_history->peer, lastChatPhoto.photo);
 	}
 
-	if (_history && (_history->peer == update.peer || (_migrated && _migrated->peer == update.peer)) && (update.mediaTypesMask & (1 << _overview)) && _msgid) {
+	if (_history && (_history->peer == update.peer || (_migrated && _migrated->peer == update.peer)) &&
+	    (update.mediaTypesMask & (1 << _overview)) && _msgid) {
 		_index = -1;
 		auto i = 0;
 		if (_msgmigrated) {
@@ -258,17 +264,20 @@ bool MediaView::fileBubbleShown() const {
 bool MediaView::gifShown() const {
 	if (_gif && _gif->ready()) {
 		if (!_gif->started()) {
-			if (_doc && (_doc->isVideo() || _doc->isRoundVideo()) && _autoplayVideoDocument != _doc && !_gif->videoPaused()) {
+			if (_doc && (_doc->isVideo() || _doc->isRoundVideo()) && _autoplayVideoDocument != _doc &&
+			    !_gif->videoPaused()) {
 				_gif->pauseResumeVideo();
-				const_cast<MediaView*>(this)->_videoPaused = _gif->videoPaused();
+				const_cast<MediaView *>(this)->_videoPaused = _gif->videoPaused();
 			}
 			auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None;
-			_gif->start(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::All);
-			const_cast<MediaView*>(this)->_current = QPixmap();
+			_gif->start(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(),
+			            _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding,
+			            ImageRoundCorner::All);
+			const_cast<MediaView *>(this)->_current = QPixmap();
 			updateMixerVideoVolume();
 			Global::RefVideoVolumeChanged().notify();
 		}
-		return true;// _gif->state() != Media::Clip::State::Error;
+		return true; // _gif->state() != Media::Clip::State::Error;
 	}
 	return false;
 }
@@ -278,7 +287,8 @@ void MediaView::stopGif() {
 	_videoPaused = _videoStopped = _videoIsSilent = false;
 	_fullScreenVideo = false;
 	_clipController.destroy();
-	disconnect(Media::Player::mixer(), SIGNAL(updated(const AudioMsgId&)), this, SLOT(onVideoPlayProgress(const AudioMsgId&)));
+	disconnect(Media::Player::mixer(), SIGNAL(updated(const AudioMsgId &)), this,
+	           SLOT(onVideoPlayProgress(const AudioMsgId &)));
 }
 
 void MediaView::documentUpdated(DocumentData *doc) {
@@ -344,18 +354,23 @@ void MediaView::updateControls() {
 		if (_doc->loading()) {
 			_docDownload->hide();
 			_docSaveAs->hide();
-			_docCancel->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize, _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
+			_docCancel->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize,
+			                       _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
 			_docCancel->show();
 		} else {
 			if (_doc->loaded(DocumentData::FilePathResolveChecked)) {
 				_docDownload->hide();
-				_docSaveAs->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize, _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
+				_docSaveAs->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize,
+				                       _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
 				_docSaveAs->show();
 				_docCancel->hide();
 			} else {
-				_docDownload->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize, _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
+				_docDownload->moveToLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize,
+				                         _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
 				_docDownload->show();
-				_docSaveAs->moveToLeft(_docRect.x() + 2.5 * st::mediaviewFilePadding + st::mediaviewFileIconSize + _docDownload->width(), _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
+				_docSaveAs->moveToLeft(_docRect.x() + 2.5 * st::mediaviewFilePadding + st::mediaviewFileIconSize +
+				                           _docDownload->width(),
+				                       _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileLinksTop);
 				_docSaveAs->show();
 				_docCancel->hide();
 			}
@@ -370,10 +385,14 @@ void MediaView::updateControls() {
 
 	updateThemePreviewGeometry();
 
-	_saveVisible = ((_photo && _photo->loaded()) || (_doc && (_doc->loaded(DocumentData::FilePathResolveChecked) || (!fileShown() && (_photo || _doc)))));
-	_saveNav = myrtlrect(width() - st::mediaviewIconSize.width() * 2, height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
+	_saveVisible =
+	    ((_photo && _photo->loaded()) ||
+	     (_doc && (_doc->loaded(DocumentData::FilePathResolveChecked) || (!fileShown() && (_photo || _doc)))));
+	_saveNav = myrtlrect(width() - st::mediaviewIconSize.width() * 2, height() - st::mediaviewIconSize.height(),
+	                     st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
 	_saveNavIcon = centerrect(_saveNav, st::mediaviewSave);
-	_moreNav = myrtlrect(width() - st::mediaviewIconSize.width(), height() - st::mediaviewIconSize.height(), st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
+	_moreNav = myrtlrect(width() - st::mediaviewIconSize.width(), height() - st::mediaviewIconSize.height(),
+	                     st::mediaviewIconSize.width(), st::mediaviewIconSize.height());
 	_moreNavIcon = centerrect(_moreNav, st::mediaviewMore);
 
 	QDateTime d, dNow(date(unixtime()));
@@ -389,33 +408,47 @@ void MediaView::updateControls() {
 	} else if (d.date().addDays(1) == dNow.date()) {
 		_dateText = lng_mediaview_yesterday(lt_time, d.time().toString(cTimeFormat()));
 	} else {
-		_dateText = lng_mediaview_date_time(lt_date, d.date().toString(qsl("dd.MM.yy")), lt_time, d.time().toString(cTimeFormat()));
+		_dateText = lng_mediaview_date_time(lt_date, d.date().toString(qsl("dd.MM.yy")), lt_time,
+		                                    d.time().toString(cTimeFormat()));
 	}
 	if (_from) {
-		_fromName.setText(st::mediaviewTextStyle, (_from->migrateTo() ? _from->migrateTo() : _from)->name, _textNameOptions);
-		_nameNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewTextTop, std::min(_fromName.maxWidth(), width() / 3), st::mediaviewFont->height);
-		_dateNav = myrtlrect(st::mediaviewTextLeft + _nameNav.width() + st::mediaviewTextSkip, height() - st::mediaviewTextTop, st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
+		_fromName.setText(st::mediaviewTextStyle, (_from->migrateTo() ? _from->migrateTo() : _from)->name,
+		                  _textNameOptions);
+		_nameNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewTextTop,
+		                     std::min(_fromName.maxWidth(), width() / 3), st::mediaviewFont->height);
+		_dateNav =
+		    myrtlrect(st::mediaviewTextLeft + _nameNav.width() + st::mediaviewTextSkip, height() - st::mediaviewTextTop,
+		              st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
 	} else {
 		_nameNav = QRect();
-		_dateNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewTextTop, st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
+		_dateNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewTextTop,
+		                     st::mediaviewFont->width(_dateText), st::mediaviewFont->height);
 	}
 	updateHeader();
 	if (_photo || (_history && _overview != OverviewCount)) {
-		_leftNavVisible = (_index > 0) || (_index == 0 && (
-			(!_msgmigrated && _history && _history->overview(_overview).size() < _history->overviewCount(_overview)) ||
-			(_msgmigrated && _migrated && _migrated->overview(_overview).size() < _migrated->overviewCount(_overview)) ||
-			(!_msgmigrated && _history && _migrated && (!_migrated->overview(_overview).isEmpty() || _migrated->overviewCount(_overview) > 0)))) ||
-			(_index < 0 && _photo == _additionalChatPhoto &&
-				((_history && _history->overviewCount(_overview) > 0) ||
-				(_migrated && _history->overviewLoaded(_overview) && _migrated->overviewCount(_overview) > 0))
-			);
-		_rightNavVisible = (_index >= 0) && (
-			(!_msgmigrated && _history && _index + 1 < _history->overview(_overview).size()) ||
-			(_msgmigrated && _migrated && _index + 1 < _migrated->overview(_overview).size()) ||
-			(_msgmigrated && _migrated && _history && (!_history->overview(_overview).isEmpty() || _history->overviewCount(_overview) > 0)) ||
-			(!_msgmigrated && _history && _index + 1 == _history->overview(_overview).size() && _additionalChatPhoto) ||
-			(_msgmigrated && _migrated && _index + 1 == _migrated->overview(_overview).size() && _history->overviewCount(_overview) == 0 && _additionalChatPhoto) ||
-			(!_history && _user && (_index + 1 < _user->photos.size() || _index + 1 < _user->photosCount)));
+		_leftNavVisible =
+		    (_index > 0) ||
+		    (_index == 0 &&
+		     ((!_msgmigrated && _history &&
+		       _history->overview(_overview).size() < _history->overviewCount(_overview)) ||
+		      (_msgmigrated && _migrated &&
+		       _migrated->overview(_overview).size() < _migrated->overviewCount(_overview)) ||
+		      (!_msgmigrated && _history && _migrated &&
+		       (!_migrated->overview(_overview).isEmpty() || _migrated->overviewCount(_overview) > 0)))) ||
+		    (_index < 0 && _photo == _additionalChatPhoto &&
+		     ((_history && _history->overviewCount(_overview) > 0) ||
+		      (_migrated && _history->overviewLoaded(_overview) && _migrated->overviewCount(_overview) > 0)));
+		_rightNavVisible =
+		    (_index >= 0) &&
+		    ((!_msgmigrated && _history && _index + 1 < _history->overview(_overview).size()) ||
+		     (_msgmigrated && _migrated && _index + 1 < _migrated->overview(_overview).size()) ||
+		     (_msgmigrated && _migrated && _history &&
+		      (!_history->overview(_overview).isEmpty() || _history->overviewCount(_overview) > 0)) ||
+		     (!_msgmigrated && _history && _index + 1 == _history->overview(_overview).size() &&
+		      _additionalChatPhoto) ||
+		     (_msgmigrated && _migrated && _index + 1 == _migrated->overview(_overview).size() &&
+		      _history->overviewCount(_overview) == 0 && _additionalChatPhoto) ||
+		     (!_history && _user && (_index + 1 < _user->photos.size() || _index + 1 < _user->photosCount)));
 		if (_msgmigrated && !_history->overviewLoaded(_overview)) {
 			_leftNavVisible = _rightNavVisible = false;
 		}
@@ -425,9 +458,17 @@ void MediaView::updateControls() {
 
 	if (!_caption.isEmpty()) {
 		qint32 skipw = std::max(_dateNav.left() + _dateNav.width(), _headerNav.left() + _headerNav.width());
-		qint32 maxw = std::min(std::max(width() - 2 * skipw - st::mediaviewCaptionPadding.left() - st::mediaviewCaptionPadding.right() - 2 * st::mediaviewCaptionMargin.width(), int(st::msgMinWidth)), _caption.maxWidth());
-		qint32 maxh = std::min(_caption.countHeight(maxw), int(height() / 4 - st::mediaviewCaptionPadding.top() - st::mediaviewCaptionPadding.bottom() - 2 * st::mediaviewCaptionMargin.height()));
-		_captionRect = QRect((width() - maxw) / 2, height() - maxh - st::mediaviewCaptionPadding.bottom() - st::mediaviewCaptionMargin.height(), maxw, maxh);
+		qint32 maxw =
+		    std::min(std::max(width() - 2 * skipw - st::mediaviewCaptionPadding.left() -
+		                          st::mediaviewCaptionPadding.right() - 2 * st::mediaviewCaptionMargin.width(),
+		                      int(st::msgMinWidth)),
+		             _caption.maxWidth());
+		qint32 maxh = std::min(_caption.countHeight(maxw),
+		                       int(height() / 4 - st::mediaviewCaptionPadding.top() -
+		                           st::mediaviewCaptionPadding.bottom() - 2 * st::mediaviewCaptionMargin.height()));
+		_captionRect = QRect(
+		    (width() - maxw) / 2,
+		    height() - maxh - st::mediaviewCaptionPadding.bottom() - st::mediaviewCaptionMargin.height(), maxw, maxh);
 	} else {
 		_captionRect = QRect();
 	}
@@ -442,26 +483,30 @@ void MediaView::updateActions() {
 	_actions.clear();
 
 	if (_doc && _doc->loading()) {
-		_actions.push_back({ lang(lng_cancel), SLOT(onSaveCancel()) });
+		_actions.push_back({lang(lng_cancel), SLOT(onSaveCancel())});
 	}
 	if (_msgid > 0 && _msgid < ServerMaxMsgId) {
-		_actions.push_back({ lang(lng_context_to_msg), SLOT(onToMessage()) });
+		_actions.push_back({lang(lng_context_to_msg), SLOT(onToMessage())});
 	}
 	if (_doc && !_doc->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-		_actions.push_back({ lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), SLOT(onShowInFolder()) });
+		_actions.push_back({lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder :
+		                                                                                 lng_context_show_in_folder),
+		                    SLOT(onShowInFolder())});
 	}
 	if ((_doc && fileShown()) || (_photo && _photo->loaded())) {
-		_actions.push_back({ lang(lng_mediaview_copy), SLOT(onCopy()) });
+		_actions.push_back({lang(lng_mediaview_copy), SLOT(onCopy())});
 	}
 	if (_canForward) {
-		_actions.push_back({ lang(lng_mediaview_forward), SLOT(onForward()) });
+		_actions.push_back({lang(lng_mediaview_forward), SLOT(onForward())});
 	}
-	if (_canDelete || (_photo && App::self() && _user == App::self()) || (_photo && _photo->peer && _photo->peer->photoId == _photo->id && (_photo->peer->isChat() || (_photo->peer->isChannel() && _photo->peer->asChannel()->amCreator())))) {
-		_actions.push_back({ lang(lng_mediaview_delete), SLOT(onDelete()) });
+	if (_canDelete || (_photo && App::self() && _user == App::self()) ||
+	    (_photo && _photo->peer && _photo->peer->photoId == _photo->id &&
+	     (_photo->peer->isChat() || (_photo->peer->isChannel() && _photo->peer->asChannel()->amCreator())))) {
+		_actions.push_back({lang(lng_mediaview_delete), SLOT(onDelete())});
 	}
-	_actions.push_back({ lang(lng_mediaview_save_as), SLOT(onSaveAs()) });
+	_actions.push_back({lang(lng_mediaview_save_as), SLOT(onSaveAs())});
 	if (_history && typeHasMediaOverview(_overview)) {
-		_actions.push_back({ lang(_doc ? lng_mediaview_files_all : lng_mediaview_photos_all), SLOT(onOverview()) });
+		_actions.push_back({lang(_doc ? lng_mediaview_files_all : lng_mediaview_photos_all), SLOT(onOverview())});
 	}
 }
 
@@ -491,7 +536,8 @@ void MediaView::step_state(TimeMs ms, bool timer) {
 		}
 	}
 	if (_controlsState == ControlsShowing || _controlsState == ControlsHiding) {
-		double dt = double(ms - _controlsAnimStarted) / (_controlsState == ControlsShowing ? st::mediaviewShowDuration : st::mediaviewHideDuration);
+		double dt = double(ms - _controlsAnimStarted) /
+		            (_controlsState == ControlsShowing ? st::mediaviewShowDuration : st::mediaviewHideDuration);
 		if (dt >= 1) {
 			a_cOpacity.finish();
 			_controlsState = (_controlsState == ControlsShowing ? ControlsShown : ControlsHidden);
@@ -499,7 +545,10 @@ void MediaView::step_state(TimeMs ms, bool timer) {
 		} else {
 			a_cOpacity.update(dt, anim::linear);
 		}
-		QRegion toUpdate = QRegion() + (_over == OverLeftNav ? _leftNav : _leftNavIcon) + (_over == OverRightNav ? _rightNav : _rightNavIcon) + (_over == OverClose ? _closeNav : _closeNavIcon) + _saveNavIcon + _moreNavIcon + _headerNav + _nameNav + _dateNav + _captionRect.marginsAdded(st::mediaviewCaptionPadding);
+		QRegion toUpdate = QRegion() + (_over == OverLeftNav ? _leftNav : _leftNavIcon) +
+		                   (_over == OverRightNav ? _rightNav : _rightNavIcon) +
+		                   (_over == OverClose ? _closeNav : _closeNavIcon) + _saveNavIcon + _moreNavIcon + _headerNav +
+		                   _nameNav + _dateNav + _captionRect.marginsAdded(st::mediaviewCaptionPadding);
 		update(toUpdate);
 		if (dt < 1) result = true;
 	}
@@ -509,7 +558,8 @@ void MediaView::step_state(TimeMs ms, bool timer) {
 }
 
 void MediaView::updateCursor() {
-	setCursor(_controlsState == ControlsHidden ? Qt::BlankCursor : (_over == OverNone ? style::cur_default : style::cur_pointer));
+	setCursor(_controlsState == ControlsHidden ? Qt::BlankCursor :
+	                                             (_over == OverNone ? style::cur_default : style::cur_pointer));
 }
 
 double MediaView::radialProgress() const {
@@ -562,7 +612,8 @@ void MediaView::step_radial(TimeMs ms, bool timer) {
 	if (timer && (wasAnimating || _radial.animating())) {
 		update(radialRect());
 	}
-	if (_doc && _doc->loaded() && _doc->size < App::kImageSizeLimit && (!_radial.animating() || _doc->isAnimation() || _doc->isVideo())) {
+	if (_doc && _doc->loaded() && _doc->size < App::kImageSizeLimit &&
+	    (!_radial.animating() || _doc->isAnimation() || _doc->isVideo())) {
 		if (_doc->isVideo() || _doc->isRoundVideo()) {
 			_autoplayVideoDocument = _doc;
 		}
@@ -571,7 +622,8 @@ void MediaView::step_radial(TimeMs ms, bool timer) {
 		} else {
 			auto &location = _doc->location(true);
 			if (location.accessEnable()) {
-				if (_doc->isAnimation() || _doc->isVideo() || _doc->isTheme() || QImageReader(location.name()).canRead()) {
+				if (_doc->isAnimation() || _doc->isVideo() || _doc->isTheme() ||
+				    QImageReader(location.name()).canRead()) {
 					displayDocument(_doc, App::histItemById(_msgmigrated ? 0 : _channel, _msgid));
 				}
 				location.accessDisable();
@@ -587,7 +639,8 @@ void MediaView::zoomIn() {
 			newZoom = std::ceil(_zoomToScreen);
 		}
 	} else {
-		if (newZoom < _zoomToScreen && (newZoom + 1 > _zoomToScreen || (_zoomToScreen > MaxZoomLevel && newZoom == MaxZoomLevel))) {
+		if (newZoom < _zoomToScreen &&
+		    (newZoom + 1 > _zoomToScreen || (_zoomToScreen > MaxZoomLevel && newZoom == MaxZoomLevel))) {
 			newZoom = ZoomToScreenLevel;
 		} else if (newZoom < MaxZoomLevel) {
 			++newZoom;
@@ -603,7 +656,8 @@ void MediaView::zoomOut() {
 			newZoom = std::floor(_zoomToScreen);
 		}
 	} else {
-		if (newZoom > _zoomToScreen && (newZoom - 1 < _zoomToScreen || (_zoomToScreen < -MaxZoomLevel && newZoom == -MaxZoomLevel))) {
+		if (newZoom > _zoomToScreen &&
+		    (newZoom - 1 < _zoomToScreen || (_zoomToScreen < -MaxZoomLevel && newZoom == -MaxZoomLevel))) {
 			newZoom = ZoomToScreenLevel;
 		} else if (newZoom > -MaxZoomLevel) {
 			--newZoom;
@@ -615,7 +669,8 @@ void MediaView::zoomOut() {
 void MediaView::zoomReset() {
 	qint32 newZoom = _zoom;
 	if (_zoom == 0) {
-		if (std::floor(_zoomToScreen) == std::ceil(_zoomToScreen) && std::round(_zoomToScreen) >= -MaxZoomLevel && std::round(_zoomToScreen) <= MaxZoomLevel) {
+		if (std::floor(_zoomToScreen) == std::ceil(_zoomToScreen) && std::round(_zoomToScreen) >= -MaxZoomLevel &&
+		    std::round(_zoomToScreen) <= MaxZoomLevel) {
 			newZoom = std::round(_zoomToScreen);
 		} else {
 			newZoom = ZoomToScreenLevel;
@@ -717,10 +772,8 @@ void MediaView::activateControls() {
 
 void MediaView::onHideControls(bool force) {
 	if (!force) {
-		if (!_dropdown->isHidden()
-			|| _menu
-			|| _mousePressed
-			|| (_fullScreenVideo && _clipController && _clipController->geometry().contains(_lastMouseMovePos))) {
+		if (!_dropdown->isHidden() || _menu || _mousePressed ||
+		    (_fullScreenVideo && _clipController && _clipController->geometry().contains(_lastMouseMovePos))) {
 			return;
 		}
 	}
@@ -829,14 +882,16 @@ void MediaView::onSaveAs() {
 
 		psBringToBack(this);
 		auto filter = qsl("JPEG Image (*.jpg);;") + FileDialog::AllFilesFilter();
-		FileDialog::GetWritePath(lang(lng_save_photo), filter, filedialogDefaultName(qsl("photo"), qsl(".jpg"), QString(), false, _photo->date), base::lambda_guarded(this, [this, photo = _photo](const QString &result) {
-			if (!result.isEmpty() && _photo == photo && photo->loaded()) {
-				photo->full->pix().toImage().save(result, "JPG");
-			}
-			psShowOverAll(this);
-		}), base::lambda_guarded(this, [this] {
-			psShowOverAll(this);
-		}));
+		FileDialog::GetWritePath(lang(lng_save_photo), filter,
+		                         filedialogDefaultName(qsl("photo"), qsl(".jpg"), QString(), false, _photo->date),
+		                         base::lambda_guarded(this,
+		                                              [this, photo = _photo](const QString &result) {
+			                                              if (!result.isEmpty() && _photo == photo && photo->loaded()) {
+				                                              photo->full->pix().toImage().save(result, "JPG");
+			                                              }
+			                                              psShowOverAll(this);
+		                                              }),
+		                         base::lambda_guarded(this, [this] { psShowOverAll(this); }));
 	}
 	activateWindow();
 	Sandbox::setActiveWindow(this);
@@ -1107,7 +1162,8 @@ void MediaView::showPhoto(PhotoData *photo, PeerData *context) {
 	_photo = photo;
 	_overview = OverviewCount;
 	if (_user) {
-		if (_user->photos.isEmpty() && _user->photosCount < 0 && _user->photoId && _user->photoId != UnknownPeerPhotoId) {
+		if (_user->photos.isEmpty() && _user->photosCount < 0 && _user->photoId &&
+		    _user->photoId != UnknownPeerPhotoId) {
 			_index = 0;
 		}
 		for (int i = 0, l = _user->photos.size(); i < l; ++i) {
@@ -1202,22 +1258,24 @@ void MediaView::displayPhoto(PhotoData *photo, HistoryItem *item) {
 	_photo = photo;
 	_radial.stop();
 
-	_photoRadialRect = QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
+	_photoRadialRect =
+	    QRect(QPoint((width() - st::radialSize.width()) / 2, (height() - st::radialSize.height()) / 2), st::radialSize);
 
 	_zoom = 0;
 
 	_caption = Text();
 	if (auto itemMsg = item ? item->toHistoryMessage() : nullptr) {
-		if (auto photoMsg = dynamic_cast<HistoryPhoto*>(itemMsg->getMedia())) {
-			auto asBot = (item->author()->isUser()
-				&& item->author()->asUser()->botInfo);
+		if (auto photoMsg = dynamic_cast<HistoryPhoto *>(itemMsg->getMedia())) {
+			auto asBot = (item->author()->isUser() && item->author()->asUser()->botInfo);
 			auto skipw = std::max(_dateNav.left() + _dateNav.width(), _headerNav.left() + _headerNav.width());
-			auto maxw = std::min(std::max(width() - 2 * skipw - st::mediaviewCaptionPadding.left() - st::mediaviewCaptionPadding.right() - 2 * st::mediaviewCaptionMargin.width(), int(st::msgMinWidth)), _caption.maxWidth());
+			auto maxw =
+			    std::min(std::max(width() - 2 * skipw - st::mediaviewCaptionPadding.left() -
+			                          st::mediaviewCaptionPadding.right() - 2 * st::mediaviewCaptionMargin.width(),
+			                      int(st::msgMinWidth)),
+			             _caption.maxWidth());
 			_caption = Text(maxw);
-			_caption.setMarkedText(
-				st::mediaviewCaptionStyle,
-				photoMsg->getCaption(),
-				asBot ? _captionBotOptions : _captionTextOptions);
+			_caption.setMarkedText(st::mediaviewCaptionStyle, photoMsg->getCaption(),
+			                       asBot ? _captionBotOptions : _captionTextOptions);
 		}
 	}
 
@@ -1260,7 +1318,9 @@ void MediaView::destroyThemePreview() {
 }
 
 void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty messages shown as docs: doc can be NULL
-	auto documentChanged = (!doc || doc != _doc || (item && (item->id != _msgid || (item->history() != (_msgmigrated ? _migrated : _history)))));
+	auto documentChanged =
+	    (!doc || doc != _doc ||
+	     (item && (item->id != _msgid || (item->history() != (_msgmigrated ? _migrated : _history)))));
 	if (documentChanged || (!doc->isAnimation() && !doc->isVideo())) {
 		_fullScreenVideo = false;
 		_current = QPixmap();
@@ -1307,12 +1367,14 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
 		}
 	}
 
-	_docIconRect = QRect((width() - st::mediaviewFileIconSize) / 2, (height() - st::mediaviewFileIconSize) / 2, st::mediaviewFileIconSize, st::mediaviewFileIconSize);
+	_docIconRect = QRect((width() - st::mediaviewFileIconSize) / 2, (height() - st::mediaviewFileIconSize) / 2,
+	                     st::mediaviewFileIconSize, st::mediaviewFileIconSize);
 	if (fileBubbleShown()) {
 		if (!_doc || _doc->thumb->isNull()) {
 			qint32 colorIndex = documentColorIndex(_doc, _docExt);
 			_docIconColor = documentColor(colorIndex);
-			const style::icon *(thumbs[]) = { &st::mediaviewFileBlue, &st::mediaviewFileGreen, &st::mediaviewFileRed, &st::mediaviewFileYellow };
+			const style::icon *(thumbs[]) = {&st::mediaviewFileBlue, &st::mediaviewFileGreen, &st::mediaviewFileRed,
+			                                 &st::mediaviewFileYellow};
 			_docIcon = thumbs[colorIndex];
 
 			qint32 extmaxw = (st::mediaviewFileIconSize - st::mediaviewFileExtPadding * 2);
@@ -1340,7 +1402,11 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
 		qint32 maxw = st::mediaviewFileSize.width() - st::mediaviewFileIconSize - st::mediaviewFilePadding * 3;
 
 		if (_doc) {
-			_docName = (_doc->type == StickerDocument) ? lang(lng_in_dlg_sticker) : (_doc->type == AnimatedDocument ? qsl("GIF") : (_doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name));
+			_docName = (_doc->type == StickerDocument) ?
+			               lang(lng_in_dlg_sticker) :
+			               (_doc->type == AnimatedDocument ?
+			                    qsl("GIF") :
+			                    (_doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name));
 		} else {
 			_docName = lang(lng_message_empty);
 		}
@@ -1352,8 +1418,10 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
 
 		// _docSize is updated in updateControls()
 
-		_docRect = QRect((width() - st::mediaviewFileSize.width()) / 2, (height() - st::mediaviewFileSize.height()) / 2, st::mediaviewFileSize.width(), st::mediaviewFileSize.height());
-		_docIconRect = myrtlrect(_docRect.x() + st::mediaviewFilePadding, _docRect.y() + st::mediaviewFilePadding, st::mediaviewFileIconSize, st::mediaviewFileIconSize);
+		_docRect = QRect((width() - st::mediaviewFileSize.width()) / 2, (height() - st::mediaviewFileSize.height()) / 2,
+		                 st::mediaviewFileSize.width(), st::mediaviewFileSize.height());
+		_docIconRect = myrtlrect(_docRect.x() + st::mediaviewFilePadding, _docRect.y() + st::mediaviewFilePadding,
+		                         st::mediaviewFileIconSize, st::mediaviewFileIconSize);
 	} else if (_themePreviewShown) {
 		updateThemePreviewGeometry();
 	} else if (!_current.isNull()) {
@@ -1407,12 +1475,16 @@ void MediaView::displayDocument(DocumentData *doc, HistoryItem *item) { // empty
 
 void MediaView::updateThemePreviewGeometry() {
 	if (_themePreviewShown) {
-		auto previewRect = QRect((width() - st::themePreviewSize.width()) / 2, (height() - st::themePreviewSize.height()) / 2, st::themePreviewSize.width(), st::themePreviewSize.height());
+		auto previewRect =
+		    QRect((width() - st::themePreviewSize.width()) / 2, (height() - st::themePreviewSize.height()) / 2,
+		          st::themePreviewSize.width(), st::themePreviewSize.height());
 		_themePreviewRect = previewRect.marginsAdded(st::themePreviewMargin);
 		if (_themeApply) {
-			auto right = std::max(width() - _themePreviewRect.x() - _themePreviewRect.width(), 0) + st::themePreviewMargin.right();
+			auto right = std::max(width() - _themePreviewRect.x() - _themePreviewRect.width(), 0) +
+			             st::themePreviewMargin.right();
 			auto bottom = std::min(height(), _themePreviewRect.y() + _themePreviewRect.height());
-			_themeApply->moveToRight(right, bottom - st::themePreviewMargin.bottom() + (st::themePreviewMargin.bottom() - _themeApply->height()) / 2);
+			_themeApply->moveToRight(right, bottom - st::themePreviewMargin.bottom() +
+			                                    (st::themePreviewMargin.bottom() - _themeApply->height()) / 2);
 			right += _themeApply->width() + st::themePreviewButtonsSkip;
 			_themeCancel->moveToRight(right, _themeApply->y());
 		}
@@ -1461,7 +1533,8 @@ void MediaView::initAnimation() {
 		_current = _doc->thumb->pixNoCache(w, h, videoThumbOptions(), w / cIntRetinaFactor(), h / cIntRetinaFactor());
 		if (cRetina()) _current.setDevicePixelRatio(cRetinaFactor());
 	} else {
-		_current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(), st::mediaviewFileIconSize, st::mediaviewFileIconSize);
+		_current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(),
+		                                   st::mediaviewFileIconSize, st::mediaviewFileIconSize);
 	}
 }
 
@@ -1477,12 +1550,14 @@ void MediaView::createClipReader() {
 		_current = _doc->thumb->pixNoCache(w, h, videoThumbOptions(), w / cIntRetinaFactor(), h / cIntRetinaFactor());
 		if (cRetina()) _current.setDevicePixelRatio(cRetinaFactor());
 	} else {
-		_current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(), st::mediaviewFileIconSize, st::mediaviewFileIconSize);
+		_current = _doc->thumb->pixNoCache(_doc->thumb->width(), _doc->thumb->height(), videoThumbOptions(),
+		                                   st::mediaviewFileIconSize, st::mediaviewFileIconSize);
 	}
-	auto mode = (_doc->isVideo() || _doc->isRoundVideo()) ? Media::Clip::Reader::Mode::Video : Media::Clip::Reader::Mode::Gif;
-	_gif = Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid), [this](Media::Clip::Notification notification) {
-		clipCallback(notification);
-	}, mode);
+	auto mode =
+	    (_doc->isVideo() || _doc->isRoundVideo()) ? Media::Clip::Reader::Mode::Video : Media::Clip::Reader::Mode::Gif;
+	_gif =
+	    Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid),
+	                            [this](Media::Clip::Notification notification) { clipCallback(notification); }, mode);
 
 	// Correct values will be set when gif gets inited.
 	_videoPaused = _videoIsSilent = _videoStopped = false;
@@ -1528,9 +1603,8 @@ void MediaView::initThemePreview() {
 		current.backgroundTiled = Window::Theme::Background()->tile();
 		base::TaskQueue::Normal().Put([ready = std::move(ready), path, current]() mutable {
 			auto preview = Window::Theme::GeneratePreview(path, current);
-			base::TaskQueue::Main().Put([ready = std::move(ready), result = std::move(preview)]() mutable {
-				ready(std::move(result));
-			});
+			base::TaskQueue::Main().Put(
+			    [ready = std::move(ready), result = std::move(preview)]() mutable { ready(std::move(result)); });
 		});
 		location.accessDisable();
 	}
@@ -1552,18 +1626,18 @@ void MediaView::createClipController() {
 	connect(_clipController, SIGNAL(toFullScreenPressed()), this, SLOT(onVideoToggleFullScreen()));
 	connect(_clipController, SIGNAL(fromFullScreenPressed()), this, SLOT(onVideoToggleFullScreen()));
 
-	connect(Media::Player::mixer(), SIGNAL(updated(const AudioMsgId&)), this, SLOT(onVideoPlayProgress(const AudioMsgId&)));
+	connect(Media::Player::mixer(), SIGNAL(updated(const AudioMsgId &)), this,
+	        SLOT(onVideoPlayProgress(const AudioMsgId &)));
 }
 
 void MediaView::setClipControllerGeometry() {
 	Assert(_clipController != nullptr);
 
 	int controllerBottom = _captionRect.isEmpty() ? height() : _captionRect.y();
-	_clipController->setGeometry(
-		(width() - _clipController->width()) / 2,
-		controllerBottom - _clipController->height() - st::mediaviewCaptionPadding.bottom() - st::mediaviewCaptionMargin.height(),
-		st::mediaviewControllerSize.width(),
-		st::mediaviewControllerSize.height());
+	_clipController->setGeometry((width() - _clipController->width()) / 2,
+	                             controllerBottom - _clipController->height() - st::mediaviewCaptionPadding.bottom() -
+	                                 st::mediaviewCaptionMargin.height(),
+	                             st::mediaviewControllerSize.width(), st::mediaviewControllerSize.height());
 	myEnsureResized(_clipController);
 }
 
@@ -1594,11 +1668,13 @@ void MediaView::restartVideoAtSeekPosition(TimeMs positionMs) {
 
 	if (_current.isNull()) {
 		auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None;
-		_current = _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::All, getms());
+		_current = _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(),
+		                         _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding,
+		                         ImageRoundCorner::All, getms());
 	}
-	_gif = Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid), [this](Media::Clip::Notification notification) {
-		clipCallback(notification);
-	}, Media::Clip::Reader::Mode::Video, positionMs);
+	_gif = Media::Clip::MakeReader(_doc, FullMsgId(_channel, _msgid),
+	                               [this](Media::Clip::Notification notification) { clipCallback(notification); },
+	                               Media::Clip::Reader::Mode::Video, positionMs);
 
 	// Correct values will be set when gif gets inited.
 	_videoPaused = _videoIsSilent = _videoStopped = false;
@@ -1742,7 +1818,11 @@ void MediaView::paintEvent(QPaintEvent *e) {
 		QRect imgRect(_x, _y, _w, _h);
 		if (imgRect.intersects(r)) {
 			auto rounding = (_doc && _doc->isRoundVideo()) ? ImageRoundRadius::Ellipse : ImageRoundRadius::None;
-			auto toDraw = _current.isNull() ? _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(), rounding, ImageRoundCorner::None, ms) : _current;
+			auto toDraw = _current.isNull() ?
+			                  _gif->current(_gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(),
+			                                _gif->width() / cIntRetinaFactor(), _gif->height() / cIntRetinaFactor(),
+			                                rounding, ImageRoundCorner::None, ms) :
+			                  _current;
 			if (!_gif && (!_doc || !_doc->sticker() || _doc->sticker()->img->isNull()) && toDraw.hasAlpha()) {
 				p.fillRect(imgRect, _transparentBrush);
 			}
@@ -1774,7 +1854,8 @@ void MediaView::paintEvent(QPaintEvent *e) {
 					}
 
 					p.setOpacity(1);
-					QRect arc(inner.marginsRemoved(QMargins(st::radialLine, st::radialLine, st::radialLine, st::radialLine)));
+					QRect arc(
+					    inner.marginsRemoved(QMargins(st::radialLine, st::radialLine, st::radialLine, st::radialLine)));
 					_radial.draw(p, arc, st::radialLine, st::radialFg);
 				}
 			} else if (_doc) {
@@ -1783,26 +1864,33 @@ void MediaView::paintEvent(QPaintEvent *e) {
 
 			if (_saveMsgStarted) {
 				auto ms = getms();
-				double dt = double(ms) - _saveMsgStarted, hidingDt = dt - st::mediaviewSaveMsgShowing - st::mediaviewSaveMsgShown;
+				double dt = double(ms) - _saveMsgStarted,
+				       hidingDt = dt - st::mediaviewSaveMsgShowing - st::mediaviewSaveMsgShown;
 				if (dt < st::mediaviewSaveMsgShowing + st::mediaviewSaveMsgShown + st::mediaviewSaveMsgHiding) {
 					if (hidingDt >= 0 && _saveMsgOpacity.to() > 0.5) {
 						_saveMsgOpacity.start(0);
 					}
-					double progress = (hidingDt >= 0) ? (hidingDt / st::mediaviewSaveMsgHiding) : (dt / st::mediaviewSaveMsgShowing);
+					double progress =
+					    (hidingDt >= 0) ? (hidingDt / st::mediaviewSaveMsgHiding) : (dt / st::mediaviewSaveMsgShowing);
 					_saveMsgOpacity.update(std::min(progress, 1.), anim::linear);
-                    if (_saveMsgOpacity.current() > 0) {
+					if (_saveMsgOpacity.current() > 0) {
 						p.setOpacity(_saveMsgOpacity.current());
 						App::roundRect(p, _saveMsg, st::mediaviewSaveMsgBg, MediaviewSaveCorners);
 						st::mediaviewSaveMsgCheck.paint(p, _saveMsg.topLeft() + st::mediaviewSaveMsgCheckPos, width());
 
 						p.setPen(st::mediaviewSaveMsgFg);
 						p.setTextPalette(st::mediaviewTextPalette);
-						_saveMsgText.draw(p, _saveMsg.x() + st::mediaviewSaveMsgPadding.left(), _saveMsg.y() + st::mediaviewSaveMsgPadding.top(), _saveMsg.width() - st::mediaviewSaveMsgPadding.left() - st::mediaviewSaveMsgPadding.right());
+						_saveMsgText.draw(p, _saveMsg.x() + st::mediaviewSaveMsgPadding.left(),
+						                  _saveMsg.y() + st::mediaviewSaveMsgPadding.top(),
+						                  _saveMsg.width() - st::mediaviewSaveMsgPadding.left() -
+						                      st::mediaviewSaveMsgPadding.right());
 						p.restoreTextPalette();
 						p.setOpacity(1);
 					}
 					if (_full >= 1) {
-                        auto nextFrame = (dt < st::mediaviewSaveMsgShowing || hidingDt >= 0) ? int(AnimationTimerDelta) : (st::mediaviewSaveMsgShowing + st::mediaviewSaveMsgShown + 1 - dt);
+						auto nextFrame = (dt < st::mediaviewSaveMsgShowing || hidingDt >= 0) ?
+						                     int(AnimationTimerDelta) :
+						                     (st::mediaviewSaveMsgShowing + st::mediaviewSaveMsgShown + 1 - dt);
 						_saveMsgUpdater.start(nextFrame);
 					}
 				} else {
@@ -1826,16 +1914,21 @@ void MediaView::paintEvent(QPaintEvent *e) {
 				if (!_doc || _doc->thumb->isNull()) {
 					p.fillRect(_docIconRect, _docIconColor);
 					if ((!_doc || _doc->loaded()) && (!radial || radialOpacity < 1) && _docIcon) {
-						_docIcon->paint(p, _docIconRect.x() + (_docIconRect.width() - _docIcon->width()), _docIconRect.y(), width());
+						_docIcon->paint(p, _docIconRect.x() + (_docIconRect.width() - _docIcon->width()),
+						                _docIconRect.y(), width());
 						p.setPen(st::mediaviewFileExtFg);
 						p.setFont(st::mediaviewFileExtFont);
 						if (!_docExt.isEmpty()) {
-							p.drawText(_docIconRect.x() + (_docIconRect.width() - _docExtWidth) / 2, _docIconRect.y() + st::mediaviewFileExtTop + st::mediaviewFileExtFont->ascent, _docExt);
+							p.drawText(_docIconRect.x() + (_docIconRect.width() - _docExtWidth) / 2,
+							           _docIconRect.y() + st::mediaviewFileExtTop + st::mediaviewFileExtFont->ascent,
+							           _docExt);
 						}
 					}
 				} else {
 					qint32 rf(cIntRetinaFactor());
-					p.drawPixmap(_docIconRect.topLeft(), _doc->thumb->pix(_docThumbw), QRect(_docThumbx * rf, _docThumby * rf, st::mediaviewFileIconSize * rf, st::mediaviewFileIconSize * rf));
+					p.drawPixmap(_docIconRect.topLeft(), _doc->thumb->pix(_docThumbw),
+					             QRect(_docThumbx * rf, _docThumby * rf, st::mediaviewFileIconSize * rf,
+					                   st::mediaviewFileIconSize * rf));
 				}
 
 				paintDocRadialLoading(p, radial, radialOpacity);
@@ -1845,11 +1938,15 @@ void MediaView::paintEvent(QPaintEvent *e) {
 				name = true;
 				p.setPen(st::mediaviewFileNameFg);
 				p.setFont(st::mediaviewFileNameFont);
-				p.drawTextLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize, _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileNameTop, width(), _docName, _docNameWidth);
+				p.drawTextLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize,
+				               _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileNameTop, width(), _docName,
+				               _docNameWidth);
 
 				p.setPen(st::mediaviewFileSizeFg);
 				p.setFont(st::mediaviewFont);
-				p.drawTextLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize, _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileSizeTop, width(), _docSize, _docSizeWidth);
+				p.drawTextLeft(_docRect.x() + 2 * st::mediaviewFilePadding + st::mediaviewFileIconSize,
+				               _docRect.y() + st::mediaviewFilePadding + st::mediaviewFileSizeTop, width(), _docSize,
+				               _docSizeWidth);
 			}
 		}
 	}
@@ -1929,7 +2026,8 @@ void MediaView::paintEvent(QPaintEvent *e) {
 
 			if (o > 0) {
 				p.setOpacity(o * co);
-				p.drawLine(_headerNav.left(), _headerNav.top() + st::mediaviewThickFont->ascent + 1, _headerNav.right(), _headerNav.top() + st::mediaviewThickFont->ascent + 1);
+				p.drawLine(_headerNav.left(), _headerNav.top() + st::mediaviewThickFont->ascent + 1, _headerNav.right(),
+				           _headerNav.top() + st::mediaviewThickFont->ascent + 1);
 			}
 		}
 
@@ -1943,7 +2041,8 @@ void MediaView::paintEvent(QPaintEvent *e) {
 
 			if (o > 0) {
 				p.setOpacity(o * co);
-				p.drawLine(_nameNav.left(), _nameNav.top() + st::mediaviewFont->ascent + 1, _nameNav.right(), _nameNav.top() + st::mediaviewFont->ascent + 1);
+				p.drawLine(_nameNav.left(), _nameNav.top() + st::mediaviewFont->ascent + 1, _nameNav.right(),
+				           _nameNav.top() + st::mediaviewFont->ascent + 1);
 			}
 		}
 
@@ -1955,7 +2054,8 @@ void MediaView::paintEvent(QPaintEvent *e) {
 
 			if (o > 0) {
 				p.setOpacity(o * co);
-				p.drawLine(_dateNav.left(), _dateNav.top() + st::mediaviewFont->ascent + 1, _dateNav.right(), _dateNav.top() + st::mediaviewFont->ascent + 1);
+				p.drawLine(_dateNav.left(), _dateNav.top() + st::mediaviewFont->ascent + 1, _dateNav.right(),
+				           _dateNav.top() + st::mediaviewFont->ascent + 1);
 			}
 		}
 
@@ -1970,7 +2070,8 @@ void MediaView::paintEvent(QPaintEvent *e) {
 				if (_captionRect.intersects(r)) {
 					p.setTextPalette(st::mediaviewTextPalette);
 					p.setPen(st::mediaviewCaptionFg);
-					_caption.drawElided(p, _captionRect.x(), _captionRect.y(), _captionRect.width(), _captionRect.height() / st::mediaviewCaptionStyle.font->height);
+					_caption.drawElided(p, _captionRect.x(), _captionRect.y(), _captionRect.width(),
+					                    _captionRect.height() / st::mediaviewCaptionStyle.font->height);
 					p.restoreTextPalette();
 				}
 			}
@@ -1981,7 +2082,9 @@ void MediaView::paintEvent(QPaintEvent *e) {
 void MediaView::paintDocRadialLoading(Painter &p, bool radial, double radialOpacity) {
 	double o = overLevel(OverIcon);
 	if (radial || (_doc && !_doc->loaded())) {
-		QRect inner(QPoint(_docIconRect.x() + ((_docIconRect.width() - st::radialSize.width()) / 2), _docIconRect.y() + ((_docIconRect.height() - st::radialSize.height()) / 2)), st::radialSize);
+		QRect inner(QPoint(_docIconRect.x() + ((_docIconRect.width() - st::radialSize.width()) / 2),
+		                   _docIconRect.y() + ((_docIconRect.height() - st::radialSize.height()) / 2)),
+		            st::radialSize);
 
 		p.setPen(Qt::NoPen);
 		p.setOpacity(_doc->loaded() ? radialOpacity : 1.);
@@ -1993,7 +2096,7 @@ void MediaView::paintDocRadialLoading(Painter &p, bool radial, double radialOpac
 		}
 
 		p.setOpacity(1.);
-		auto icon = ([radial, this]() -> const style::icon* {
+		auto icon = ([radial, this]() -> const style::icon * {
 			if (radial || _doc->loading()) {
 				return &st::historyFileInCancel;
 			}
@@ -2019,7 +2122,9 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
 			p.fillRect(fill, st::themePreviewBg);
 			p.setFont(st::themePreviewLoadingFont);
 			p.setPen(st::themePreviewLoadingFg);
-			p.drawText(_themePreviewRect, lang(_themePreviewId ? lng_theme_preview_generating : lng_theme_preview_invalid), QTextOption(style::al_center));
+			p.drawText(_themePreviewRect,
+			           lang(_themePreviewId ? lng_theme_preview_generating : lng_theme_preview_invalid),
+			           QTextOption(style::al_center));
 		}
 	}
 
@@ -2031,7 +2136,8 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
 			p.setOpacity(1.);
 		}
 	};
-	auto titleRect = QRect(_themePreviewRect.x(), _themePreviewRect.y(), _themePreviewRect.width(), st::themePreviewMargin.top());
+	auto titleRect =
+	    QRect(_themePreviewRect.x(), _themePreviewRect.y(), _themePreviewRect.width(), st::themePreviewMargin.top());
 	if (titleRect.x() < 0) {
 		titleRect = QRect(0, _themePreviewRect.y(), width(), st::themePreviewMargin.top());
 	}
@@ -2039,14 +2145,18 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
 		titleRect.moveTop(0);
 		fillOverlay(titleRect);
 	}
-	titleRect = titleRect.marginsRemoved(QMargins(st::themePreviewMargin.left(), st::themePreviewTitleTop, st::themePreviewMargin.right(), titleRect.height() - st::themePreviewTitleTop - st::themePreviewTitleFont->height));
+	titleRect = titleRect.marginsRemoved(
+	    QMargins(st::themePreviewMargin.left(), st::themePreviewTitleTop, st::themePreviewMargin.right(),
+	             titleRect.height() - st::themePreviewTitleTop - st::themePreviewTitleFont->height));
 	if (titleRect.intersects(clip)) {
 		p.setFont(st::themePreviewTitleFont);
 		p.setPen(st::themePreviewTitleFg);
 		p.drawTextLeft(titleRect.x(), titleRect.y(), width(), lang(lng_theme_preview_title));
 	}
 
-	auto buttonsRect = QRect(_themePreviewRect.x(), _themePreviewRect.y() + _themePreviewRect.height() - st::themePreviewMargin.bottom(), _themePreviewRect.width(), st::themePreviewMargin.bottom());
+	auto buttonsRect = QRect(_themePreviewRect.x(),
+	                         _themePreviewRect.y() + _themePreviewRect.height() - st::themePreviewMargin.bottom(),
+	                         _themePreviewRect.width(), st::themePreviewMargin.bottom());
 	if (auto fillButtonsRect = (buttonsRect.y() + buttonsRect.height() > height())) {
 		buttonsRect.moveTop(height() - buttonsRect.height());
 		fillOverlay(buttonsRect);
@@ -2056,7 +2166,8 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
 void MediaView::keyPressEvent(QKeyEvent *e) {
 	if (_clipController) {
 		auto toggle1 = (e->key() == Qt::Key_F && e->modifiers().testFlag(Qt::ControlModifier));
-		auto toggle2 = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && (e->modifiers().testFlag(Qt::AltModifier) || e->modifiers().testFlag(Qt::ControlModifier));
+		auto toggle2 = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) &&
+		               (e->modifiers().testFlag(Qt::AltModifier) || e->modifiers().testFlag(Qt::ControlModifier));
 		if (toggle1 || toggle2) {
 			onVideoToggleFullScreen();
 			return;
@@ -2090,7 +2201,10 @@ void MediaView::keyPressEvent(QKeyEvent *e) {
 		moveToNext(-1);
 	} else if (e->key() == Qt::Key_Right) {
 		moveToNext(1);
-	} else if (e->modifiers().testFlag(Qt::ControlModifier) && (e->key() == Qt::Key_Plus || e->key() == Qt::Key_Equal || e->key() == ']' || e->key() == Qt::Key_Asterisk || e->key() == Qt::Key_Minus || e->key() == Qt::Key_Underscore || e->key() == Qt::Key_0)) {
+	} else if (e->modifiers().testFlag(Qt::ControlModifier) &&
+	           (e->key() == Qt::Key_Plus || e->key() == Qt::Key_Equal || e->key() == ']' ||
+	            e->key() == Qt::Key_Asterisk || e->key() == Qt::Key_Minus || e->key() == Qt::Key_Underscore ||
+	            e->key() == Qt::Key_0)) {
 		if (e->key() == Qt::Key_Plus || e->key() == Qt::Key_Equal || e->key() == Qt::Key_Asterisk || e->key() == ']') {
 			zoomIn();
 		} else if (e->key() == Qt::Key_Minus || e->key() == Qt::Key_Underscore) {
@@ -2185,8 +2299,8 @@ bool MediaView::moveToNext(qint32 delta) {
 				displayPhoto(lastChatPhoto.photo, lastChatPhoto.item);
 				preloadData(delta);
 				return true;
-			} else if (_history && (_history->overviewCount(OverviewChatPhotos) != 0 || (
-				_migrated && _migrated->overviewCount(OverviewChatPhotos) != 0))) {
+			} else if (_history && (_history->overviewCount(OverviewChatPhotos) != 0 ||
+			                        (_migrated && _migrated->overviewCount(OverviewChatPhotos) != 0))) {
 				loadBack();
 				return true;
 			}
@@ -2207,11 +2321,13 @@ bool MediaView::moveToNext(qint32 delta) {
 			newIndex += _migrated->overview(_overview).size();
 			newMigrated = true;
 		} else if (newMigrated && newIndex >= _migrated->overview(_overview).size()) {
-			newIndex -= _migrated->overview(_overview).size() + (_history->overviewCount(_overview) - _history->overview(_overview).size());
+			newIndex -= _migrated->overview(_overview).size() +
+			            (_history->overviewCount(_overview) - _history->overview(_overview).size());
 			newMigrated = false;
 		}
 		if (newIndex >= 0 && newIndex < (newMigrated ? _migrated : _history)->overview(_overview).size()) {
-			if (auto item = App::histItemById(newMigrated ? 0 : _channel, getMsgIdFromOverview(newMigrated ? _migrated : _history, newIndex))) {
+			if (auto item = App::histItemById(newMigrated ? 0 : _channel,
+			                                  getMsgIdFromOverview(newMigrated ? _migrated : _history, newIndex))) {
 				_index = newIndex;
 				_msgid = item->id;
 				_msgmigrated = (item->history() == _migrated);
@@ -2221,11 +2337,17 @@ bool MediaView::moveToNext(qint32 delta) {
 				stopGif();
 				if (auto media = item->getMedia()) {
 					switch (media->type()) {
-					case MediaTypePhoto: displayPhoto(static_cast<HistoryPhoto*>(item->getMedia())->photo(), item); preloadData(delta); break;
+					case MediaTypePhoto:
+						displayPhoto(static_cast<HistoryPhoto *>(item->getMedia())->photo(), item);
+						preloadData(delta);
+						break;
 					case MediaTypeFile:
 					case MediaTypeVideo:
 					case MediaTypeGif:
-					case MediaTypeSticker: displayDocument(media->getDocument(), item); preloadData(delta); break;
+					case MediaTypeSticker:
+						displayDocument(media->getDocument(), item);
+						preloadData(delta);
+						break;
 					}
 				} else {
 					displayDocument(nullptr, item);
@@ -2275,17 +2397,20 @@ void MediaView::preloadData(qint32 delta) {
 		if (_migrated) {
 			if (indexOfMigratedItem && forgetIndex >= _migrated->overview(_overview).size()) {
 				forgetHistory = _history;
-				forgetIndex -= _migrated->overview(_overview).size() + (_history->overviewCount(_overview) - _history->overview(_overview).size());
+				forgetIndex -= _migrated->overview(_overview).size() +
+				               (_history->overviewCount(_overview) - _history->overview(_overview).size());
 			} else if (!indexOfMigratedItem && forgetIndex < 0) {
 				forgetHistory = _migrated;
 				forgetIndex += _migrated->overview(_overview).size();
 			}
 		}
-		if (forgetIndex >= 0 && forgetIndex < forgetHistory->overview(_overview).size() && (forgetHistory != (indexOfMigratedItem ? _migrated : _history) || forgetIndex != indexInOverview)) {
-			if (auto item = App::histItemById(forgetHistory->channelId(), getMsgIdFromOverview(forgetHistory, forgetIndex))) {
+		if (forgetIndex >= 0 && forgetIndex < forgetHistory->overview(_overview).size() &&
+		    (forgetHistory != (indexOfMigratedItem ? _migrated : _history) || forgetIndex != indexInOverview)) {
+			if (auto item =
+			        App::histItemById(forgetHistory->channelId(), getMsgIdFromOverview(forgetHistory, forgetIndex))) {
 				if (auto media = item->getMedia()) {
 					switch (media->type()) {
-					case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->forget(); break;
+					case MediaTypePhoto: static_cast<HistoryPhoto *>(media)->photo()->forget(); break;
 					case MediaTypeFile:
 					case MediaTypeVideo:
 					case MediaTypeGif:
@@ -2301,17 +2426,20 @@ void MediaView::preloadData(qint32 delta) {
 			if (_migrated) {
 				if (indexOfMigratedItem && previewIndex >= _migrated->overview(_overview).size()) {
 					previewHistory = _history;
-					previewIndex -= _migrated->overview(_overview).size() + (_history->overviewCount(_overview) - _history->overview(_overview).size());
+					previewIndex -= _migrated->overview(_overview).size() +
+					                (_history->overviewCount(_overview) - _history->overview(_overview).size());
 				} else if (!indexOfMigratedItem && previewIndex < 0) {
 					previewHistory = _migrated;
 					previewIndex += _migrated->overview(_overview).size();
 				}
 			}
-			if (previewIndex >= 0 && previewIndex < previewHistory->overview(_overview).size() && (previewHistory != (indexOfMigratedItem ? _migrated : _history) || previewIndex != indexInOverview)) {
-				if (auto item = App::histItemById(previewHistory->channelId(), getMsgIdFromOverview(previewHistory, previewIndex))) {
+			if (previewIndex >= 0 && previewIndex < previewHistory->overview(_overview).size() &&
+			    (previewHistory != (indexOfMigratedItem ? _migrated : _history) || previewIndex != indexInOverview)) {
+				if (auto item = App::histItemById(previewHistory->channelId(),
+				                                  getMsgIdFromOverview(previewHistory, previewIndex))) {
 					if (auto media = item->getMedia()) {
 						switch (media->type()) {
-						case MediaTypePhoto: static_cast<HistoryPhoto*>(media)->photo()->download(); break;
+						case MediaTypePhoto: static_cast<HistoryPhoto *>(media)->photo()->download(); break;
 						case MediaTypeFile:
 						case MediaTypeVideo:
 						case MediaTypeGif: {
@@ -2493,7 +2621,9 @@ void MediaView::updateOver(QPoint pos) {
 	ClickHandlerPtr lnk;
 	ClickHandlerHost *lnkhost = nullptr;
 	if (_saveMsgStarted && _saveMsg.contains(pos)) {
-		auto textState = _saveMsgText.getState(pos - _saveMsg.topLeft() - QPoint(st::mediaviewSaveMsgPadding.left(), st::mediaviewSaveMsgPadding.top()), _saveMsg.width() - st::mediaviewSaveMsgPadding.left() - st::mediaviewSaveMsgPadding.right());
+		auto textState = _saveMsgText.getState(
+		    pos - _saveMsg.topLeft() - QPoint(st::mediaviewSaveMsgPadding.left(), st::mediaviewSaveMsgPadding.top()),
+		    _saveMsg.width() - st::mediaviewSaveMsgPadding.left() - st::mediaviewSaveMsgPadding.right());
 		lnk = textState.link;
 		lnkhost = this;
 	} else if (_captionRect.contains(pos)) {
@@ -2607,10 +2737,8 @@ void MediaView::contextMenuEvent(QContextMenuEvent *e) {
 		}
 		_menu = new Ui::PopupMenu(nullptr, st::mediaviewPopupMenu);
 		updateActions();
-		for_const (auto &action, _actions) {
-			_menu->addAction(action.text, this, action.member)->setEnabled(true);
-		}
-		connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroy(QObject*)));
+		for_const (auto &action, _actions) { _menu->addAction(action.text, this, action.member)->setEnabled(true); }
+		connect(_menu, SIGNAL(destroyed(QObject *)), this, SLOT(onMenuDestroy(QObject *)));
 		_menu->popup(e->globalPos());
 		e->accept();
 		activateControls();
@@ -2629,7 +2757,8 @@ void MediaView::touchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchUpdate:
 		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
 		break;
@@ -2640,11 +2769,13 @@ void MediaView::touchEvent(QTouchEvent *e) {
 			Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton);
 			auto mapped = mapFromGlobal(_touchStart);
 
-			QMouseEvent pressEvent(QEvent::MouseButtonPress, mapped, mapped, _touchStart, btn, Qt::MouseButtons(btn), Qt::KeyboardModifiers());
+			QMouseEvent pressEvent(QEvent::MouseButtonPress, mapped, mapped, _touchStart, btn, Qt::MouseButtons(btn),
+			                       Qt::KeyboardModifiers());
 			pressEvent.accept();
 			mousePressEvent(&pressEvent);
 
-			QMouseEvent releaseEvent(QEvent::MouseButtonRelease, mapped, mapped, _touchStart, btn, Qt::MouseButtons(btn), Qt::KeyboardModifiers());
+			QMouseEvent releaseEvent(QEvent::MouseButtonRelease, mapped, mapped, _touchStart, btn,
+			                         Qt::MouseButtons(btn), Qt::KeyboardModifiers());
 			mouseReleaseEvent(&releaseEvent);
 
 			if (_touchRightButton) {
@@ -2652,9 +2783,11 @@ void MediaView::touchEvent(QTouchEvent *e) {
 				contextMenuEvent(&contextEvent);
 			}
 		} else if (_touchMove) {
-			if ((!_leftNavVisible || !_leftNav.contains(mapFromGlobal(_touchStart))) && (!_rightNavVisible || !_rightNav.contains(mapFromGlobal(_touchStart)))) {
+			if ((!_leftNavVisible || !_leftNav.contains(mapFromGlobal(_touchStart))) &&
+			    (!_rightNavVisible || !_rightNav.contains(mapFromGlobal(_touchStart)))) {
 				QPoint d = (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart);
-				if (d.x() * d.x() > d.y() * d.y() && (d.x() > st::mediaviewSwipeDistance || d.x() < -st::mediaviewSwipeDistance)) {
+				if (d.x() * d.x() > d.y() * d.y() &&
+				    (d.x() > st::mediaviewSwipeDistance || d.x() < -st::mediaviewSwipeDistance)) {
 					moveToNext(d.x() > 0 ? -1 : 1);
 				}
 			}
@@ -2671,23 +2804,26 @@ void MediaView::touchEvent(QTouchEvent *e) {
 }
 
 bool MediaView::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
-			if (ev->type() != QEvent::TouchBegin || ev->touchPoints().isEmpty() || !childAt(mapFromGlobal(ev->touchPoints().cbegin()->screenPos().toPoint()))) {
+			if (ev->type() != QEvent::TouchBegin || ev->touchPoints().isEmpty() ||
+			    !childAt(mapFromGlobal(ev->touchPoints().cbegin()->screenPos().toPoint()))) {
 				touchEvent(ev);
 				return true;
 			}
 		}
 	} else if (e->type() == QEvent::Wheel) {
-		QWheelEvent *ev = static_cast<QWheelEvent*>(e);
+		QWheelEvent *ev = static_cast<QWheelEvent *>(e);
 		if (ev->phase() == Qt::ScrollBegin) {
 			_accumScroll = ev->angleDelta();
 		} else {
 			_accumScroll += ev->angleDelta();
 			if (ev->phase() == Qt::ScrollEnd) {
 				if (ev->orientation() == Qt::Horizontal) {
-					if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() && _accumScroll.x() != 0) {
+					if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() &&
+					    _accumScroll.x() != 0) {
 						moveToNext(_accumScroll.x() > 0 ? -1 : 1);
 					}
 					_accumScroll = QPoint();
@@ -2700,9 +2836,10 @@ bool MediaView::event(QEvent *e) {
 
 bool MediaView::eventFilter(QObject *obj, QEvent *e) {
 	auto type = e->type();
-	if ((type == QEvent::MouseMove || type == QEvent::MouseButtonPress || type == QEvent::MouseButtonRelease) && obj->isWidgetType()) {
-		if (isAncestorOf(static_cast<QWidget*>(obj))) {
-			auto mouseEvent = static_cast<QMouseEvent*>(e);
+	if ((type == QEvent::MouseMove || type == QEvent::MouseButtonPress || type == QEvent::MouseButtonRelease) &&
+	    obj->isWidgetType()) {
+		if (isAncestorOf(static_cast<QWidget *>(obj))) {
+			auto mouseEvent = static_cast<QMouseEvent *>(e);
 			auto mousePosition = mapFromGlobal(mouseEvent->globalPos());
 			bool activate = (mousePosition != _lastMouseMovePos);
 			_lastMouseMovePos = mousePosition;
@@ -2753,9 +2890,7 @@ void MediaView::receiveMouse() {
 void MediaView::onDropdown() {
 	updateActions();
 	_dropdown->clearActions();
-	for_const (auto &action, _actions) {
-		_dropdown->addAction(action.text, this, action.member);
-	}
+	for_const (auto &action, _actions) { _dropdown->addAction(action.text, this, action.member); }
 	_dropdown->moveToRight(0, height() - _dropdown->height());
 	_dropdown->showAnimated(Ui::PanelAnimation::Origin::BottomRight);
 	_dropdown->setFocus();
@@ -2795,7 +2930,8 @@ void MediaView::findCurrent() {
 			++i;
 		}
 		if (!_history->overviewLoaded(_overview)) {
-			if (!_history->overviewCountLoaded(_overview) || (_index < 2 && _history->overviewCount(_overview) > 0) || (_index < 1 && _migrated && !_migrated->overviewLoaded(_overview))) {
+			if (!_history->overviewCountLoaded(_overview) || (_index < 2 && _history->overviewCount(_overview) > 0) ||
+			    (_index < 1 && _migrated && !_migrated->overviewLoaded(_overview))) {
 				loadBack();
 			}
 		} else if (_index < 1 && _migrated && !_migrated->overviewLoaded(_overview)) {
@@ -2815,13 +2951,16 @@ void MediaView::loadBack() {
 		return;
 	}
 
-	if (_history && _overview != OverviewCount && (!_history->overviewLoaded(_overview) || (_migrated && !_migrated->overviewLoaded(_overview)))) {
+	if (_history && _overview != OverviewCount &&
+	    (!_history->overviewLoaded(_overview) || (_migrated && !_migrated->overviewLoaded(_overview)))) {
 		if (App::main()) {
 			if (_msgmigrated || (_migrated && _index == 0 && _history->overviewLoaded(_overview))) {
 				App::main()->loadMediaBack(_migrated->peer, _overview);
 			} else {
 				App::main()->loadMediaBack(_history->peer, _overview);
-				if (_migrated && _index == 0 && (_migrated->overviewCount(_overview) < 0 || _migrated->overview(_overview).isEmpty()) && !_migrated->overviewLoaded(_overview)) {
+				if (_migrated && _index == 0 &&
+				    (_migrated->overviewCount(_overview) < 0 || _migrated->overview(_overview).isEmpty()) &&
+				    !_migrated->overviewLoaded(_overview)) {
 					App::main()->loadMediaBack(_migrated->peer, _overview);
 				}
 			}
@@ -2830,19 +2969,23 @@ void MediaView::loadBack() {
 			}
 		}
 	} else if (_user && _user->photosCount != 0) {
-		qint32 limit = (_index < MediaOverviewStartPerPage && _user->photos.size() > MediaOverviewStartPerPage) ? SearchPerPage : MediaOverviewStartPerPage;
-		_loadRequest = MTP::send(MTPphotos_GetUserPhotos(_user->inputUser, MTP_int(_user->photos.size()), MTP_long(0), MTP_int(limit)), rpcDone(&MediaView::userPhotosLoaded, _user));
+		qint32 limit = (_index < MediaOverviewStartPerPage && _user->photos.size() > MediaOverviewStartPerPage) ?
+		                   SearchPerPage :
+		                   MediaOverviewStartPerPage;
+		_loadRequest = MTP::send(
+		    MTPphotos_GetUserPhotos(_user->inputUser, MTP_int(_user->photos.size()), MTP_long(0), MTP_int(limit)),
+		    rpcDone(&MediaView::userPhotosLoaded, _user));
 	}
 }
 
 MediaView::LastChatPhoto MediaView::computeLastOverviewChatPhoto() {
-	LastChatPhoto emptyResult = { nullptr, nullptr };
+	LastChatPhoto emptyResult = {nullptr, nullptr};
 	auto lastPhotoInOverview = [&emptyResult](auto history, auto list) -> LastChatPhoto {
 		auto end = list.end();
 		if (auto item = App::histItemById(history->channelId(), *--end)) {
 			if (auto media = item->getMedia()) {
 				if (media->type() == MediaTypePhoto && !item->toHistoryMessage()) {
-					return { item, static_cast<HistoryPhoto*>(media)->photo() };
+					return {item, static_cast<HistoryPhoto *>(media)->photo()};
 				}
 			}
 		}
@@ -2910,16 +3053,19 @@ void MediaView::userPhotosLoaded(UserData *u, const MTPphotos_Photos &photos, mt
 }
 
 void MediaView::updateHeader() {
-	qint32 index = _index, count = 0, addcount = (_migrated && _overview != OverviewCount) ? _migrated->overviewCount(_overview) : 0;
+	qint32 index = _index, count = 0,
+	       addcount = (_migrated && _overview != OverviewCount) ? _migrated->overviewCount(_overview) : 0;
 	if (_history) {
 		if (_overview != OverviewCount) {
-			bool lastOverviewPhotoLoaded = (!_history->overview(_overview).isEmpty() || (
-				_migrated && _history->overviewCount(_overview) == 0 && !_migrated->overview(_overview).isEmpty()));
+			bool lastOverviewPhotoLoaded =
+			    (!_history->overview(_overview).isEmpty() ||
+			     (_migrated && _history->overviewCount(_overview) == 0 && !_migrated->overview(_overview).isEmpty()));
 			count = _history->overviewCount(_overview);
 			if (addcount >= 0 && count >= 0) {
 				count += addcount;
 			}
-			if (index >= 0 && (_msgmigrated ? (count >= 0 && addcount >= 0 && _history->overviewLoaded(_overview)) : (count >= 0))) {
+			if (index >= 0 &&
+			    (_msgmigrated ? (count >= 0 && addcount >= 0 && _history->overviewLoaded(_overview)) : (count >= 0))) {
 				if (_msgmigrated) {
 					index += addcount - _migrated->overview(_overview).size();
 				} else {
@@ -2941,7 +3087,9 @@ void MediaView::updateHeader() {
 	}
 	if (index >= 0 && index < count && count > 1) {
 		if (_doc) {
-			_headerText = lng_mediaview_file_n_of_count(lt_file, _doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name, lt_n, QString::number(index + 1), lt_count, QString::number(count));
+			_headerText = lng_mediaview_file_n_of_count(
+			    lt_file, _doc->name.isEmpty() ? lang(lng_mediaview_doc_image) : _doc->name, lt_n,
+			    QString::number(index + 1), lt_count, QString::number(count));
 		} else {
 			_headerText = lng_mediaview_n_of_count(lt_n, QString::number(index + 1), lt_count, QString::number(count));
 		}
@@ -2964,7 +3112,8 @@ void MediaView::updateHeader() {
 		hwidth = width() / 3;
 		_headerText = st::mediaviewThickFont->elided(_headerText, hwidth, Qt::ElideMiddle);
 	}
-	_headerNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewHeaderTop, hwidth, st::mediaviewThickFont->height);
+	_headerNav =
+	    myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewHeaderTop, hwidth, st::mediaviewThickFont->height);
 }
 
 double MediaView::overLevel(OverState control) const {
@@ -2972,7 +3121,7 @@ double MediaView::overLevel(OverState control) const {
 	return (i == _animOpacities.cend()) ? (_over == control ? 1 : 0) : i->current();
 }
 
-MsgId MediaView::getMsgIdFromOverview(not_null<History*> history, int index) const {
+MsgId MediaView::getMsgIdFromOverview(not_null<History *> history, int index) const {
 	auto &overview = history->overview(_overview);
 	if (index >= 0 && index < overview.size()) {
 		auto it = overview.begin();
diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h
index 45a651960..6fef8b25f 100644
--- a/Telegram/SourceFiles/mediaview.h
+++ b/Telegram/SourceFiles/mediaview.h
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/widgets/dropdown_menu.h"
-#include "ui/effects/radial_animation.h"
 #include "core/click_handler.h"
-#include "ui/images.h"
-#include "structs.h"
 #include "history/history.h"
+#include "structs.h"
+#include "ui/effects/radial_animation.h"
+#include "ui/images.h"
+#include "ui/widgets/dropdown_menu.h"
 
 class PeerData;
 class PhotoData;
@@ -233,7 +233,7 @@ private:
 	bool updateOverState(OverState newState);
 	double overLevel(OverState control) const;
 
-	MsgId getMsgIdFromOverview(not_null<History*> history, int index) const;
+	MsgId getMsgIdFromOverview(not_null<History *> history, int index) const;
 
 	QBrush _transparentBrush;
 
@@ -251,7 +251,7 @@ private:
 	QString _dateText;
 	QString _headerText;
 
-	object_ptr<Media::Clip::Controller> _clipController = { nullptr };
+	object_ptr<Media::Clip::Controller> _clipController = {nullptr};
 	DocumentData *_autoplayVideoDocument = nullptr;
 	bool _fullScreenVideo = false;
 	int _fullScreenZoomCache = 0;
@@ -380,7 +380,6 @@ private:
 	quint64 _themePreviewId = 0;
 	QRect _themePreviewRect;
 	std::unique_ptr<Window::Theme::Preview> _themePreview;
-	object_ptr<Ui::RoundButton> _themeApply = { nullptr };
-	object_ptr<Ui::RoundButton> _themeCancel = { nullptr };
-
+	object_ptr<Ui::RoundButton> _themeApply = {nullptr};
+	object_ptr<Ui::RoundButton> _themeCancel = {nullptr};
 };
diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp
index b61b3d012..42fe8ae51 100644
--- a/Telegram/SourceFiles/messenger.cpp
+++ b/Telegram/SourceFiles/messenger.cpp
@@ -20,45 +20,45 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "messenger.h"
 
-#include "base/timer.h"
-#include "storage/localstorage.h"
-#include "platform/platform_specific.h"
-#include "mainwindow.h"
-#include "application.h"
-#include "shortcuts.h"
-#include "auth_session.h"
 #include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
+#include "base/timer.h"
+#include "boxes/confirm_phone_box.h"
+#include "boxes/connection_box.h"
+#include "boxes/share_box.h"
 #include "calls/calls_instance.h"
+#include "history/history_location_manager.h"
+#include "lang/lang_cloud_manager.h"
 #include "lang/lang_file_parser.h"
 #include "lang/lang_translator.h"
-#include "lang/lang_cloud_manager.h"
-#include "observer_peer.h"
-#include "storage/file_upload.h"
 #include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_audio_track.h"
+#include "media/player/media_player_instance.h"
 #include "mediaview.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/mtp_instance.h"
-#include "media/player/media_player_instance.h"
-#include "media/media_audio_track.h"
+#include "observer_peer.h"
+#include "platform/platform_specific.h"
+#include "shortcuts.h"
+#include "storage/file_upload.h"
+#include "storage/localstorage.h"
+#include "storage/serialize_common.h"
+#include "ui/widgets/tooltip.h"
 #include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
-#include "history/history_location_manager.h"
-#include "ui/widgets/tooltip.h"
-#include "storage/serialize_common.h"
 #include "window/window_controller.h"
-#include "base/qthelp_regex.h"
-#include "base/qthelp_url.h"
-#include "boxes/connection_box.h"
-#include "boxes/confirm_phone_box.h"
-#include "boxes/share_box.h"
 
-#include <QMimeDatabase>
-#include <QDesktopServices>
-#include <QBuffer>
-#include <QWindow>
 #include <QApplication>
+#include <QBuffer>
+#include <QDesktopServices>
 #include <QDesktopWidget>
+#include <QMimeDatabase>
 #include <QScreen>
+#include <QWindow>
 
 namespace {
 
@@ -80,12 +80,13 @@ struct Messenger::Private {
 	base::Timer quitTimer;
 };
 
-Messenger::Messenger() : QObject()
-, _private(std::make_unique<Private>())
-, _langpack(std::make_unique<Lang::Instance>())
-, _audio(std::make_unique<Media::Audio::Instance>())
-, _logo(Window::LoadLogo())
-, _logoNoMargin(Window::LoadLogoNoMargin()) {
+Messenger::Messenger()
+    : QObject()
+    , _private(std::make_unique<Private>())
+    , _langpack(std::make_unique<Lang::Instance>())
+    , _audio(std::make_unique<Media::Audio::Instance>())
+    , _logo(Window::LoadLogo())
+    , _logoNoMargin(Window::LoadLogoNoMargin()) {
 	Expects(!_logo.isNull());
 	Expects(!_logoNoMargin.isNull());
 	Expects(SingleInstance == nullptr);
@@ -143,7 +144,8 @@ Messenger::Messenger() : QObject()
 	_window->setGeometry(currentGeometry);
 
 	QCoreApplication::instance()->installEventFilter(this);
-	Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState)));
+	Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this,
+	                 SLOT(onAppStateChanged(Qt::ApplicationState)));
 
 	DEBUG_LOG(("Application Info: window created..."));
 
@@ -205,27 +207,25 @@ bool Messenger::hideMediaView() {
 	return false;
 }
 
-void Messenger::showPhoto(not_null<const PhotoOpenClickHandler*> link, HistoryItem *item) {
-	return (!item && link->peer())
-		? showPhoto(link->photo(), link->peer())
-		: showPhoto(link->photo(), item);
+void Messenger::showPhoto(not_null<const PhotoOpenClickHandler *> link, HistoryItem *item) {
+	return (!item && link->peer()) ? showPhoto(link->photo(), link->peer()) : showPhoto(link->photo(), item);
 }
 
-void Messenger::showPhoto(not_null<PhotoData*> photo, HistoryItem *item) {
+void Messenger::showPhoto(not_null<PhotoData *> photo, HistoryItem *item) {
 	if (_mediaView->isHidden()) Ui::hideLayer(true);
 	_mediaView->showPhoto(photo, item);
 	_mediaView->activateWindow();
 	_mediaView->setFocus();
 }
 
-void Messenger::showPhoto(not_null<PhotoData*> photo, PeerData *peer) {
+void Messenger::showPhoto(not_null<PhotoData *> photo, PeerData *peer) {
 	if (_mediaView->isHidden()) Ui::hideLayer(true);
 	_mediaView->showPhoto(photo, peer);
 	_mediaView->activateWindow();
 	_mediaView->setFocus();
 }
 
-void Messenger::showDocument(not_null<DocumentData*> document, HistoryItem *item) {
+void Messenger::showDocument(not_null<DocumentData *> document, HistoryItem *item) {
 	if (cUseExternalVideoPlayer() && document->isVideo()) {
 		QDesktopServices::openUrl(QUrl("file:///" + document->location(false).fname));
 	} else {
@@ -260,8 +260,8 @@ bool Messenger::eventFilter(QObject *object, QEvent *e) {
 	} break;
 
 	case QEvent::Shortcut: {
-		DEBUG_LOG(("Shortcut event caught: %1").arg(static_cast<QShortcutEvent*>(e)->key().toString()));
-		if (Shortcuts::launch(static_cast<QShortcutEvent*>(e)->shortcutId())) {
+		DEBUG_LOG(("Shortcut event caught: %1").arg(static_cast<QShortcutEvent *>(e)->key().toString()));
+		if (Shortcuts::launch(static_cast<QShortcutEvent *>(e)->shortcutId())) {
 			return true;
 		}
 	} break;
@@ -274,7 +274,7 @@ bool Messenger::eventFilter(QObject *object, QEvent *e) {
 
 	case QEvent::FileOpen: {
 		if (object == QCoreApplication::instance()) {
-			auto url = QString::fromUtf8(static_cast<QFileOpenEvent*>(e)->url().toEncoded().trimmed());
+			auto url = QString::fromUtf8(static_cast<QFileOpenEvent *>(e)->url().toEncoded().trimmed());
 			if (url.startsWith(qstr("tg://"), Qt::CaseInsensitive)) {
 				cSetStartUrl(url.mid(0, 8192));
 				checkStartUrl();
@@ -391,12 +391,15 @@ void Messenger::setMtpAuthorization(const QByteArray &serialized) {
 	};
 	readKeys(_private->mtpConfig.keys);
 	readKeys(_private->mtpKeysToDestroy);
-	LOG(("MTP Info: read keys, current: %1, to destroy: %2").arg(_private->mtpConfig.keys.size()).arg(_private->mtpKeysToDestroy.size()));
+	LOG(("MTP Info: read keys, current: %1, to destroy: %2")
+	        .arg(_private->mtpConfig.keys.size())
+	        .arg(_private->mtpKeysToDestroy.size()));
 }
 
 void Messenger::startMtp() {
 	Expects(!_mtproto);
-	_mtproto = std::make_unique<MTP::Instance>(_dcOptions.get(), MTP::Instance::Mode::Normal, base::take(_private->mtpConfig));
+	_mtproto =
+	    std::make_unique<MTP::Instance>(_dcOptions.get(), MTP::Instance::Mode::Normal, base::take(_private->mtpConfig));
 	_private->mtpConfig.mainDcId = _mtproto->mainDcId();
 
 	_mtproto->setStateChangedHandler([](MTP::ShiftedDcId shiftedDcId, qint32 state) {
@@ -443,7 +446,8 @@ void Messenger::destroyMtpKeys(MTP::AuthKeysList &&keys) {
 	auto destroyConfig = MTP::Instance::Config();
 	destroyConfig.mainDcId = MTP::Instance::Config::kNoneMainDc;
 	destroyConfig.keys = std::move(keys);
-	_mtprotoForKeysDestroy = std::make_unique<MTP::Instance>(_dcOptions.get(), MTP::Instance::Mode::KeysDestroyer, std::move(destroyConfig));
+	_mtprotoForKeysDestroy =
+	    std::make_unique<MTP::Instance>(_dcOptions.get(), MTP::Instance::Mode::KeysDestroyer, std::move(destroyConfig));
 	connect(_mtprotoForKeysDestroy.get(), SIGNAL(allKeysDestroyed()), this, SLOT(onAllKeysDestroyed()));
 }
 
@@ -567,12 +571,15 @@ void Messenger::peerClearPhoto(PeerId id) {
 	if (!AuthSession::Exists()) return;
 
 	if (id == Auth().userPeerId()) {
-		MTP::send(MTPphotos_UpdateProfilePhoto(MTP_inputPhotoEmpty()), rpcDone(&Messenger::selfPhotoCleared), rpcFail(&Messenger::peerPhotoFail, id));
+		MTP::send(MTPphotos_UpdateProfilePhoto(MTP_inputPhotoEmpty()), rpcDone(&Messenger::selfPhotoCleared),
+		          rpcFail(&Messenger::peerPhotoFail, id));
 	} else if (peerIsChat(id)) {
-		MTP::send(MTPmessages_EditChatPhoto(peerToBareMTPInt(id), MTP_inputChatPhotoEmpty()), rpcDone(&Messenger::chatPhotoCleared, id), rpcFail(&Messenger::peerPhotoFail, id));
+		MTP::send(MTPmessages_EditChatPhoto(peerToBareMTPInt(id), MTP_inputChatPhotoEmpty()),
+		          rpcDone(&Messenger::chatPhotoCleared, id), rpcFail(&Messenger::peerPhotoFail, id));
 	} else if (peerIsChannel(id)) {
 		if (auto channel = App::channelLoaded(id)) {
-			MTP::send(MTPchannels_EditPhoto(channel->inputChannel, MTP_inputChatPhotoEmpty()), rpcDone(&Messenger::chatPhotoCleared, id), rpcFail(&Messenger::peerPhotoFail, id));
+			MTP::send(MTPchannels_EditPhoto(channel->inputChannel, MTP_inputChatPhotoEmpty()),
+			          rpcDone(&Messenger::chatPhotoCleared, id), rpcFail(&Messenger::peerPhotoFail, id));
 		}
 	}
 }
@@ -637,7 +644,7 @@ void Messenger::call_handleObservables() {
 
 void Messenger::killDownloadSessions() {
 	auto ms = getms(), left = static_cast<TimeMs>(MTPAckSendWaiting) + MTPKillFileSessionTimeout;
-	for (auto i = killDownloadSessionTimes.begin(); i != killDownloadSessionTimes.end(); ) {
+	for (auto i = killDownloadSessionTimes.begin(); i != killDownloadSessionTimes.end();) {
 		if (i.value() <= ms) {
 			for (int j = 0; j < MTP::kDownloadSessionsCount; ++j) {
 				MTP::stopSession(MTP::downloadDcId(i.key(), j));
@@ -662,13 +669,20 @@ void Messenger::photoUpdated(const FullMsgId &msgId, bool silent, const MTPInput
 	if (i != photoUpdates.end()) {
 		auto id = i.value();
 		if (id == Auth().userPeerId()) {
-			MTP::send(MTPphotos_UploadProfilePhoto(file), rpcDone(&Messenger::selfPhotoDone), rpcFail(&Messenger::peerPhotoFail, id));
+			MTP::send(MTPphotos_UploadProfilePhoto(file), rpcDone(&Messenger::selfPhotoDone),
+			          rpcFail(&Messenger::peerPhotoFail, id));
 		} else if (peerIsChat(id)) {
 			auto history = App::history(id);
-			history->sendRequestId = MTP::send(MTPmessages_EditChatPhoto(history->peer->asChat()->inputChat, MTP_inputChatUploadedPhoto(file)), rpcDone(&Messenger::chatPhotoDone, id), rpcFail(&Messenger::peerPhotoFail, id), 0, 0, history->sendRequestId);
+			history->sendRequestId = MTP::send(
+			    MTPmessages_EditChatPhoto(history->peer->asChat()->inputChat, MTP_inputChatUploadedPhoto(file)),
+			    rpcDone(&Messenger::chatPhotoDone, id), rpcFail(&Messenger::peerPhotoFail, id), 0, 0,
+			    history->sendRequestId);
 		} else if (peerIsChannel(id)) {
 			auto history = App::history(id);
-			history->sendRequestId = MTP::send(MTPchannels_EditPhoto(history->peer->asChannel()->inputChannel, MTP_inputChatUploadedPhoto(file)), rpcDone(&Messenger::chatPhotoDone, id), rpcFail(&Messenger::peerPhotoFail, id), 0, 0, history->sendRequestId);
+			history->sendRequestId = MTP::send(
+			    MTPchannels_EditPhoto(history->peer->asChannel()->inputChannel, MTP_inputChatUploadedPhoto(file)),
+			    rpcDone(&Messenger::chatPhotoDone, id), rpcFail(&Messenger::peerPhotoFail, id), 0, 0,
+			    history->sendRequestId);
 		}
 	}
 }
@@ -731,8 +745,8 @@ void Messenger::setInternalLinkDomain(const QString &domain) const {
 	// This domain should start with 'http[s]://' and end with '/', like 'https://t.me/'.
 	auto validate = [](auto &domain) {
 		auto prefixes = {
-			qstr("https://"),
-			qstr("http://"),
+		    qstr("https://"),
+		    qstr("http://"),
 		};
 		for (auto &prefix : prefixes) {
 			if (domain.startsWith(prefix, Qt::CaseInsensitive)) {
@@ -749,8 +763,8 @@ void Messenger::setInternalLinkDomain(const QString &domain) const {
 QString Messenger::createInternalLink(const QString &query) const {
 	auto result = createInternalLinkFull(query);
 	auto prefixes = {
-		qstr("https://"),
-		qstr("http://"),
+	    qstr("https://"),
+	    qstr("http://"),
 	};
 	for (auto &prefix : prefixes) {
 		if (result.startsWith(prefix, Qt::CaseInsensitive)) {
@@ -791,7 +805,8 @@ bool Messenger::openLocalUrl(const QString &url) {
 			main->joinGroupByHash(joinChatMatch->captured(1));
 			return true;
 		}
-	} else if (auto stickerSetMatch = regex_match(qsl("^addstickers/?\\?set=([a-zA-Z0-9\\.\\_]+)(&|$)"), command, matchOptions)) {
+	} else if (auto stickerSetMatch =
+	               regex_match(qsl("^addstickers/?\\?set=([a-zA-Z0-9\\.\\_]+)(&|$)"), command, matchOptions)) {
 		if (auto main = App::main()) {
 			main->stickersBox(MTP_inputStickerSetShortName(MTP_string(stickerSetMatch->captured(1))));
 			return true;
@@ -863,15 +878,21 @@ void Messenger::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId) {
 
 	auto thumb = App::pixmapFromImageInPlace(tosend.scaled(160, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 	photoThumbs.insert('a', thumb);
-	photoSizes.push_back(MTP_photoSize(MTP_string("a"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0)));
+	photoSizes.push_back(MTP_photoSize(MTP_string("a"),
+	                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+	                                   MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0)));
 
 	auto medium = App::pixmapFromImageInPlace(tosend.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 	photoThumbs.insert('b', medium);
-	photoSizes.push_back(MTP_photoSize(MTP_string("b"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(medium.width()), MTP_int(medium.height()), MTP_int(0)));
+	photoSizes.push_back(MTP_photoSize(MTP_string("b"),
+	                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+	                                   MTP_int(medium.width()), MTP_int(medium.height()), MTP_int(0)));
 
 	auto full = QPixmap::fromImage(tosend, Qt::ColorOnly);
 	photoThumbs.insert('c', full);
-	photoSizes.push_back(MTP_photoSize(MTP_string("c"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(full.width()), MTP_int(full.height()), MTP_int(0)));
+	photoSizes.push_back(MTP_photoSize(MTP_string("c"),
+	                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+	                                   MTP_int(full.width()), MTP_int(full.height()), MTP_int(0)));
 
 	QByteArray jpeg;
 	QBuffer jpegBuffer(&jpeg);
@@ -879,15 +900,18 @@ void Messenger::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId) {
 
 	PhotoId id = rand_value<PhotoId>();
 
-	auto photo = MTP_photo(MTP_flags(0), MTP_long(id), MTP_long(0), MTP_int(unixtime()), MTP_vector<MTPPhotoSize>(photoSizes));
+	auto photo =
+	    MTP_photo(MTP_flags(0), MTP_long(id), MTP_long(0), MTP_int(unixtime()), MTP_vector<MTPPhotoSize>(photoSizes));
 
 	QString file, filename;
 	qint32 filesize = 0;
 	QByteArray data;
 
-	SendMediaReady ready(SendMediaType::Photo, file, filename, filesize, data, id, id, qsl("jpg"), peerId, photo, photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg, 0);
+	SendMediaReady ready(SendMediaType::Photo, file, filename, filesize, data, id, id, qsl("jpg"), peerId, photo,
+	                     photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg, 0);
 
-	connect(&Auth().uploader(), SIGNAL(photoReady(const FullMsgId&, bool, const MTPInputFile&)), this, SLOT(photoUpdated(const FullMsgId&, bool, const MTPInputFile&)), Qt::UniqueConnection);
+	connect(&Auth().uploader(), SIGNAL(photoReady(const FullMsgId &, bool, const MTPInputFile &)), this,
+	        SLOT(photoUpdated(const FullMsgId &, bool, const MTPInputFile &)), Qt::UniqueConnection);
 
 	FullMsgId newId(peerToChannel(peerId), clientMsgId());
 	regPhotoUpdate(peerId, newId);
@@ -973,7 +997,7 @@ bool Messenger::minimizeActiveWindow() {
 }
 
 QWidget *Messenger::getFileDialogParent() {
-	return (_mediaView && _mediaView->isVisible()) ? (QWidget*)_mediaView.get() : (QWidget*)getActiveWindow();
+	return (_mediaView && _mediaView->isVisible()) ? (QWidget *)_mediaView.get() : (QWidget *)getActiveWindow();
 }
 
 void Messenger::checkMediaViewActivation() {
diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h
index 31eaa1d35..4dca790f8 100644
--- a/Telegram/SourceFiles/messenger.h
+++ b/Telegram/SourceFiles/messenger.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QImage>
 #include "base/observer.h"
-#include "mtproto/auth_key.h"
 #include "base/timer.h"
+#include "core/single_timer.h"
+#include "mtproto/auth_key.h"
 #include "mtproto/rpc_sender.h"
 #include "structs.h"
-#include "core/single_timer.h"
+#include <QImage>
 
 namespace App {
 void quit();
@@ -94,10 +94,10 @@ public:
 	// MediaView interface.
 	void checkMediaViewActivation();
 	bool hideMediaView();
-	void showPhoto(not_null<const PhotoOpenClickHandler*> link, HistoryItem *item = nullptr);
-	void showPhoto(not_null<PhotoData*> photo, HistoryItem *item);
-	void showPhoto(not_null<PhotoData*> photo, PeerData *item);
-	void showDocument(not_null<DocumentData*> document, HistoryItem *item);
+	void showPhoto(not_null<const PhotoOpenClickHandler *> link, HistoryItem *item = nullptr);
+	void showPhoto(not_null<PhotoData *> photo, HistoryItem *item);
+	void showPhoto(not_null<PhotoData *> photo, PeerData *item);
+	void showDocument(not_null<DocumentData *> document, HistoryItem *item);
 	PeerData *ui_getPeerForMouseAction();
 
 	QPoint getPointForCallPanelCenter() const;
@@ -261,5 +261,4 @@ private:
 	QImage _logoNoMargin;
 
 	base::DelayedCallTimer _callDelayedTimer;
-
 };
diff --git a/Telegram/SourceFiles/mtproto/auth_key.cpp b/Telegram/SourceFiles/mtproto/auth_key.cpp
index 7f99b5dc0..b949f8fa4 100644
--- a/Telegram/SourceFiles/mtproto/auth_key.cpp
+++ b/Telegram/SourceFiles/mtproto/auth_key.cpp
@@ -51,8 +51,8 @@ void AuthKey::prepareAES_oldmtp(const MTPint128 &msgKey, MTPint256 &aesKey, MTPi
 	memcpy(data_d + 16, _key.data() + 96 + x, 32);
 	hashSha1(data_d, 16 + 32, sha1_d);
 
-	auto key = reinterpret_cast<uchar*>(&aesKey);
-	auto iv = reinterpret_cast<uchar*>(&aesIV);
+	auto key = reinterpret_cast<uchar *>(&aesKey);
+	auto iv = reinterpret_cast<uchar *>(&aesIV);
 	memcpy(key, sha1_a, 8);
 	memcpy(key + 8, sha1_b + 8, 12);
 	memcpy(key + 8 + 12, sha1_c + 4, 12);
@@ -75,8 +75,8 @@ void AuthKey::prepareAES(const MTPint128 &msgKey, MTPint256 &aesKey, MTPint256 &
 	memcpy(data_b + 36, &msgKey, 16);
 	hashSha256(data_b, 36 + 16, sha256_b);
 
-	auto key = reinterpret_cast<uchar*>(&aesKey);
-	auto iv = reinterpret_cast<uchar*>(&aesIV);
+	auto key = reinterpret_cast<uchar *>(&aesKey);
+	auto iv = reinterpret_cast<uchar *>(&aesIV);
 	memcpy(key, sha256_a, 8);
 	memcpy(key + 8, sha256_b + 8, 16);
 	memcpy(key + 8 + 16, sha256_a + 24, 8);
@@ -92,7 +92,7 @@ void aesIgeEncryptRaw(const void *src, void *dst, quint32 len, const void *key,
 
 	AES_KEY aes;
 	AES_set_encrypt_key(aes_key, 256, &aes);
-	AES_ige_encrypt(static_cast<const uchar*>(src), static_cast<uchar*>(dst), len, &aes, aes_iv, AES_ENCRYPT);
+	AES_ige_encrypt(static_cast<const uchar *>(src), static_cast<uchar *>(dst), len, &aes, aes_iv, AES_ENCRYPT);
 }
 
 void aesIgeDecryptRaw(const void *src, void *dst, quint32 len, const void *key, const void *iv) {
@@ -102,17 +102,18 @@ void aesIgeDecryptRaw(const void *src, void *dst, quint32 len, const void *key,
 
 	AES_KEY aes;
 	AES_set_decrypt_key(aes_key, 256, &aes);
-	AES_ige_encrypt(static_cast<const uchar*>(src), static_cast<uchar*>(dst), len, &aes, aes_iv, AES_DECRYPT);
+	AES_ige_encrypt(static_cast<const uchar *>(src), static_cast<uchar *>(dst), len, &aes, aes_iv, AES_DECRYPT);
 }
 
 void aesCtrEncrypt(void *data, quint32 len, const void *key, CTRState *state) {
 	AES_KEY aes;
-	AES_set_encrypt_key(static_cast<const uchar*>(key), 256, &aes);
+	AES_set_encrypt_key(static_cast<const uchar *>(key), 256, &aes);
 
 	static_assert(CTRState::IvecSize == AES_BLOCK_SIZE, "Wrong size of ctr ivec!");
 	static_assert(CTRState::EcountSize == AES_BLOCK_SIZE, "Wrong size of ctr ecount!");
 
-	CRYPTO_ctr128_encrypt(static_cast<const uchar*>(data), static_cast<uchar*>(data), len, &aes, state->ivec, state->ecount, &state->num, (block128_f) AES_encrypt);
+	CRYPTO_ctr128_encrypt(static_cast<const uchar *>(data), static_cast<uchar *>(data), len, &aes, state->ivec,
+	                      state->ecount, &state->num, (block128_f)AES_encrypt);
 }
 
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/auth_key.h b/Telegram/SourceFiles/mtproto/auth_key.h
index f7d5b72c0..8d2c47082 100644
--- a/Telegram/SourceFiles/mtproto/auth_key.h
+++ b/Telegram/SourceFiles/mtproto/auth_key.h
@@ -23,10 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <array>
 #include <memory>
 
-#include <QtGlobal>
-#include <gsl/gsl_byte>
 #include "mtproto/core_types.h"
 #include <QDataStream>
+#include <QtGlobal>
+#include <gsl/gsl_byte>
 
 namespace MTP {
 
@@ -41,10 +41,15 @@ public:
 		ReadFromFile,
 		Local,
 	};
-	AuthKey(Type type, DcId dcId, const Data &data) : _type(type), _dcId(dcId), _key(data) {
+	AuthKey(Type type, DcId dcId, const Data &data)
+	    : _type(type)
+	    , _dcId(dcId)
+	    , _key(data) {
 		countKeyId();
 	}
-	AuthKey(const Data &data) : _type(Type::Local), _key(data) {
+	AuthKey(const Data &data)
+	    : _type(Type::Local)
+	    , _key(data) {
 		countKeyId();
 	}
 
@@ -71,7 +76,7 @@ public:
 	}
 
 	void write(QDataStream &to) const {
-		to.writeRawData(reinterpret_cast<const char*>(_key.data()), static_cast<int>(_key.size()));
+		to.writeRawData(reinterpret_cast<const char *>(_key.data()), static_cast<int>(_key.size()));
 	}
 
 	bool equals(const std::shared_ptr<AuthKey> &other) const {
@@ -95,14 +100,13 @@ private:
 		auto sha1 = hashSha1(_key.data(), _key.size());
 
 		// Lower 64 bits = 8 bytes of 20 byte SHA1 hash.
-		_keyId = *reinterpret_cast<KeyId*>(sha1.data() + 12);
+		_keyId = *reinterpret_cast<KeyId *>(sha1.data() + 12);
 	}
 
 	Type _type = Type::Generated;
 	DcId _dcId = 0;
-	Data _key = { { gsl::byte{} } };
+	Data _key = {{gsl::byte{}}};
 	KeyId _keyId = 0;
-
 };
 
 using AuthKeyPtr = std::shared_ptr<AuthKey>;
@@ -111,46 +115,48 @@ using AuthKeysList = std::vector<AuthKeyPtr>;
 void aesIgeEncryptRaw(const void *src, void *dst, quint32 len, const void *key, const void *iv);
 void aesIgeDecryptRaw(const void *src, void *dst, quint32 len, const void *key, const void *iv);
 
-inline void aesIgeEncrypt_oldmtp(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const MTPint128 &msgKey) {
+inline void aesIgeEncrypt_oldmtp(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey,
+                                 const MTPint128 &msgKey) {
 	MTPint256 aesKey, aesIV;
 	authKey->prepareAES_oldmtp(msgKey, aesKey, aesIV, true);
 
-	return aesIgeEncryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeEncryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
 inline void aesIgeEncrypt(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const MTPint128 &msgKey) {
 	MTPint256 aesKey, aesIV;
 	authKey->prepareAES(msgKey, aesKey, aesIV, true);
 
-	return aesIgeEncryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeEncryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
 inline void aesEncryptLocal(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const void *key128) {
 	MTPint256 aesKey, aesIV;
-	authKey->prepareAES_oldmtp(*(const MTPint128*)key128, aesKey, aesIV, false);
+	authKey->prepareAES_oldmtp(*(const MTPint128 *)key128, aesKey, aesIV, false);
 
-	return aesIgeEncryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeEncryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
-inline void aesIgeDecrypt_oldmtp(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const MTPint128 &msgKey) {
+inline void aesIgeDecrypt_oldmtp(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey,
+                                 const MTPint128 &msgKey) {
 	MTPint256 aesKey, aesIV;
 	authKey->prepareAES_oldmtp(msgKey, aesKey, aesIV, false);
 
-	return aesIgeDecryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeDecryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
 inline void aesIgeDecrypt(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const MTPint128 &msgKey) {
 	MTPint256 aesKey, aesIV;
 	authKey->prepareAES(msgKey, aesKey, aesIV, false);
 
-	return aesIgeDecryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeDecryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
 inline void aesDecryptLocal(const void *src, void *dst, quint32 len, const AuthKeyPtr &authKey, const void *key128) {
 	MTPint256 aesKey, aesIV;
-	authKey->prepareAES_oldmtp(*(const MTPint128*)key128, aesKey, aesIV, false);
+	authKey->prepareAES_oldmtp(*(const MTPint128 *)key128, aesKey, aesIV, false);
 
-	return aesIgeDecryptRaw(src, dst, len, static_cast<const void*>(&aesKey), static_cast<const void*>(&aesIV));
+	return aesIgeDecryptRaw(src, dst, len, static_cast<const void *>(&aesKey), static_cast<const void *>(&aesIV));
 }
 
 // ctr used inplace, encrypt the data and leave it at the same place
@@ -159,9 +165,9 @@ struct CTRState {
 	static constexpr int IvecSize = 16;
 	static constexpr int EcountSize = 16;
 
-	uchar ivec[IvecSize] = { 0 };
+	uchar ivec[IvecSize] = {0};
 	quint32 num = 0;
-	uchar ecount[EcountSize] = { 0 };
+	uchar ecount[EcountSize] = {0};
 };
 void aesCtrEncrypt(void *data, quint32 len, const void *key, CTRState *state);
 
diff --git a/Telegram/SourceFiles/mtproto/config_loader.cpp b/Telegram/SourceFiles/mtproto/config_loader.cpp
index e8c5d6fd4..5139e445c 100644
--- a/Telegram/SourceFiles/mtproto/config_loader.cpp
+++ b/Telegram/SourceFiles/mtproto/config_loader.cpp
@@ -35,9 +35,10 @@ constexpr auto kSpecialRequestTimeoutMs = 6000; // 4 seconds timeout for it to w
 
 } // namespace
 
-ConfigLoader::ConfigLoader(not_null<Instance*> instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail) : _instance(instance)
-	, _doneHandler(onDone)
-	, _failHandler(onFail) {
+ConfigLoader::ConfigLoader(not_null<Instance *> instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail)
+    : _instance(instance)
+    , _doneHandler(onDone)
+    , _failHandler(onFail) {
 	_enumDCTimer.setCallback([this] { enumerate(); });
 	_specialEnumTimer.setCallback([this] { sendSpecialRequest(); });
 }
@@ -112,17 +113,15 @@ void ConfigLoader::createSpecialLoader() {
 		return;
 	}
 	if (!_specialLoader || (!_specialEnumRequest && _specialEndpoints.empty())) {
-		_specialLoader = std::make_unique<SpecialConfigRequest>([this](DcId dcId, const std::string &ip, int port) {
-			addSpecialEndpoint(dcId, ip, port);
-		});
+		_specialLoader = std::make_unique<SpecialConfigRequest>(
+		    [this](DcId dcId, const std::string &ip, int port) { addSpecialEndpoint(dcId, ip, port); });
 		_triedSpecialEndpoints.clear();
 	}
 }
 
 void ConfigLoader::addSpecialEndpoint(DcId dcId, const std::string &ip, int port) {
-	auto endpoint = SpecialEndpoint { dcId, ip, port };
-	if (base::contains(_specialEndpoints, endpoint)
-		|| base::contains(_triedSpecialEndpoints, endpoint)) {
+	auto endpoint = SpecialEndpoint{dcId, ip, port};
+	if (base::contains(_specialEndpoints, endpoint) || base::contains(_triedSpecialEndpoints, endpoint)) {
 		return;
 	}
 	DEBUG_LOG(("MTP Info: Special endpoint received, '%1:%2'").arg(ip.c_str()).arg(port));
@@ -148,13 +147,15 @@ void ConfigLoader::sendSpecialRequest() {
 	auto index = rand_value<quint32>() % quint32(_specialEndpoints.size());
 	auto endpoint = _specialEndpoints.begin() + index;
 	_specialEnumCurrent = specialToRealDcId(endpoint->dcId);
-	_instance->dcOptions()->constructAddOne(_specialEnumCurrent, MTPDdcOption::Flag::f_tcpo_only, endpoint->ip, endpoint->port);
+	_instance->dcOptions()->constructAddOne(_specialEnumCurrent, MTPDdcOption::Flag::f_tcpo_only, endpoint->ip,
+	                                        endpoint->port);
 	_specialEnumRequest = _instance->send(MTPhelp_GetConfig(), rpcDone([weak](const MTPConfig &result) {
-		if (!weak) {
-			return;
-		}
-		weak->specialConfigLoaded(result);
-	}), _failHandler, _specialEnumCurrent);
+		                                      if (!weak) {
+			                                      return;
+		                                      }
+		                                      weak->specialConfigLoaded(result);
+	                                      }),
+	                                      _failHandler, _specialEnumCurrent);
 	_triedSpecialEndpoints.push_back(*endpoint);
 	_specialEndpoints.erase(endpoint);
 
diff --git a/Telegram/SourceFiles/mtproto/config_loader.h b/Telegram/SourceFiles/mtproto/config_loader.h
index 9d4c70855..9e5aa16ce 100644
--- a/Telegram/SourceFiles/mtproto/config_loader.h
+++ b/Telegram/SourceFiles/mtproto/config_loader.h
@@ -33,7 +33,7 @@ namespace internal {
 
 class ConfigLoader : public base::enable_weak_from_this {
 public:
-	ConfigLoader(not_null<Instance*> instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail);
+	ConfigLoader(not_null<Instance *> instance, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail);
 	~ConfigLoader();
 
 	void load();
@@ -49,7 +49,7 @@ private:
 	void terminateRequest();
 	void terminateSpecialRequest();
 
-	not_null<Instance*> _instance;
+	not_null<Instance *> _instance;
 	base::Timer _enumDCTimer;
 	DcId _enumCurrent = 0;
 	mtpRequestId _enumRequest = 0;
@@ -69,7 +69,6 @@ private:
 
 	RPCDoneHandlerPtr _doneHandler;
 	RPCFailHandlerPtr _failHandler;
-
 };
 
 inline bool operator==(const ConfigLoader::SpecialEndpoint &a, const ConfigLoader::SpecialEndpoint &b) {
diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp
index b0fd98bb2..1e0dcd93b 100644
--- a/Telegram/SourceFiles/mtproto/connection.cpp
+++ b/Telegram/SourceFiles/mtproto/connection.cpp
@@ -19,21 +19,21 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/connection.h"
-#include "mtproto/rsa_public_key.h"
-#include "mtproto/rpc_sender.h"
-#include "mtproto/dc_options.h"
-#include "mtproto/connection_abstract.h"
-#include "mtproto/facade.h"
-#include "zlib.h"
-#include "lang/lang_keys.h"
 #include "base/openssl_help.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
+#include "mtproto/connection_abstract.h"
+#include "mtproto/dc_options.h"
+#include "mtproto/facade.h"
+#include "mtproto/rpc_sender.h"
+#include "mtproto/rsa_public_key.h"
+#include "zlib.h"
+#include <openssl/aes.h>
 #include <openssl/bn.h>
 #include <openssl/err.h>
-#include <openssl/aes.h>
-#include <openssl/sha.h>
 #include <openssl/md5.h>
 #include <openssl/rand.h>
-#include "facades.h"
+#include <openssl/sha.h>
 
 namespace MTP {
 namespace internal {
@@ -129,22 +129,21 @@ bool IsPrimeAndGoodCheck(const openssl::BigNum &prime, int g) {
 
 bool IsPrimeAndGood(base::const_byte_span primeBytes, int g) {
 	static constexpr unsigned char GoodPrime[] = {
-		0xC7, 0x1C, 0xAE, 0xB9, 0xC6, 0xB1, 0xC9, 0x04, 0x8E, 0x6C, 0x52, 0x2F, 0x70, 0xF1, 0x3F, 0x73,
-		0x98, 0x0D, 0x40, 0x23, 0x8E, 0x3E, 0x21, 0xC1, 0x49, 0x34, 0xD0, 0x37, 0x56, 0x3D, 0x93, 0x0F,
-		0x48, 0x19, 0x8A, 0x0A, 0xA7, 0xC1, 0x40, 0x58, 0x22, 0x94, 0x93, 0xD2, 0x25, 0x30, 0xF4, 0xDB,
-		0xFA, 0x33, 0x6F, 0x6E, 0x0A, 0xC9, 0x25, 0x13, 0x95, 0x43, 0xAE, 0xD4, 0x4C, 0xCE, 0x7C, 0x37,
-		0x20, 0xFD, 0x51, 0xF6, 0x94, 0x58, 0x70, 0x5A, 0xC6, 0x8C, 0xD4, 0xFE, 0x6B, 0x6B, 0x13, 0xAB,
-		0xDC, 0x97, 0x46, 0x51, 0x29, 0x69, 0x32, 0x84, 0x54, 0xF1, 0x8F, 0xAF, 0x8C, 0x59, 0x5F, 0x64,
-		0x24, 0x77, 0xFE, 0x96, 0xBB, 0x2A, 0x94, 0x1D, 0x5B, 0xCD, 0x1D, 0x4A, 0xC8, 0xCC, 0x49, 0x88,
-		0x07, 0x08, 0xFA, 0x9B, 0x37, 0x8E, 0x3C, 0x4F, 0x3A, 0x90, 0x60, 0xBE, 0xE6, 0x7C, 0xF9, 0xA4,
-		0xA4, 0xA6, 0x95, 0x81, 0x10, 0x51, 0x90, 0x7E, 0x16, 0x27, 0x53, 0xB5, 0x6B, 0x0F, 0x6B, 0x41,
-		0x0D, 0xBA, 0x74, 0xD8, 0xA8, 0x4B, 0x2A, 0x14, 0xB3, 0x14, 0x4E, 0x0E, 0xF1, 0x28, 0x47, 0x54,
-		0xFD, 0x17, 0xED, 0x95, 0x0D, 0x59, 0x65, 0xB4, 0xB9, 0xDD, 0x46, 0x58, 0x2D, 0xB1, 0x17, 0x8D,
-		0x16, 0x9C, 0x6B, 0xC4, 0x65, 0xB0, 0xD6, 0xFF, 0x9C, 0xA3, 0x92, 0x8F, 0xEF, 0x5B, 0x9A, 0xE4,
-		0xE4, 0x18, 0xFC, 0x15, 0xE8, 0x3E, 0xBE, 0xA0, 0xF8, 0x7F, 0xA9, 0xFF, 0x5E, 0xED, 0x70, 0x05,
-		0x0D, 0xED, 0x28, 0x49, 0xF4, 0x7B, 0xF9, 0x59, 0xD9, 0x56, 0x85, 0x0C, 0xE9, 0x29, 0x85, 0x1F,
-		0x0D, 0x81, 0x15, 0xF6, 0x35, 0xB1, 0x05, 0xEE, 0x2E, 0x4E, 0x15, 0xD0, 0x4B, 0x24, 0x54, 0xBF,
-		0x6F, 0x4F, 0xAD, 0xF0, 0x34, 0xB1, 0x04, 0x03, 0x11, 0x9C, 0xD8, 0xE3, 0xB9, 0x2F, 0xCC, 0x5B };
+	    0xC7, 0x1C, 0xAE, 0xB9, 0xC6, 0xB1, 0xC9, 0x04, 0x8E, 0x6C, 0x52, 0x2F, 0x70, 0xF1, 0x3F, 0x73, 0x98, 0x0D,
+	    0x40, 0x23, 0x8E, 0x3E, 0x21, 0xC1, 0x49, 0x34, 0xD0, 0x37, 0x56, 0x3D, 0x93, 0x0F, 0x48, 0x19, 0x8A, 0x0A,
+	    0xA7, 0xC1, 0x40, 0x58, 0x22, 0x94, 0x93, 0xD2, 0x25, 0x30, 0xF4, 0xDB, 0xFA, 0x33, 0x6F, 0x6E, 0x0A, 0xC9,
+	    0x25, 0x13, 0x95, 0x43, 0xAE, 0xD4, 0x4C, 0xCE, 0x7C, 0x37, 0x20, 0xFD, 0x51, 0xF6, 0x94, 0x58, 0x70, 0x5A,
+	    0xC6, 0x8C, 0xD4, 0xFE, 0x6B, 0x6B, 0x13, 0xAB, 0xDC, 0x97, 0x46, 0x51, 0x29, 0x69, 0x32, 0x84, 0x54, 0xF1,
+	    0x8F, 0xAF, 0x8C, 0x59, 0x5F, 0x64, 0x24, 0x77, 0xFE, 0x96, 0xBB, 0x2A, 0x94, 0x1D, 0x5B, 0xCD, 0x1D, 0x4A,
+	    0xC8, 0xCC, 0x49, 0x88, 0x07, 0x08, 0xFA, 0x9B, 0x37, 0x8E, 0x3C, 0x4F, 0x3A, 0x90, 0x60, 0xBE, 0xE6, 0x7C,
+	    0xF9, 0xA4, 0xA4, 0xA6, 0x95, 0x81, 0x10, 0x51, 0x90, 0x7E, 0x16, 0x27, 0x53, 0xB5, 0x6B, 0x0F, 0x6B, 0x41,
+	    0x0D, 0xBA, 0x74, 0xD8, 0xA8, 0x4B, 0x2A, 0x14, 0xB3, 0x14, 0x4E, 0x0E, 0xF1, 0x28, 0x47, 0x54, 0xFD, 0x17,
+	    0xED, 0x95, 0x0D, 0x59, 0x65, 0xB4, 0xB9, 0xDD, 0x46, 0x58, 0x2D, 0xB1, 0x17, 0x8D, 0x16, 0x9C, 0x6B, 0xC4,
+	    0x65, 0xB0, 0xD6, 0xFF, 0x9C, 0xA3, 0x92, 0x8F, 0xEF, 0x5B, 0x9A, 0xE4, 0xE4, 0x18, 0xFC, 0x15, 0xE8, 0x3E,
+	    0xBE, 0xA0, 0xF8, 0x7F, 0xA9, 0xFF, 0x5E, 0xED, 0x70, 0x05, 0x0D, 0xED, 0x28, 0x49, 0xF4, 0x7B, 0xF9, 0x59,
+	    0xD9, 0x56, 0x85, 0x0C, 0xE9, 0x29, 0x85, 0x1F, 0x0D, 0x81, 0x15, 0xF6, 0x35, 0xB1, 0x05, 0xEE, 0x2E, 0x4E,
+	    0x15, 0xD0, 0x4B, 0x24, 0x54, 0xBF, 0x6F, 0x4F, 0xAD, 0xF0, 0x34, 0xB1, 0x04, 0x03, 0x11, 0x9C, 0xD8, 0xE3,
+	    0xB9, 0x2F, 0xCC, 0x5B};
 
 	if (!base::compare_bytes(gsl::as_bytes(gsl::make_span(GoodPrime)), primeBytes)) {
 		if (g == 3 || g == 4 || g == 5 || g == 7) {
@@ -155,10 +154,8 @@ bool IsPrimeAndGood(base::const_byte_span primeBytes, int g) {
 	return IsPrimeAndGoodCheck(openssl::BigNum(primeBytes), g);
 }
 
-std::vector<gsl::byte> CreateAuthKey(
-		base::const_byte_span firstBytes,
-		base::const_byte_span randomBytes,
-		base::const_byte_span primeBytes) {
+std::vector<gsl::byte> CreateAuthKey(base::const_byte_span firstBytes, base::const_byte_span randomBytes,
+                                     base::const_byte_span primeBytes) {
 	using openssl::BigNum;
 	BigNum first(firstBytes);
 	BigNum prime(primeBytes);
@@ -169,10 +166,7 @@ std::vector<gsl::byte> CreateAuthKey(
 	return BigNum::ModExp(first, BigNum(randomBytes), prime).getBytes();
 }
 
-ModExpFirst CreateModExp(
-		int g,
-		base::const_byte_span primeBytes,
-		base::const_byte_span randomSeed) {
+ModExpFirst CreateModExp(int g, base::const_byte_span primeBytes, base::const_byte_span randomSeed) {
 	Expects(randomSeed.size() == ModExpFirst::kRandomPowerSize);
 
 	using namespace openssl;
@@ -194,15 +188,17 @@ ModExpFirst CreateModExp(
 	return result;
 }
 
-void wrapInvokeAfter(mtpRequest &to, const mtpRequest &from, const mtpRequestMap &haveSent, qint32 skipBeforeRequest = 0) {
-	mtpMsgId afterId(*(mtpMsgId*)(from->after->data() + 4));
+void wrapInvokeAfter(mtpRequest &to, const mtpRequest &from, const mtpRequestMap &haveSent,
+                     qint32 skipBeforeRequest = 0) {
+	mtpMsgId afterId(*(mtpMsgId *)(from->after->data() + 4));
 	mtpRequestMap::const_iterator i = afterId ? haveSent.constFind(afterId) : haveSent.cend();
 	qint32 size = to->size(), lenInInts = (from.innerLength() >> 2), headlen = 4, fulllen = headlen + lenInInts;
 	if (i == haveSent.constEnd()) { // no invoke after or such msg was not sent or was completed recently
 		to->resize(size + fulllen + skipBeforeRequest);
 		if (skipBeforeRequest) {
 			memcpy(to->data() + size, from->constData() + 4, headlen * sizeof(mtpPrime));
-			memcpy(to->data() + size + headlen + skipBeforeRequest, from->constData() + 4 + headlen, lenInInts * sizeof(mtpPrime));
+			memcpy(to->data() + size + headlen + skipBeforeRequest, from->constData() + 4 + headlen,
+			       lenInInts * sizeof(mtpPrime));
 		} else {
 			memcpy(to->data() + size, from->constData() + 4, fulllen * sizeof(mtpPrime));
 		}
@@ -210,9 +206,10 @@ void wrapInvokeAfter(mtpRequest &to, const mtpRequest &from, const mtpRequestMap
 		to->resize(size + fulllen + skipBeforeRequest + 3);
 		memcpy(to->data() + size, from->constData() + 4, headlen * sizeof(mtpPrime));
 		(*to)[size + 3] += 3 * sizeof(mtpPrime);
-		*((mtpTypeId*)&((*to)[size + headlen + skipBeforeRequest])) = mtpc_invokeAfterMsg;
+		*((mtpTypeId *)&((*to)[size + headlen + skipBeforeRequest])) = mtpc_invokeAfterMsg;
 		memcpy(to->data() + size + headlen + skipBeforeRequest + 1, &afterId, 2 * sizeof(mtpPrime));
-		memcpy(to->data() + size + headlen + skipBeforeRequest + 3, from->constData() + 4 + headlen, lenInInts * sizeof(mtpPrime));
+		memcpy(to->data() + size + headlen + skipBeforeRequest + 3, from->constData() + 4 + headlen,
+		       lenInInts * sizeof(mtpPrime));
 		if (size + 3 != 7) (*to)[7] += 3 * sizeof(mtpPrime);
 	}
 }
@@ -221,7 +218,7 @@ bool parsePQ(const QByteArray &pqStr, QByteArray &pStr, QByteArray &qStr) {
 	if (pqStr.length() > 8) return false; // more than 64 bit pq
 
 	quint64 pq = 0, p, q;
-	const uchar *pqChars = (const uchar*)pqStr.constData();
+	const uchar *pqChars = (const uchar *)pqStr.constData();
 	for (quint32 i = 0, l = pqStr.length(); i < l; ++i) {
 		pq <<= 8;
 		pq |= (quint64)pqChars[i];
@@ -229,7 +226,7 @@ bool parsePQ(const QByteArray &pqStr, QByteArray &pStr, QByteArray &qStr) {
 	quint64 pqSqrt = (quint64)sqrtl((long double)pq), ySqr, y;
 	while (pqSqrt * pqSqrt > pq) --pqSqrt;
 	while (pqSqrt * pqSqrt < pq) ++pqSqrt;
-	for (ySqr = pqSqrt * pqSqrt - pq; ; ++pqSqrt, ySqr = pqSqrt * pqSqrt - pq) {
+	for (ySqr = pqSqrt * pqSqrt - pq;; ++pqSqrt, ySqr = pqSqrt * pqSqrt - pq) {
 		y = (quint64)sqrtl((long double)ySqr);
 		while (y * y > ySqr) --y;
 		while (y * y < ySqr) ++y;
@@ -243,14 +240,14 @@ bool parsePQ(const QByteArray &pqStr, QByteArray &pStr, QByteArray &qStr) {
 	if (p > q) std::swap(p, q);
 
 	pStr.resize(4);
-	uchar *pChars = (uchar*)pStr.data();
+	uchar *pChars = (uchar *)pStr.data();
 	for (quint32 i = 0; i < 4; ++i) {
 		*(pChars + 3 - i) = (uchar)(p & 0xFF);
 		p >>= 8;
 	}
 
 	qStr.resize(4);
-	uchar *qChars = (uchar*)qStr.data();
+	uchar *qChars = (uchar *)qStr.data();
 	for (quint32 i = 0; i < 4; ++i) {
 		*(qChars + 3 - i) = (uchar)(q & 0xFF);
 		q >>= 8;
@@ -261,8 +258,8 @@ bool parsePQ(const QByteArray &pqStr, QByteArray &pStr, QByteArray &qStr) {
 
 } // namespace
 
-Connection::Connection(Instance *instance) : _instance(instance) {
-}
+Connection::Connection(Instance *instance)
+    : _instance(instance) {}
 
 void Connection::start(SessionData *sessionData, ShiftedDcId shiftedDcId) {
 	Expects(thread == nullptr && data == nullptr);
@@ -358,15 +355,17 @@ void ConnectionPrivate::destroyConn(AbstractConnection **conn) {
 	}
 }
 
-ConnectionPrivate::ConnectionPrivate(Instance *instance, QThread *thread, Connection *owner, SessionData *data, ShiftedDcId shiftedDcId) : QObject()
-, _instance(instance)
-, _state(DisconnectedState)
-, _shiftedDcId(shiftedDcId)
-, _owner(owner)
-, _waitForReceived(MTPMinReceiveDelay)
-, _waitForConnected(MTPMinConnectDelay)
-//, sessionDataMutex(QReadWriteLock::Recursive)
-, sessionData(data) {
+ConnectionPrivate::ConnectionPrivate(Instance *instance, QThread *thread, Connection *owner, SessionData *data,
+                                     ShiftedDcId shiftedDcId)
+    : QObject()
+    , _instance(instance)
+    , _state(DisconnectedState)
+    , _shiftedDcId(shiftedDcId)
+    , _owner(owner)
+    , _waitForReceived(MTPMinReceiveDelay)
+    , _waitForConnected(MTPMinConnectDelay)
+    //, sessionDataMutex(QReadWriteLock::Recursive)
+    , sessionData(data) {
 	oldConnectionTimer.moveToThread(thread);
 	_waitForConnectedTimer.moveToThread(thread);
 	_waitForReceivedTimer.moveToThread(thread);
@@ -379,7 +378,8 @@ ConnectionPrivate::ConnectionPrivate(Instance *instance, QThread *thread, Connec
 
 	connect(thread, &QThread::started, this, [this] { connectToServer(); });
 	connect(thread, &QThread::finished, this, [this] { finishAndDestroy(); });
-	connect(this, SIGNAL(finished(internal::Connection*)), _instance, SLOT(connectionFinished(internal::Connection*)), Qt::QueuedConnection);
+	connect(this, SIGNAL(finished(internal::Connection *)), _instance, SLOT(connectionFinished(internal::Connection *)),
+	        Qt::QueuedConnection);
 
 	connect(&retryTimer, SIGNAL(timeout()), this, SLOT(retryByTimer()));
 	connect(&_waitForConnectedTimer, SIGNAL(timeout()), this, SLOT(onWaitConnectedFailed()));
@@ -391,7 +391,8 @@ ConnectionPrivate::ConnectionPrivate(Instance *instance, QThread *thread, Connec
 
 	connect(sessionData->owner(), SIGNAL(needToRestart()), this, SLOT(restartNow()), Qt::QueuedConnection);
 	connect(this, SIGNAL(needToReceive()), sessionData->owner(), SLOT(tryToReceive()), Qt::QueuedConnection);
-	connect(this, SIGNAL(stateChanged(qint32)), sessionData->owner(), SLOT(onConnectionStateChange(qint32)), Qt::QueuedConnection);
+	connect(this, SIGNAL(stateChanged(qint32)), sessionData->owner(), SLOT(onConnectionStateChange(qint32)),
+	        Qt::QueuedConnection);
 	connect(sessionData->owner(), SIGNAL(needToSend()), this, SLOT(tryToSend()), Qt::QueuedConnection);
 	connect(sessionData->owner(), SIGNAL(needToPing()), this, SLOT(onPingSendForce()), Qt::QueuedConnection);
 	connect(this, SIGNAL(sessionResetDone()), sessionData->owner(), SLOT(onResetDone()), Qt::QueuedConnection);
@@ -399,16 +400,21 @@ ConnectionPrivate::ConnectionPrivate(Instance *instance, QThread *thread, Connec
 	static bool _registered = false;
 	if (!_registered) {
 		_registered = true;
-		qRegisterMetaType<QVector<quint64> >("QVector<quint64>");
+		qRegisterMetaType<QVector<quint64>>("QVector<quint64>");
 	}
 
 	connect(this, SIGNAL(needToSendAsync()), sessionData->owner(), SLOT(needToResumeAndSend()), Qt::QueuedConnection);
-	connect(this, SIGNAL(sendAnythingAsync(qint64)), sessionData->owner(), SLOT(sendAnything(qint64)), Qt::QueuedConnection);
+	connect(this, SIGNAL(sendAnythingAsync(qint64)), sessionData->owner(), SLOT(sendAnything(qint64)),
+	        Qt::QueuedConnection);
 	connect(this, SIGNAL(sendHttpWaitAsync()), sessionData->owner(), SLOT(sendAnything()), Qt::QueuedConnection);
-	connect(this, SIGNAL(sendPongAsync(quint64,quint64)), sessionData->owner(), SLOT(sendPong(quint64,quint64)), Qt::QueuedConnection);
-	connect(this, SIGNAL(sendMsgsStateInfoAsync(quint64, QByteArray)), sessionData->owner(), SLOT(sendMsgsStateInfo(quint64,QByteArray)), Qt::QueuedConnection);
-	connect(this, SIGNAL(resendAsync(quint64,qint64,bool,bool)), sessionData->owner(), SLOT(resend(quint64,qint64,bool,bool)), Qt::QueuedConnection);
-	connect(this, SIGNAL(resendManyAsync(QVector<quint64>,qint64,bool,bool)), sessionData->owner(), SLOT(resendMany(QVector<quint64>,qint64,bool,bool)), Qt::QueuedConnection);
+	connect(this, SIGNAL(sendPongAsync(quint64, quint64)), sessionData->owner(), SLOT(sendPong(quint64, quint64)),
+	        Qt::QueuedConnection);
+	connect(this, SIGNAL(sendMsgsStateInfoAsync(quint64, QByteArray)), sessionData->owner(),
+	        SLOT(sendMsgsStateInfo(quint64, QByteArray)), Qt::QueuedConnection);
+	connect(this, SIGNAL(resendAsync(quint64, qint64, bool, bool)), sessionData->owner(),
+	        SLOT(resend(quint64, qint64, bool, bool)), Qt::QueuedConnection);
+	connect(this, SIGNAL(resendManyAsync(QVector<quint64>, qint64, bool, bool)), sessionData->owner(),
+	        SLOT(resendMany(QVector<quint64>, qint64, bool, bool)), Qt::QueuedConnection);
 	connect(this, SIGNAL(resendAllAsync()), sessionData->owner(), SLOT(resendAll()));
 }
 
@@ -483,12 +489,14 @@ void ConnectionPrivate::resetSession() { // recreate all msg_id and msg_seqno
 	Replaces replaces;
 	for (mtpRequestMap::const_iterator i = haveSent.cbegin(), e = haveSent.cend(); i != e; ++i) {
 		if (!mtpRequestData::isSentContainer(i.value())) {
-			if (!*(mtpMsgId*)(i.value()->constData() + 4)) continue;
+			if (!*(mtpMsgId *)(i.value()->constData() + 4)) continue;
 
 			mtpMsgId id = i.key();
 			if (id > newId) {
 				while (true) {
-					if (toResend.constFind(newId) == toResend.cend() && wereAcked.constFind(newId) == wereAcked.cend() && haveSent.constFind(newId) == haveSent.cend()) {
+					if (toResend.constFind(newId) == toResend.cend() &&
+					    wereAcked.constFind(newId) == wereAcked.cend() &&
+					    haveSent.constFind(newId) == haveSent.cend()) {
 						break;
 					}
 					mtpMsgId m = msgid();
@@ -500,22 +508,25 @@ void ConnectionPrivate::resetSession() { // recreate all msg_id and msg_seqno
 				MTP_LOG(_shiftedDcId, ("Replacing msgId %1 to %2!").arg(id).arg(newId));
 				replaces.insert(id, newId);
 				id = newId;
-				*(mtpMsgId*)(i.value()->data() + 4) = id;
+				*(mtpMsgId *)(i.value()->data() + 4) = id;
 			}
 			setSeqNumbers.insert(id, i.value());
 		}
 	}
-	for (mtpRequestIdsMap::const_iterator i = toResend.cbegin(), e = toResend.cend(); i != e; ++i) { // collect all non-container requests
+	for (mtpRequestIdsMap::const_iterator i = toResend.cbegin(), e = toResend.cend(); i != e;
+	     ++i) { // collect all non-container requests
 		mtpPreRequestMap::const_iterator j = toSend.constFind(i.value());
 		if (j == toSend.cend()) continue;
 
 		if (!mtpRequestData::isSentContainer(j.value())) {
-			if (!*(mtpMsgId*)(j.value()->constData() + 4)) continue;
+			if (!*(mtpMsgId *)(j.value()->constData() + 4)) continue;
 
 			mtpMsgId id = i.key();
 			if (id > newId) {
 				while (true) {
-					if (toResend.constFind(newId) == toResend.cend() && wereAcked.constFind(newId) == wereAcked.cend() && haveSent.constFind(newId) == haveSent.cend()) {
+					if (toResend.constFind(newId) == toResend.cend() &&
+					    wereAcked.constFind(newId) == wereAcked.cend() &&
+					    haveSent.constFind(newId) == haveSent.cend()) {
 						break;
 					}
 					mtpMsgId m = msgid();
@@ -527,22 +538,25 @@ void ConnectionPrivate::resetSession() { // recreate all msg_id and msg_seqno
 				MTP_LOG(_shiftedDcId, ("Replacing msgId %1 to %2!").arg(id).arg(newId));
 				replaces.insert(id, newId);
 				id = newId;
-				*(mtpMsgId*)(j.value()->data() + 4) = id;
+				*(mtpMsgId *)(j.value()->data() + 4) = id;
 			}
 			setSeqNumbers.insert(id, j.value());
 		}
 	}
 
 	quint64 session = rand_value<quint64>();
-	DEBUG_LOG(("MTP Info: creating new session after bad_msg_notification, setting random server_session %1").arg(session));
+	DEBUG_LOG(
+	    ("MTP Info: creating new session after bad_msg_notification, setting random server_session %1").arg(session));
 	sessionData->setSession(session);
 
-	for (mtpRequestMap::const_iterator i = setSeqNumbers.cbegin(), e = setSeqNumbers.cend(); i != e; ++i) { // generate new seq_numbers
+	for (mtpRequestMap::const_iterator i = setSeqNumbers.cbegin(), e = setSeqNumbers.cend(); i != e;
+	     ++i) { // generate new seq_numbers
 		bool wasNeedAck = (*(i.value()->data() + 6) & 1);
 		*(i.value()->data() + 6) = sessionData->nextRequestSeqNumber(wasNeedAck);
 	}
 	if (!replaces.isEmpty()) {
-		for (Replaces::const_iterator i = replaces.cbegin(), e = replaces.cend(); i != e; ++i) { // replace msgIds keys in all data structs
+		for (Replaces::const_iterator i = replaces.cbegin(), e = replaces.cend(); i != e;
+		     ++i) { // replace msgIds keys in all data structs
 			mtpRequestMap::iterator j = haveSent.find(i.key());
 			if (j != haveSent.cend()) {
 				mtpRequest req = j.value();
@@ -562,7 +576,8 @@ void ConnectionPrivate::resetSession() { // recreate all msg_id and msg_seqno
 				wereAcked.insert(i.value(), req);
 			}
 		}
-		for (mtpRequestMap::const_iterator i = haveSent.cbegin(), e = haveSent.cend(); i != e; ++i) { // replace msgIds in saved containers
+		for (mtpRequestMap::const_iterator i = haveSent.cbegin(), e = haveSent.cend(); i != e;
+		     ++i) { // replace msgIds in saved containers
 			if (mtpRequestData::isSentContainer(i.value())) {
 				mtpMsgId *ids = (mtpMsgId *)(i.value()->data() + 8);
 				for (quint32 j = 0, l = (i.value()->size() - 8) >> 1; j < l; ++j) {
@@ -587,7 +602,7 @@ void ConnectionPrivate::resetSession() { // recreate all msg_id and msg_seqno
 
 mtpMsgId ConnectionPrivate::prepareToSend(mtpRequest &request, mtpMsgId currentLastId) {
 	if (request->size() < 9) return 0;
-	mtpMsgId msgId = *(mtpMsgId*)(request->constData() + 4);
+	mtpMsgId msgId = *(mtpMsgId *)(request->constData() + 4);
 	if (msgId) { // resending this request
 		QWriteLocker locker(sessionData->toResendMutex());
 		mtpRequestIdsMap &toResend(sessionData->toResendMap());
@@ -596,7 +611,7 @@ mtpMsgId ConnectionPrivate::prepareToSend(mtpRequest &request, mtpMsgId currentL
 			toResend.erase(i);
 		}
 	} else {
-		msgId = *(mtpMsgId*)(request->data() + 4) = currentLastId;
+		msgId = *(mtpMsgId *)(request->data() + 4) = currentLastId;
 		*(request->data() + 6) = sessionData->nextRequestSeqNumber(mtpRequestData::needAck(request));
 	}
 	return msgId;
@@ -605,7 +620,7 @@ mtpMsgId ConnectionPrivate::prepareToSend(mtpRequest &request, mtpMsgId currentL
 mtpMsgId ConnectionPrivate::replaceMsgId(mtpRequest &request, mtpMsgId newId) {
 	if (request->size() < 9) return 0;
 
-	mtpMsgId oldMsgId = *(mtpMsgId*)(request->constData() + 4);
+	mtpMsgId oldMsgId = *(mtpMsgId *)(request->constData() + 4);
 	if (oldMsgId != newId) {
 		if (oldMsgId) {
 			QWriteLocker locker(sessionData->toResendMutex());
@@ -616,7 +631,8 @@ mtpMsgId ConnectionPrivate::replaceMsgId(mtpRequest &request, mtpMsgId newId) {
 			mtpRequestMap &haveSent(sessionData->haveSentMap());
 
 			while (true) {
-				if (toResend.constFind(newId) == toResend.cend() && wereAcked.constFind(newId) == wereAcked.cend() && haveSent.constFind(newId) == haveSent.cend()) {
+				if (toResend.constFind(newId) == toResend.cend() && wereAcked.constFind(newId) == wereAcked.cend() &&
+				    haveSent.constFind(newId) == haveSent.cend()) {
 					break;
 				}
 				mtpMsgId m = msgid();
@@ -660,12 +676,13 @@ mtpMsgId ConnectionPrivate::replaceMsgId(mtpRequest &request, mtpMsgId newId) {
 		} else {
 			*(request->data() + 6) = sessionData->nextRequestSeqNumber(mtpRequestData::needAck(request));
 		}
-		*(mtpMsgId*)(request->data() + 4) = newId;
+		*(mtpMsgId *)(request->data() + 4) = newId;
 	}
 	return newId;
 }
 
-mtpMsgId ConnectionPrivate::placeToContainer(mtpRequest &toSendRequest, mtpMsgId &bigMsgId, mtpMsgId *&haveSentArr, mtpRequest &req) {
+mtpMsgId ConnectionPrivate::placeToContainer(mtpRequest &toSendRequest, mtpMsgId &bigMsgId, mtpMsgId *&haveSentArr,
+                                             mtpRequest &req) {
 	mtpMsgId msgId = prepareToSend(req, bigMsgId);
 	if (msgId > bigMsgId) msgId = replaceMsgId(req, bigMsgId);
 	if (msgId >= bigMsgId) bigMsgId = msgid();
@@ -720,7 +737,8 @@ void ConnectionPrivate::tryToSend() {
 		_pingIdToSend = 0;
 	} else {
 		if (prependOnly) {
-			DEBUG_LOG(("MTP Info: dc %1 not sending, waiting for Connected state, state: %2").arg(_shiftedDcId).arg(state));
+			DEBUG_LOG(
+			    ("MTP Info: dc %1 not sending, waiting for Connected state, state: %2").arg(_shiftedDcId).arg(state));
 			return; // just do nothing, if is not connected yet
 		} else {
 			DEBUG_LOG(("MTP Info: dc %1 trying to send after ping, state: %2").arg(_shiftedDcId).arg(state));
@@ -770,7 +788,7 @@ void ConnectionPrivate::tryToSend() {
 			req.write(*stateRequest);
 
 			stateRequest->msDate = getms(true); // > 0 - can send without container
-			stateRequest->requestId = reqid();// add to haveSent / wereAcked maps, but don't add to requestMap
+			stateRequest->requestId = reqid(); // add to haveSent / wereAcked maps, but don't add to requestMap
 		}
 		if (_conn->usingHttpWait()) {
 			MTPHttpWait req(MTP_http_wait(MTP_int(100), MTP_int(30), MTP_int(25000)));
@@ -791,7 +809,10 @@ void ConnectionPrivate::tryToSend() {
 		auto langPack = "tdesktop";
 		auto deviceModel = (_dcType == DcType::Cdn) ? "n/a" : cApiDeviceModel();
 		auto systemVersion = (_dcType == DcType::Cdn) ? "n/a" : cApiSystemVersion();
-		initWrapper = MTPInitConnection<mtpRequest>(MTP_int(ApiId), MTP_string(deviceModel), MTP_string(systemVersion), MTP_string(str_const_toString(AppVersionStr)), MTP_string(systemLangCode), MTP_string(langPack), MTP_string(cloudLangCode), mtpRequest());
+		initWrapper =
+		    MTPInitConnection<mtpRequest>(MTP_int(ApiId), MTP_string(deviceModel), MTP_string(systemVersion),
+		                                  MTP_string(str_const_toString(AppVersionStr)), MTP_string(systemLangCode),
+		                                  MTP_string(langPack), MTP_string(cloudLangCode), mtpRequest());
 		initSizeInInts = (initWrapper.innerLength() >> 2) + 2;
 		initSize = initSizeInInts * sizeof(mtpPrime);
 	}
@@ -813,7 +834,14 @@ void ConnectionPrivate::tryToSend() {
 
 		if (!toSendCount) return; // nothing to send
 
-		mtpRequest first = pingRequest ? pingRequest : (ackRequest ? ackRequest : (resendRequest ? resendRequest : (stateRequest ? stateRequest : (httpWaitRequest ? httpWaitRequest : toSend.cbegin().value()))));
+		mtpRequest first =
+		    pingRequest ?
+		        pingRequest :
+		        (ackRequest ?
+		             ackRequest :
+		             (resendRequest ? resendRequest :
+		                              (stateRequest ? stateRequest :
+		                                              (httpWaitRequest ? httpWaitRequest : toSend.cbegin().value()))));
 		if (toSendCount == 1 && first->msDate > 0) { // if can send without container
 			toSendRequest = first;
 			if (!prependOnly) {
@@ -847,14 +875,17 @@ void ConnectionPrivate::tryToSend() {
 						toSendRequest = wrappedRequest;
 					}
 					if (needsLayer) {
-						qint32 noWrapSize = (toSendRequest.innerLength() >> 2), toSendSize = noWrapSize + initSizeInInts;
+						qint32 noWrapSize = (toSendRequest.innerLength() >> 2),
+						       toSendSize = noWrapSize + initSizeInInts;
 						mtpRequest wrappedRequest(mtpRequestData::prepare(toSendSize));
-						memcpy(wrappedRequest->data(), toSendRequest->constData(), 7 * sizeof(mtpPrime)); // all except length
+						memcpy(wrappedRequest->data(), toSendRequest->constData(),
+						       7 * sizeof(mtpPrime)); // all except length
 						wrappedRequest->push_back(mtpc_invokeWithLayer);
 						wrappedRequest->push_back(MTP::internal::CurrentLayer);
 						initWrapper.write(*wrappedRequest);
 						wrappedRequest->resize(wrappedRequest->size() + noWrapSize);
-						memcpy(wrappedRequest->data() + wrappedRequest->size() - noWrapSize, toSendRequest->constData() + 8, noWrapSize * sizeof(mtpPrime));
+						memcpy(wrappedRequest->data() + wrappedRequest->size() - noWrapSize,
+						       toSendRequest->constData() + 8, noWrapSize * sizeof(mtpPrime));
 						toSendRequest = wrappedRequest;
 					}
 
@@ -866,7 +897,10 @@ void ConnectionPrivate::tryToSend() {
 			}
 		} else { // send in container
 			bool willNeedInit = false;
-			quint32 containerSize = 1 + 1, idsWrapSize = (toSendCount << 1); // cons + vector size, idsWrapSize - size of "request-like" wrap for msgId vector
+			quint32 containerSize = 1 + 1,
+			        idsWrapSize =
+			            (toSendCount
+			             << 1); // cons + vector size, idsWrapSize - size of "request-like" wrap for msgId vector
 			if (pingRequest) containerSize += mtpRequestData::messageSize(pingRequest);
 			if (ackRequest) containerSize += mtpRequestData::messageSize(ackRequest);
 			if (resendRequest) containerSize += mtpRequestData::messageSize(resendRequest);
@@ -886,7 +920,8 @@ void ConnectionPrivate::tryToSend() {
 				initSerialized.push_back(MTP::internal::CurrentLayer);
 				initWrapper.write(initSerialized);
 			}
-			toSendRequest = mtpRequestData::prepare(containerSize, containerSize + 3 * toSend.size()); // prepare container + each in invoke after
+			toSendRequest = mtpRequestData::prepare(
+			    containerSize, containerSize + 3 * toSend.size()); // prepare container + each in invoke after
 			toSendRequest->push_back(mtpc_msg_container);
 			toSendRequest->push_back(toSendCount);
 
@@ -898,10 +933,11 @@ void ConnectionPrivate::tryToSend() {
 			QWriteLocker locker3(sessionData->wereAckedMutex()); // the fact of this lock is used in replaceMsgId()
 			mtpRequestIdsMap &wereAcked(sessionData->wereAckedMap());
 
-			mtpRequest haveSentIdsWrap(mtpRequestData::prepare(idsWrapSize)); // prepare "request-like" wrap for msgId vector
+			mtpRequest haveSentIdsWrap(
+			    mtpRequestData::prepare(idsWrapSize)); // prepare "request-like" wrap for msgId vector
 			haveSentIdsWrap->requestId = 0;
 			haveSentIdsWrap->resize(haveSentIdsWrap->size() + idsWrapSize);
-			mtpMsgId *haveSentArr = (mtpMsgId*)(haveSentIdsWrap->data() + 8);
+			mtpMsgId *haveSentArr = (mtpMsgId *)(haveSentIdsWrap->data() + 8);
 
 			if (pingRequest) {
 				_pingMsgId = placeToContainer(toSendRequest, bigMsgId, haveSentArr, pingRequest);
@@ -931,7 +967,8 @@ void ConnectionPrivate::tryToSend() {
 							toSendRequest->resize(reqNeedsLayer + initSizeInInts + mtpRequestData::messageSize(req));
 							memcpy(toSendRequest->data() + reqNeedsLayer, req->constData() + 4, 4 * sizeof(mtpPrime));
 							memcpy(toSendRequest->data() + reqNeedsLayer + 4, initSerialized.constData(), initSize);
-							memcpy(toSendRequest->data() + reqNeedsLayer + 4 + initSizeInInts, req->constData() + 8, req.innerLength());
+							memcpy(toSendRequest->data() + reqNeedsLayer + 4 + initSizeInInts, req->constData() + 8,
+							       req.innerLength());
 							*(toSendRequest->data() + reqNeedsLayer + 3) += initSize;
 							added = true;
 						}
@@ -958,7 +995,7 @@ void ConnectionPrivate::tryToSend() {
 			if (httpWaitRequest) placeToContainer(toSendRequest, bigMsgId, haveSentArr, httpWaitRequest);
 
 			mtpMsgId contMsgId = prepareToSend(toSendRequest, bigMsgId);
-			*(mtpMsgId*)(haveSentIdsWrap->data() + 4) = contMsgId;
+			*(mtpMsgId *)(haveSentIdsWrap->data() + 4) = contMsgId;
 			(*haveSentIdsWrap)[6] = 0; // for container, msDate = 0, seqNo = 0
 			haveSent.insert(contMsgId, haveSentIdsWrap);
 			toSend.clear();
@@ -1022,21 +1059,28 @@ void ConnectionPrivate::connectToServer(bool afterConfig) {
 	auto kTcp = Variants::Tcp;
 	auto kHttp = Variants::Http;
 	auto variants = _instance->dcOptions()->lookup(bareDc, _dcType);
-	auto noIPv4 = (_dcType == DcType::Temporary) ? (variants.data[kIPv4][kTcp].port == 0) : (variants.data[kIPv4][kHttp].port == 0);
-	auto noIPv6 = (_dcType == DcType::Temporary) ? true : (!Global::TryIPv6() || (variants.data[kIPv6][kHttp].port == 0));
+	auto noIPv4 = (_dcType == DcType::Temporary) ? (variants.data[kIPv4][kTcp].port == 0) :
+	                                               (variants.data[kIPv4][kHttp].port == 0);
+	auto noIPv6 =
+	    (_dcType == DcType::Temporary) ? true : (!Global::TryIPv6() || (variants.data[kIPv6][kHttp].port == 0));
 	if (noIPv4 && noIPv6) {
 		if (_instance->isKeysDestroyer()) {
 			LOG(("MTP Error: DC %1 options for IPv4 over HTTP not found for auth key destruction!").arg(_shiftedDcId));
-			if (Global::TryIPv6() && noIPv6) LOG(("MTP Error: DC %1 options for IPv6 over HTTP not found for auth key destruction!").arg(_shiftedDcId));
+			if (Global::TryIPv6() && noIPv6)
+				LOG(("MTP Error: DC %1 options for IPv6 over HTTP not found for auth key destruction!")
+				        .arg(_shiftedDcId));
 			emit _instance->keyDestroyed(_shiftedDcId);
 			return;
 		} else if (afterConfig) {
 			LOG(("MTP Error: DC %1 options for IPv4 over HTTP not found right after config load!").arg(_shiftedDcId));
-			if (Global::TryIPv6() && noIPv6) LOG(("MTP Error: DC %1 options for IPv6 over HTTP not found right after config load!").arg(_shiftedDcId));
+			if (Global::TryIPv6() && noIPv6)
+				LOG(("MTP Error: DC %1 options for IPv6 over HTTP not found right after config load!")
+				        .arg(_shiftedDcId));
 			return restart();
 		}
 		DEBUG_LOG(("MTP Info: DC %1 options for IPv4 over HTTP not found, waiting for config").arg(_shiftedDcId));
-		if (Global::TryIPv6() && noIPv6) DEBUG_LOG(("MTP Info: DC %1 options for IPv6 over HTTP not found, waiting for config").arg(_shiftedDcId));
+		if (Global::TryIPv6() && noIPv6)
+			DEBUG_LOG(("MTP Info: DC %1 options for IPv6 over HTTP not found, waiting for config").arg(_shiftedDcId));
 		connect(_instance, SIGNAL(configLoaded()), this, SLOT(onConfigLoaded()), Qt::UniqueConnection);
 		InvokeQueued(_instance, [instance = _instance] { instance->requestConfig(); });
 		return;
@@ -1052,8 +1096,18 @@ void ConnectionPrivate::connectToServer(bool afterConfig) {
 	_pingId = _pingMsgId = _pingIdToSend = _pingSendAt = 0;
 	_pingSender.stop();
 
-	if (!noIPv4) DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2 (tcp) and %3:%4 (http)...").arg(variants.data[kIPv4][kTcp].ip.c_str()).arg(variants.data[kIPv4][kTcp].port).arg(variants.data[kIPv4][kHttp].ip.c_str()).arg(variants.data[kIPv4][kHttp].port));
-	if (!noIPv6) DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)...").arg(variants.data[kIPv6][kTcp].ip.c_str()).arg(variants.data[kIPv6][kTcp].port).arg(variants.data[kIPv4][kHttp].ip.c_str()).arg(variants.data[kIPv4][kHttp].port));
+	if (!noIPv4)
+		DEBUG_LOG(("MTP Info: creating IPv4 connection to %1:%2 (tcp) and %3:%4 (http)...")
+		              .arg(variants.data[kIPv4][kTcp].ip.c_str())
+		              .arg(variants.data[kIPv4][kTcp].port)
+		              .arg(variants.data[kIPv4][kHttp].ip.c_str())
+		              .arg(variants.data[kIPv4][kHttp].port));
+	if (!noIPv6)
+		DEBUG_LOG(("MTP Info: creating IPv6 connection to [%1]:%2 (tcp) and [%3]:%4 (http)...")
+		              .arg(variants.data[kIPv6][kTcp].ip.c_str())
+		              .arg(variants.data[kIPv6][kTcp].port)
+		              .arg(variants.data[kIPv4][kHttp].ip.c_str())
+		              .arg(variants.data[kIPv4][kHttp].port));
 
 	_waitForConnectedTimer.start(_waitForConnected);
 	if (auto conn = _conn4) {
@@ -1142,7 +1196,8 @@ void ConnectionPrivate::onReceivedSome() {
 		qint32 ms = getms(true) - firstSentAt;
 		DEBUG_LOG(("MTP Info: response in %1ms, _waitForReceived: %2ms").arg(ms).arg(_waitForReceived));
 
-		if (ms > 0 && ms * 2 < qint32(_waitForReceived)) _waitForReceived = std::max(ms * 2, qint32(MTPMinReceiveDelay));
+		if (ms > 0 && ms * 2 < qint32(_waitForReceived))
+			_waitForReceived = std::max(ms * 2, qint32(MTPMinReceiveDelay));
 		firstSentAt = -1;
 	}
 }
@@ -1285,8 +1340,8 @@ void ConnectionPrivate::handleReceived() {
 
 			return restartOnError();
 		}
-		if (keyId != *(quint64*)ints) {
-			LOG(("TCP Error: bad auth_key_id %1 instead of %2 received").arg(keyId).arg(*(quint64*)ints));
+		if (keyId != *(quint64 *)ints) {
+			LOG(("TCP Error: bad auth_key_id %1 instead of %2 received").arg(keyId).arg(*(quint64 *)ints));
 			TCP_LOG(("TCP Error: bad message %1").arg(Logs::mb(ints, intsCount * kIntSize).str()));
 
 			return restartOnError();
@@ -1296,7 +1351,7 @@ void ConnectionPrivate::handleReceived() {
 		auto encryptedIntsCount = (intsCount - kExternalHeaderIntsCount);
 		auto encryptedBytesCount = encryptedIntsCount * kIntSize;
 		auto decryptedBuffer = QByteArray(encryptedBytesCount, Qt::Uninitialized);
-		auto msgKey = *(MTPint128*)(ints + 2);
+		auto msgKey = *(MTPint128 *)(ints + 2);
 
 #ifdef TDESKTOP_MTPROTO_OLD
 		aesIgeDecrypt_oldmtp(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, key, msgKey);
@@ -1304,20 +1359,19 @@ void ConnectionPrivate::handleReceived() {
 		aesIgeDecrypt(encryptedInts, decryptedBuffer.data(), encryptedBytesCount, key, msgKey);
 #endif // TDESKTOP_MTPROTO_OLD
 
-		auto decryptedInts = reinterpret_cast<const mtpPrime*>(decryptedBuffer.constData());
-		auto serverSalt = *(quint64*)&decryptedInts[0];
-		auto session = *(quint64*)&decryptedInts[2];
-		auto msgId = *(quint64*)&decryptedInts[4];
-		auto seqNo = *(quint32*)&decryptedInts[6];
+		auto decryptedInts = reinterpret_cast<const mtpPrime *>(decryptedBuffer.constData());
+		auto serverSalt = *(quint64 *)&decryptedInts[0];
+		auto session = *(quint64 *)&decryptedInts[2];
+		auto msgId = *(quint64 *)&decryptedInts[4];
+		auto seqNo = *(quint32 *)&decryptedInts[6];
 		auto needAck = ((seqNo & 0x01) != 0);
 
-		auto messageLength = *(quint32*)&decryptedInts[7];
+		auto messageLength = *(quint32 *)&decryptedInts[7];
 		if (messageLength > kMaxMessageLength) {
 			LOG(("TCP Error: bad messageLength %1").arg(messageLength));
 			TCP_LOG(("TCP Error: bad message %1").arg(Logs::mb(ints, intsCount * kIntSize).str()));
 
 			return restartOnError();
-
 		}
 		auto fullDataLength = kEncryptedHeaderIntsCount * kIntSize + messageLength; // Without padding.
 
@@ -1327,7 +1381,7 @@ void ConnectionPrivate::handleReceived() {
 #ifdef TDESKTOP_MTPROTO_OLD
 		constexpr auto kMinPaddingSize_oldmtp = 0U;
 		constexpr auto kMaxPaddingSize_oldmtp = 15U;
-		auto badMessageLength = (/*paddingSize < kMinPaddingSize_oldmtp || */paddingSize > kMaxPaddingSize_oldmtp);
+		auto badMessageLength = (/*paddingSize < kMinPaddingSize_oldmtp || */ paddingSize > kMaxPaddingSize_oldmtp);
 
 		auto hashedDataLength = badMessageLength ? encryptedBytesCount : fullDataLength;
 		auto sha1ForMsgKeyCheck = hashSha1(decryptedInts, hashedDataLength);
@@ -1344,7 +1398,7 @@ void ConnectionPrivate::handleReceived() {
 		constexpr auto kMaxPaddingSize = 1024U;
 		auto badMessageLength = (paddingSize < kMinPaddingSize || paddingSize > kMaxPaddingSize);
 
-		std::array<uchar, 32> sha256Buffer = { { 0 } };
+		std::array<uchar, 32> sha256Buffer = {{0}};
 
 		SHA256_CTX msgKeyLargeContext;
 		SHA256_Init(&msgKeyLargeContext);
@@ -1368,12 +1422,17 @@ void ConnectionPrivate::handleReceived() {
 			return restartOnError();
 		}
 
-		TCP_LOG(("TCP Info: decrypted message %1,%2,%3 is %4 len").arg(msgId).arg(seqNo).arg(Logs::b(needAck)).arg(fullDataLength));
+		TCP_LOG(("TCP Info: decrypted message %1,%2,%3 is %4 len")
+		            .arg(msgId)
+		            .arg(seqNo)
+		            .arg(Logs::b(needAck))
+		            .arg(fullDataLength));
 
 		quint64 serverSession = sessionData->getSession();
 		if (session != serverSession) {
 			LOG(("MTP Error: bad server session received"));
-			TCP_LOG(("MTP Error: bad server session %1 instead of %2 in message received").arg(session).arg(serverSession));
+			TCP_LOG(
+			    ("MTP Error: bad server session %1 instead of %2 in message received").arg(session).arg(serverSession));
 
 			return restartOnError();
 		}
@@ -1396,7 +1455,9 @@ void ConnectionPrivate::handleReceived() {
 		bool wasConnected = (getState() == ConnectedState);
 		if (serverSalt != mySalt) {
 			if (!badTime) {
-				DEBUG_LOG(("MTP Info: other salt received... received: %1, my salt: %2, updating...").arg(serverSalt).arg(mySalt));
+				DEBUG_LOG(("MTP Info: other salt received... received: %1, my salt: %2, updating...")
+				              .arg(serverSalt)
+				              .arg(mySalt));
 				sessionData->setSalt(serverSalt);
 				if (setState(ConnectedState, ConnectingState)) { // only connected
 					if (restarted) {
@@ -1442,9 +1503,13 @@ void ConnectionPrivate::handleReceived() {
 		bool emitSignal = false;
 		{
 			QReadLocker locker(sessionData->haveReceivedMutex());
-			emitSignal = !sessionData->haveReceivedResponses().isEmpty() || !sessionData->haveReceivedUpdates().isEmpty();
+			emitSignal =
+			    !sessionData->haveReceivedResponses().isEmpty() || !sessionData->haveReceivedUpdates().isEmpty();
 			if (emitSignal) {
-				DEBUG_LOG(("MTP Info: emitting needToReceive() - need to parse in another thread, %1 responses, %2 updates.").arg(sessionData->haveReceivedResponses().size()).arg(sessionData->haveReceivedUpdates().size()));
+				DEBUG_LOG(
+				    ("MTP Info: emitting needToReceive() - need to parse in another thread, %1 responses, %2 updates.")
+				        .arg(sessionData->haveReceivedResponses().size())
+				        .arg(sessionData->haveReceivedUpdates().size()));
 			}
 		}
 
@@ -1475,529 +1540,584 @@ void ConnectionPrivate::handleReceived() {
 	}
 }
 
-ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime *end, quint64 msgId, qint32 serverTime, quint64 serverSalt, bool badTime) {
+ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPrime *from, const mtpPrime *end,
+                                                                     quint64 msgId, qint32 serverTime,
+                                                                     quint64 serverSalt, bool badTime) {
 	mtpTypeId cons = *from;
 	try {
-
-	switch (cons) {
-
-	case mtpc_gzip_packed: {
-		DEBUG_LOG(("Message Info: gzip container"));
-		mtpBuffer response = ungzip(++from, end);
-		if (!response.size()) {
-			return HandleResult::RestartConnection;
-		}
-		return handleOneReceived(response.data(), response.data() + response.size(), msgId, serverTime, serverSalt, badTime);
-	}
-
-	case mtpc_msg_container: {
-		if (++from >= end) throw mtpErrorInsufficient();
-
-		const mtpPrime *otherEnd;
-		quint32 msgsCount = (quint32)*(from++);
-		DEBUG_LOG(("Message Info: container received, count: %1").arg(msgsCount));
-		for (quint32 i = 0; i < msgsCount; ++i) {
-			if (from + 4 >= end) throw mtpErrorInsufficient();
-			otherEnd = from + 4;
-
-			MTPlong inMsgId;
-			inMsgId.read(from, otherEnd);
-			bool isReply = ((inMsgId.v & 0x03) == 1);
-			if (!isReply && ((inMsgId.v & 0x03) != 3)) {
-				LOG(("Message Error: bad msg_id %1 in contained message received").arg(inMsgId.v));
-				return HandleResult::RestartConnection;
-			}
-
-			MTPint inSeqNo;
-			inSeqNo.read(from, otherEnd);
-			MTPint bytes;
-			bytes.read(from, otherEnd);
-			if ((bytes.v & 0x03) || bytes.v < 4) {
-				LOG(("Message Error: bad length %1 of contained message received").arg(bytes.v));
-				return HandleResult::RestartConnection;
-			}
-
-			bool needAck = (inSeqNo.v & 0x01);
-			if (needAck) ackRequestData.push_back(inMsgId);
-
-			DEBUG_LOG(("Message Info: message from container, msg_id: %1, needAck: %2").arg(inMsgId.v).arg(Logs::b(needAck)));
-
-			otherEnd = from + (bytes.v >> 2);
-			if (otherEnd > end) throw mtpErrorInsufficient();
-
-			bool needToHandle = false;
-			{
-				QWriteLocker lock(sessionData->receivedIdsMutex());
-				needToHandle = sessionData->receivedIdsSet().registerMsgId(inMsgId.v, needAck);
-			}
-			auto res = HandleResult::Success; // if no need to handle, then succeed
-			if (needToHandle) {
-				res = handleOneReceived(from, otherEnd, inMsgId.v, serverTime, serverSalt, badTime);
-				badTime = false;
-			}
-			if (res != HandleResult::Success) {
-				return res;
-			}
-
-			from = otherEnd;
-		}
-	} return HandleResult::Success;
-
-	case mtpc_msgs_ack: {
-		MTPMsgsAck msg;
-		msg.read(from, end);
-		auto &ids = msg.c_msgs_ack().vmsg_ids.v;
-		quint32 idsCount = ids.size();
-
-		DEBUG_LOG(("Message Info: acks received, ids: %1").arg(Logs::vector(ids)));
-		if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success);
-
-		if (badTime) {
-			if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
-				badTime = false;
-			} else {
-				return HandleResult::Ignored;
-			}
-		}
-		requestsAcked(ids);
-	} return HandleResult::Success;
-
-	case mtpc_bad_msg_notification: {
-		MTPBadMsgNotification msg;
-		msg.read(from, end);
-		const auto &data(msg.c_bad_msg_notification());
-		LOG(("Message Info: bad message notification received (error_code %3) for msg_id = %1, seq_no = %2").arg(data.vbad_msg_id.v).arg(data.vbad_msg_seqno.v).arg(data.verror_code.v));
-
-		mtpMsgId resendId = data.vbad_msg_id.v;
-		if (resendId == _pingMsgId) {
-			_pingId = 0;
-		}
-		qint32 errorCode = data.verror_code.v;
-		if (errorCode == 16 || errorCode == 17 || errorCode == 32 || errorCode == 33 || errorCode == 64) { // can handle
-			bool needResend = (errorCode == 16 || errorCode == 17); // bad msg_id
-			if (errorCode == 64) { // bad container!
-				needResend = true;
-				if (cDebug()) {
-					mtpRequest request;
-					{
-						QWriteLocker locker(sessionData->haveSentMutex());
-						mtpRequestMap &haveSent(sessionData->haveSentMap());
-
-						mtpRequestMap::const_iterator i = haveSent.constFind(resendId);
-						if (i == haveSent.cend()) {
-							LOG(("Message Error: Container not found!"));
-						} else {
-							request = i.value();
-						}
-					}
-					if (request) {
-						if (mtpRequestData::isSentContainer(request)) {
-							QStringList lst;
-							const mtpMsgId *ids = (const mtpMsgId *)(request->constData() + 8);
-							for (quint32 i = 0, l = (request->size() - 8) >> 1; i < l; ++i) {
-								lst.push_back(QString::number(ids[i]));
-							}
-							LOG(("Message Info: bad container received! messages: %1").arg(lst.join(',')));
-						} else {
-							LOG(("Message Error: bad container received, but request is not a container!"));
-						}
-					}
-				}
-			}
-
-			if (!wasSent(resendId)) {
-				DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
-				return (badTime ? HandleResult::Ignored : HandleResult::Success);
-			}
-
-			if (needResend) { // bad msg_id
-				if (serverSalt) sessionData->setSalt(serverSalt);
-				unixtimeSet(serverTime, true);
-
-				DEBUG_LOG(("Message Info: unixtime updated, now %1, resending in container...").arg(serverTime));
-
-				resend(resendId, 0, true);
-			} else { // must create new session, because msg_id and msg_seqno are inconsistent
-				if (badTime) {
-					if (serverSalt) sessionData->setSalt(serverSalt);
-					unixtimeSet(serverTime, true);
-					badTime = false;
-				}
-				LOG(("Message Info: bad message notification received, msgId %1, error_code %2").arg(data.vbad_msg_id.v).arg(errorCode));
-				return HandleResult::ResetSession;
-			}
-		} else { // fatal (except 48, but it must not get here)
-			mtpMsgId resendId = data.vbad_msg_id.v;
-			mtpRequestId requestId = wasSent(resendId);
-			if (requestId) {
-				LOG(("Message Error: bad message notification received, msgId %1, error_code %2, fatal: clearing callbacks").arg(data.vbad_msg_id.v).arg(errorCode));
-				_instance->clearCallbacksDelayed(RPCCallbackClears(1, RPCCallbackClear(requestId, -errorCode)));
-			} else {
-				DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
-			}
-			return (badTime ? HandleResult::Ignored : HandleResult::Success);
-		}
-	} return HandleResult::Success;
-
-	case mtpc_bad_server_salt: {
-		MTPBadMsgNotification msg;
-		msg.read(from, end);
-		const auto &data(msg.c_bad_server_salt());
-		DEBUG_LOG(("Message Info: bad server salt received (error_code %4) for msg_id = %1, seq_no = %2, new salt: %3").arg(data.vbad_msg_id.v).arg(data.vbad_msg_seqno.v).arg(data.vnew_server_salt.v).arg(data.verror_code.v));
-
-		mtpMsgId resendId = data.vbad_msg_id.v;
-		if (resendId == _pingMsgId) {
-			_pingId = 0;
-		} else if (!wasSent(resendId)) {
-			DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
-			return (badTime ? HandleResult::Ignored : HandleResult::Success);
-		}
-
-		quint64 serverSalt = data.vnew_server_salt.v;
-		sessionData->setSalt(serverSalt);
-		unixtimeSet(serverTime);
-
-		if (setState(ConnectedState, ConnectingState)) { // maybe only connected
-			if (restarted) {
-				emit resendAllAsync();
-				restarted = false;
-			}
-		}
-
-		badTime = false;
-
-		DEBUG_LOG(("Message Info: unixtime updated, now %1, server_salt updated, now %2, resending...").arg(serverTime).arg(serverSalt));
-		resend(resendId);
-	} return HandleResult::Success;
-
-	case mtpc_msgs_state_req: {
-		if (badTime) {
-			DEBUG_LOG(("Message Info: skipping with bad time..."));
-			return HandleResult::Ignored;
-		}
-		MTPMsgsStateReq msg;
-		msg.read(from, end);
-		auto &ids = msg.c_msgs_state_req().vmsg_ids.v;
-		auto idsCount = ids.size();
-		DEBUG_LOG(("Message Info: msgs_state_req received, ids: %1").arg(Logs::vector(ids)));
-		if (!idsCount) return HandleResult::Success;
-
-		QByteArray info(idsCount, Qt::Uninitialized);
-		{
-			QReadLocker lock(sessionData->receivedIdsMutex());
-			auto &receivedIds = sessionData->receivedIdsSet();
-			auto minRecv = receivedIds.min();
-			auto maxRecv = receivedIds.max();
-
-			QReadLocker locker(sessionData->wereAckedMutex());
-			const mtpRequestIdsMap &wereAcked(sessionData->wereAckedMap());
-			mtpRequestIdsMap::const_iterator wereAckedEnd(wereAcked.cend());
-
-			for (quint32 i = 0, l = idsCount; i < l; ++i) {
-				char state = 0;
-				quint64 reqMsgId = ids[i].v;
-				if (reqMsgId < minRecv) {
-					state |= 0x01;
-				} else if (reqMsgId > maxRecv) {
-					state |= 0x03;
-				} else {
-					auto msgIdState = receivedIds.lookup(reqMsgId);
-					if (msgIdState == ReceivedMsgIds::State::NotFound) {
-						state |= 0x02;
-					} else {
-						state |= 0x04;
-						if (wereAcked.constFind(reqMsgId) != wereAckedEnd) {
-							state |= 0x80; // we know, that server knows, that we received request
-						}
-						if (msgIdState == ReceivedMsgIds::State::NeedsAck) { // need ack, so we sent ack
-							state |= 0x08;
-						} else {
-							state |= 0x10;
-						}
-					}
-				}
-				info[i] = state;
-			}
-		}
-		emit sendMsgsStateInfoAsync(msgId, info);
-	} return HandleResult::Success;
-
-	case mtpc_msgs_state_info: {
-		MTPMsgsStateInfo msg;
-		msg.read(from, end);
-		auto &data = msg.c_msgs_state_info();
-
-		auto reqMsgId = data.vreq_msg_id.v;
-		auto &states = data.vinfo.v;
-
-		DEBUG_LOG(("Message Info: msg state received, msgId %1, reqMsgId: %2, HEX states %3").arg(msgId).arg(reqMsgId).arg(Logs::mb(states.data(), states.length()).str()));
-		mtpRequest requestBuffer;
-		{ // find this request in session-shared sent requests map
-			QReadLocker locker(sessionData->haveSentMutex());
-			const mtpRequestMap &haveSent(sessionData->haveSentMap());
-			mtpRequestMap::const_iterator replyTo = haveSent.constFind(reqMsgId);
-			if (replyTo == haveSent.cend()) { // do not look in toResend, because we do not resend msgs_state_req requests
-				DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(reqMsgId));
-				return (badTime ? HandleResult::Ignored : HandleResult::Success);
-			}
-			if (badTime) {
-				if (serverSalt) sessionData->setSalt(serverSalt); // requestsFixTimeSalt with no lookup
-				unixtimeSet(serverTime, true);
-
-				DEBUG_LOG(("Message Info: unixtime updated from mtpc_msgs_state_info, now %1").arg(serverTime));
-
-				badTime = false;
-			}
-			requestBuffer = replyTo.value();
-		}
-		QVector<MTPlong> toAckReq(1, MTP_long(reqMsgId)), toAck;
-		requestsAcked(toAck, true);
-
-		if (requestBuffer->size() < 9) {
-			LOG(("Message Error: bad request %1 found in requestMap, size: %2").arg(reqMsgId).arg(requestBuffer->size()));
-			return HandleResult::RestartConnection;
-		}
-		try {
-			const mtpPrime *rFrom = requestBuffer->constData() + 8, *rEnd = requestBuffer->constData() + requestBuffer->size();
-			if (mtpTypeId(*rFrom) == mtpc_msgs_state_req) {
-				MTPMsgsStateReq request;
-				request.read(rFrom, rEnd);
-				handleMsgsStates(request.c_msgs_state_req().vmsg_ids.v, states, toAck);
-			} else {
-				MTPMsgResendReq request;
-				request.read(rFrom, rEnd);
-				handleMsgsStates(request.c_msg_resend_req().vmsg_ids.v, states, toAck);
-			}
-		} catch(Exception &) {
-			LOG(("Message Error: could not parse sent msgs_state_req"));
-			throw;
-		}
-
-		requestsAcked(toAck);
-	} return HandleResult::Success;
-
-	case mtpc_msgs_all_info: {
-		if (badTime) {
-			DEBUG_LOG(("Message Info: skipping with bad time..."));
-			return HandleResult::Ignored;
-		}
-
-		MTPMsgsAllInfo msg;
-		msg.read(from, end);
-		auto &data = msg.c_msgs_all_info();
-		auto &ids = data.vmsg_ids.v;
-		auto &states = data.vinfo.v;
-
-		QVector<MTPlong> toAck;
-
-		DEBUG_LOG(("Message Info: msgs all info received, msgId %1, reqMsgIds: %2, states %3").arg(msgId).arg(Logs::vector(ids)).arg(Logs::mb(states.data(), states.length()).str()));
-		handleMsgsStates(ids, states, toAck);
-
-		requestsAcked(toAck);
-	} return HandleResult::Success;
-
-	case mtpc_msg_detailed_info: {
-		MTPMsgDetailedInfo msg;
-		msg.read(from, end);
-		const auto &data(msg.c_msg_detailed_info());
-
-		DEBUG_LOG(("Message Info: msg detailed info, sent msgId %1, answerId %2, status %3, bytes %4").arg(data.vmsg_id.v).arg(data.vanswer_msg_id.v).arg(data.vstatus.v).arg(data.vbytes.v));
-
-		QVector<MTPlong> ids(1, data.vmsg_id);
-		if (badTime) {
-			if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
-				badTime = false;
-			} else {
-				DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(data.vmsg_id.v));
-				return HandleResult::Ignored;
-			}
-		}
-		requestsAcked(ids);
-
-		bool received = false;
-		MTPlong resMsgId = data.vanswer_msg_id;
-		{
-			QReadLocker lock(sessionData->receivedIdsMutex());
-			received = (sessionData->receivedIdsSet().lookup(resMsgId.v) != ReceivedMsgIds::State::NotFound);
-		}
-		if (received) {
-			ackRequestData.push_back(resMsgId);
-		} else {
-			DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
-			resendRequestData.push_back(resMsgId);
-		}
-	} return HandleResult::Success;
-
-	case mtpc_msg_new_detailed_info: {
-		if (badTime) {
-			DEBUG_LOG(("Message Info: skipping msg_new_detailed_info with bad time..."));
-			return HandleResult::Ignored;
-		}
-		MTPMsgDetailedInfo msg;
-		msg.read(from, end);
-		const auto &data(msg.c_msg_new_detailed_info());
-
-		DEBUG_LOG(("Message Info: msg new detailed info, answerId %2, status %3, bytes %4").arg(data.vanswer_msg_id.v).arg(data.vstatus.v).arg(data.vbytes.v));
-
-		bool received = false;
-		MTPlong resMsgId = data.vanswer_msg_id;
-		{
-			QReadLocker lock(sessionData->receivedIdsMutex());
-			received = (sessionData->receivedIdsSet().lookup(resMsgId.v) != ReceivedMsgIds::State::NotFound);
-		}
-		if (received) {
-			ackRequestData.push_back(resMsgId);
-		} else {
-			DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
-			resendRequestData.push_back(resMsgId);
-		}
-	} return HandleResult::Success;
-
-	case mtpc_msg_resend_req: {
-		MTPMsgResendReq msg;
-		msg.read(from, end);
-		auto &ids = msg.c_msg_resend_req().vmsg_ids.v;
-
-		auto idsCount = ids.size();
-		DEBUG_LOG(("Message Info: resend of msgs requested, ids: %1").arg(Logs::vector(ids)));
-		if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success);
-
-		QVector<quint64> toResend(ids.size());
-		for (qint32 i = 0, l = ids.size(); i < l; ++i) {
-			toResend[i] = ids.at(i).v;
-		}
-		resendMany(toResend, 0, false, true);
-	} return HandleResult::Success;
-
-	case mtpc_rpc_result: {
-		if (from + 3 > end) throw mtpErrorInsufficient();
-		auto response = SerializedMessage();
-
-		MTPlong reqMsgId;
-		reqMsgId.read(++from, end);
-		mtpTypeId typeId = from[0];
-
-		DEBUG_LOG(("RPC Info: response received for %1, queueing...").arg(reqMsgId.v));
-
-		QVector<MTPlong> ids(1, reqMsgId);
-		if (badTime) {
-			if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
-				badTime = false;
-			} else {
-				DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(reqMsgId.v));
-				return HandleResult::Ignored;
-			}
-		}
-		requestsAcked(ids, true);
-
-		if (typeId == mtpc_gzip_packed) {
-			DEBUG_LOG(("RPC Info: gzip container"));
-			response = ungzip(++from, end);
+		switch (cons) {
+		case mtpc_gzip_packed: {
+			DEBUG_LOG(("Message Info: gzip container"));
+			mtpBuffer response = ungzip(++from, end);
 			if (!response.size()) {
 				return HandleResult::RestartConnection;
 			}
-			typeId = response[0];
-		} else {
-			response.resize(end - from);
-			memcpy(response.data(), from, (end - from) * sizeof(mtpPrime));
-		}
-		if (typeId != mtpc_rpc_error) {
-			// An error could be some RPC_CALL_FAIL or other error inside
-			// the initConnection, so we're not sure yet that it was inited.
-			// Wait till a good response is received.
-			if (!sessionData->layerWasInited()) {
-				sessionData->setLayerWasInited(true);
-				sessionData->owner()->notifyLayerInited(true);
-			}
+			return handleOneReceived(response.data(), response.data() + response.size(), msgId, serverTime, serverSalt,
+			                         badTime);
 		}
 
-		auto requestId = wasSent(reqMsgId.v);
-		if (requestId && requestId != mtpRequestId(0xFFFFFFFF)) {
-			// Save rpc_result for processing in the main thread.
+		case mtpc_msg_container: {
+			if (++from >= end) throw mtpErrorInsufficient();
+
+			const mtpPrime *otherEnd;
+			quint32 msgsCount = (quint32) * (from++);
+			DEBUG_LOG(("Message Info: container received, count: %1").arg(msgsCount));
+			for (quint32 i = 0; i < msgsCount; ++i) {
+				if (from + 4 >= end) throw mtpErrorInsufficient();
+				otherEnd = from + 4;
+
+				MTPlong inMsgId;
+				inMsgId.read(from, otherEnd);
+				bool isReply = ((inMsgId.v & 0x03) == 1);
+				if (!isReply && ((inMsgId.v & 0x03) != 3)) {
+					LOG(("Message Error: bad msg_id %1 in contained message received").arg(inMsgId.v));
+					return HandleResult::RestartConnection;
+				}
+
+				MTPint inSeqNo;
+				inSeqNo.read(from, otherEnd);
+				MTPint bytes;
+				bytes.read(from, otherEnd);
+				if ((bytes.v & 0x03) || bytes.v < 4) {
+					LOG(("Message Error: bad length %1 of contained message received").arg(bytes.v));
+					return HandleResult::RestartConnection;
+				}
+
+				bool needAck = (inSeqNo.v & 0x01);
+				if (needAck) ackRequestData.push_back(inMsgId);
+
+				DEBUG_LOG(("Message Info: message from container, msg_id: %1, needAck: %2")
+				              .arg(inMsgId.v)
+				              .arg(Logs::b(needAck)));
+
+				otherEnd = from + (bytes.v >> 2);
+				if (otherEnd > end) throw mtpErrorInsufficient();
+
+				bool needToHandle = false;
+				{
+					QWriteLocker lock(sessionData->receivedIdsMutex());
+					needToHandle = sessionData->receivedIdsSet().registerMsgId(inMsgId.v, needAck);
+				}
+				auto res = HandleResult::Success; // if no need to handle, then succeed
+				if (needToHandle) {
+					res = handleOneReceived(from, otherEnd, inMsgId.v, serverTime, serverSalt, badTime);
+					badTime = false;
+				}
+				if (res != HandleResult::Success) {
+					return res;
+				}
+
+				from = otherEnd;
+			}
+		}
+			return HandleResult::Success;
+
+		case mtpc_msgs_ack: {
+			MTPMsgsAck msg;
+			msg.read(from, end);
+			auto &ids = msg.c_msgs_ack().vmsg_ids.v;
+			quint32 idsCount = ids.size();
+
+			DEBUG_LOG(("Message Info: acks received, ids: %1").arg(Logs::vector(ids)));
+			if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success);
+
+			if (badTime) {
+				if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
+					badTime = false;
+				} else {
+					return HandleResult::Ignored;
+				}
+			}
+			requestsAcked(ids);
+		}
+			return HandleResult::Success;
+
+		case mtpc_bad_msg_notification: {
+			MTPBadMsgNotification msg;
+			msg.read(from, end);
+			const auto &data(msg.c_bad_msg_notification());
+			LOG(("Message Info: bad message notification received (error_code %3) for msg_id = %1, seq_no = %2")
+			        .arg(data.vbad_msg_id.v)
+			        .arg(data.vbad_msg_seqno.v)
+			        .arg(data.verror_code.v));
+
+			mtpMsgId resendId = data.vbad_msg_id.v;
+			if (resendId == _pingMsgId) {
+				_pingId = 0;
+			}
+			qint32 errorCode = data.verror_code.v;
+			if (errorCode == 16 || errorCode == 17 || errorCode == 32 || errorCode == 33 ||
+			    errorCode == 64) { // can handle
+				bool needResend = (errorCode == 16 || errorCode == 17); // bad msg_id
+				if (errorCode == 64) { // bad container!
+					needResend = true;
+					if (cDebug()) {
+						mtpRequest request;
+						{
+							QWriteLocker locker(sessionData->haveSentMutex());
+							mtpRequestMap &haveSent(sessionData->haveSentMap());
+
+							mtpRequestMap::const_iterator i = haveSent.constFind(resendId);
+							if (i == haveSent.cend()) {
+								LOG(("Message Error: Container not found!"));
+							} else {
+								request = i.value();
+							}
+						}
+						if (request) {
+							if (mtpRequestData::isSentContainer(request)) {
+								QStringList lst;
+								const mtpMsgId *ids = (const mtpMsgId *)(request->constData() + 8);
+								for (quint32 i = 0, l = (request->size() - 8) >> 1; i < l; ++i) {
+									lst.push_back(QString::number(ids[i]));
+								}
+								LOG(("Message Info: bad container received! messages: %1").arg(lst.join(',')));
+							} else {
+								LOG(("Message Error: bad container received, but request is not a container!"));
+							}
+						}
+					}
+				}
+
+				if (!wasSent(resendId)) {
+					DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
+					return (badTime ? HandleResult::Ignored : HandleResult::Success);
+				}
+
+				if (needResend) { // bad msg_id
+					if (serverSalt) sessionData->setSalt(serverSalt);
+					unixtimeSet(serverTime, true);
+
+					DEBUG_LOG(("Message Info: unixtime updated, now %1, resending in container...").arg(serverTime));
+
+					resend(resendId, 0, true);
+				} else { // must create new session, because msg_id and msg_seqno are inconsistent
+					if (badTime) {
+						if (serverSalt) sessionData->setSalt(serverSalt);
+						unixtimeSet(serverTime, true);
+						badTime = false;
+					}
+					LOG(("Message Info: bad message notification received, msgId %1, error_code %2")
+					        .arg(data.vbad_msg_id.v)
+					        .arg(errorCode));
+					return HandleResult::ResetSession;
+				}
+			} else { // fatal (except 48, but it must not get here)
+				mtpMsgId resendId = data.vbad_msg_id.v;
+				mtpRequestId requestId = wasSent(resendId);
+				if (requestId) {
+					LOG(("Message Error: bad message notification received, msgId %1, error_code %2, fatal: clearing "
+					     "callbacks")
+					        .arg(data.vbad_msg_id.v)
+					        .arg(errorCode));
+					_instance->clearCallbacksDelayed(RPCCallbackClears(1, RPCCallbackClear(requestId, -errorCode)));
+				} else {
+					DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
+				}
+				return (badTime ? HandleResult::Ignored : HandleResult::Success);
+			}
+		}
+			return HandleResult::Success;
+
+		case mtpc_bad_server_salt: {
+			MTPBadMsgNotification msg;
+			msg.read(from, end);
+			const auto &data(msg.c_bad_server_salt());
+			DEBUG_LOG(
+			    ("Message Info: bad server salt received (error_code %4) for msg_id = %1, seq_no = %2, new salt: %3")
+			        .arg(data.vbad_msg_id.v)
+			        .arg(data.vbad_msg_seqno.v)
+			        .arg(data.vnew_server_salt.v)
+			        .arg(data.verror_code.v));
+
+			mtpMsgId resendId = data.vbad_msg_id.v;
+			if (resendId == _pingMsgId) {
+				_pingId = 0;
+			} else if (!wasSent(resendId)) {
+				DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(resendId));
+				return (badTime ? HandleResult::Ignored : HandleResult::Success);
+			}
+
+			quint64 serverSalt = data.vnew_server_salt.v;
+			sessionData->setSalt(serverSalt);
+			unixtimeSet(serverTime);
+
+			if (setState(ConnectedState, ConnectingState)) { // maybe only connected
+				if (restarted) {
+					emit resendAllAsync();
+					restarted = false;
+				}
+			}
+
+			badTime = false;
+
+			DEBUG_LOG(("Message Info: unixtime updated, now %1, server_salt updated, now %2, resending...")
+			              .arg(serverTime)
+			              .arg(serverSalt));
+			resend(resendId);
+		}
+			return HandleResult::Success;
+
+		case mtpc_msgs_state_req: {
+			if (badTime) {
+				DEBUG_LOG(("Message Info: skipping with bad time..."));
+				return HandleResult::Ignored;
+			}
+			MTPMsgsStateReq msg;
+			msg.read(from, end);
+			auto &ids = msg.c_msgs_state_req().vmsg_ids.v;
+			auto idsCount = ids.size();
+			DEBUG_LOG(("Message Info: msgs_state_req received, ids: %1").arg(Logs::vector(ids)));
+			if (!idsCount) return HandleResult::Success;
+
+			QByteArray info(idsCount, Qt::Uninitialized);
+			{
+				QReadLocker lock(sessionData->receivedIdsMutex());
+				auto &receivedIds = sessionData->receivedIdsSet();
+				auto minRecv = receivedIds.min();
+				auto maxRecv = receivedIds.max();
+
+				QReadLocker locker(sessionData->wereAckedMutex());
+				const mtpRequestIdsMap &wereAcked(sessionData->wereAckedMap());
+				mtpRequestIdsMap::const_iterator wereAckedEnd(wereAcked.cend());
+
+				for (quint32 i = 0, l = idsCount; i < l; ++i) {
+					char state = 0;
+					quint64 reqMsgId = ids[i].v;
+					if (reqMsgId < minRecv) {
+						state |= 0x01;
+					} else if (reqMsgId > maxRecv) {
+						state |= 0x03;
+					} else {
+						auto msgIdState = receivedIds.lookup(reqMsgId);
+						if (msgIdState == ReceivedMsgIds::State::NotFound) {
+							state |= 0x02;
+						} else {
+							state |= 0x04;
+							if (wereAcked.constFind(reqMsgId) != wereAckedEnd) {
+								state |= 0x80; // we know, that server knows, that we received request
+							}
+							if (msgIdState == ReceivedMsgIds::State::NeedsAck) { // need ack, so we sent ack
+								state |= 0x08;
+							} else {
+								state |= 0x10;
+							}
+						}
+					}
+					info[i] = state;
+				}
+			}
+			emit sendMsgsStateInfoAsync(msgId, info);
+		}
+			return HandleResult::Success;
+
+		case mtpc_msgs_state_info: {
+			MTPMsgsStateInfo msg;
+			msg.read(from, end);
+			auto &data = msg.c_msgs_state_info();
+
+			auto reqMsgId = data.vreq_msg_id.v;
+			auto &states = data.vinfo.v;
+
+			DEBUG_LOG(("Message Info: msg state received, msgId %1, reqMsgId: %2, HEX states %3")
+			              .arg(msgId)
+			              .arg(reqMsgId)
+			              .arg(Logs::mb(states.data(), states.length()).str()));
+			mtpRequest requestBuffer;
+			{ // find this request in session-shared sent requests map
+				QReadLocker locker(sessionData->haveSentMutex());
+				const mtpRequestMap &haveSent(sessionData->haveSentMap());
+				mtpRequestMap::const_iterator replyTo = haveSent.constFind(reqMsgId);
+				if (replyTo ==
+				    haveSent.cend()) { // do not look in toResend, because we do not resend msgs_state_req requests
+					DEBUG_LOG(("Message Error: such message was not sent recently %1").arg(reqMsgId));
+					return (badTime ? HandleResult::Ignored : HandleResult::Success);
+				}
+				if (badTime) {
+					if (serverSalt) sessionData->setSalt(serverSalt); // requestsFixTimeSalt with no lookup
+					unixtimeSet(serverTime, true);
+
+					DEBUG_LOG(("Message Info: unixtime updated from mtpc_msgs_state_info, now %1").arg(serverTime));
+
+					badTime = false;
+				}
+				requestBuffer = replyTo.value();
+			}
+			QVector<MTPlong> toAckReq(1, MTP_long(reqMsgId)), toAck;
+			requestsAcked(toAck, true);
+
+			if (requestBuffer->size() < 9) {
+				LOG(("Message Error: bad request %1 found in requestMap, size: %2")
+				        .arg(reqMsgId)
+				        .arg(requestBuffer->size()));
+				return HandleResult::RestartConnection;
+			}
+			try {
+				const mtpPrime *rFrom = requestBuffer->constData() + 8,
+				               *rEnd = requestBuffer->constData() + requestBuffer->size();
+				if (mtpTypeId(*rFrom) == mtpc_msgs_state_req) {
+					MTPMsgsStateReq request;
+					request.read(rFrom, rEnd);
+					handleMsgsStates(request.c_msgs_state_req().vmsg_ids.v, states, toAck);
+				} else {
+					MTPMsgResendReq request;
+					request.read(rFrom, rEnd);
+					handleMsgsStates(request.c_msg_resend_req().vmsg_ids.v, states, toAck);
+				}
+			} catch (Exception &) {
+				LOG(("Message Error: could not parse sent msgs_state_req"));
+				throw;
+			}
+
+			requestsAcked(toAck);
+		}
+			return HandleResult::Success;
+
+		case mtpc_msgs_all_info: {
+			if (badTime) {
+				DEBUG_LOG(("Message Info: skipping with bad time..."));
+				return HandleResult::Ignored;
+			}
+
+			MTPMsgsAllInfo msg;
+			msg.read(from, end);
+			auto &data = msg.c_msgs_all_info();
+			auto &ids = data.vmsg_ids.v;
+			auto &states = data.vinfo.v;
+
+			QVector<MTPlong> toAck;
+
+			DEBUG_LOG(("Message Info: msgs all info received, msgId %1, reqMsgIds: %2, states %3")
+			              .arg(msgId)
+			              .arg(Logs::vector(ids))
+			              .arg(Logs::mb(states.data(), states.length()).str()));
+			handleMsgsStates(ids, states, toAck);
+
+			requestsAcked(toAck);
+		}
+			return HandleResult::Success;
+
+		case mtpc_msg_detailed_info: {
+			MTPMsgDetailedInfo msg;
+			msg.read(from, end);
+			const auto &data(msg.c_msg_detailed_info());
+
+			DEBUG_LOG(("Message Info: msg detailed info, sent msgId %1, answerId %2, status %3, bytes %4")
+			              .arg(data.vmsg_id.v)
+			              .arg(data.vanswer_msg_id.v)
+			              .arg(data.vstatus.v)
+			              .arg(data.vbytes.v));
+
+			QVector<MTPlong> ids(1, data.vmsg_id);
+			if (badTime) {
+				if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
+					badTime = false;
+				} else {
+					DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(data.vmsg_id.v));
+					return HandleResult::Ignored;
+				}
+			}
+			requestsAcked(ids);
+
+			bool received = false;
+			MTPlong resMsgId = data.vanswer_msg_id;
+			{
+				QReadLocker lock(sessionData->receivedIdsMutex());
+				received = (sessionData->receivedIdsSet().lookup(resMsgId.v) != ReceivedMsgIds::State::NotFound);
+			}
+			if (received) {
+				ackRequestData.push_back(resMsgId);
+			} else {
+				DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
+				resendRequestData.push_back(resMsgId);
+			}
+		}
+			return HandleResult::Success;
+
+		case mtpc_msg_new_detailed_info: {
+			if (badTime) {
+				DEBUG_LOG(("Message Info: skipping msg_new_detailed_info with bad time..."));
+				return HandleResult::Ignored;
+			}
+			MTPMsgDetailedInfo msg;
+			msg.read(from, end);
+			const auto &data(msg.c_msg_new_detailed_info());
+
+			DEBUG_LOG(("Message Info: msg new detailed info, answerId %2, status %3, bytes %4")
+			              .arg(data.vanswer_msg_id.v)
+			              .arg(data.vstatus.v)
+			              .arg(data.vbytes.v));
+
+			bool received = false;
+			MTPlong resMsgId = data.vanswer_msg_id;
+			{
+				QReadLocker lock(sessionData->receivedIdsMutex());
+				received = (sessionData->receivedIdsSet().lookup(resMsgId.v) != ReceivedMsgIds::State::NotFound);
+			}
+			if (received) {
+				ackRequestData.push_back(resMsgId);
+			} else {
+				DEBUG_LOG(("Message Info: answer message %1 was not received, requesting...").arg(resMsgId.v));
+				resendRequestData.push_back(resMsgId);
+			}
+		}
+			return HandleResult::Success;
+
+		case mtpc_msg_resend_req: {
+			MTPMsgResendReq msg;
+			msg.read(from, end);
+			auto &ids = msg.c_msg_resend_req().vmsg_ids.v;
+
+			auto idsCount = ids.size();
+			DEBUG_LOG(("Message Info: resend of msgs requested, ids: %1").arg(Logs::vector(ids)));
+			if (!idsCount) return (badTime ? HandleResult::Ignored : HandleResult::Success);
+
+			QVector<quint64> toResend(ids.size());
+			for (qint32 i = 0, l = ids.size(); i < l; ++i) {
+				toResend[i] = ids.at(i).v;
+			}
+			resendMany(toResend, 0, false, true);
+		}
+			return HandleResult::Success;
+
+		case mtpc_rpc_result: {
+			if (from + 3 > end) throw mtpErrorInsufficient();
+			auto response = SerializedMessage();
+
+			MTPlong reqMsgId;
+			reqMsgId.read(++from, end);
+			mtpTypeId typeId = from[0];
+
+			DEBUG_LOG(("RPC Info: response received for %1, queueing...").arg(reqMsgId.v));
+
+			QVector<MTPlong> ids(1, reqMsgId);
+			if (badTime) {
+				if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
+					badTime = false;
+				} else {
+					DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(reqMsgId.v));
+					return HandleResult::Ignored;
+				}
+			}
+			requestsAcked(ids, true);
+
+			if (typeId == mtpc_gzip_packed) {
+				DEBUG_LOG(("RPC Info: gzip container"));
+				response = ungzip(++from, end);
+				if (!response.size()) {
+					return HandleResult::RestartConnection;
+				}
+				typeId = response[0];
+			} else {
+				response.resize(end - from);
+				memcpy(response.data(), from, (end - from) * sizeof(mtpPrime));
+			}
+			if (typeId != mtpc_rpc_error) {
+				// An error could be some RPC_CALL_FAIL or other error inside
+				// the initConnection, so we're not sure yet that it was inited.
+				// Wait till a good response is received.
+				if (!sessionData->layerWasInited()) {
+					sessionData->setLayerWasInited(true);
+					sessionData->owner()->notifyLayerInited(true);
+				}
+			}
+
+			auto requestId = wasSent(reqMsgId.v);
+			if (requestId && requestId != mtpRequestId(0xFFFFFFFF)) {
+				// Save rpc_result for processing in the main thread.
+				QWriteLocker locker(sessionData->haveReceivedMutex());
+				sessionData->haveReceivedResponses().insert(requestId, response);
+			} else {
+				DEBUG_LOG(("RPC Info: requestId not found for msgId %1").arg(reqMsgId.v));
+			}
+		}
+			return HandleResult::Success;
+
+		case mtpc_new_session_created: {
+			const mtpPrime *start = from;
+			MTPNewSession msg;
+			msg.read(from, end);
+			const auto &data(msg.c_new_session_created());
+
+			if (badTime) {
+				if (requestsFixTimeSalt(QVector<MTPlong>(1, data.vfirst_msg_id), serverTime, serverSalt)) {
+					badTime = false;
+				} else {
+					DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(data.vfirst_msg_id.v));
+					return HandleResult::Ignored;
+				}
+			}
+
+			DEBUG_LOG(("Message Info: new server session created, unique_id %1, first_msg_id %2, server_salt %3")
+			              .arg(data.vunique_id.v)
+			              .arg(data.vfirst_msg_id.v)
+			              .arg(data.vserver_salt.v));
+			sessionData->setSalt(data.vserver_salt.v);
+
+			mtpMsgId firstMsgId = data.vfirst_msg_id.v;
+			QVector<quint64> toResend;
+			{
+				QReadLocker locker(sessionData->haveSentMutex());
+				const mtpRequestMap &haveSent(sessionData->haveSentMap());
+				toResend.reserve(haveSent.size());
+				for (mtpRequestMap::const_iterator i = haveSent.cbegin(), e = haveSent.cend(); i != e; ++i) {
+					if (i.key() >= firstMsgId) break;
+					if (i.value()->requestId) toResend.push_back(i.key());
+				}
+			}
+			resendMany(toResend, 10, true);
+
+			mtpBuffer update(from - start);
+			if (from > start) memcpy(update.data(), start, (from - start) * sizeof(mtpPrime));
+
+			// Notify main process about new session - need to get difference.
 			QWriteLocker locker(sessionData->haveReceivedMutex());
-			sessionData->haveReceivedResponses().insert(requestId, response);
-		} else {
-			DEBUG_LOG(("RPC Info: requestId not found for msgId %1").arg(reqMsgId.v));
+			sessionData->haveReceivedUpdates().push_back(SerializedMessage(update));
 		}
-	} return HandleResult::Success;
+			return HandleResult::Success;
 
-	case mtpc_new_session_created: {
-		const mtpPrime *start = from;
-		MTPNewSession msg;
-		msg.read(from, end);
-		const auto &data(msg.c_new_session_created());
+		case mtpc_ping: {
+			if (badTime) return HandleResult::Ignored;
 
-		if (badTime) {
-			if (requestsFixTimeSalt(QVector<MTPlong>(1, data.vfirst_msg_id), serverTime, serverSalt)) {
-				badTime = false;
-			} else {
-				DEBUG_LOG(("Message Info: error, such message was not sent recently %1").arg(data.vfirst_msg_id.v));
+			MTPPing msg;
+			msg.read(from, end);
+			DEBUG_LOG(("Message Info: ping received, ping_id: %1, sending pong...").arg(msg.vping_id.v));
+
+			emit sendPongAsync(msgId, msg.vping_id.v);
+		}
+			return HandleResult::Success;
+
+		case mtpc_pong: {
+			MTPPong msg;
+			msg.read(from, end);
+			const auto &data(msg.c_pong());
+			DEBUG_LOG(
+			    ("Message Info: pong received, msg_id: %1, ping_id: %2").arg(data.vmsg_id.v).arg(data.vping_id.v));
+
+			if (!wasSent(data.vmsg_id.v)) {
+				DEBUG_LOG(("Message Error: such msg_id %1 ping_id %2 was not sent recently")
+				              .arg(data.vmsg_id.v)
+				              .arg(data.vping_id.v));
 				return HandleResult::Ignored;
 			}
-		}
-
-		DEBUG_LOG(("Message Info: new server session created, unique_id %1, first_msg_id %2, server_salt %3").arg(data.vunique_id.v).arg(data.vfirst_msg_id.v).arg(data.vserver_salt.v));
-		sessionData->setSalt(data.vserver_salt.v);
-
-		mtpMsgId firstMsgId = data.vfirst_msg_id.v;
-		QVector<quint64> toResend;
-		{
-			QReadLocker locker(sessionData->haveSentMutex());
-			const mtpRequestMap &haveSent(sessionData->haveSentMap());
-			toResend.reserve(haveSent.size());
-			for (mtpRequestMap::const_iterator i = haveSent.cbegin(), e = haveSent.cend(); i != e; ++i) {
-				if (i.key() >= firstMsgId) break;
-				if (i.value()->requestId) toResend.push_back(i.key());
-			}
-		}
-		resendMany(toResend, 10, true);
-
-		mtpBuffer update(from - start);
-		if (from > start) memcpy(update.data(), start, (from - start) * sizeof(mtpPrime));
-
-		// Notify main process about new session - need to get difference.
-		QWriteLocker locker(sessionData->haveReceivedMutex());
-		sessionData->haveReceivedUpdates().push_back(SerializedMessage(update));
-	} return HandleResult::Success;
-
-	case mtpc_ping: {
-		if (badTime) return HandleResult::Ignored;
-
-		MTPPing msg;
-		msg.read(from, end);
-		DEBUG_LOG(("Message Info: ping received, ping_id: %1, sending pong...").arg(msg.vping_id.v));
-
-		emit sendPongAsync(msgId, msg.vping_id.v);
-	} return HandleResult::Success;
-
-	case mtpc_pong: {
-		MTPPong msg;
-		msg.read(from, end);
-		const auto &data(msg.c_pong());
-		DEBUG_LOG(("Message Info: pong received, msg_id: %1, ping_id: %2").arg(data.vmsg_id.v).arg(data.vping_id.v));
-
-		if (!wasSent(data.vmsg_id.v)) {
-			DEBUG_LOG(("Message Error: such msg_id %1 ping_id %2 was not sent recently").arg(data.vmsg_id.v).arg(data.vping_id.v));
-			return HandleResult::Ignored;
-		}
-		if (data.vping_id.v == _pingId) {
-			_pingId = 0;
-		} else {
-			DEBUG_LOG(("Message Info: just pong..."));
-		}
-
-		QVector<MTPlong> ids(1, data.vmsg_id);
-		if (badTime) {
-			if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
-				badTime = false;
+			if (data.vping_id.v == _pingId) {
+				_pingId = 0;
 			} else {
-				return HandleResult::Ignored;
+				DEBUG_LOG(("Message Info: just pong..."));
 			}
-		}
-		requestsAcked(ids, true);
-	} return HandleResult::Success;
 
-	}
+			QVector<MTPlong> ids(1, data.vmsg_id);
+			if (badTime) {
+				if (requestsFixTimeSalt(ids, serverTime, serverSalt)) {
+					badTime = false;
+				} else {
+					return HandleResult::Ignored;
+				}
+			}
+			requestsAcked(ids, true);
+		}
+			return HandleResult::Success;
+		}
 
 	} catch (Exception &) {
 		return HandleResult::RestartConnection;
@@ -2016,7 +2136,9 @@ ConnectionPrivate::HandleResult ConnectionPrivate::handleOneReceived(const mtpPr
 		QWriteLocker locker(sessionData->haveReceivedMutex());
 		sessionData->haveReceivedUpdates().push_back(SerializedMessage(update));
 
-		if (cons != mtpc_updatesTooLong && cons != mtpc_updateShortMessage && cons != mtpc_updateShortChatMessage && cons != mtpc_updateShortSentMessage && cons != mtpc_updateShort && cons != mtpc_updatesCombined && cons != mtpc_updates) {
+		if (cons != mtpc_updatesTooLong && cons != mtpc_updateShortMessage && cons != mtpc_updateShortChatMessage &&
+		    cons != mtpc_updateShortSentMessage && cons != mtpc_updateShort && cons != mtpc_updatesCombined &&
+		    cons != mtpc_updates) {
 			LOG(("Message Error: unknown constructor %1").arg(cons)); // maybe new api?..
 		}
 	} else {
@@ -2045,13 +2167,13 @@ mtpBuffer ConnectionPrivate::ungzip(const mtpPrime *from, const mtpPrime *end) c
 		return result;
 	}
 	stream.avail_in = packedLen;
-	stream.next_in = reinterpret_cast<Bytef*>(packed.v.data());
+	stream.next_in = reinterpret_cast<Bytef *>(packed.v.data());
 
 	stream.avail_out = 0;
 	while (!stream.avail_out) {
 		result.resize(result.size() + unpackedChunk);
 		stream.avail_out = unpackedChunk * sizeof(mtpPrime);
-		stream.next_out = (Bytef*)&result[result.size() - unpackedChunk];
+		stream.next_out = (Bytef *)&result[result.size() - unpackedChunk];
 		int res = inflate(&stream, Z_NO_FLUSH);
 		if (res != Z_OK && res != Z_STREAM_END) {
 			inflateEnd(&stream);
@@ -2078,7 +2200,7 @@ bool ConnectionPrivate::requestsFixTimeSalt(const QVector<MTPlong> &ids, qint32
 	quint32 idsCount = ids.size();
 
 	for (quint32 i = 0; i < idsCount; ++i) {
-		if (wasSent(ids[i].v)) {// found such msg_id in recent acked requests or in recent sent requests
+		if (wasSent(ids[i].v)) { // found such msg_id in recent acked requests or in recent sent requests
 			if (serverSalt) sessionData->setSalt(serverSalt);
 			unixtimeSet(serverTime, true);
 			return true;
@@ -2125,11 +2247,15 @@ void ConnectionPrivate::requestsAcked(const QVector<MTPlong> &ids, bool byRespon
 							wereAcked.insert(msgId, reqId);
 							haveSent.erase(req);
 						} else {
-							DEBUG_LOG(("Message Info: ignoring ACK for msgId %1 because request %2 requires a response").arg(msgId).arg(reqId));
+							DEBUG_LOG(("Message Info: ignoring ACK for msgId %1 because request %2 requires a response")
+							              .arg(msgId)
+							              .arg(reqId));
 						}
 					}
 				} else {
-					DEBUG_LOG(("Message Info: msgId %1 was not found in recent sent, while acking requests, searching in resend...").arg(msgId));
+					DEBUG_LOG(("Message Info: msgId %1 was not found in recent sent, while acking requests, searching "
+					           "in resend...")
+					              .arg(msgId));
 					QWriteLocker locker3(sessionData->toResendMutex());
 					mtpRequestIdsMap &toResend(sessionData->toResendMap());
 					mtpRequestIdsMap::iterator reqIt = toResend.find(msgId);
@@ -2146,17 +2272,27 @@ void ConnectionPrivate::requestsAcked(const QVector<MTPlong> &ids, bool byRespon
 							if (req != toSend.cend()) {
 								wereAcked.insert(msgId, req.value()->requestId);
 								if (req.value()->requestId != reqId) {
-									DEBUG_LOG(("Message Error: for msgId %1 found resent request, requestId %2, contains requestId %3").arg(msgId).arg(reqId).arg(req.value()->requestId));
+									DEBUG_LOG(("Message Error: for msgId %1 found resent request, requestId %2, "
+									           "contains requestId %3")
+									              .arg(msgId)
+									              .arg(reqId)
+									              .arg(req.value()->requestId));
 								} else {
-									DEBUG_LOG(("Message Info: acked msgId %1 that was prepared to resend, requestId %2").arg(msgId).arg(reqId));
+									DEBUG_LOG(("Message Info: acked msgId %1 that was prepared to resend, requestId %2")
+									              .arg(msgId)
+									              .arg(reqId));
 								}
 								toSend.erase(req);
 							} else {
-								DEBUG_LOG(("Message Info: msgId %1 was found in recent resent, requestId %2 was not found in prepared to send").arg(msgId));
+								DEBUG_LOG(("Message Info: msgId %1 was found in recent resent, requestId %2 was not "
+								           "found in prepared to send")
+								              .arg(msgId));
 							}
 							toResend.erase(reqIt);
 						} else {
-							DEBUG_LOG(("Message Info: ignoring ACK for msgId %1 because request %2 requires a response").arg(msgId).arg(reqId));
+							DEBUG_LOG(("Message Info: ignoring ACK for msgId %1 because request %2 requires a response")
+							              .arg(msgId)
+							              .arg(reqId));
 						}
 					} else {
 						DEBUG_LOG(("Message Info: msgId %1 was not found in recent resent either").arg(msgId));
@@ -2186,7 +2322,8 @@ void ConnectionPrivate::requestsAcked(const QVector<MTPlong> &ids, bool byRespon
 	}
 }
 
-void ConnectionPrivate::handleMsgsStates(const QVector<MTPlong> &ids, const QByteArray &states, QVector<MTPlong> &acked) {
+void ConnectionPrivate::handleMsgsStates(const QVector<MTPlong> &ids, const QByteArray &states,
+                                         QVector<MTPlong> &acked) {
 	auto idsCount = ids.size();
 	if (!idsCount) {
 		DEBUG_LOG(("Message Info: void ids vector in handleMsgsStates()"));
@@ -2206,15 +2343,22 @@ void ConnectionPrivate::handleMsgsStates(const QVector<MTPlong> &ids, const QByt
 			const mtpRequestMap &haveSent(sessionData->haveSentMap());
 			mtpRequestMap::const_iterator haveSentEnd = haveSent.cend();
 			if (haveSent.find(requestMsgId) == haveSentEnd) {
-				DEBUG_LOG(("Message Info: state was received for msgId %1, but request is not found, looking in resent requests...").arg(requestMsgId));
+				DEBUG_LOG(("Message Info: state was received for msgId %1, but request is not found, looking in resent "
+				           "requests...")
+				              .arg(requestMsgId));
 				QWriteLocker locker2(sessionData->toResendMutex());
 				mtpRequestIdsMap &toResend(sessionData->toResendMap());
 				mtpRequestIdsMap::iterator reqIt = toResend.find(requestMsgId);
 				if (reqIt != toResend.cend()) {
 					if ((state & 0x07) != 0x04) { // was received
-						DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, already resending in container").arg(requestMsgId).arg((qint32)state));
+						DEBUG_LOG(
+						    ("Message Info: state was received for msgId %1, state %2, already resending in container")
+						        .arg(requestMsgId)
+						        .arg((qint32)state));
 					} else {
-						DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, ack, cancelling resend").arg(requestMsgId).arg((qint32)state));
+						DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, ack, cancelling resend")
+						              .arg(requestMsgId)
+						              .arg((qint32)state));
 						acked.push_back(MTP_long(requestMsgId)); // will remove from resend in requestsAcked
 					}
 				} else {
@@ -2224,10 +2368,13 @@ void ConnectionPrivate::handleMsgsStates(const QVector<MTPlong> &ids, const QByt
 			}
 		}
 		if ((state & 0x07) != 0x04) { // was received
-			DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, resending in container").arg(requestMsgId).arg((qint32)state));
+			DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, resending in container")
+			              .arg(requestMsgId)
+			              .arg((qint32)state));
 			resend(requestMsgId, 10, true);
 		} else {
-			DEBUG_LOG(("Message Info: state was received for msgId %1, state %2, ack").arg(requestMsgId).arg((qint32)state));
+			DEBUG_LOG(
+			    ("Message Info: state was received for msgId %1, state %2, ack").arg(requestMsgId).arg((qint32)state));
 			acked.push_back(MTP_long(requestMsgId));
 		}
 	}
@@ -2238,7 +2385,8 @@ void ConnectionPrivate::resend(quint64 msgId, qint64 msCanWait, bool forceContai
 	emit resendAsync(msgId, msCanWait, forceContainer, sendMsgStateInfo);
 }
 
-void ConnectionPrivate::resendMany(QVector<quint64> msgIds, qint64 msCanWait, bool forceContainer, bool sendMsgStateInfo) {
+void ConnectionPrivate::resendMany(QVector<quint64> msgIds, qint64 msCanWait, bool forceContainer,
+                                   bool sendMsgStateInfo) {
 	for (qint32 i = 0, l = msgIds.size(); i < l; ++i) {
 		if (msgIds.at(i) == _pingMsgId) {
 			msgIds.remove(i);
@@ -2316,7 +2464,7 @@ void ConnectionPrivate::onDisconnected6() {
 	}
 }
 
-void ConnectionPrivate::updateAuthKey() 	{
+void ConnectionPrivate::updateAuthKey() {
 	QReadLocker lockFinished(&sessionDataMutex);
 	if (!sessionData || !_conn) return;
 
@@ -2337,7 +2485,9 @@ void ConnectionPrivate::updateAuthKey() 	{
 		clearMessages();
 		keyId = newKeyId;
 	}
-	DEBUG_LOG(("AuthKey Info: Connection update key from Session, dc %1 result: %2").arg(_shiftedDcId).arg(Logs::mb(&keyId, sizeof(keyId)).str()));
+	DEBUG_LOG(("AuthKey Info: Connection update key from Session, dc %1 result: %2")
+	              .arg(_shiftedDcId)
+	              .arg(Logs::mb(&keyId, sizeof(keyId)).str()));
 	if (keyId) {
 		return authKeyCreated();
 	}
@@ -2391,12 +2541,15 @@ void ConnectionPrivate::pqAnswered() {
 	auto &res_pq_data = res_pq.c_resPQ();
 	if (res_pq_data.vnonce != _authKeyData->nonce) {
 		LOG(("AuthKey Error: received nonce <> sent nonce (in res_pq)!"));
-		DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&res_pq_data.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+		DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+		              .arg(Logs::mb(&res_pq_data.vnonce, 16).str())
+		              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 		return restart();
 	}
 
 	auto rsaKey = internal::RSAPublicKey();
-	if (!_instance->dcOptions()->getDcRSAKey(bareDcId(_shiftedDcId), res_pq.c_resPQ().vserver_public_key_fingerprints.v, &rsaKey)) {
+	if (!_instance->dcOptions()->getDcRSAKey(bareDcId(_shiftedDcId), res_pq.c_resPQ().vserver_public_key_fingerprints.v,
+	                                         &rsaKey)) {
 		if (_dcType == DcType::Cdn) {
 			LOG(("Warning: CDN public RSA key not found"));
 			requestCDNConfig();
@@ -2419,7 +2572,8 @@ void ConnectionPrivate::pqAnswered() {
 		return restart();
 	}
 
-	auto p_q_inner = MTP_p_q_inner_data(res_pq_data.vpq, MTP_bytes(std::move(p)), MTP_bytes(std::move(q)), _authKeyData->nonce, _authKeyData->server_nonce, _authKeyData->new_nonce);
+	auto p_q_inner = MTP_p_q_inner_data(res_pq_data.vpq, MTP_bytes(std::move(p)), MTP_bytes(std::move(q)),
+	                                    _authKeyData->nonce, _authKeyData->server_nonce, _authKeyData->new_nonce);
 	auto dhEncString = encryptPQInnerRSA(p_q_inner, rsaKey);
 	if (dhEncString.empty()) {
 		return restart();
@@ -2439,7 +2593,8 @@ void ConnectionPrivate::pqAnswered() {
 	sendRequestNotSecure(req_DH_params);
 }
 
-base::byte_vector ConnectionPrivate::encryptPQInnerRSA(const MTPP_Q_inner_data &data, const MTP::internal::RSAPublicKey &key) {
+base::byte_vector ConnectionPrivate::encryptPQInnerRSA(const MTPP_Q_inner_data &data,
+                                                       const MTP::internal::RSAPublicKey &key) {
 	auto p_q_inner_size = data.innerLength();
 	auto encSize = (p_q_inner_size >> 2) + 6;
 	if (encSize >= 65) {
@@ -2482,12 +2637,16 @@ void ConnectionPrivate::dhParamsAnswered() {
 		const auto &encDH(res_DH_params.c_server_DH_params_ok());
 		if (encDH.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in server_DH_params_ok)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&encDH.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&encDH.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 			return restart();
 		}
 		if (encDH.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in server_DH_params_ok)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&encDH.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&encDH.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 			return restart();
 		}
 
@@ -2495,7 +2654,8 @@ void ConnectionPrivate::dhParamsAnswered() {
 		quint32 encDHLen = encDHStr.length(), encDHBufLen = encDHLen >> 2;
 		if ((encDHLen & 0x03) || encDHBufLen < 6) {
 			LOG(("AuthKey Error: bad encrypted data length %1 (in server_DH_params_ok)!").arg(encDHLen));
-			DEBUG_LOG(("AuthKey Error: received encrypted data %1").arg(Logs::mb(encDHStr.constData(), encDHLen).str()));
+			DEBUG_LOG(
+			    ("AuthKey Error: received encrypted data %1").arg(Logs::mb(encDHStr.constData(), encDHLen).str()));
 			return restart();
 		}
 
@@ -2526,18 +2686,25 @@ void ConnectionPrivate::dhParamsAnswered() {
 		const auto &dh_inner_data(dh_inner.c_server_DH_inner_data());
 		if (dh_inner_data.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in server_DH_inner_data)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&dh_inner_data.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&dh_inner_data.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 			return restart();
 		}
 		if (dh_inner_data.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in server_DH_inner_data)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&dh_inner_data.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&dh_inner_data.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 			return restart();
 		}
 		uchar sha1Buffer[20];
 		if (memcmp(&decBuffer[0], hashSha1(&decBuffer[5], (to - from) * sizeof(mtpPrime), sha1Buffer), 20)) {
 			LOG(("AuthKey Error: sha1 hash of encrypted part did not match!"));
-			DEBUG_LOG(("AuthKey Error: sha1 did not match, server_nonce: %1, new_nonce %2, encrypted data %3").arg(Logs::mb(&_authKeyData->server_nonce, 16).str()).arg(Logs::mb(&_authKeyData->new_nonce, 16).str()).arg(Logs::mb(encDHStr.constData(), encDHLen).str()));
+			DEBUG_LOG(("AuthKey Error: sha1 did not match, server_nonce: %1, new_nonce %2, encrypted data %3")
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->new_nonce, 16).str())
+			              .arg(Logs::mb(encDHStr.constData(), encDHLen).str()));
 			return restart();
 		}
 		unixtimeSet(dh_inner_data.vserver_time.v);
@@ -2553,29 +2720,36 @@ void ConnectionPrivate::dhParamsAnswered() {
 		_authKeyStrings->g_a = byteVectorFromMTP(dh_inner_data.vg_a);
 		_authKeyData->retry_id = MTP_long(0);
 		_authKeyData->retries = 0;
-	} return dhClientParamsSend();
+	}
+		return dhClientParamsSend();
 
 	case mtpc_server_DH_params_fail: {
 		const auto &encDH(res_DH_params.c_server_DH_params_fail());
 		if (encDH.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in server_DH_params_fail)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&encDH.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&encDH.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 			return restart();
 		}
 		if (encDH.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in server_DH_params_fail)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&encDH.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&encDH.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 			return restart();
 		}
 		uchar sha1Buffer[20];
-		if (encDH.vnew_nonce_hash != *(MTPint128*)(hashSha1(&_authKeyData->new_nonce, 32, sha1Buffer) + 1)) {
+		if (encDH.vnew_nonce_hash != *(MTPint128 *)(hashSha1(&_authKeyData->new_nonce, 32, sha1Buffer) + 1)) {
 			LOG(("AuthKey Error: received new_nonce_hash did not match!"));
-			DEBUG_LOG(("AuthKey Error: received new_nonce_hash: %1, new_nonce: %2").arg(Logs::mb(&encDH.vnew_nonce_hash, 16).str()).arg(Logs::mb(&_authKeyData->new_nonce, 32).str()));
+			DEBUG_LOG(("AuthKey Error: received new_nonce_hash: %1, new_nonce: %2")
+			              .arg(Logs::mb(&encDH.vnew_nonce_hash, 16).str())
+			              .arg(Logs::mb(&_authKeyData->new_nonce, 32).str()));
 			return restart();
 		}
 		LOG(("AuthKey Error: server_DH_params_fail received!"));
-	} return restart();
-
+	}
+		return restart();
 	}
 	LOG(("AuthKey Error: unknown server_DH_params received, typeId = %1").arg(res_DH_params.type()));
 	return restart();
@@ -2608,7 +2782,8 @@ void ConnectionPrivate::dhClientParamsSend() {
 	memcpy(&_authKeyData->auth_key_aux_hash, auth_key_sha.data(), 8);
 	memcpy(&_authKeyData->auth_key_hash, auth_key_sha.data() + 12, 8);
 
-	auto client_dh_inner = MTP_client_DH_inner_data(_authKeyData->nonce, _authKeyData->server_nonce, _authKeyData->retry_id, MTP_bytes(g_b_data.modexp));
+	auto client_dh_inner = MTP_client_DH_inner_data(_authKeyData->nonce, _authKeyData->server_nonce,
+	                                                _authKeyData->retry_id, MTP_bytes(g_b_data.modexp));
 
 	auto sdhEncString = encryptClientDHInner(client_dh_inner);
 
@@ -2644,7 +2819,8 @@ std::string ConnectionPrivate::encryptClientDHInner(const MTPClient_DH_Inner_Dat
 
 	auto sdhEncString = std::string(encFullSize * 4, ' ');
 
-	aesIgeEncryptRaw(&encBuffer[0], &sdhEncString[0], encFullSize * sizeof(mtpPrime), _authKeyData->aesKey, _authKeyData->aesIV);
+	aesIgeEncryptRaw(&encBuffer[0], &sdhEncString[0], encFullSize * sizeof(mtpPrime), _authKeyData->aesKey,
+	                 _authKeyData->aesIV);
 
 	return sdhEncString;
 }
@@ -2667,23 +2843,29 @@ void ConnectionPrivate::dhClientParamsAnswered() {
 		const auto &resDH(res_client_DH_params.c_dh_gen_ok());
 		if (resDH.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in dh_gen_ok)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&resDH.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&resDH.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		if (resDH.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in dh_gen_ok)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&resDH.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&resDH.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		_authKeyData->new_nonce_buf[32] = 1;
 		uchar sha1Buffer[20];
-		if (resDH.vnew_nonce_hash1 != *(MTPint128*)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
+		if (resDH.vnew_nonce_hash1 != *(MTPint128 *)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
 			LOG(("AuthKey Error: received new_nonce_hash1 did not match!"));
-			DEBUG_LOG(("AuthKey Error: received new_nonce_hash1: %1, new_nonce_buf: %2").arg(Logs::mb(&resDH.vnew_nonce_hash1, 16).str()).arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
+			DEBUG_LOG(("AuthKey Error: received new_nonce_hash1: %1, new_nonce_buf: %2")
+			              .arg(Logs::mb(&resDH.vnew_nonce_hash1, 16).str())
+			              .arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
 
 			lockFinished.unlock();
 			return restart();
@@ -2692,64 +2874,80 @@ void ConnectionPrivate::dhClientParamsAnswered() {
 		quint64 salt1 = _authKeyData->new_nonce.l.l, salt2 = _authKeyData->server_nonce.l, serverSalt = salt1 ^ salt2;
 		sessionData->setSalt(serverSalt);
 
-		auto authKey = std::make_shared<AuthKey>(AuthKey::Type::Generated, bareDcId(_shiftedDcId), _authKeyStrings->auth_key);
+		auto authKey =
+		    std::make_shared<AuthKey>(AuthKey::Type::Generated, bareDcId(_shiftedDcId), _authKeyStrings->auth_key);
 
-		DEBUG_LOG(("AuthKey Info: auth key gen succeed, id: %1, server salt: %2").arg(authKey->keyId()).arg(serverSalt));
+		DEBUG_LOG(
+		    ("AuthKey Info: auth key gen succeed, id: %1, server salt: %2").arg(authKey->keyId()).arg(serverSalt));
 
 		sessionData->owner()->notifyKeyCreated(std::move(authKey)); // slot will call authKeyCreated()
 		sessionData->clear(_instance);
 		unlockKey();
-	} return;
+	}
+		return;
 
 	case mtpc_dh_gen_retry: {
 		const auto &resDH(res_client_DH_params.c_dh_gen_retry());
 		if (resDH.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in dh_gen_retry)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&resDH.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&resDH.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		if (resDH.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in dh_gen_retry)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&resDH.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&resDH.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		_authKeyData->new_nonce_buf[32] = 2;
 		uchar sha1Buffer[20];
-		if (resDH.vnew_nonce_hash2 != *(MTPint128*)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
+		if (resDH.vnew_nonce_hash2 != *(MTPint128 *)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
 			LOG(("AuthKey Error: received new_nonce_hash2 did not match!"));
-			DEBUG_LOG(("AuthKey Error: received new_nonce_hash2: %1, new_nonce_buf: %2").arg(Logs::mb(&resDH.vnew_nonce_hash2, 16).str()).arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
+			DEBUG_LOG(("AuthKey Error: received new_nonce_hash2: %1, new_nonce_buf: %2")
+			              .arg(Logs::mb(&resDH.vnew_nonce_hash2, 16).str())
+			              .arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		_authKeyData->retry_id = _authKeyData->auth_key_aux_hash;
-	} return dhClientParamsSend();
+	}
+		return dhClientParamsSend();
 
 	case mtpc_dh_gen_fail: {
 		const auto &resDH(res_client_DH_params.c_dh_gen_fail());
 		if (resDH.vnonce != _authKeyData->nonce) {
 			LOG(("AuthKey Error: received nonce <> sent nonce (in dh_gen_fail)!"));
-			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2").arg(Logs::mb(&resDH.vnonce, 16).str()).arg(Logs::mb(&_authKeyData->nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received nonce: %1, sent nonce: %2")
+			              .arg(Logs::mb(&resDH.vnonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		if (resDH.vserver_nonce != _authKeyData->server_nonce) {
 			LOG(("AuthKey Error: received server_nonce <> sent server_nonce (in dh_gen_fail)!"));
-			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2").arg(Logs::mb(&resDH.vserver_nonce, 16).str()).arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
+			DEBUG_LOG(("AuthKey Error: received server_nonce: %1, sent server_nonce: %2")
+			              .arg(Logs::mb(&resDH.vserver_nonce, 16).str())
+			              .arg(Logs::mb(&_authKeyData->server_nonce, 16).str()));
 
 			lockFinished.unlock();
 			return restart();
 		}
 		_authKeyData->new_nonce_buf[32] = 3;
 		uchar sha1Buffer[20];
-		if (resDH.vnew_nonce_hash3 != *(MTPint128*)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
+		if (resDH.vnew_nonce_hash3 != *(MTPint128 *)(hashSha1(_authKeyData->new_nonce_buf, 41, sha1Buffer) + 1)) {
 			LOG(("AuthKey Error: received new_nonce_hash3 did not match!"));
-			DEBUG_LOG(("AuthKey Error: received new_nonce_hash3: %1, new_nonce_buf: %2").arg(Logs::mb(&resDH.vnew_nonce_hash3, 16).str()).arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
+			DEBUG_LOG(("AuthKey Error: received new_nonce_hash3: %1, new_nonce_buf: %2")
+			              .arg(Logs::mb(&resDH.vnew_nonce_hash3, 16).str())
+			              .arg(Logs::mb(_authKeyData->new_nonce_buf, 41).str()));
 
 			lockFinished.unlock();
 			return restart();
@@ -2759,7 +2957,6 @@ void ConnectionPrivate::dhClientParamsAnswered() {
 
 		lockFinished.unlock();
 		return restart();
-
 	}
 	LOG(("AuthKey Error: unknown set_client_DH_params_answer received, typeId = %1").arg(res_client_DH_params.type()));
 
@@ -2790,14 +2987,14 @@ void ConnectionPrivate::clearAuthKeyData() {
 #ifdef Q_OS_WIN2
 		SecureZeroMemory(bytes.data(), bytes.size());
 #else // Q_OS_WIN
-		auto end = reinterpret_cast<char*>(bytes.data()) + bytes.size();
-		for (volatile auto p = reinterpret_cast<volatile char*>(bytes.data()); p != end; ++p) {
+		auto end = reinterpret_cast<char *>(bytes.data()) + bytes.size();
+		for (volatile auto p = reinterpret_cast<volatile char *>(bytes.data()); p != end; ++p) {
 			*p = 0;
 		}
 #endif // Q_OS_WIN
 	};
 	if (_authKeyData) {
-		zeroMemory(gsl::make_span(reinterpret_cast<gsl::byte*>(_authKeyData.get()), sizeof(AuthKeyCreateData)));
+		zeroMemory(gsl::make_span(reinterpret_cast<gsl::byte *>(_authKeyData.get()), sizeof(AuthKeyCreateData)));
 		_authKeyData.reset();
 	}
 	if (_authKeyStrings) {
@@ -2848,7 +3045,8 @@ void ConnectionPrivate::handleError(int errorCode) {
 			emit _instance->keyDestroyed(_shiftedDcId);
 			return;
 		} else if (_dcType == DcType::Cdn) {
-			LOG(("MTP Info: -404 error received in CDN dc %1, assuming it was destroyed, recreating.").arg(_shiftedDcId));
+			LOG(("MTP Info: -404 error received in CDN dc %1, assuming it was destroyed, recreating.")
+			        .arg(_shiftedDcId));
 			clearMessages();
 			keyId = kRecreateKeyId;
 			return restart();
@@ -2858,11 +3056,9 @@ void ConnectionPrivate::handleError(int errorCode) {
 	return restart();
 }
 
-void ConnectionPrivate::onReadyData() {
-}
+void ConnectionPrivate::onReadyData() {}
 
-template <typename TRequest>
-void ConnectionPrivate::sendRequestNotSecure(const TRequest &request) {
+template <typename TRequest> void ConnectionPrivate::sendRequestNotSecure(const TRequest &request) {
 	try {
 		mtpBuffer buffer;
 		quint32 requestSize = request.innerLength() >> 2;
@@ -2880,7 +3076,10 @@ void ConnectionPrivate::sendRequestNotSecure(const TRequest &request) {
 		buffer.push_back(0); // tcp crc32 hash
 		++_authKeyData->msgs_sent;
 
-		DEBUG_LOG(("AuthKey Info: sending request, size: %1, num: %2, time: %3").arg(requestSize).arg(_authKeyData->req_num).arg(buffer[5]));
+		DEBUG_LOG(("AuthKey Info: sending request, size: %1, num: %2, time: %3")
+		              .arg(requestSize)
+		              .arg(_authKeyData->req_num)
+		              .arg(buffer[5]));
 
 		_conn->sendData(buffer);
 
@@ -2891,8 +3090,7 @@ void ConnectionPrivate::sendRequestNotSecure(const TRequest &request) {
 	}
 }
 
-template <typename TResponse>
-bool ConnectionPrivate::readResponseNotSecure(TResponse &response) {
+template <typename TResponse> bool ConnectionPrivate::readResponseNotSecure(TResponse &response) {
 	onReceivedSome();
 
 	try {
@@ -2911,7 +3109,9 @@ bool ConnectionPrivate::readResponseNotSecure(TResponse &response) {
 			DEBUG_LOG(("AuthKey Error: answer bytes %1").arg(Logs::mb(answer, len * sizeof(mtpPrime)).str()));
 			return false;
 		}
-		if (answer[0] != 0 || answer[1] != 0 || (((quint32)answer[2]) & 0x03) != 1/* || (unixtime() - answer[3] > 300) || (answer[3] - unixtime() > 60)*/) { // didnt sync time yet
+		if (answer[0] != 0 || answer[1] != 0 ||
+		    (((quint32)answer[2]) & 0x03) !=
+		        1 /* || (unixtime() - answer[3] > 300) || (answer[3] - unixtime() > 60)*/) { // didnt sync time yet
 			LOG(("AuthKey Error: bad request answer start (%1 %2 %3)").arg(answer[0]).arg(answer[1]).arg(answer[2]));
 			DEBUG_LOG(("AuthKey Error: answer bytes %1").arg(Logs::mb(answer, len * sizeof(mtpPrime)).str()));
 			return false;
@@ -2968,18 +3168,18 @@ bool ConnectionPrivate::sendRequest(mtpRequest &request, bool needAnyResponse, Q
 	quint32 padding = fullSize - 4 - messageSize;
 
 	uchar encryptedSHA[20];
-	MTPint128 &msgKey(*(MTPint128*)(encryptedSHA + 4));
+	MTPint128 &msgKey(*(MTPint128 *)(encryptedSHA + 4));
 	hashSha1(request->constData(), (fullSize - padding) * sizeof(mtpPrime), encryptedSHA);
 
 	mtpBuffer result;
 	result.resize(9 + fullSize);
-	*((quint64*)&result[2]) = keyId;
-	*((MTPint128*)&result[4]) = msgKey;
+	*((quint64 *)&result[2]) = keyId;
+	*((MTPint128 *)&result[4]) = msgKey;
 
 	aesIgeEncrypt_oldmtp(request->constData(), &result[8], fullSize * sizeof(mtpPrime), key, msgKey);
 #else // TDESKTOP_MTPROTO_OLD
 	uchar encryptedSHA256[32];
-	MTPint128 &msgKey(*(MTPint128*)(encryptedSHA256 + 8));
+	MTPint128 &msgKey(*(MTPint128 *)(encryptedSHA256 + 8));
 
 	SHA256_CTX msgKeyLargeContext;
 	SHA256_Init(&msgKeyLargeContext);
@@ -2989,13 +3189,16 @@ bool ConnectionPrivate::sendRequest(mtpRequest &request, bool needAnyResponse, Q
 
 	mtpBuffer result;
 	result.resize(9 + fullSize);
-	*((quint64*)&result[2]) = keyId;
-	*((MTPint128*)&result[4]) = msgKey;
+	*((quint64 *)&result[2]) = keyId;
+	*((MTPint128 *)&result[4]) = msgKey;
 
 	aesIgeEncrypt(request->constData(), &result[8], fullSize * sizeof(mtpPrime), key, msgKey);
 #endif // TDESKTOP_MTPROTO_OLD
 
-	DEBUG_LOG(("MTP Info: sending request, size: %1, num: %2, time: %3").arg(fullSize + 6).arg((*request)[4]).arg((*request)[5]));
+	DEBUG_LOG(("MTP Info: sending request, size: %1, num: %2, time: %3")
+	              .arg(fullSize + 6)
+	              .arg((*request)[4])
+	              .arg((*request)[5]));
 
 	_conn->setSentEncrypted();
 	_conn->sendData(result);
@@ -3070,7 +3273,8 @@ ModExpFirst CreateModExp(int g, base::const_byte_span primeBytes, base::const_by
 	return internal::CreateModExp(g, primeBytes, randomSeed);
 }
 
-std::vector<gsl::byte> CreateAuthKey(base::const_byte_span firstBytes, base::const_byte_span randomBytes, base::const_byte_span primeBytes) {
+std::vector<gsl::byte> CreateAuthKey(base::const_byte_span firstBytes, base::const_byte_span randomBytes,
+                                     base::const_byte_span primeBytes) {
 	return internal::CreateAuthKey(firstBytes, randomBytes, primeBytes);
 }
 
diff --git a/Telegram/SourceFiles/mtproto/connection.h b/Telegram/SourceFiles/mtproto/connection.h
index a59f853ce..98dcfbd08 100644
--- a/Telegram/SourceFiles/mtproto/connection.h
+++ b/Telegram/SourceFiles/mtproto/connection.h
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QThread>
-#include "mtproto/core_types.h"
-#include "mtproto/auth_key.h"
-#include "mtproto/dc_options.h"
 #include "core/single_timer.h"
+#include "mtproto/auth_key.h"
+#include "mtproto/core_types.h"
+#include "mtproto/dc_options.h"
 #include "scheme.h"
+#include <QThread>
 
 namespace MTP {
 
@@ -39,7 +39,8 @@ struct ModExpFirst {
 	std::array<gsl::byte, kRandomPowerSize> randomPower;
 };
 ModExpFirst CreateModExp(int g, base::const_byte_span primeBytes, base::const_byte_span randomSeed);
-std::vector<gsl::byte> CreateAuthKey(base::const_byte_span firstBytes, base::const_byte_span randomBytes, base::const_byte_span primeBytes);
+std::vector<gsl::byte> CreateAuthKey(base::const_byte_span firstBytes, base::const_byte_span randomBytes,
+                                     base::const_byte_span primeBytes);
 
 namespace internal {
 
@@ -62,15 +63,11 @@ public:
 
 private:
 	int _threadIndex = 0;
-
 };
 
 class Connection {
 public:
-	enum ConnectionType {
-		TcpConnection,
-		HttpConnection
-	};
+	enum ConnectionType { TcpConnection, HttpConnection };
 
 	Connection(Instance *instance);
 
@@ -89,14 +86,14 @@ private:
 	Instance *_instance = nullptr;
 	std::unique_ptr<QThread> thread;
 	ConnectionPrivate *data = nullptr;
-
 };
 
 class ConnectionPrivate : public QObject {
 	Q_OBJECT
 
 public:
-	ConnectionPrivate(Instance *instance, QThread *thread, Connection *owner, SessionData *data, ShiftedDcId shiftedDcId);
+	ConnectionPrivate(Instance *instance, QThread *thread, Connection *owner, SessionData *data,
+	                  ShiftedDcId shiftedDcId);
 	~ConnectionPrivate();
 
 	void stop();
@@ -187,7 +184,8 @@ private:
 		RestartConnection,
 		ResetSession,
 	};
-	HandleResult handleOneReceived(const mtpPrime *from, const mtpPrime *end, quint64 msgId, qint32 serverTime, quint64 serverSalt, bool badTime);
+	HandleResult handleOneReceived(const mtpPrime *from, const mtpPrime *end, quint64 msgId, qint32 serverTime,
+	                               quint64 serverSalt, bool badTime);
 	mtpBuffer ungzip(const mtpPrime *from, const mtpPrime *end) const;
 	void handleMsgsStates(const QVector<MTPlong> &ids, const QByteArray &states, QVector<MTPlong> &acked);
 
@@ -202,7 +200,7 @@ private:
 	DcType _dcType = DcType::Regular;
 
 	mutable QReadWriteLock stateConnMutex;
-    qint32 _state = 0;
+	qint32 _state = 0;
 
 	bool _needSessionReset = false;
 	void resetSession();
@@ -211,7 +209,8 @@ private:
 	Connection *_owner = nullptr;
 	AbstractConnection *_conn = nullptr;
 	AbstractConnection *_conn4 = nullptr;
-	AbstractConnection *_conn6 = nullptr;;
+	AbstractConnection *_conn6 = nullptr;
+	;
 
 	SingleTimer retryTimer; // exp retry timer
 	int retryTimeout = 1;
@@ -226,7 +225,8 @@ private:
 
 	QVector<MTPlong> ackRequestData, resendRequestData;
 
-	// if badTime received - search for ids in sessionData->haveSent and sessionData->wereAcked and sync time/salt, return true if found
+	// if badTime received - search for ids in sessionData->haveSent and sessionData->wereAcked and sync time/salt,
+	// return true if found
 	bool requestsFixTimeSalt(const QVector<MTPlong> &ids, qint32 serverTime, quint64 serverSalt);
 
 	// remove msgs with such ids from sessionData->haveSent, add to sessionData->wereAcked
@@ -239,13 +239,12 @@ private:
 	SingleTimer _pingSender;
 
 	void resend(quint64 msgId, qint64 msCanWait = 0, bool forceContainer = false, bool sendMsgStateInfo = false);
-	void resendMany(QVector<quint64> msgIds, qint64 msCanWait = 0, bool forceContainer = false, bool sendMsgStateInfo = false);
+	void resendMany(QVector<quint64> msgIds, qint64 msCanWait = 0, bool forceContainer = false,
+	                bool sendMsgStateInfo = false);
 
-	template <typename TRequest>
-	void sendRequestNotSecure(const TRequest &request);
+	template <typename TRequest> void sendRequestNotSecure(const TRequest &request);
 
-	template <typename TResponse>
-	bool readResponseNotSecure(TResponse &response);
+	template <typename TResponse> bool readResponseNotSecure(TResponse &response);
 
 	bool restarted = false;
 	bool _finished = false;
@@ -261,11 +260,10 @@ private:
 	// Auth key creation fields and methods
 	struct AuthKeyCreateData {
 		AuthKeyCreateData()
-		: new_nonce(*(MTPint256*)((uchar*)new_nonce_buf))
-		, auth_key_aux_hash(*(MTPlong*)((uchar*)new_nonce_buf + 33)) {
-		}
+		    : new_nonce(*(MTPint256 *)((uchar *)new_nonce_buf))
+		    , auth_key_aux_hash(*(MTPlong *)((uchar *)new_nonce_buf + 33)) {}
 		MTPint128 nonce, server_nonce;
-		uchar new_nonce_buf[41] = { 0 }; // 32 bytes new_nonce + 1 check byte + 8 bytes of auth_key_aux_hash
+		uchar new_nonce_buf[41] = {0}; // 32 bytes new_nonce + 1 check byte + 8 bytes of auth_key_aux_hash
 		MTPint256 &new_nonce;
 		MTPlong &auth_key_aux_hash;
 
@@ -274,8 +272,8 @@ private:
 
 		qint32 g = 0;
 
-		uchar aesKey[32] = { 0 };
-		uchar aesIV[32] = { 0 };
+		uchar aesKey[32] = {0};
+		uchar aesIV[32] = {0};
 		MTPlong auth_key_hash;
 
 		quint32 req_num = 0; // sent not encrypted request number
@@ -284,7 +282,7 @@ private:
 	struct AuthKeyCreateStrings {
 		std::vector<gsl::byte> dh_prime;
 		std::vector<gsl::byte> g_a;
-		AuthKey::Data auth_key = { { gsl::byte{} } };
+		AuthKey::Data auth_key = {{gsl::byte{}}};
 	};
 	std::unique_ptr<AuthKeyCreateData> _authKeyData;
 	std::unique_ptr<AuthKeyCreateStrings> _authKeyStrings;
@@ -292,7 +290,6 @@ private:
 	void dhClientParamsSend();
 	void authKeyCreated();
 	void clearAuthKeyData();
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/connection_abstract.cpp b/Telegram/SourceFiles/mtproto/connection_abstract.cpp
index 730b018e6..6b2732e70 100644
--- a/Telegram/SourceFiles/mtproto/connection_abstract.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_abstract.cpp
@@ -20,17 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/connection_abstract.h"
 
-#include "mtproto/connection_tcp.h"
-#include "mtproto/connection_http.h"
 #include "mtproto/connection_auto.h"
+#include "mtproto/connection_http.h"
+#include "mtproto/connection_tcp.h"
 
 #include "facades.h"
 
 namespace MTP {
 namespace internal {
 
-AbstractConnection::~AbstractConnection() {
-}
+AbstractConnection::~AbstractConnection() {}
 
 mtpBuffer AbstractConnection::preparePQFake(const MTPint128 &nonce) {
 	MTPReq_pq req_pq(nonce);
@@ -60,7 +59,9 @@ MTPResPQ AbstractConnection::readPQFakeReply(const mtpBuffer &buffer) {
 		DEBUG_LOG(("Fake PQ Error: answer bytes %1").arg(Logs::mb(answer, len * sizeof(mtpPrime)).str()));
 		throw Exception("bad pq reply");
 	}
-	if (answer[0] != 0 || answer[1] != 0 || (((quint32)answer[2]) & 0x03) != 1/* || (unixtime() - answer[3] > 300) || (answer[3] - unixtime() > 60)*/) { // didnt sync time yet
+	if (answer[0] != 0 || answer[1] != 0 ||
+	    (((quint32)answer[2]) & 0x03) !=
+	        1 /* || (unixtime() - answer[3] > 300) || (answer[3] - unixtime() > 60)*/) { // didnt sync time yet
 		LOG(("Fake PQ Error: bad request answer start (%1 %2 %3)").arg(answer[0]).arg(answer[1]).arg(answer[2]));
 		DEBUG_LOG(("Fake PQ Error: answer bytes %1").arg(Logs::mb(answer, len * sizeof(mtpPrime)).str()));
 		throw Exception("bad pq reply");
diff --git a/Telegram/SourceFiles/mtproto/connection_abstract.h b/Telegram/SourceFiles/mtproto/connection_abstract.h
index 938497b4c..e3bece864 100644
--- a/Telegram/SourceFiles/mtproto/connection_abstract.h
+++ b/Telegram/SourceFiles/mtproto/connection_abstract.h
@@ -29,7 +29,8 @@ class AbstractConnection : public QObject {
 	Q_OBJECT
 
 public:
-	AbstractConnection(QThread *thread) : _sentEncrypted(false) {
+	AbstractConnection(QThread *thread)
+	    : _sentEncrypted(false) {
 		moveToThread(thread);
 	}
 	AbstractConnection(const AbstractConnection &other) = delete;
@@ -43,7 +44,8 @@ public:
 		_sentEncrypted = true;
 	}
 
-	virtual void sendData(mtpBuffer &buffer) = 0; // has size + 3, buffer[0] = len, buffer[1] = packetnum, buffer[last] = crc32
+	virtual void
+	sendData(mtpBuffer &buffer) = 0; // has size + 3, buffer[0] = len, buffer[1] = packetnum, buffer[last] = crc32
 	virtual void disconnectFromServer() = 0;
 	virtual void connectTcp(const DcOptions::Endpoint &endpoint) = 0;
 	virtual void connectHttp(const DcOptions::Endpoint &endpoint) = 0;
@@ -84,7 +86,6 @@ protected:
 	// we send them simultaneously through TCP/HTTP/IPv4/IPv6 to choose the working one
 	static mtpBuffer preparePQFake(const MTPint128 &nonce);
 	static MTPResPQ readPQFakeReply(const mtpBuffer &buffer);
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/connection_auto.cpp b/Telegram/SourceFiles/mtproto/connection_auto.cpp
index cb9f2971c..0827a777f 100644
--- a/Telegram/SourceFiles/mtproto/connection_auto.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_auto.cpp
@@ -26,13 +26,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace MTP {
 namespace internal {
 
-AutoConnection::AutoConnection(QThread *thread) : AbstractTCPConnection(thread)
-, status(WaitingBoth)
-, tcpNonce(rand_value<MTPint128>())
-, httpNonce(rand_value<MTPint128>())
-, _flagsTcp(0)
-, _flagsHttp(0)
-, _tcpTimeout(MTPMinReceiveDelay) {
+AutoConnection::AutoConnection(QThread *thread)
+    : AbstractTCPConnection(thread)
+    , status(WaitingBoth)
+    , tcpNonce(rand_value<MTPint128>())
+    , httpNonce(rand_value<MTPint128>())
+    , _flagsTcp(0)
+    , _flagsHttp(0)
+    , _tcpTimeout(MTPMinReceiveDelay) {
 	manager.moveToThread(thread);
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
 	manager.setProxy(QNetworkProxy(QNetworkProxy::DefaultProxy));
@@ -57,7 +58,8 @@ AutoConnection::AutoConnection(QThread *thread) : AbstractTCPConnection(thread)
 
 void AutoConnection::onHttpStart() {
 	if (status == HttpReady) {
-		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by timer").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by timer")
+		              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 		status = UsingHttp;
 		sock.disconnectFromHost();
 		emit connected();
@@ -68,7 +70,8 @@ void AutoConnection::onSocketConnected() {
 	if (status == HttpReady || status == WaitingBoth || status == WaitingTcp) {
 		mtpBuffer buffer(preparePQFake(tcpNonce));
 
-		DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport").arg((_flagsTcp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+		DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport")
+		              .arg((_flagsTcp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 
 		if (_tcpTimeout < 0) _tcpTimeout = -_tcpTimeout;
 		tcpTimeoutTimer.start(_tcpTimeout);
@@ -85,7 +88,8 @@ void AutoConnection::onTcpTimeoutTimer() {
 		_tcpTimeout = -_tcpTimeout;
 
 		QAbstractSocket::SocketState state = sock.state();
-		if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState || state == QAbstractSocket::HostLookupState) {
+		if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState ||
+		    state == QAbstractSocket::HostLookupState) {
 			sock.disconnectFromHost();
 		} else if (state != QAbstractSocket::ClosingState) {
 			sock.connectToHost(QHostAddress(_addrTcp), _portTcp);
@@ -106,7 +110,8 @@ void AutoConnection::onSocketDisconnected() {
 	} else if (status == WaitingTcp || status == UsingTcp) {
 		emit disconnected();
 	} else if (status == HttpReady) {
-		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by socket disconnect").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by socket disconnect")
+		              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 		status = UsingHttp;
 		emit connected();
 	}
@@ -134,10 +139,10 @@ void AutoConnection::httpSend(mtpBuffer &buffer) {
 
 	QNetworkRequest request(address);
 	request.setHeader(QNetworkRequest::ContentLengthHeader, QVariant(requestSize));
-    request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(qsl("application/x-www-form-urlencoded")));
+	request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(qsl("application/x-www-form-urlencoded")));
 
 	TCP_LOG(("HTTP Info: sending %1 len request").arg(requestSize));
-	requests.insert(manager.post(request, QByteArray((const char*)(&buffer[2]), requestSize)));
+	requests.insert(manager.post(request, QByteArray((const char *)(&buffer[2]), requestSize)));
 }
 
 void AutoConnection::disconnectFromServer() {
@@ -151,7 +156,7 @@ void AutoConnection::disconnectFromServer() {
 		(*i)->deleteLater();
 	}
 
-	disconnect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
+	disconnect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(requestFinished(QNetworkReply *)));
 
 	address = QUrl();
 
@@ -176,13 +181,16 @@ void AutoConnection::connectHttp(const DcOptions::Endpoint &endpoint) {
 	_flagsHttp = endpoint.flags;
 
 	// not endpoint.port - always 80 port for http transport
-	address = QUrl(((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(_addrHttp).arg(80));
+	address = QUrl(((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api"))
+	                   .arg(_addrHttp)
+	                   .arg(80));
 	TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString()));
-	connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
+	connect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(requestFinished(QNetworkReply *)));
 
 	mtpBuffer buffer(preparePQFake(httpNonce));
 
-	DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+	DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport")
+	              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 
 	httpSend(buffer);
 }
@@ -218,7 +226,8 @@ void AutoConnection::requestFinished(QNetworkReply *reply) {
 							status = HttpReady;
 							httpStartTimer.start(MTPTcpConnectionWaitTimeout);
 						} else {
-							DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by pq-response, awaited").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+							DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by pq-response, awaited")
+							              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 							status = UsingHttp;
 							sock.disconnectFromHost();
 							emit connected();
@@ -260,7 +269,8 @@ void AutoConnection::socketPacket(const char *packet, quint32 length) {
 			status = WaitingHttp;
 			sock.disconnectFromHost();
 		} else if (status == HttpReady) {
-			DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, ready").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+			DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, ready")
+			              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 			status = UsingHttp;
 			sock.disconnectFromHost();
 			emit connected();
@@ -278,7 +288,8 @@ void AutoConnection::socketPacket(const char *packet, quint32 length) {
 			auto res_pq = readPQFakeReply(data);
 			const auto &res_pq_data(res_pq.c_resPQ());
 			if (res_pq_data.vnonce == tcpNonce) {
-				DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response").arg((_flagsTcp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+				DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response")
+				              .arg((_flagsTcp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 				status = UsingTcp;
 				emit connected();
 			}
@@ -288,7 +299,8 @@ void AutoConnection::socketPacket(const char *packet, quint32 length) {
 				status = WaitingHttp;
 				sock.disconnectFromHost();
 			} else if (status == HttpReady) {
-				DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, awaited").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+				DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by bad tcp response, awaited")
+				              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 				status = UsingHttp;
 				sock.disconnectFromHost();
 				emit connected();
@@ -328,7 +340,8 @@ void AutoConnection::socketError(QAbstractSocket::SocketError e) {
 	if (status == WaitingBoth) {
 		status = WaitingHttp;
 	} else if (status == HttpReady) {
-		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by tcp error, ready").arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+		DEBUG_LOG(("Connection Info: HTTP/%1-transport chosen by tcp error, ready")
+		              .arg((_flagsHttp & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 		status = UsingHttp;
 		emit connected();
 	} else if (status == WaitingTcp || status == UsingTcp) {
diff --git a/Telegram/SourceFiles/mtproto/connection_auto.h b/Telegram/SourceFiles/mtproto/connection_auto.h
index c5ab67bd1..e46c6099b 100644
--- a/Telegram/SourceFiles/mtproto/connection_auto.h
+++ b/Telegram/SourceFiles/mtproto/connection_auto.h
@@ -32,7 +32,6 @@ class AutoConnection : public AbstractTCPConnection {
 	Q_OBJECT
 
 public:
-
 	AutoConnection(QThread *thread);
 
 	void sendData(mtpBuffer &buffer) override;
@@ -59,21 +58,11 @@ public slots:
 	void onTcpTimeoutTimer();
 
 protected:
-
 	void socketPacket(const char *packet, quint32 length) override;
 
 private:
-
 	void httpSend(mtpBuffer &buffer);
-	enum Status {
-		WaitingBoth = 0,
-		WaitingHttp,
-		WaitingTcp,
-		HttpReady,
-		UsingHttp,
-		UsingTcp,
-		FinishedWork
-	};
+	enum Status { WaitingBoth = 0, WaitingHttp, WaitingTcp, HttpReady, UsingHttp, UsingTcp, FinishedWork };
 	Status status;
 	MTPint128 tcpNonce, httpNonce;
 	QTimer httpStartTimer;
@@ -81,7 +70,7 @@ private:
 	QNetworkAccessManager manager;
 	QUrl address;
 
-	typedef QSet<QNetworkReply*> Requests;
+	typedef QSet<QNetworkReply *> Requests;
 	Requests requests;
 
 	QString _addrTcp, _addrHttp;
@@ -89,7 +78,6 @@ private:
 	MTPDdcOption::Flags _flagsTcp, _flagsHttp;
 	qint32 _tcpTimeout;
 	QTimer tcpTimeoutTimer;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/connection_http.cpp b/Telegram/SourceFiles/mtproto/connection_http.cpp
index 958aaff7c..e79bed3af 100644
--- a/Telegram/SourceFiles/mtproto/connection_http.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_http.cpp
@@ -52,16 +52,28 @@ qint32 HTTPConnection::handleError(QNetworkReply *reply) { // returnes "maybe ba
 	}
 
 	switch (reply->error()) {
-	case QNetworkReply::ConnectionRefusedError: LOG(("HTTP Error: connection refused - %1").arg(reply->errorString())); break;
-	case QNetworkReply::RemoteHostClosedError: LOG(("HTTP Error: remote host closed - %1").arg(reply->errorString())); break;
-	case QNetworkReply::HostNotFoundError: LOG(("HTTP Error: host not found - %2").arg(reply->error()).arg(reply->errorString())); break;
-	case QNetworkReply::TimeoutError: LOG(("HTTP Error: timeout - %2").arg(reply->error()).arg(reply->errorString())); break;
-	case QNetworkReply::OperationCanceledError: LOG(("HTTP Error: cancelled - %2").arg(reply->error()).arg(reply->errorString())); break;
+	case QNetworkReply::ConnectionRefusedError:
+		LOG(("HTTP Error: connection refused - %1").arg(reply->errorString()));
+		break;
+	case QNetworkReply::RemoteHostClosedError:
+		LOG(("HTTP Error: remote host closed - %1").arg(reply->errorString()));
+		break;
+	case QNetworkReply::HostNotFoundError:
+		LOG(("HTTP Error: host not found - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
+	case QNetworkReply::TimeoutError:
+		LOG(("HTTP Error: timeout - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
+	case QNetworkReply::OperationCanceledError:
+		LOG(("HTTP Error: cancelled - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
 	case QNetworkReply::SslHandshakeFailedError:
 	case QNetworkReply::TemporaryNetworkFailureError:
 	case QNetworkReply::NetworkSessionFailedError:
 	case QNetworkReply::BackgroundRequestNotAllowedError:
-	case QNetworkReply::UnknownNetworkError: LOG(("HTTP Error: network error %1 - %2").arg(reply->error()).arg(reply->errorString())); break;
+	case QNetworkReply::UnknownNetworkError:
+		LOG(("HTTP Error: network error %1 - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
 
 	// proxy errors (101-199):
 	case QNetworkReply::ProxyConnectionRefusedError:
@@ -69,7 +81,9 @@ qint32 HTTPConnection::handleError(QNetworkReply *reply) { // returnes "maybe ba
 	case QNetworkReply::ProxyNotFoundError:
 	case QNetworkReply::ProxyTimeoutError:
 	case QNetworkReply::ProxyAuthenticationRequiredError:
-	case QNetworkReply::UnknownProxyError:LOG(("HTTP Error: proxy error %1 - %2").arg(reply->error()).arg(reply->errorString())); break;
+	case QNetworkReply::UnknownProxyError:
+		LOG(("HTTP Error: proxy error %1 - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
 
 	// content errors (201-299):
 	case QNetworkReply::ContentAccessDenied:
@@ -77,22 +91,27 @@ qint32 HTTPConnection::handleError(QNetworkReply *reply) { // returnes "maybe ba
 	case QNetworkReply::ContentNotFoundError:
 	case QNetworkReply::AuthenticationRequiredError:
 	case QNetworkReply::ContentReSendError:
-	case QNetworkReply::UnknownContentError: LOG(("HTTP Error: content error %1 - %2").arg(reply->error()).arg(reply->errorString())); break;
+	case QNetworkReply::UnknownContentError:
+		LOG(("HTTP Error: content error %1 - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
 
 	// protocol errors
 	case QNetworkReply::ProtocolUnknownError:
 	case QNetworkReply::ProtocolInvalidOperationError:
-	case QNetworkReply::ProtocolFailure: LOG(("HTTP Error: protocol error %1 - %2").arg(reply->error()).arg(reply->errorString())); break;
+	case QNetworkReply::ProtocolFailure:
+		LOG(("HTTP Error: protocol error %1 - %2").arg(reply->error()).arg(reply->errorString()));
+		break;
 	};
 	TCP_LOG(("HTTP Error %1, restarting! - %2").arg(reply->error()).arg(reply->errorString()));
 
 	return result;
 }
 
-HTTPConnection::HTTPConnection(QThread *thread) : AbstractConnection(thread)
-, status(WaitingHttp)
-, httpNonce(rand_value<MTPint128>())
-, _flags(0) {
+HTTPConnection::HTTPConnection(QThread *thread)
+    : AbstractConnection(thread)
+    , status(WaitingHttp)
+    , httpNonce(rand_value<MTPint128>())
+    , _flags(0) {
 	manager.moveToThread(thread);
 	App::setProxySettings(manager);
 }
@@ -114,7 +133,7 @@ void HTTPConnection::sendData(mtpBuffer &buffer) {
 	request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(qsl("application/x-www-form-urlencoded")));
 
 	TCP_LOG(("HTTP Info: sending %1 len request %2").arg(requestSize).arg(Logs::mb(&buffer[2], requestSize).str()));
-	requests.insert(manager.post(request, QByteArray((const char*)(&buffer[2]), requestSize)));
+	requests.insert(manager.post(request, QByteArray((const char *)(&buffer[2]), requestSize)));
 }
 
 void HTTPConnection::disconnectFromServer() {
@@ -128,7 +147,7 @@ void HTTPConnection::disconnectFromServer() {
 		(*i)->deleteLater();
 	}
 
-	disconnect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
+	disconnect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(requestFinished(QNetworkReply *)));
 
 	address = QUrl();
 }
@@ -138,13 +157,16 @@ void HTTPConnection::connectHttp(const DcOptions::Endpoint &endpoint) {
 	auto addr = QString::fromStdString(endpoint.ip);
 
 	// not endpoint.port - always 80 port for http transport
-	address = QUrl(((_flags & MTPDdcOption::Flag::f_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api")).arg(addr).arg(80));
+	address = QUrl(((_flags & MTPDdcOption::Flag::f_ipv6) ? qsl("http://[%1]:%2/api") : qsl("http://%1:%2/api"))
+	                   .arg(addr)
+	                   .arg(80));
 	TCP_LOG(("HTTP Info: address is %1").arg(address.toDisplayString()));
-	connect(&manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(requestFinished(QNetworkReply*)));
+	connect(&manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(requestFinished(QNetworkReply *)));
 
 	mtpBuffer buffer(preparePQFake(httpNonce));
 
-	DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport").arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+	DEBUG_LOG(("Connection Info: sending fake req_pq through HTTP/%1 transport")
+	              .arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 
 	sendData(buffer);
 }
@@ -172,7 +194,8 @@ void HTTPConnection::requestFinished(QNetworkReply *reply) {
 					auto res_pq = readPQFakeReply(data);
 					const auto &res_pq_data(res_pq.c_resPQ());
 					if (res_pq_data.vnonce == httpNonce) {
-						DEBUG_LOG(("Connection Info: HTTP/%1-transport connected by pq-response").arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+						DEBUG_LOG(("Connection Info: HTTP/%1-transport connected by pq-response")
+						              .arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 						status = UsingHttp;
 						emit connected();
 					}
diff --git a/Telegram/SourceFiles/mtproto/connection_http.h b/Telegram/SourceFiles/mtproto/connection_http.h
index 25686e555..bb3d707ef 100644
--- a/Telegram/SourceFiles/mtproto/connection_http.h
+++ b/Telegram/SourceFiles/mtproto/connection_http.h
@@ -56,11 +56,7 @@ public slots:
 	void requestFinished(QNetworkReply *reply);
 
 private:
-	enum Status {
-		WaitingHttp = 0,
-		UsingHttp,
-		FinishedWork
-	};
+	enum Status { WaitingHttp = 0, UsingHttp, FinishedWork };
 	Status status;
 	MTPint128 httpNonce;
 	MTPDdcOption::Flags _flags;
@@ -68,9 +64,8 @@ private:
 	QNetworkAccessManager manager;
 	QUrl address;
 
-	typedef QSet<QNetworkReply*> Requests;
+	typedef QSet<QNetworkReply *> Requests;
 	Requests requests;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.cpp b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
index 1878495ea..de1c22a7b 100644
--- a/Telegram/SourceFiles/mtproto/connection_tcp.cpp
+++ b/Telegram/SourceFiles/mtproto/connection_tcp.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/connection_tcp.h"
 
-#include <openssl/aes.h>
 #include "app.h"
 #include <QHostAddress>
+#include <openssl/aes.h>
 
 namespace MTP {
 namespace internal {
@@ -32,7 +32,7 @@ namespace {
 quint32 tcpPacketSize(const char *packet) { // must have at least 4 bytes readable
 	quint32 result = (packet[0] > 0) ? packet[0] : 0;
 	if (result == 0x7f) {
-		const uchar *bytes = reinterpret_cast<const uchar*>(packet);
+		const uchar *bytes = reinterpret_cast<const uchar *>(packet);
 		result = (((quint32(bytes[3]) << 8) | quint32(bytes[2])) << 8) | quint32(bytes[1]);
 		return (result << 2) + 4;
 	}
@@ -41,16 +41,15 @@ quint32 tcpPacketSize(const char *packet) { // must have at least 4 bytes readab
 
 } // namespace
 
-AbstractTCPConnection::AbstractTCPConnection(QThread *thread) : AbstractConnection(thread)
-, packetNum(0)
-, packetRead(0)
-, packetLeft(0)
-, readingToShort(true)
-, currentPos((char*)shortBuffer) {
-}
+AbstractTCPConnection::AbstractTCPConnection(QThread *thread)
+    : AbstractConnection(thread)
+    , packetNum(0)
+    , packetRead(0)
+    , packetLeft(0)
+    , readingToShort(true)
+    , currentPos((char *)shortBuffer) {}
 
-AbstractTCPConnection::~AbstractTCPConnection() {
-}
+AbstractTCPConnection::~AbstractTCPConnection() {}
 
 void AbstractTCPConnection::socketRead() {
 	if (sock.state() != QAbstractSocket::ConnectedState) {
@@ -60,18 +59,19 @@ void AbstractTCPConnection::socketRead() {
 	}
 
 	do {
-		quint32 toRead = packetLeft ? packetLeft : (readingToShort ? (MTPShortBufferSize * sizeof(mtpPrime) - packetRead) : 4);
+		quint32 toRead =
+		    packetLeft ? packetLeft : (readingToShort ? (MTPShortBufferSize * sizeof(mtpPrime) - packetRead) : 4);
 		if (readingToShort) {
-			if (currentPos + toRead > ((char*)shortBuffer) + MTPShortBufferSize * sizeof(mtpPrime)) {
+			if (currentPos + toRead > ((char *)shortBuffer) + MTPShortBufferSize * sizeof(mtpPrime)) {
 				longBuffer.resize(((packetRead + toRead) >> 2) + 1);
 				memcpy(&longBuffer[0], shortBuffer, packetRead);
-				currentPos = ((char*)&longBuffer[0]) + packetRead;
+				currentPos = ((char *)&longBuffer[0]) + packetRead;
 				readingToShort = false;
 			}
 		} else {
 			if (longBuffer.size() * sizeof(mtpPrime) < packetRead + toRead) {
 				longBuffer.resize(((packetRead + toRead) >> 2) + 1);
-				currentPos = ((char*)&longBuffer[0]) + packetRead;
+				currentPos = ((char *)&longBuffer[0]) + packetRead;
 			}
 		}
 		qint32 bytes = (qint32)sock.read(currentPos, toRead);
@@ -85,7 +85,7 @@ void AbstractTCPConnection::socketRead() {
 				packetLeft -= bytes;
 				if (!packetLeft) {
 					socketPacket(currentPos - packetRead, packetRead);
-					currentPos = (char*)shortBuffer;
+					currentPos = (char *)shortBuffer;
 					packetRead = packetLeft = 0;
 					readingToShort = true;
 					longBuffer.clear();
@@ -109,19 +109,22 @@ void AbstractTCPConnection::socketRead() {
 						move = true;
 					} else {
 						packetLeft = packetSize - packetRead;
-						TCP_LOG(("TCP Info: not enough %1 for packet! size %2 read %3").arg(packetLeft).arg(packetSize).arg(packetRead));
+						TCP_LOG(("TCP Info: not enough %1 for packet! size %2 read %3")
+						            .arg(packetLeft)
+						            .arg(packetSize)
+						            .arg(packetRead));
 						emit receivedSome();
 						break;
 					}
 				}
 				if (move) {
 					if (!packetRead) {
-						currentPos = (char*)shortBuffer;
+						currentPos = (char *)shortBuffer;
 						readingToShort = true;
 						longBuffer.clear();
 					} else if (!readingToShort && packetRead < MTPShortBufferSize * sizeof(mtpPrime)) {
 						memcpy(shortBuffer, currentPos - packetRead, packetRead);
-						currentPos = (char*)shortBuffer + packetRead;
+						currentPos = (char *)shortBuffer + packetRead;
 						readingToShort = true;
 						longBuffer.clear();
 					}
@@ -145,7 +148,7 @@ mtpBuffer AbstractTCPConnection::handleResponse(const char *packet, quint32 leng
 	}
 	qint32 size = packet[0], len = length - 1;
 	if (size == 0x7f) {
-		const uchar *bytes = reinterpret_cast<const uchar*>(packet);
+		const uchar *bytes = reinterpret_cast<const uchar *>(packet);
 		size = (((quint32(bytes[3]) << 8) | quint32(bytes[2])) << 8) | quint32(bytes[1]);
 		len -= 3;
 	}
@@ -154,7 +157,7 @@ mtpBuffer AbstractTCPConnection::handleResponse(const char *packet, quint32 leng
 		TCP_LOG(("TCP Error: bad packet header, packet: %1").arg(Logs::mb(packet, length).str()));
 		return mtpBuffer(1, -500);
 	}
-	const mtpPrime *packetdata = reinterpret_cast<const mtpPrime*>(packet + (length - len));
+	const mtpPrime *packetdata = reinterpret_cast<const mtpPrime *>(packet + (length - len));
 	TCP_LOG(("TCP Info: packet received, size = %1").arg(size * sizeof(mtpPrime)));
 	if (size == 1) {
 		LOG(("TCP Error: error packet received, code = %1").arg(*packetdata));
@@ -170,47 +173,38 @@ mtpBuffer AbstractTCPConnection::handleResponse(const char *packet, quint32 leng
 void AbstractTCPConnection::handleError(QAbstractSocket::SocketError e, QTcpSocket &sock) {
 	switch (e) {
 	case QAbstractSocket::ConnectionRefusedError:
-	LOG(("TCP Error: socket connection refused - %1").arg(sock.errorString()));
-	break;
+		LOG(("TCP Error: socket connection refused - %1").arg(sock.errorString()));
+		break;
 
 	case QAbstractSocket::RemoteHostClosedError:
-	TCP_LOG(("TCP Info: remote host closed socket connection - %1").arg(sock.errorString()));
-	break;
+		TCP_LOG(("TCP Info: remote host closed socket connection - %1").arg(sock.errorString()));
+		break;
 
-	case QAbstractSocket::HostNotFoundError:
-	LOG(("TCP Error: host not found - %1").arg(sock.errorString()));
-	break;
+	case QAbstractSocket::HostNotFoundError: LOG(("TCP Error: host not found - %1").arg(sock.errorString())); break;
 
-	case QAbstractSocket::SocketTimeoutError:
-	LOG(("TCP Error: socket timeout - %1").arg(sock.errorString()));
-	break;
+	case QAbstractSocket::SocketTimeoutError: LOG(("TCP Error: socket timeout - %1").arg(sock.errorString())); break;
 
-	case QAbstractSocket::NetworkError:
-	LOG(("TCP Error: network - %1").arg(sock.errorString()));
-	break;
+	case QAbstractSocket::NetworkError: LOG(("TCP Error: network - %1").arg(sock.errorString())); break;
 
 	case QAbstractSocket::ProxyAuthenticationRequiredError:
 	case QAbstractSocket::ProxyConnectionRefusedError:
 	case QAbstractSocket::ProxyConnectionClosedError:
 	case QAbstractSocket::ProxyConnectionTimeoutError:
 	case QAbstractSocket::ProxyNotFoundError:
-	case QAbstractSocket::ProxyProtocolError:
-	LOG(("TCP Error: proxy (%1) - %2").arg(e).arg(sock.errorString()));
-	break;
+	case QAbstractSocket::ProxyProtocolError: LOG(("TCP Error: proxy (%1) - %2").arg(e).arg(sock.errorString())); break;
 
-	default:
-	LOG(("TCP Error: other (%1) - %2").arg(e).arg(sock.errorString()));
-	break;
+	default: LOG(("TCP Error: other (%1) - %2").arg(e).arg(sock.errorString())); break;
 	}
 
 	TCP_LOG(("TCP Error %1, restarting! - %2").arg(e).arg(sock.errorString()));
 }
 
-TCPConnection::TCPConnection(QThread *thread) : AbstractTCPConnection(thread)
-, status(WaitingTcp)
-, tcpNonce(rand_value<MTPint128>())
-, _tcpTimeout(MTPMinReceiveDelay)
-, _flags(0) {
+TCPConnection::TCPConnection(QThread *thread)
+    : AbstractTCPConnection(thread)
+    , status(WaitingTcp)
+    , tcpNonce(rand_value<MTPint128>())
+    , _tcpTimeout(MTPMinReceiveDelay)
+    , _flags(0) {
 	tcpTimeoutTimer.moveToThread(thread);
 	tcpTimeoutTimer.setSingleShot(true);
 	connect(&tcpTimeoutTimer, SIGNAL(timeout()), this, SLOT(onTcpTimeoutTimer()));
@@ -226,7 +220,8 @@ void TCPConnection::onSocketConnected() {
 	if (status == WaitingTcp) {
 		mtpBuffer buffer(preparePQFake(tcpNonce));
 
-		DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport").arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+		DEBUG_LOG(("Connection Info: sending fake req_pq through TCP/%1 transport")
+		              .arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 
 		if (_tcpTimeout < 0) _tcpTimeout = -_tcpTimeout;
 		tcpTimeoutTimer.start(_tcpTimeout);
@@ -241,7 +236,8 @@ void TCPConnection::onTcpTimeoutTimer() {
 		_tcpTimeout = -_tcpTimeout;
 
 		QAbstractSocket::SocketState state = sock.state();
-		if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState || state == QAbstractSocket::HostLookupState) {
+		if (state == QAbstractSocket::ConnectedState || state == QAbstractSocket::ConnectingState ||
+		    state == QAbstractSocket::HostLookupState) {
 			sock.disconnectFromHost();
 		} else if (state != QAbstractSocket::ClosingState) {
 			sock.connectToHost(QHostAddress(_addr), _port);
@@ -279,13 +275,15 @@ void AbstractTCPConnection::tcpSend(mtpBuffer &buffer) {
 	if (!packetNum) {
 		// prepare random part
 		char nonce[64];
-		quint32 *first = reinterpret_cast<quint32*>(nonce), *second = first + 1;
-		quint32 first1 = 0x44414548U, first2 = 0x54534f50U, first3 = 0x20544547U, first4 = 0x20544547U, first5 = 0xeeeeeeeeU;
+		quint32 *first = reinterpret_cast<quint32 *>(nonce), *second = first + 1;
+		quint32 first1 = 0x44414548U, first2 = 0x54534f50U, first3 = 0x20544547U, first4 = 0x20544547U,
+		        first5 = 0xeeeeeeeeU;
 		quint32 second1 = 0;
 		do {
 			memset_rand(nonce, sizeof(nonce));
-		} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || *reinterpret_cast<uchar*>(nonce) == 0xef);
-		//sock.write(nonce, 64);
+		} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 ||
+		         *second == second1 || *reinterpret_cast<uchar *>(nonce) == 0xef);
+		// sock.write(nonce, 64);
 
 		// prepare encryption key/iv
 		memcpy(_sendKey, nonce + 8, CTRState::KeySize);
@@ -299,7 +297,7 @@ void AbstractTCPConnection::tcpSend(mtpBuffer &buffer) {
 		memcpy(_receiveState.ivec, reversed + CTRState::KeySize, CTRState::IvecSize);
 
 		// write protocol identifier
-		*reinterpret_cast<quint32*>(nonce + 56) = 0xefefefefU;
+		*reinterpret_cast<quint32 *>(nonce + 56) = 0xefefefefU;
 
 		sock.write(nonce, 56);
 		aesCtrEncrypt(nonce, 64, _sendKey, &_sendState);
@@ -308,7 +306,7 @@ void AbstractTCPConnection::tcpSend(mtpBuffer &buffer) {
 	++packetNum;
 
 	quint32 size = buffer.size() - 3, len = size * 4;
-	char *data = reinterpret_cast<char*>(&buffer[0]);
+	char *data = reinterpret_cast<char *>(&buffer[0]);
 	if (size < 0x7f) {
 		data[7] = char(size);
 		TCP_LOG(("TCP Info: write %1 packet %2").arg(packetNum).arg(len + 1));
@@ -317,9 +315,9 @@ void AbstractTCPConnection::tcpSend(mtpBuffer &buffer) {
 		sock.write(data + 7, len + 1);
 	} else {
 		data[4] = 0x7f;
-		reinterpret_cast<uchar*>(data)[5] = uchar(size & 0xFF);
-		reinterpret_cast<uchar*>(data)[6] = uchar((size >> 8) & 0xFF);
-		reinterpret_cast<uchar*>(data)[7] = uchar((size >> 16) & 0xFF);
+		reinterpret_cast<uchar *>(data)[5] = uchar(size & 0xFF);
+		reinterpret_cast<uchar *>(data)[6] = uchar((size >> 8) & 0xFF);
+		reinterpret_cast<uchar *>(data)[7] = uchar((size >> 16) & 0xFF);
 		TCP_LOG(("TCP Info: write %1 packet %2").arg(packetNum).arg(len + 4));
 
 		aesCtrEncrypt(data + 4, len + 4, _sendKey, &_sendState);
@@ -359,7 +357,8 @@ void TCPConnection::socketPacket(const char *packet, quint32 length) {
 			auto res_pq = readPQFakeReply(data);
 			const auto &res_pq_data(res_pq.c_resPQ());
 			if (res_pq_data.vnonce == tcpNonce) {
-				DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response").arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
+				DEBUG_LOG(("Connection Info: TCP/%1-transport chosen by pq-response")
+				              .arg((_flags & MTPDdcOption::Flag::f_ipv6) ? "IPv6" : "IPv4"));
 				status = UsingTcp;
 				emit connected();
 			}
diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.h b/Telegram/SourceFiles/mtproto/connection_tcp.h
index 9d6c11989..2d1737afd 100644
--- a/Telegram/SourceFiles/mtproto/connection_tcp.h
+++ b/Telegram/SourceFiles/mtproto/connection_tcp.h
@@ -34,7 +34,6 @@ class AbstractTCPConnection : public AbstractConnection {
 	Q_OBJECT
 
 public:
-
 	AbstractTCPConnection(QThread *thread);
 	virtual ~AbstractTCPConnection() = 0;
 
@@ -43,7 +42,6 @@ public slots:
 	void socketRead();
 
 protected:
-
 	QTcpSocket sock;
 	quint32 packetNum; // sent packet number
 
@@ -57,8 +55,8 @@ protected:
 	static mtpBuffer handleResponse(const char *packet, quint32 length);
 	static void handleError(QAbstractSocket::SocketError e, QTcpSocket &sock);
 	static quint32 fourCharsToUInt(char ch1, char ch2, char ch3, char ch4) {
-		char ch[4] = { ch1, ch2, ch3, ch4 };
-		return *reinterpret_cast<quint32*>(ch);
+		char ch[4] = {ch1, ch2, ch3, ch4};
+		return *reinterpret_cast<quint32 *>(ch);
 	}
 
 	void tcpSend(mtpBuffer &buffer);
@@ -66,14 +64,12 @@ protected:
 	CTRState _sendState;
 	uchar _receiveKey[CTRState::KeySize];
 	CTRState _receiveState;
-
 };
 
 class TCPConnection : public AbstractTCPConnection {
 	Q_OBJECT
 
 public:
-
 	TCPConnection(QThread *thread);
 
 	void sendData(mtpBuffer &buffer) override;
@@ -97,16 +93,10 @@ public slots:
 	void onTcpTimeoutTimer();
 
 protected:
-
 	void socketPacket(const char *packet, quint32 length) override;
 
 private:
-
-	enum Status {
-		WaitingTcp = 0,
-		UsingTcp,
-		FinishedWork
-	};
+	enum Status { WaitingTcp = 0, UsingTcp, FinishedWork };
 	Status status;
 	MTPint128 tcpNonce;
 
@@ -114,7 +104,6 @@ private:
 	qint32 _port, _tcpTimeout;
 	MTPDdcOption::Flags _flags;
 	QTimer tcpTimeoutTimer;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/core_types.cpp b/Telegram/SourceFiles/mtproto/core_types.cpp
index f77f1910e..4d9e6d2a1 100644
--- a/Telegram/SourceFiles/mtproto/core_types.cpp
+++ b/Telegram/SourceFiles/mtproto/core_types.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/core_types.h"
 
-#include "zlib.h"
 #include "scheme.h"
+#include "zlib.h"
 
 quint32 MTPstring::innerLength() const {
 	quint32 l = v.length();
@@ -40,7 +40,7 @@ void MTPstring::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons)
 	if (cons != mtpc_string) throw mtpErrorUnexpected(cons, "MTPstring");
 
 	quint32 l;
-	const uchar *buf = (const uchar*)from;
+	const uchar *buf = (const uchar *)from;
 	if (buf[0] == 254) {
 		l = (quint32)buf[1] + ((quint32)buf[2] << 8) + ((quint32)buf[3] << 16);
 		buf += 4;
@@ -52,7 +52,7 @@ void MTPstring::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons)
 	}
 	if (from > end) throw mtpErrorInsufficient();
 
-	v = QByteArray(reinterpret_cast<const char*>(buf), l);
+	v = QByteArray(reinterpret_cast<const char *>(buf), l);
 }
 
 void MTPstring::write(mtpBuffer &to) const {
@@ -62,10 +62,10 @@ void MTPstring::write(mtpBuffer &to) const {
 	}
 	s >>= 2;
 	to.resize(was + s);
-	char *buf = (char*)&to[was];
+	char *buf = (char *)&to[was];
 	if (l < 254) {
 		uchar sl = (uchar)l;
-		*(buf++) = *(char*)(&sl);
+		*(buf++) = *(char *)(&sl);
 	} else {
 		*(buf++) = (char)254;
 		*(buf++) = (char)(l & 0xFF);
@@ -108,8 +108,7 @@ bool mtpRequestData::needAckByType(mtpTypeId type) {
 	case mtpc_msgs_all_info:
 	case mtpc_msgs_state_info:
 	case mtpc_msg_detailed_info:
-	case mtpc_msg_new_detailed_info:
-	return false;
+	case mtpc_msg_new_detailed_info: return false;
 	}
 	return true;
 }
@@ -126,7 +125,8 @@ mtpRequest mtpRequestData::prepare(quint32 requestSize, quint32 maxSize) {
 void mtpRequestData::padding(mtpRequest &request) {
 	if (request->size() < 9) return;
 
-	quint32 requestSize = (request.innerLength() >> 2), padding = _padding(requestSize), fullSize = 8 + requestSize + padding; // 2: salt, 2: session_id, 2: msg_id, 1: seq_no, 1: message_length
+	quint32 requestSize = (request.innerLength() >> 2), padding = _padding(requestSize),
+	        fullSize = 8 + requestSize + padding; // 2: salt, 2: session_id, 2: msg_id, 1: seq_no, 1: message_length
 	if (quint32(request->size()) != fullSize) {
 		request->resize(fullSize);
 		if (padding) {
@@ -150,7 +150,8 @@ quint32 mtpRequestData::_padding(quint32 requestSize) {
 #endif // TDESKTOP_MTPROTO_OLD
 }
 
-void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons, quint32 level, mtpPrime vcons) {
+void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons,
+                          quint32 level, mtpPrime vcons) {
 	switch (mtpTypeId(cons)) {
 	case mtpc_int: {
 		MTPint value;
@@ -173,7 +174,14 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
 	case mtpc_int256: {
 		MTPint256 value;
 		value.read(from, end, cons);
-		to.add(QString::number(value.h.h)).add(" * 2^192 + ").add(QString::number(value.h.l)).add(" * 2^128 + ").add(QString::number(value.l.h)).add(" * 2 ^ 64 + ").add(QString::number(value.l.l)).add(" [INT256]");
+		to.add(QString::number(value.h.h))
+		    .add(" * 2^192 + ")
+		    .add(QString::number(value.h.l))
+		    .add(" * 2^128 + ")
+		    .add(QString::number(value.l.h))
+		    .add(" * 2 ^ 64 + ")
+		    .add(QString::number(value.l.l))
+		    .add(" [INT256]");
 	} break;
 
 	case mtpc_double: {
@@ -190,9 +198,15 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
 		if (str.toUtf8() == strUtf8) {
 			to.add("\"").add(str.replace('\\', "\\\\").replace('"', "\\\"").replace('\n', "\\n")).add("\" [STRING]");
 		} else if (strUtf8.size() < 64) {
-			to.add(Logs::mb(strUtf8.constData(), strUtf8.size()).str()).add(" [").add(QString::number(strUtf8.size())).add(" BYTES]");
+			to.add(Logs::mb(strUtf8.constData(), strUtf8.size()).str())
+			    .add(" [")
+			    .add(QString::number(strUtf8.size()))
+			    .add(" BYTES]");
 		} else {
-			to.add(Logs::mb(strUtf8.constData(), 16).str()).add("... [").add(QString::number(strUtf8.size())).add(" BYTES]");
+			to.add(Logs::mb(strUtf8.constData(), 16).str())
+			    .add("... [")
+			    .add(QString::number(strUtf8.size()))
+			    .add(" BYTES]");
 		}
 	} break;
 
@@ -233,12 +247,12 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
 			throw Exception(QString("ungzip init, code: %1").arg(res));
 		}
 		stream.avail_in = packedLen;
-		stream.next_in = reinterpret_cast<Bytef*>(packed.v.data());
+		stream.next_in = reinterpret_cast<Bytef *>(packed.v.data());
 		stream.avail_out = 0;
 		while (!stream.avail_out) {
 			result.resize(result.size() + unpackedChunk);
 			stream.avail_out = unpackedChunk * sizeof(mtpPrime);
-			stream.next_out = (Bytef*)&result[result.size() - unpackedChunk];
+			stream.next_out = (Bytef *)&result[result.size() - unpackedChunk];
 			int res = inflate(&stream, Z_NO_FLUSH);
 			if (res != Z_OK && res != Z_STREAM_END) {
 				inflateEnd(&stream);
@@ -256,13 +270,15 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
 			throw Exception("ungzip void data");
 		}
 		const mtpPrime *newFrom = result.constData(), *newEnd = result.constData() + result.size();
-		to.add("[GZIPPED] "); mtpTextSerializeType(to, newFrom, newEnd, 0, level);
+		to.add("[GZIPPED] ");
+		mtpTextSerializeType(to, newFrom, newEnd, 0, level);
 	} break;
 
 	default: {
 		for (quint32 i = 1; i < mtpLayerMaxSingle; ++i) {
 			if (cons == mtpLayers[i]) {
-				to.add("[LAYER").add(QString::number(i + 1)).add("] "); mtpTextSerializeType(to, from, end, 0, level);
+				to.add("[LAYER").add(QString::number(i + 1)).add("] ");
+				mtpTextSerializeType(to, from, end, 0, level);
 				return;
 			}
 		}
@@ -271,7 +287,8 @@ void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpP
 				throw Exception("from >= end in invokeWithLayer");
 			}
 			qint32 layer = *(from++);
-			to.add("[LAYER").add(QString::number(layer)).add("] "); mtpTextSerializeType(to, from, end, 0, level);
+			to.add("[LAYER").add(QString::number(layer)).add("] ");
+			mtpTextSerializeType(to, from, end, 0, level);
 			return;
 		}
 		throw Exception(QString("unknown cons 0x%1").arg(cons, 0, 16));
diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h
index a728641c4..b79931060 100644
--- a/Telegram/SourceFiles/mtproto/core_types.h
+++ b/Telegram/SourceFiles/mtproto/core_types.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <cstdint>
-#include <QVector>
-#include <QSharedPointer>
-#include <QMap>
-#include "core/basic_types.h"
 #include "base/flags.h"
 #include "config.h"
+#include "core/basic_types.h"
+#include <QMap>
+#include <QSharedPointer>
+#include <QVector>
+#include <cstdint>
 
 namespace MTP {
 
@@ -49,14 +49,13 @@ class mtpRequestData;
 class mtpRequest : public QSharedPointer<mtpRequestData> {
 public:
 	mtpRequest() = default;
-    explicit mtpRequest(mtpRequestData *ptr) : QSharedPointer<mtpRequestData>(ptr) {
-	}
+	explicit mtpRequest(mtpRequestData *ptr)
+	    : QSharedPointer<mtpRequestData>(ptr) {}
 
 	quint32 innerLength() const;
 	void write(mtpBuffer &to) const;
 
 	using ResponseType = void; // don't know real response type =(
-
 };
 
 class mtpRequestData : public mtpBuffer {
@@ -69,8 +68,7 @@ public:
 	mtpRequest after;
 	bool needsLayer = false;
 
-	mtpRequestData(bool/* sure*/) {
-	}
+	mtpRequestData(bool /* sure*/) {}
 
 	static mtpRequest prepare(quint32 requestSize, quint32 maxSize = 0);
 	static void padding(mtpRequest &request);
@@ -90,7 +88,6 @@ public:
 
 private:
 	static quint32 _padding(quint32 requestSize);
-
 };
 
 using mtpPreRequestMap = QMap<mtpRequestId, mtpRequest>;
@@ -113,23 +110,22 @@ public:
 
 class mtpErrorUnexpected : public Exception {
 public:
-	mtpErrorUnexpected(mtpTypeId typeId, const QString &type) : Exception(QString("MTP Unexpected type id #%1 read in %2").arg(quint32(typeId), 0, 16).arg(type), false) { // maybe api changed?..
+	mtpErrorUnexpected(mtpTypeId typeId, const QString &type)
+	    : Exception(QString("MTP Unexpected type id #%1 read in %2").arg(quint32(typeId), 0, 16).arg(type),
+	                false) { // maybe api changed?..
 	}
-
 };
 
 class mtpErrorInsufficient : public Exception {
 public:
-	mtpErrorInsufficient() : Exception("MTP Insufficient bytes in input buffer") {
-	}
-
+	mtpErrorInsufficient()
+	    : Exception("MTP Insufficient bytes in input buffer") {}
 };
 
 class mtpErrorBadTypeId : public Exception {
 public:
-	mtpErrorBadTypeId(mtpTypeId typeId, const QString &type) : Exception(QString("MTP Bad type id %1 passed to constructor of %2").arg(typeId).arg(type)) {
-	}
-
+	mtpErrorBadTypeId(mtpTypeId typeId, const QString &type)
+	    : Exception(QString("MTP Bad type id %1 passed to constructor of %2").arg(typeId).arg(type)) {}
 };
 
 namespace MTP {
@@ -143,8 +139,7 @@ public:
 	TypeData &operator=(const TypeData &other) = delete;
 	TypeData &operator=(TypeData &&other) = delete;
 
-	virtual ~TypeData() {
-	}
+	virtual ~TypeData() {}
 
 private:
 	void incrementCounter() const {
@@ -155,15 +150,15 @@ private:
 	}
 	friend class TypeDataOwner;
 
-	mutable QAtomicInt _counter = { 1 };
-
+	mutable QAtomicInt _counter = {1};
 };
 
 class TypeDataOwner {
 public:
-	TypeDataOwner(TypeDataOwner &&other) : _data(base::take(other._data)) {
-	}
-	TypeDataOwner(const TypeDataOwner &other) : _data(other._data) {
+	TypeDataOwner(TypeDataOwner &&other)
+	    : _data(base::take(other._data)) {}
+	TypeDataOwner(const TypeDataOwner &other)
+	    : _data(other._data) {
 		incrementCounter();
 	}
 	TypeDataOwner &operator=(TypeDataOwner &&other) {
@@ -186,8 +181,8 @@ public:
 
 protected:
 	TypeDataOwner() = default;
-	TypeDataOwner(const TypeData *data) : _data(data) {
-	}
+	TypeDataOwner(const TypeData *data)
+	    : _data(data) {}
 
 	void setData(const TypeData *data) {
 		decrementCounter();
@@ -195,8 +190,7 @@ protected:
 	}
 
 	// Unsafe cast, type should be checked by the caller.
-	template <typename DataType>
-	const DataType &queryData() const {
+	template <typename DataType> const DataType &queryData() const {
 		Expects(_data != nullptr);
 		return static_cast<const DataType &>(*_data);
 	}
@@ -213,8 +207,7 @@ private:
 		}
 	}
 
-	const TypeData * _data = nullptr;
-
+	const TypeData *_data = nullptr;
 };
 
 } // namespace internal
@@ -254,45 +247,32 @@ enum {
 	// manually parsed
 	mtpc_rpc_result = 0xf35c6d01,
 	mtpc_msg_container = 0x73f1f8dc,
-//	mtpc_msg_copy = 0xe06046b2,
+	//	mtpc_msg_copy = 0xe06046b2,
 	mtpc_gzip_packed = 0x3072cfa1
 };
 static const mtpTypeId mtpc_bytes = mtpc_string;
 static const mtpTypeId mtpc_flags = mtpc_int;
 static const mtpTypeId mtpc_core_message = -1; // undefined type, but is used
 static const mtpTypeId mtpLayers[] = {
-	mtpTypeId(mtpc_invokeWithLayer1),
-	mtpTypeId(mtpc_invokeWithLayer2),
-	mtpTypeId(mtpc_invokeWithLayer3),
-	mtpTypeId(mtpc_invokeWithLayer4),
-	mtpTypeId(mtpc_invokeWithLayer5),
-	mtpTypeId(mtpc_invokeWithLayer6),
-	mtpTypeId(mtpc_invokeWithLayer7),
-	mtpTypeId(mtpc_invokeWithLayer8),
-	mtpTypeId(mtpc_invokeWithLayer9),
-	mtpTypeId(mtpc_invokeWithLayer10),
-	mtpTypeId(mtpc_invokeWithLayer11),
-	mtpTypeId(mtpc_invokeWithLayer12),
-	mtpTypeId(mtpc_invokeWithLayer13),
-	mtpTypeId(mtpc_invokeWithLayer14),
-	mtpTypeId(mtpc_invokeWithLayer15),
-	mtpTypeId(mtpc_invokeWithLayer16),
-	mtpTypeId(mtpc_invokeWithLayer17),
-	mtpTypeId(mtpc_invokeWithLayer18),
+    mtpTypeId(mtpc_invokeWithLayer1),  mtpTypeId(mtpc_invokeWithLayer2),  mtpTypeId(mtpc_invokeWithLayer3),
+    mtpTypeId(mtpc_invokeWithLayer4),  mtpTypeId(mtpc_invokeWithLayer5),  mtpTypeId(mtpc_invokeWithLayer6),
+    mtpTypeId(mtpc_invokeWithLayer7),  mtpTypeId(mtpc_invokeWithLayer8),  mtpTypeId(mtpc_invokeWithLayer9),
+    mtpTypeId(mtpc_invokeWithLayer10), mtpTypeId(mtpc_invokeWithLayer11), mtpTypeId(mtpc_invokeWithLayer12),
+    mtpTypeId(mtpc_invokeWithLayer13), mtpTypeId(mtpc_invokeWithLayer14), mtpTypeId(mtpc_invokeWithLayer15),
+    mtpTypeId(mtpc_invokeWithLayer16), mtpTypeId(mtpc_invokeWithLayer17), mtpTypeId(mtpc_invokeWithLayer18),
 };
 static const quint32 mtpLayerMaxSingle = sizeof(mtpLayers) / sizeof(mtpLayers[0]);
 
-template <typename bareT>
-class MTPBoxed : public bareT {
+template <typename bareT> class MTPBoxed : public bareT {
 public:
 	using bareT::bareT;
 	MTPBoxed() = default;
 	MTPBoxed(const MTPBoxed<bareT> &v) = default;
 	MTPBoxed<bareT> &operator=(const MTPBoxed<bareT> &v) = default;
-	MTPBoxed(const bareT &v) : bareT(v) {
-	}
+	MTPBoxed(const bareT &v)
+	    : bareT(v) {}
 	MTPBoxed<bareT> &operator=(const bareT &v) {
-		*((bareT*)this) = v;
+		*((bareT *)this) = v;
 		return *this;
 	}
 
@@ -301,21 +281,17 @@ public:
 	}
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) {
 		if (from + 1 > end) throw mtpErrorInsufficient();
-		cons = (mtpTypeId)*(from++);
+		cons = (mtpTypeId) * (from++);
 		bareT::read(from, end, cons);
 	}
 	void write(mtpBuffer &to) const {
-        to.push_back(bareT::type());
+		to.push_back(bareT::type());
 		bareT::write(to);
 	}
 
 	using Unboxed = bareT;
-
-};
-template <typename T>
-class MTPBoxed<MTPBoxed<T> > {
-	typename T::CantMakeBoxedBoxedType v;
 };
+template <typename T> class MTPBoxed<MTPBoxed<T>> { typename T::CantMakeBoxedBoxedType v; };
 
 class MTPint {
 public:
@@ -332,15 +308,15 @@ public:
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_int) {
 		if (from + 1 > end) throw mtpErrorInsufficient();
 		if (cons != mtpc_int) throw mtpErrorUnexpected(cons, "MTPint");
-		v = (qint32)*(from++);
+		v = (qint32) * (from++);
 	}
 	void write(mtpBuffer &to) const {
 		to.push_back((mtpPrime)v);
 	}
 
 private:
-	explicit MTPint(qint32 val) : v(val) {
-	}
+	explicit MTPint(qint32 val)
+	    : v(val) {}
 
 	friend MTPint MTP_int(qint32 v);
 };
@@ -351,20 +327,17 @@ using MTPInt = MTPBoxed<MTPint>;
 
 namespace internal {
 
-struct ZeroFlagsHelper {
-};
+struct ZeroFlagsHelper {};
 
 } // namespace internal
 
-template <typename Flags>
-class MTPflags {
+template <typename Flags> class MTPflags {
 public:
 	Flags v = 0;
 	static_assert(sizeof(Flags) == sizeof(qint32), "MTPflags are allowed only wrapping qint32 flag types!");
 
 	MTPflags() = default;
-	MTPflags(internal::ZeroFlagsHelper helper) {
-	}
+	MTPflags(internal::ZeroFlagsHelper helper) {}
 
 	quint32 innerLength() const {
 		return sizeof(Flags);
@@ -382,19 +355,15 @@ public:
 	}
 
 private:
-	explicit MTPflags(Flags val) : v(val) {
-	}
+	explicit MTPflags(Flags val)
+	    : v(val) {}
 
-	template <typename T>
-	friend MTPflags<base::flags<T>> MTP_flags(base::flags<T> v);
-
-	template <typename T, typename>
-	friend MTPflags<base::flags<T>> MTP_flags(T v);
+	template <typename T> friend MTPflags<base::flags<T>> MTP_flags(base::flags<T> v);
 
+	template <typename T, typename> friend MTPflags<base::flags<T>> MTP_flags(T v);
 };
 
-template <typename T>
-inline MTPflags<base::flags<T>> MTP_flags(base::flags<T> v) {
+template <typename T> inline MTPflags<base::flags<T>> MTP_flags(base::flags<T> v) {
 	return MTPflags<base::flags<T>>(v);
 }
 
@@ -403,12 +372,11 @@ inline MTPflags<base::flags<T>> MTP_flags(T v) {
 	return MTPflags<base::flags<T>>(v);
 }
 
-inline internal::ZeroFlagsHelper MTP_flags(void(internal::ZeroFlagsHelper::*)()) {
+inline internal::ZeroFlagsHelper MTP_flags(void (internal::ZeroFlagsHelper::*)()) {
 	return internal::ZeroFlagsHelper();
 }
 
-template <typename Flags>
-using MTPFlags = MTPBoxed<MTPflags<Flags>>;
+template <typename Flags> using MTPFlags = MTPBoxed<MTPflags<Flags>>;
 
 inline bool operator==(const MTPint &a, const MTPint &b) {
 	return a.v == b.v;
@@ -432,7 +400,7 @@ public:
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_long) {
 		if (from + 2 > end) throw mtpErrorInsufficient();
 		if (cons != mtpc_long) throw mtpErrorUnexpected(cons, "MTPlong");
-		v = (quint64)(((quint32*)from)[0]) | ((quint64)(((quint32*)from)[1]) << 32);
+		v = (quint64)(((quint32 *)from)[0]) | ((quint64)(((quint32 *)from)[1]) << 32);
 		from += 2;
 	}
 	void write(mtpBuffer &to) const {
@@ -441,8 +409,8 @@ public:
 	}
 
 private:
-	explicit MTPlong(quint64 val) : v(val) {
-	}
+	explicit MTPlong(quint64 val)
+	    : v(val) {}
 
 	friend MTPlong MTP_long(quint64 v);
 };
@@ -474,8 +442,8 @@ public:
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_int128) {
 		if (from + 4 > end) throw mtpErrorInsufficient();
 		if (cons != mtpc_int128) throw mtpErrorUnexpected(cons, "MTPint128");
-		l = (quint64)(((quint32*)from)[0]) | ((quint64)(((quint32*)from)[1]) << 32);
-		h = (quint64)(((quint32*)from)[2]) | ((quint64)(((quint32*)from)[3]) << 32);
+		l = (quint64)(((quint32 *)from)[0]) | ((quint64)(((quint32 *)from)[1]) << 32);
+		h = (quint64)(((quint32 *)from)[2]) | ((quint64)(((quint32 *)from)[3]) << 32);
 		from += 4;
 	}
 	void write(mtpBuffer &to) const {
@@ -486,8 +454,9 @@ public:
 	}
 
 private:
-	explicit MTPint128(quint64 low, quint64 high) : l(low), h(high) {
-	}
+	explicit MTPint128(quint64 low, quint64 high)
+	    : l(low)
+	    , h(high) {}
 
 	friend MTPint128 MTP_int128(quint64 l, quint64 h);
 };
@@ -527,8 +496,9 @@ public:
 	}
 
 private:
-	explicit MTPint256(MTPint128 low, MTPint128 high) : l(low), h(high) {
-	}
+	explicit MTPint256(MTPint128 low, MTPint128 high)
+	    : l(low)
+	    , h(high) {}
 
 	friend MTPint256 MTP_int256(const MTPint128 &l, const MTPint128 &h);
 };
@@ -559,18 +529,18 @@ public:
 	void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_double) {
 		if (from + 2 > end) throw mtpErrorInsufficient();
 		if (cons != mtpc_double) throw mtpErrorUnexpected(cons, "MTPdouble");
-		*(quint64*)(&v) = (quint64)(((quint32*)from)[0]) | ((quint64)(((quint32*)from)[1]) << 32);
+		*(quint64 *)(&v) = (quint64)(((quint32 *)from)[0]) | ((quint64)(((quint32 *)from)[1]) << 32);
 		from += 2;
 	}
 	void write(mtpBuffer &to) const {
-		quint64 iv = *(quint64*)(&v);
+		quint64 iv = *(quint64 *)(&v);
 		to.push_back((mtpPrime)(iv & 0xFFFFFFFFL));
 		to.push_back((mtpPrime)(iv >> 32));
 	}
 
 private:
-	explicit MTPdouble(double val) : v(val) {
-	}
+	explicit MTPdouble(double val)
+	    : v(val) {}
 
 	friend MTPdouble MTP_double(double v);
 };
@@ -603,8 +573,8 @@ public:
 	QByteArray v;
 
 private:
-	explicit MTPstring(QByteArray &&data) : v(std::move(data)) {
-	}
+	explicit MTPstring(QByteArray &&data)
+	    : v(std::move(data)) {}
 
 	friend MTPstring MTP_string(const std::string &v);
 	friend MTPstring MTP_string(const QString &v);
@@ -612,7 +582,6 @@ private:
 
 	friend MTPbytes MTP_bytes(const QByteArray &v);
 	friend MTPbytes MTP_bytes(QByteArray &&v);
-
 };
 using MTPString = MTPBoxed<MTPstring>;
 using MTPBytes = MTPBoxed<MTPbytes>;
@@ -635,13 +604,12 @@ inline MTPbytes MTP_bytes(QByteArray &&v) {
 	return MTPbytes(std::move(v));
 }
 inline MTPbytes MTP_bytes(base::const_byte_span bytes) {
-	return MTP_bytes(QByteArray(reinterpret_cast<const char*>(bytes.data()), bytes.size()));
+	return MTP_bytes(QByteArray(reinterpret_cast<const char *>(bytes.data()), bytes.size()));
 }
 inline MTPbytes MTP_bytes(const std::vector<gsl::byte> &bytes) {
 	return MTP_bytes(gsl::make_span(bytes));
 }
-template <size_t N>
-inline MTPbytes MTP_bytes(const std::array<gsl::byte, N> &bytes) {
+template <size_t N> inline MTPbytes MTP_bytes(const std::array<gsl::byte, N> &bytes) {
 	return MTP_bytes(gsl::make_span(bytes));
 }
 
@@ -669,16 +637,13 @@ inline std::vector<gsl::byte> byteVectorFromMTP(const MTPbytes &v) {
 	return std::vector<gsl::byte>(bytes.cbegin(), bytes.cend());
 }
 
-template <typename T>
-class MTPvector {
+template <typename T> class MTPvector {
 public:
 	MTPvector() = default;
 
 	quint32 innerLength() const {
 		quint32 result(sizeof(quint32));
-		for_const (auto &item, v) {
-			result += item.innerLength();
-		}
+		for_const (auto &item, v) { result += item.innerLength(); }
 		return result;
 	}
 	mtpTypeId type() const {
@@ -697,60 +662,48 @@ public:
 	}
 	void write(mtpBuffer &to) const {
 		to.push_back(v.size());
-		for_const (auto &item, v) {
-			item.write(to);
-		}
+		for_const (auto &item, v) { item.write(to); }
 	}
 
 	QVector<T> v;
 
 private:
-	explicit MTPvector(QVector<T> &&data) : v(std::move(data)) {
-	}
-
-	template <typename U>
-	friend MTPvector<U> MTP_vector(quint32 count);
-	template <typename U>
-	friend MTPvector<U> MTP_vector(quint32 count, const U &value);
-	template <typename U>
-	friend MTPvector<U> MTP_vector(const QVector<U> &v);
-	template <typename U>
-	friend MTPvector<U> MTP_vector(QVector<U> &&v);
+	explicit MTPvector(QVector<T> &&data)
+	    : v(std::move(data)) {}
 
+	template <typename U> friend MTPvector<U> MTP_vector(quint32 count);
+	template <typename U> friend MTPvector<U> MTP_vector(quint32 count, const U &value);
+	template <typename U> friend MTPvector<U> MTP_vector(const QVector<U> &v);
+	template <typename U> friend MTPvector<U> MTP_vector(QVector<U> &&v);
 };
-template <typename T>
-inline MTPvector<T> MTP_vector(quint32 count) {
+template <typename T> inline MTPvector<T> MTP_vector(quint32 count) {
 	return MTPvector<T>(QVector<T>(count));
 }
-template <typename T>
-inline MTPvector<T> MTP_vector(quint32 count, const T &value) {
+template <typename T> inline MTPvector<T> MTP_vector(quint32 count, const T &value) {
 	return MTPvector<T>(QVector<T>(count, value));
 }
-template <typename T>
-inline MTPvector<T> MTP_vector(const QVector<T> &v) {
+template <typename T> inline MTPvector<T> MTP_vector(const QVector<T> &v) {
 	return MTPvector<T>(QVector<T>(v));
 }
-template <typename T>
-inline MTPvector<T> MTP_vector(QVector<T> &&v) {
+template <typename T> inline MTPvector<T> MTP_vector(QVector<T> &&v) {
 	return MTPvector<T>(std::move(v));
 }
-template <typename T>
-using MTPVector = MTPBoxed<MTPvector<T>>;
+template <typename T> using MTPVector = MTPBoxed<MTPvector<T>>;
 
-template <typename T>
-inline bool operator==(const MTPvector<T> &a, const MTPvector<T> &b) {
+template <typename T> inline bool operator==(const MTPvector<T> &a, const MTPvector<T> &b) {
 	return a.c_vector().v == b.c_vector().v;
 }
-template <typename T>
-inline bool operator!=(const MTPvector<T> &a, const MTPvector<T> &b) {
+template <typename T> inline bool operator!=(const MTPvector<T> &a, const MTPvector<T> &b) {
 	return a.c_vector().v != b.c_vector().v;
 }
 
 // Human-readable text serialization
 
 struct MTPStringLogger {
-	MTPStringLogger() : p(new char[MTPDebugBufferSize]), size(0), alloced(MTPDebugBufferSize) {
-	}
+	MTPStringLogger()
+	    : p(new char[MTPDebugBufferSize])
+	    , size(0)
+	    , alloced(MTPDebugBufferSize) {}
 	~MTPStringLogger() {
 		delete[] p;
 	}
@@ -797,9 +750,11 @@ struct MTPStringLogger {
 	qint32 size, alloced;
 };
 
-void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpPrime cons = 0, quint32 level = 0, mtpPrime vcons = 0);
+void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpPrime cons = 0,
+                          quint32 level = 0, mtpPrime vcons = 0);
 
-void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons, quint32 level, mtpPrime vcons = 0);
+void mtpTextSerializeCore(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons,
+                          quint32 level, mtpPrime vcons = 0);
 
 inline QString mtpTextSerialize(const mtpPrime *&from, const mtpPrime *end) {
 	MTPStringLogger to;
diff --git a/Telegram/SourceFiles/mtproto/dc_options.cpp b/Telegram/SourceFiles/mtproto/dc_options.cpp
index 00893bb9f..1299a0ba7 100644
--- a/Telegram/SourceFiles/mtproto/dc_options.cpp
+++ b/Telegram/SourceFiles/mtproto/dc_options.cpp
@@ -22,8 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "storage/serialize_common.h"
 
-#include "mtproto/facade.h"
 #include "facades.h"
+#include "mtproto/facade.h"
 
 #include <QHostAddress>
 
@@ -31,26 +31,25 @@ namespace MTP {
 
 class DcOptions::WriteLocker {
 public:
-	WriteLocker(DcOptions *that) : _that(that), _lock(&_that->_useThroughLockers) {
-	}
+	WriteLocker(DcOptions *that)
+	    : _that(that)
+	    , _lock(&_that->_useThroughLockers) {}
 	~WriteLocker() {
 		_that->computeCdnDcIds();
 	}
 
 private:
-	not_null<DcOptions*> _that;
+	not_null<DcOptions *> _that;
 	QWriteLocker _lock;
-
 };
 
 class DcOptions::ReadLocker {
 public:
-	ReadLocker(const DcOptions *that) : _lock(&that->_useThroughLockers) {
-	}
+	ReadLocker(const DcOptions *that)
+	    : _lock(&that->_useThroughLockers) {}
 
 private:
 	QReadLocker _lock;
-
 };
 
 void DcOptions::readBuiltInPublicKeys() {
@@ -79,7 +78,10 @@ void DcOptions::constructFromBuiltIn() {
 		auto flags = MTPDdcOption::Flags(0);
 		auto idWithShift = MTP::shiftDcId(bdcs[i].id, flags);
 		_data.emplace(idWithShift, Option(bdcs[i].id, flags, bdcs[i].ip, bdcs[i].port));
-		DEBUG_LOG(("MTP Info: adding built in DC %1 connect option: %2:%3").arg(bdcs[i].id).arg(bdcs[i].ip).arg(bdcs[i].port));
+		DEBUG_LOG(("MTP Info: adding built in DC %1 connect option: %2:%3")
+		              .arg(bdcs[i].id)
+		              .arg(bdcs[i].ip)
+		              .arg(bdcs[i].port));
 	}
 
 	auto bdcsipv6 = builtInDcsIPv6();
@@ -87,7 +89,10 @@ void DcOptions::constructFromBuiltIn() {
 		auto flags = MTPDdcOption::Flags(MTPDdcOption::Flag::f_ipv6);
 		auto idWithShift = MTP::shiftDcId(bdcsipv6[i].id, flags);
 		_data.emplace(idWithShift, Option(bdcsipv6[i].id, flags, bdcsipv6[i].ip, bdcsipv6[i].port));
-		DEBUG_LOG(("MTP Info: adding built in DC %1 IPv6 connect option: %2:%3").arg(bdcsipv6[i].id).arg(bdcsipv6[i].ip).arg(bdcsipv6[i].port));
+		DEBUG_LOG(("MTP Info: adding built in DC %1 IPv6 connect option: %2:%3")
+		              .arg(bdcsipv6[i].id)
+		              .arg(bdcsipv6[i].ip)
+		              .arg(bdcsipv6[i].port));
 	}
 }
 
@@ -244,8 +249,9 @@ QByteArray DcOptions::serialize() const {
 	publicKeys.reserve(count);
 	for (auto &keysInDc : _cdnPublicKeys) {
 		for (auto &entry : keysInDc.second) {
-			publicKeys.push_back({ keysInDc.first, entry.second.getN(), entry.second.getE() });
-			size += sizeof(qint32) + Serialize::bytesSize(publicKeys.back().n) + Serialize::bytesSize(publicKeys.back().e);
+			publicKeys.push_back({keysInDc.first, entry.second.getN(), entry.second.getE()});
+			size +=
+			    sizeof(qint32) + Serialize::bytesSize(publicKeys.back().n) + Serialize::bytesSize(publicKeys.back().e);
 		}
 	}
 
@@ -339,9 +345,8 @@ DcOptions::Ids DcOptions::configEnumDcIds() const {
 		ReadLocker lock(this);
 		result.reserve(_data.size());
 		for (auto &item : _data) {
-			if (!isCdnDc(item.second.flags)
-				&& !isTemporaryDcId(item.first)
-				&& !base::contains(result, item.second.id)) {
+			if (!isCdnDc(item.second.flags) && !isTemporaryDcId(item.first) &&
+			    !base::contains(result, item.second.id)) {
 				result.push_back(item.second.id);
 			}
 		}
@@ -417,34 +422,40 @@ DcOptions::Variants DcOptions::lookup(DcId dcId, DcType type) const {
 			switch (address) {
 			case Variants::IPv4: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// Regular TCP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | 0),
-					throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
-					(MTPDdcOption::Flag::f_tcpo_only | 0),
-					0
-				};
-				case Variants::Http: return {
-					// Regular HTTP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
-					0,
-				};
+				case Variants::Tcp:
+					return {// Regular TCP IPv4
+					        throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) :
+					                       (MTPDdcOption::Flag::f_tcpo_only | 0),
+					        throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
+					        (MTPDdcOption::Flag::f_tcpo_only | 0), 0};
+				case Variants::Http:
+					return {
+					    // Regular HTTP IPv4
+					    throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
+					    0,
+					};
 				}
 			} break;
 			case Variants::IPv6: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// Regular TCP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_ipv6 | 0),
-					(MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_ipv6 | 0),
-				};
-				case Variants::Http: return {
-					// Regular HTTP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_ipv6 | 0),
-					(MTPDdcOption::Flag::f_ipv6 | 0),
-				};
+				case Variants::Tcp:
+					return {
+					    // Regular TCP IPv6
+					    throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6 |
+					                    MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
+					    throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_ipv6 | 0),
+					    (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
+					    (MTPDdcOption::Flag::f_ipv6 | 0),
+					};
+				case Variants::Http:
+					return {
+					    // Regular HTTP IPv6
+					    throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_ipv6 | 0),
+					    (MTPDdcOption::Flag::f_ipv6 | 0),
+					};
 				}
 			} break;
 			}
@@ -453,46 +464,66 @@ DcOptions::Variants DcOptions::lookup(DcId dcId, DcType type) const {
 			switch (address) {
 			case Variants::IPv4: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// Media download TCP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only),
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | 0),
-					(MTPDdcOption::Flag::f_media_only | 0),
-					throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
-					(MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only),
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | 0),
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | 0) : (MTPDdcOption::Flag::f_media_only | 0),
-					0,
-				};
-				case Variants::Http: return {
-					// Media download HTTP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_media_only | 0),
-					(MTPDdcOption::Flag::f_media_only | 0),
-					throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
-					0,
-				};
+				case Variants::Tcp:
+					return {
+					    // Media download TCP IPv4
+					    throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only |
+					                    MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only),
+					    throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_tcpo_only | 0),
+					    (MTPDdcOption::Flag::f_media_only | 0),
+					    throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
+					    (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only),
+					    throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_tcpo_only | 0),
+					    throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | 0) : (MTPDdcOption::Flag::f_media_only | 0),
+					    0,
+					};
+				case Variants::Http:
+					return {
+					    // Media download HTTP IPv4
+					    throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_media_only | 0),
+					    (MTPDdcOption::Flag::f_media_only | 0),
+					    throughProxy ? (MTPDdcOption::Flag::f_static | 0) : MTPDdcOption::Flags(0),
+					    0,
+					};
 				}
 			} break;
 			case Variants::IPv6: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// Media download TCP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_ipv6 | 0),
-					(MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6) : (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_ipv6 | 0)
-				};
-				case Variants::Http: return {
-					// Media download HTTP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
-					throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_ipv6 | 0),
-					(MTPDdcOption::Flag::f_ipv6 | 0),
-				};
+				case Variants::Tcp:
+					return {// Media download TCP IPv6
+					        throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only |
+					                        MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					                       (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only |
+					                        MTPDdcOption::Flag::f_ipv6),
+					        throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6 |
+					                        MTPDdcOption::Flag::f_static) :
+					                       (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
+					        (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
+					        throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					                       (MTPDdcOption::Flag::f_ipv6 | 0),
+					        (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_tcpo_only |
+					         MTPDdcOption::Flag::f_ipv6),
+					        throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6 |
+					                        MTPDdcOption::Flag::f_static) :
+					                       (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
+					        throughProxy ? (MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6) :
+					                       (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
+					        (MTPDdcOption::Flag::f_ipv6 | 0)};
+				case Variants::Http:
+					return {
+					    // Media download HTTP IPv6
+					    throughProxy ? (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6 |
+					                    MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
+					    (MTPDdcOption::Flag::f_media_only | MTPDdcOption::Flag::f_ipv6),
+					    throughProxy ? (MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_ipv6 | 0),
+					    (MTPDdcOption::Flag::f_ipv6 | 0),
+					};
 				}
 			} break;
 			}
@@ -501,34 +532,49 @@ DcOptions::Variants DcOptions::lookup(DcId dcId, DcType type) const {
 			switch (address) {
 			case Variants::IPv4: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// CDN TCP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only),
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | 0),
-					(MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only),
-					(MTPDdcOption::Flag::f_cdn | 0),
-				};
-				case Variants::Http: return {
-					// CDN HTTP IPv4
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | 0),
-					(MTPDdcOption::Flag::f_cdn | 0),
-				};
+				case Variants::Tcp:
+					return {
+					    // CDN TCP IPv4
+					    throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only |
+					                    MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only),
+					    throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_cdn | 0),
+					    (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only),
+					    (MTPDdcOption::Flag::f_cdn | 0),
+					};
+				case Variants::Http:
+					return {
+					    // CDN HTTP IPv4
+					    throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_static) :
+					                   (MTPDdcOption::Flag::f_cdn | 0),
+					    (MTPDdcOption::Flag::f_cdn | 0),
+					};
 				}
 			} break;
 			case Variants::IPv6: {
 				switch (protocol) {
-				case Variants::Tcp: return {
-					// CDN TCP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_tcpo_only),
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
-				};
-				case Variants::Http: return {
-					// CDN HTTP IPv6
-					throughProxy ? (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) : (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
-					(MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
-				};
+				case Variants::Tcp:
+					return {
+					    // CDN TCP IPv6
+					    throughProxy ?
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_tcpo_only |
+					         MTPDdcOption::Flag::f_static) :
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_tcpo_only),
+					    throughProxy ?
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
+					    (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_tcpo_only | MTPDdcOption::Flag::f_ipv6),
+					    (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
+					};
+				case Variants::Http:
+					return {
+					    // CDN HTTP IPv6
+					    throughProxy ?
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6 | MTPDdcOption::Flag::f_static) :
+					        (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
+					    (MTPDdcOption::Flag::f_cdn | MTPDdcOption::Flag::f_ipv6),
+					};
 				}
 			} break;
 			}
@@ -588,7 +634,8 @@ bool DcOptions::loadFromFile(const QString &path) {
 		}
 
 		auto error = [line] {
-			LOG(("MTP Error: in .tdesktop-endpoints expected 'dcId host port [tcpo_only] [media_only]', got '%1'").arg(line));
+			LOG(("MTP Error: in .tdesktop-endpoints expected 'dcId host port [tcpo_only] [media_only]', got '%1'")
+			        .arg(line));
 			return false;
 		};
 		if (components.size() < 3) {
diff --git a/Telegram/SourceFiles/mtproto/dc_options.h b/Telegram/SourceFiles/mtproto/dc_options.h
index 1604882c8..d4020bf37 100644
--- a/Telegram/SourceFiles/mtproto/dc_options.h
+++ b/Telegram/SourceFiles/mtproto/dc_options.h
@@ -23,9 +23,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "base/observer.h"
 #include "mtproto/rsa_public_key.h"
 #include "scheme.h"
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 namespace MTP {
 
@@ -84,8 +84,11 @@ public:
 
 private:
 	struct Option {
-		Option(DcId id, MTPDdcOption::Flags flags, const std::string &ip, int port) : id(id), flags(flags), ip(ip), port(port) {
-		}
+		Option(DcId id, MTPDdcOption::Flags flags, const std::string &ip, int port)
+		    : id(id)
+		    , flags(flags)
+		    , ip(ip)
+		    , port(port) {}
 
 		DcId id;
 		MTPDdcOption::Flags flags;
@@ -115,7 +118,6 @@ private:
 
 	// True when we have overriden options from a .tdesktop-endpoints file.
 	bool _immutable = false;
-
 };
 
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/dcenter.cpp b/Telegram/SourceFiles/mtproto/dcenter.cpp
index 754ccc5de..f7b314481 100644
--- a/Telegram/SourceFiles/mtproto/dcenter.cpp
+++ b/Telegram/SourceFiles/mtproto/dcenter.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/dcenter.h"
 
-#include "mtproto/facade.h"
 #include "mtproto/auth_key.h"
 #include "mtproto/dc_options.h"
+#include "mtproto/facade.h"
 #include "mtproto/mtp_instance.h"
 #include "mtproto/special_config_request.h"
 #include "storage/localstorage.h"
@@ -36,10 +36,10 @@ constexpr auto kSpecialRequestTimeoutMs = 6000; // 4 seconds timeout for it to w
 
 } // namespace
 
-Dcenter::Dcenter(not_null<Instance*> instance, DcId dcId, AuthKeyPtr &&key)
-: _instance(instance)
-, _id(dcId)
-, _key(std::move(key)) {
+Dcenter::Dcenter(not_null<Instance *> instance, DcId dcId, AuthKeyPtr &&key)
+    : _instance(instance)
+    , _id(dcId)
+    , _key(std::move(key)) {
 	connect(this, SIGNAL(authKeyCreated()), this, SLOT(authKeyWrite()), Qt::QueuedConnection);
 }
 
@@ -51,7 +51,8 @@ void Dcenter::authKeyWrite() {
 }
 
 void Dcenter::setKey(AuthKeyPtr &&key) {
-	DEBUG_LOG(("AuthKey Info: MTProtoDC::setKey(%1), emitting authKeyCreated, dc %2").arg(key ? key->keyId() : 0).arg(_id));
+	DEBUG_LOG(
+	    ("AuthKey Info: MTProtoDC::setKey(%1), emitting authKeyCreated, dc %2").arg(key ? key->keyId() : 0).arg(_id));
 	_key = std::move(key);
 	_connectionInited = false;
 	_instance->setKeyForWrite(_id, _key);
diff --git a/Telegram/SourceFiles/mtproto/dcenter.h b/Telegram/SourceFiles/mtproto/dcenter.h
index 42f77364a..a7ed6be3a 100644
--- a/Telegram/SourceFiles/mtproto/dcenter.h
+++ b/Telegram/SourceFiles/mtproto/dcenter.h
@@ -40,7 +40,7 @@ class Dcenter : public QObject {
 	Q_OBJECT
 
 public:
-	Dcenter(gsl::not_null<Instance*> instance, DcId dcId, AuthKeyPtr &&key);
+	Dcenter(gsl::not_null<Instance *> instance, DcId dcId, AuthKeyPtr &&key);
 
 	QReadWriteLock *keyMutex() const;
 	const AuthKeyPtr &getKey() const;
@@ -67,11 +67,10 @@ private slots:
 private:
 	mutable QReadWriteLock keyLock;
 	mutable QMutex initLock;
-	gsl::not_null<Instance*> _instance;
+	gsl::not_null<Instance *> _instance;
 	DcId _id = 0;
 	AuthKeyPtr _key;
 	bool _connectionInited = false;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/facade.cpp b/Telegram/SourceFiles/mtproto/facade.cpp
index 98de185c7..c4ec10050 100644
--- a/Telegram/SourceFiles/mtproto/facade.cpp
+++ b/Telegram/SourceFiles/mtproto/facade.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/facade.h"
 
-#include "storage/localstorage.h"
 #include "messenger.h"
+#include "storage/localstorage.h"
 
 namespace MTP {
 namespace internal {
diff --git a/Telegram/SourceFiles/mtproto/facade.h b/Telegram/SourceFiles/mtproto/facade.h
index f057de8f3..02dec0384 100644
--- a/Telegram/SourceFiles/mtproto/facade.h
+++ b/Telegram/SourceFiles/mtproto/facade.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "mtproto/type_utils.h"
-#include "mtproto/session.h"
 #include "core/single_timer.h"
 #include "mtproto/mtp_instance.h"
+#include "mtproto/session.h"
+#include "mtproto/type_utils.h"
 
 namespace MTP {
 namespace internal {
@@ -63,7 +63,6 @@ public:
 
 private:
 	bool _paused = false;
-
 };
 
 constexpr DcId bareDcId(ShiftedDcId shiftedDcId) {
@@ -105,7 +104,8 @@ inline ShiftedDcId downloadDcId(DcId dcId, int index) {
 }
 
 inline constexpr bool isDownloadDcId(ShiftedDcId shiftedDcId) {
-	return (shiftedDcId >= internal::downloadDcId(0, 0)) && (shiftedDcId < internal::downloadDcId(0, kDownloadSessionsCount - 1) + internal::kDcShift);
+	return (shiftedDcId >= internal::downloadDcId(0, 0)) &&
+	       (shiftedDcId < internal::downloadDcId(0, kDownloadSessionsCount - 1) + internal::kDcShift);
 }
 
 inline bool isCdnDc(MTPDdcOption::Flags flags) {
@@ -144,7 +144,8 @@ inline ShiftedDcId uploadDcId(int index) {
 };
 
 constexpr bool isUploadDcId(ShiftedDcId shiftedDcId) {
-	return (shiftedDcId >= internal::uploadDcId(0, 0)) && (shiftedDcId < internal::uploadDcId(0, kUploadSessionsCount - 1) + internal::kDcShift);
+	return (shiftedDcId >= internal::uploadDcId(0, 0)) &&
+	       (shiftedDcId < internal::uploadDcId(0, kUploadSessionsCount - 1) + internal::kDcShift);
 }
 
 inline ShiftedDcId destroyKeyNextDcId(ShiftedDcId shiftedDcId) {
@@ -158,11 +159,7 @@ enum {
 	ConnectedState = 2,
 };
 
-enum {
-	RequestSent = 0,
-	RequestConnecting = 1,
-	RequestSending = 2
-};
+enum { RequestSent = 0, RequestConnecting = 1, RequestSending = 2 };
 
 Instance *MainInstance();
 
@@ -193,12 +190,15 @@ inline QString dctransport(ShiftedDcId shiftedDcId = 0) {
 }
 
 template <typename TRequest>
-inline mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(), ShiftedDcId dcId = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
+inline mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(),
+                         ShiftedDcId dcId = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
 	return MainInstance()->send(request, std::move(callbacks), dcId, msCanWait, after);
 }
 
 template <typename TRequest>
-inline mtpRequestId send(const TRequest &request, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail = RPCFailHandlerPtr(), ShiftedDcId dcId = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
+inline mtpRequestId send(const TRequest &request, RPCDoneHandlerPtr onDone,
+                         RPCFailHandlerPtr onFail = RPCFailHandlerPtr(), ShiftedDcId dcId = 0, TimeMs msCanWait = 0,
+                         mtpRequestId after = 0) {
 	return MainInstance()->send(request, std::move(onDone), std::move(onFail), dcId, msCanWait, after);
 }
 
@@ -229,7 +229,8 @@ inline qint32 state(mtpRequestId requestId) { // < 0 means waiting for such coun
 namespace internal {
 
 template <typename TRequest>
-mtpRequestId Session::send(const TRequest &request, RPCResponseHandler callbacks, TimeMs msCanWait, bool needsLayer, bool toMainDC, mtpRequestId after) {
+mtpRequestId Session::send(const TRequest &request, RPCResponseHandler callbacks, TimeMs msCanWait, bool needsLayer,
+                           bool toMainDC, mtpRequestId after) {
 	mtpRequestId requestId = 0;
 	try {
 		quint32 requestSize = request.innerLength() >> 2;
@@ -246,7 +247,9 @@ mtpRequestId Session::send(const TRequest &request, RPCResponseHandler callbacks
 		sendPrepared(reqSerialized, msCanWait);
 	} catch (Exception &e) {
 		requestId = 0;
-		rpcErrorOccured(requestId, callbacks.onFail, rpcClientError("NO_REQUEST_ID", QString("send() failed to queue request, exception: %1").arg(e.what())));
+		rpcErrorOccured(
+		    requestId, callbacks.onFail,
+		    rpcClientError("NO_REQUEST_ID", QString("send() failed to queue request, exception: %1").arg(e.what())));
 	}
 	if (requestId) registerRequest(requestId, toMainDC ? -getDcWithShift() : getDcWithShift());
 	return requestId;
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
index cd93505a2..834975542 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@@ -20,25 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/mtp_instance.h"
 
-#include "mtproto/dc_options.h"
-#include "mtproto/dcenter.h"
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "base/timer.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
+#include "messenger.h"
 #include "mtproto/config_loader.h"
 #include "mtproto/connection.h"
-#include "mtproto/sender.h"
+#include "mtproto/dc_options.h"
+#include "mtproto/dcenter.h"
 #include "mtproto/rsa_public_key.h"
+#include "mtproto/sender.h"
 #include "storage/localstorage.h"
-#include "auth_session.h"
-#include "apiwrap.h"
-#include "messenger.h"
-#include "lang/lang_instance.h"
-#include "lang/lang_cloud_manager.h"
-#include "base/timer.h"
 
 namespace MTP {
 
 class Instance::Private : private Sender {
 public:
-	Private(not_null<Instance*> instance, not_null<DcOptions*> options, Instance::Mode mode);
+	Private(not_null<Instance *> instance, not_null<DcOptions *> options, Instance::Mode mode);
 
 	void start(Config &&config);
 
@@ -50,7 +50,7 @@ public:
 	AuthKeysList getKeysForWrite() const;
 	void addKeysForDestroy(AuthKeysList &&keys);
 
-	not_null<DcOptions*> dcOptions();
+	not_null<DcOptions *> dcOptions();
 
 	void requestConfig();
 	void requestCDNConfig();
@@ -78,7 +78,8 @@ public:
 	void unregisterRequest(mtpRequestId requestId);
 	mtpRequestId storeRequest(mtpRequest &request, const RPCResponseHandler &parser);
 	mtpRequest getRequest(mtpRequestId requestId);
-	void clearCallbacks(mtpRequestId requestId, qint32 errorCode = RPCError::NoError); // 0 - do not toggle onError callback
+	void clearCallbacks(mtpRequestId requestId,
+	                    qint32 errorCode = RPCError::NoError); // 0 - do not toggle onError callback
 	void clearCallbacksDelayed(const RPCCallbackClears &requestIds);
 	void performDelayedClear();
 	void execCallback(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end);
@@ -137,8 +138,8 @@ private:
 
 	void checkDelayedRequests();
 
-	not_null<Instance*> _instance;
-	not_null<DcOptions*> _dcOptions;
+	not_null<Instance *> _instance;
+	not_null<DcOptions *> _dcOptions;
 	Instance::Mode _mode = Instance::Mode::Normal;
 
 	DcId _mainDcId = Config::kDefaultMainDc;
@@ -191,18 +192,18 @@ private:
 
 	// Debug flag to find out how we end up crashing.
 	bool MustNotCreateSessions = false;
-
 };
 
-Instance::Private::Private(not_null<Instance*> instance, not_null<DcOptions*> options, Instance::Mode mode) : Sender()
-, _instance(instance)
-, _dcOptions(options)
-, _mode(mode) {
-}
+Instance::Private::Private(not_null<Instance *> instance, not_null<DcOptions *> options, Instance::Mode mode)
+    : Sender()
+    , _instance(instance)
+    , _dcOptions(options)
+    , _mode(mode) {}
 
 void Instance::Private::start(Config &&config) {
 	if (isKeysDestroyer()) {
-		_instance->connect(_instance, SIGNAL(keyDestroyed(qint32)), _instance, SLOT(onKeyDestroyed(qint32)), Qt::QueuedConnection);
+		_instance->connect(_instance, SIGNAL(keyDestroyed(qint32)), _instance, SLOT(onKeyDestroyed(qint32)),
+		                   Qt::QueuedConnection);
 	} else if (isNormal()) {
 		unixtimeInit();
 	}
@@ -283,11 +284,9 @@ void Instance::Private::requestConfig() {
 	if (_configLoader) {
 		return;
 	}
-	_configLoader = std::make_unique<internal::ConfigLoader>(_instance, rpcDone([this](const MTPConfig &result) {
-		configLoadDone(result);
-	}), rpcFail([this](const RPCError &error) {
-		return configLoadFail(error);
-	}));
+	_configLoader = std::make_unique<internal::ConfigLoader>(
+	    _instance, rpcDone([this](const MTPConfig &result) { configLoadDone(result); }),
+	    rpcFail([this](const RPCError &error) { return configLoadFail(error); }));
 	_configLoader->load();
 }
 
@@ -295,16 +294,18 @@ void Instance::Private::requestCDNConfig() {
 	if (_cdnConfigLoadRequestId || _mainDcId == Config::kNoneMainDc) {
 		return;
 	}
-	_cdnConfigLoadRequestId = request(MTPhelp_GetCdnConfig()).done([this](const MTPCdnConfig &result) {
-		_cdnConfigLoadRequestId = 0;
+	_cdnConfigLoadRequestId = request(MTPhelp_GetCdnConfig())
+	                              .done([this](const MTPCdnConfig &result) {
+		                              _cdnConfigLoadRequestId = 0;
 
-		Expects(result.type() == mtpc_cdnConfig);
-		dcOptions()->setCDNConfig(result.c_cdnConfig());
+		                              Expects(result.type() == mtpc_cdnConfig);
+		                              dcOptions()->setCDNConfig(result.c_cdnConfig());
 
-		Local::writeSettings();
+		                              Local::writeSettings();
 
-		emit _instance->cdnConfigLoaded();
-	}).send();
+		                              emit _instance->cdnConfigLoaded();
+	                              })
+	                              .send();
 }
 
 void Instance::Private::restart() {
@@ -374,7 +375,7 @@ void Instance::Private::cancel(mtpRequestId requestId) {
 		QWriteLocker locker(&_requestMapLock);
 		auto it = _requestMap.find(requestId);
 		if (it != _requestMap.end()) {
-			msgId = *(mtpMsgId*)(it->second->constData() + 4);
+			msgId = *(mtpMsgId *)(it->second->constData() + 4);
 			_requestMap.erase(it);
 		}
 	}
@@ -429,9 +430,7 @@ void Instance::Private::killSession(ShiftedDcId shiftedDcId) {
 		_sessions.emplace(_mainDcId, std::move(main));
 		_mainSession->start();
 	}
-	InvokeQueued(_instance, [this] {
-		clearKilledSessions();
-	});
+	InvokeQueued(_instance, [this] { clearKilledSessions(); });
 }
 
 void Instance::Private::clearKilledSessions() {
@@ -466,11 +465,9 @@ void Instance::Private::logout(RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFai
 	for (auto dcId : dcIds) {
 		if (dcId != mainDcId() && dcOptions()->dcType(dcId) != DcType::Cdn) {
 			auto shiftedDcId = MTP::logoutDcId(dcId);
-			auto requestId = _instance->send(MTPauth_LogOut(), rpcDone([this](mtpRequestId requestId) {
-				logoutGuestDone(requestId);
-			}), rpcFail([this](mtpRequestId requestId) {
-				return logoutGuestDone(requestId);
-			}), shiftedDcId);
+			auto requestId = _instance->send(
+			    MTPauth_LogOut(), rpcDone([this](mtpRequestId requestId) { logoutGuestDone(requestId); }),
+			    rpcFail([this](mtpRequestId requestId) { return logoutGuestDone(requestId); }), shiftedDcId);
 			_logoutGuestRequestIds.emplace(shiftedDcId, requestId);
 		}
 	}
@@ -556,7 +553,7 @@ void Instance::Private::addKeysForDestroy(AuthKeysList &&keys) {
 	}
 }
 
-not_null<DcOptions*> Instance::Private::dcOptions() {
+not_null<DcOptions *> Instance::Private::dcOptions() {
 	return _dcOptions;
 }
 
@@ -583,7 +580,12 @@ void Instance::Private::configLoadDone(const MTPConfig &result) {
 	_configLoader.reset();
 
 	auto &data = result.c_config();
-	DEBUG_LOG(("MTP Info: got config, chat_size_max: %1, date: %2, test_mode: %3, this_dc: %4, dc_options.length: %5").arg(data.vchat_size_max.v).arg(data.vdate.v).arg(mtpIsTrue(data.vtest_mode)).arg(data.vthis_dc.v).arg(data.vdc_options.v.size()));
+	DEBUG_LOG(("MTP Info: got config, chat_size_max: %1, date: %2, test_mode: %3, this_dc: %4, dc_options.length: %5")
+	              .arg(data.vchat_size_max.v)
+	              .arg(data.vdate.v)
+	              .arg(mtpIsTrue(data.vtest_mode))
+	              .arg(data.vthis_dc.v)
+	              .arg(data.vdc_options.v.size()));
 	if (data.vdc_options.v.empty()) {
 		LOG(("MTP Error: config with empty dc_options received!"));
 	} else {
@@ -616,7 +618,8 @@ void Instance::Private::configLoadDone(const MTPConfig &result) {
 		Global::SetPhoneCallsEnabled(data.is_phonecalls_enabled());
 		Global::RefPhoneCallsEnabledChanged().notify();
 	}
-	Lang::CurrentCloudManager().setSuggestedLanguage(data.has_suggested_lang_code() ? qs(data.vsuggested_lang_code) : QString());
+	Lang::CurrentCloudManager().setSuggestedLanguage(data.has_suggested_lang_code() ? qs(data.vsuggested_lang_code) :
+	                                                                                  QString());
 
 	Local::writeSettings();
 
@@ -730,7 +733,10 @@ void Instance::Private::clearCallbacks(mtpRequestId requestId, qint32 errorCode)
 		}
 	}
 	if (errorCode && found) {
-		rpcErrorOccured(requestId, h, internal::rpcClientError("CLEAR_CALLBACK", QString("did not handle request %1, error code %2").arg(requestId).arg(errorCode)));
+		rpcErrorOccured(
+		    requestId, h,
+		    internal::rpcClientError(
+		        "CLEAR_CALLBACK", QString("did not handle request %1, error code %2").arg(requestId).arg(errorCode)));
 	}
 }
 
@@ -763,7 +769,9 @@ void Instance::Private::performDelayedClear() {
 			if (cDebug()) {
 				QMutexLocker locker(&_parserMapLock);
 				if (_parserMap.find(clearRequest.requestId) != _parserMap.end()) {
-					DEBUG_LOG(("RPC Info: clearing delayed callback %1, error code %2").arg(clearRequest.requestId).arg(clearRequest.errorCode));
+					DEBUG_LOG(("RPC Info: clearing delayed callback %1, error code %2")
+					              .arg(clearRequest.requestId)
+					              .arg(clearRequest.errorCode));
 				}
 			}
 			clearCallbacks(clearRequest.requestId, clearRequest.errorCode);
@@ -793,7 +801,10 @@ void Instance::Private::execCallback(mtpRequestId requestId, const mtpPrime *fro
 				auto mtpError = MTPRpcError();
 				mtpError.read(from, end);
 				auto error = RPCError(mtpError);
-				DEBUG_LOG(("RPC Info: error received, code %1, type %2, description: %3").arg(error.code()).arg(error.type()).arg(error.description()));
+				DEBUG_LOG(("RPC Info: error received, code %1, type %2, description: %3")
+				              .arg(error.code())
+				              .arg(error.type())
+				              .arg(error.description()));
 				if (!rpcErrorOccured(requestId, h, error)) {
 					QMutexLocker locker(&_parserMapLock);
 					_parserMap.emplace(requestId, h);
@@ -805,7 +816,9 @@ void Instance::Private::execCallback(mtpRequestId requestId, const mtpPrime *fro
 				}
 			}
 		} catch (Exception &e) {
-			if (!rpcErrorOccured(requestId, h, internal::rpcClientError("RESPONSE_PARSE_FAILED", QString("exception text: ") + e.what()))) {
+			if (!rpcErrorOccured(
+			        requestId, h,
+			        internal::rpcClientError("RESPONSE_PARSE_FAILED", QString("exception text: ") + e.what()))) {
 				QMutexLocker locker(&_parserMapLock);
 				_parserMap.emplace(requestId, h);
 				return;
@@ -841,7 +854,8 @@ void Instance::Private::onSessionReset(qint32 dcWithShift) {
 	}
 }
 
-bool Instance::Private::rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail, const RPCError &err) { // return true if need to clean request data
+bool Instance::Private::rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail,
+                                        const RPCError &err) { // return true if need to clean request data
 	if (isDefaultHandledError(err)) {
 		if (onFail && (*onFail)(requestId, err)) return true;
 	}
@@ -849,7 +863,11 @@ bool Instance::Private::rpcErrorOccured(mtpRequestId requestId, const RPCFailHan
 	if (onErrorDefault(requestId, err)) {
 		return false;
 	}
-	LOG(("RPC Error: request %1 got fail with code %2, error %3%4").arg(requestId).arg(err.code()).arg(err.type()).arg(err.description().isEmpty() ? QString() : QString(": %1").arg(err.description())));
+	LOG(("RPC Error: request %1 got fail with code %2, error %3%4")
+	        .arg(requestId)
+	        .arg(err.code())
+	        .arg(err.type())
+	        .arg(err.description().isEmpty() ? QString() : QString(": %1").arg(err.description())));
 	onFail && (*onFail)(requestId, err);
 	return true;
 }
@@ -864,7 +882,8 @@ void Instance::Private::importDone(const MTPauth_Authorization &result, mtpReque
 	auto it = _requestsByDc.find(requestId);
 	if (it == _requestsByDc.end()) {
 		LOG(("MTP Error: auth import request not found in requestsByDC, requestId: %1").arg(requestId));
-		RPCError error(internal::rpcClientError("AUTH_IMPORT_FAIL", QString("did not find import request in requestsByDC, request %1").arg(requestId)));
+		RPCError error(internal::rpcClientError(
+		    "AUTH_IMPORT_FAIL", QString("did not find import request in requestsByDC, request %1").arg(requestId)));
 		if (_globalHandler.onFail && hasAuthorization()) {
 			(*_globalHandler.onFail)(requestId, error); // auth failed in main dc
 		}
@@ -897,7 +916,8 @@ void Instance::Private::importDone(const MTPauth_Authorization &result, mtpReque
 					dcWithShift = shiftDcId(newdc, getDcIdShift(k->second));
 					k->second = dcWithShift;
 				}
-				DEBUG_LOG(("MTP Info: resending request %1 to dc %2 after import auth").arg(waitedRequestId).arg(k->second));
+				DEBUG_LOG(
+				    ("MTP Info: resending request %1 to dc %2 after import auth").arg(waitedRequestId).arg(k->second));
 			}
 			if (auto session = getSession(dcWithShift)) {
 				session->sendPrepared(it->second);
@@ -920,7 +940,8 @@ void Instance::Private::exportDone(const MTPauth_ExportedAuthorization &result,
 	auto it = _authExportRequests.find(requestId);
 	if (it == _authExportRequests.cend()) {
 		LOG(("MTP Error: auth export request target dcWithShift not found, requestId: %1").arg(requestId));
-		RPCError error(internal::rpcClientError("AUTH_IMPORT_FAIL", QString("did not find target dcWithShift, request %1").arg(requestId)));
+		RPCError error(internal::rpcClientError("AUTH_IMPORT_FAIL",
+		                                        QString("did not find target dcWithShift, request %1").arg(requestId)));
 		if (_globalHandler.onFail && hasAuthorization()) {
 			(*_globalHandler.onFail)(requestId, error); // auth failed in main dc
 		}
@@ -928,11 +949,11 @@ void Instance::Private::exportDone(const MTPauth_ExportedAuthorization &result,
 	}
 
 	auto &data = result.c_auth_exportedAuthorization();
-	_instance->send(MTPauth_ImportAuthorization(data.vid, data.vbytes), rpcDone([this](const MTPauth_Authorization &result, mtpRequestId requestId) {
-		importDone(result, requestId);
-	}), rpcFail([this](const RPCError &error, mtpRequestId requestId) {
-		return importFail(error, requestId);
-	}), it->second);
+	_instance->send(
+	    MTPauth_ImportAuthorization(data.vid, data.vbytes),
+	    rpcDone([this](const MTPauth_Authorization &result, mtpRequestId requestId) { importDone(result, requestId); }),
+	    rpcFail([this](const RPCError &error, mtpRequestId requestId) { return importFail(error, requestId); }),
+	    it->second);
 	_authExportRequests.erase(requestId);
 }
 
@@ -972,7 +993,10 @@ bool Instance::Private::onErrorDefault(mtpRequestId requestId, const RPCError &e
 		}
 		if (!dcWithShift || !newdcWithShift) return false;
 
-		DEBUG_LOG(("MTP Info: changing request %1 from dcWithShift%2 to dc%3").arg(requestId).arg(dcWithShift).arg(newdcWithShift));
+		DEBUG_LOG(("MTP Info: changing request %1 from dcWithShift%2 to dc%3")
+		              .arg(requestId)
+		              .arg(dcWithShift)
+		              .arg(newdcWithShift));
 		if (dcWithShift < 0) { // newdc shift = 0
 			if (false && hasAuthorization() && _authExportRequests.find(requestId) == _authExportRequests.cend()) {
 				//
@@ -1028,7 +1052,7 @@ bool Instance::Private::onErrorDefault(mtpRequestId requestId, const RPCError &e
 			}
 		} else {
 			secs = m.captured(1).toInt();
-//			if (secs >= 60) return false;
+			//			if (secs >= 60) return false;
 		}
 		auto sendAt = getms(true) + secs * 1000 + 10;
 		auto it = _delayedRequests.begin(), e = _delayedRequests.end();
@@ -1063,11 +1087,14 @@ bool Instance::Private::onErrorDefault(mtpRequestId requestId, const RPCError &e
 		DEBUG_LOG(("MTP Info: importing auth to dcWithShift %1").arg(dcWithShift));
 		auto &waiters(_authWaiters[newdc]);
 		if (!waiters.size()) {
-			auto exportRequestId = _instance->send(MTPauth_ExportAuthorization(MTP_int(newdc)), rpcDone([this](const MTPauth_ExportedAuthorization &result, mtpRequestId requestId) {
-				exportDone(result, requestId);
-			}), rpcFail([this](const RPCError &error, mtpRequestId requestId) {
-				return exportFail(error, requestId);
-			}));
+			auto exportRequestId =
+			    _instance->send(MTPauth_ExportAuthorization(MTP_int(newdc)),
+			                    rpcDone([this](const MTPauth_ExportedAuthorization &result, mtpRequestId requestId) {
+				                    exportDone(result, requestId);
+			                    }),
+			                    rpcFail([this](const RPCError &error, mtpRequestId requestId) {
+				                    return exportFail(error, requestId);
+			                    }));
 			_authExportRequests.emplace(exportRequestId, abs(dcWithShift));
 		}
 		waiters.push_back(requestId);
@@ -1194,33 +1221,38 @@ internal::Session *Instance::Private::getSession(ShiftedDcId shiftedDcId) {
 void Instance::Private::scheduleKeyDestroy(ShiftedDcId shiftedDcId) {
 	Expects(isKeysDestroyer());
 
-	_instance->send(MTPauth_LogOut(), rpcDone([this, shiftedDcId](const MTPBool &result) {
-		performKeyDestroy(shiftedDcId);
-	}), rpcFail([this, shiftedDcId](const RPCError &error) {
-		if (isDefaultHandledError(error)) return false;
-		performKeyDestroy(shiftedDcId);
-		return true;
-	}), shiftedDcId);
+	_instance->send(MTPauth_LogOut(),
+	                rpcDone([this, shiftedDcId](const MTPBool &result) { performKeyDestroy(shiftedDcId); }),
+	                rpcFail([this, shiftedDcId](const RPCError &error) {
+		                if (isDefaultHandledError(error)) return false;
+		                performKeyDestroy(shiftedDcId);
+		                return true;
+	                }),
+	                shiftedDcId);
 }
 
 void Instance::Private::performKeyDestroy(ShiftedDcId shiftedDcId) {
 	Expects(isKeysDestroyer());
 
 	_instance->send(MTPDestroy_auth_key(), rpcDone([this, shiftedDcId](const MTPDestroyAuthKeyRes &result) {
-		switch (result.type()) {
-		case mtpc_destroy_auth_key_ok: LOG(("MTP Info: key %1 destroyed.").arg(shiftedDcId)); break;
-		case mtpc_destroy_auth_key_fail: {
-			LOG(("MTP Error: key %1 destruction fail, leave it for now.").arg(shiftedDcId));
-			killSession(shiftedDcId);
-		} break;
-		case mtpc_destroy_auth_key_none: LOG(("MTP Info: key %1 already destroyed.").arg(shiftedDcId)); break;
-		}
-		emit _instance->keyDestroyed(shiftedDcId);
-	}), rpcFail([this, shiftedDcId](const RPCError &error) {
-		LOG(("MTP Error: key %1 destruction resulted in error: %2").arg(shiftedDcId).arg(error.type()));
-		emit _instance->keyDestroyed(shiftedDcId);
-		return true;
-	}), shiftedDcId);
+		                switch (result.type()) {
+		                case mtpc_destroy_auth_key_ok: LOG(("MTP Info: key %1 destroyed.").arg(shiftedDcId)); break;
+		                case mtpc_destroy_auth_key_fail: {
+			                LOG(("MTP Error: key %1 destruction fail, leave it for now.").arg(shiftedDcId));
+			                killSession(shiftedDcId);
+		                } break;
+		                case mtpc_destroy_auth_key_none:
+			                LOG(("MTP Info: key %1 already destroyed.").arg(shiftedDcId));
+			                break;
+		                }
+		                emit _instance->keyDestroyed(shiftedDcId);
+	                }),
+	                rpcFail([this, shiftedDcId](const RPCError &error) {
+		                LOG(("MTP Error: key %1 destruction resulted in error: %2").arg(shiftedDcId).arg(error.type()));
+		                emit _instance->keyDestroyed(shiftedDcId);
+		                return true;
+	                }),
+	                shiftedDcId);
 }
 
 void Instance::Private::completedKeyDestroy(ShiftedDcId shiftedDcId) {
@@ -1256,7 +1288,7 @@ void Instance::Private::setSessionResetHandler(base::lambda<void(ShiftedDcId shi
 void Instance::Private::clearGlobalHandlers() {
 	setUpdatesHandler(RPCDoneHandlerPtr());
 	setGlobalFailHandler(RPCFailHandlerPtr());
-	setStateChangedHandler(base::lambda<void(ShiftedDcId,qint32)>());
+	setStateChangedHandler(base::lambda<void(ShiftedDcId, qint32)>());
 	setSessionResetHandler(base::lambda<void(ShiftedDcId)>());
 }
 
@@ -1274,8 +1306,9 @@ void Instance::Private::prepareToDestroy() {
 	MustNotCreateSessions = true;
 }
 
-Instance::Instance(not_null<DcOptions*> options, Mode mode, Config &&config) : QObject()
-, _private(std::make_unique<Private>(this, options, mode)) {
+Instance::Instance(not_null<DcOptions *> options, Mode mode, Config &&config)
+    : QObject()
+    , _private(std::make_unique<Private>(this, options, mode)) {
 	_private->start(std::move(config));
 }
 
@@ -1371,7 +1404,7 @@ void Instance::addKeysForDestroy(AuthKeysList &&keys) {
 	_private->addKeysForDestroy(std::move(keys));
 }
 
-not_null<DcOptions*> Instance::dcOptions() {
+not_null<DcOptions *> Instance::dcOptions() {
 	return _private->dcOptions();
 }
 
diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.h b/Telegram/SourceFiles/mtproto/mtp_instance.h
index 6da883edd..0db340277 100644
--- a/Telegram/SourceFiles/mtproto/mtp_instance.h
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.h
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <map>
-#include <set>
-#include <vector>
-#include <memory>
-#include <QString>
-#include <QObject>
 #include "core/basic_types.h"
+#include "mtproto/connection.h"
 #include "mtproto/core_types.h"
 #include "mtproto/rpc_sender.h"
-#include "mtproto/connection.h"
 #include "mtproto/session.h"
+#include <QObject>
+#include <QString>
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
 
 namespace MTP {
 namespace internal {
@@ -61,7 +61,7 @@ public:
 		SpecialConfigRequester,
 		KeysDestroyer,
 	};
-	Instance(not_null<DcOptions*> options, Mode mode, Config &&config);
+	Instance(not_null<DcOptions *> options, Mode mode, Config &&config);
 
 	Instance(const Instance &other) = delete;
 	Instance &operator=(const Instance &other) = delete;
@@ -76,10 +76,11 @@ public:
 	AuthKeysList getKeysForWrite() const;
 	void addKeysForDestroy(AuthKeysList &&keys);
 
-	not_null<DcOptions*> dcOptions();
+	not_null<DcOptions *> dcOptions();
 
 	template <typename TRequest>
-	mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(), ShiftedDcId dcId = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
+	mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(),
+	                  ShiftedDcId dcId = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
 		if (auto session = getSession(dcId)) {
 			return session->send(request, callbacks, msCanWait, true, !dcId, after);
 		}
@@ -87,7 +88,8 @@ public:
 	}
 
 	template <typename TRequest>
-	mtpRequestId send(const TRequest &request, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail = RPCFailHandlerPtr(), qint32 dc = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
+	mtpRequestId send(const TRequest &request, RPCDoneHandlerPtr onDone, RPCFailHandlerPtr onFail = RPCFailHandlerPtr(),
+	                  qint32 dc = 0, TimeMs msCanWait = 0, mtpRequestId after = 0) {
 		return send(request, RPCResponseHandler(onDone, onFail), dc, msCanWait, after);
 	}
 
@@ -160,7 +162,6 @@ private:
 
 	class Private;
 	const std::unique_ptr<Private> _private;
-
 };
 
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/rpc_sender.cpp b/Telegram/SourceFiles/mtproto/rpc_sender.cpp
index e9b27a6cf..ab4c9314f 100644
--- a/Telegram/SourceFiles/mtproto/rpc_sender.cpp
+++ b/Telegram/SourceFiles/mtproto/rpc_sender.cpp
@@ -20,7 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/rpc_sender.h"
 
-RPCOwnedDoneHandler::RPCOwnedDoneHandler(RPCSender *owner) : _owner(owner) {
+RPCOwnedDoneHandler::RPCOwnedDoneHandler(RPCSender *owner)
+    : _owner(owner) {
 	_owner->_rpcRegHandler(this);
 }
 
@@ -28,7 +29,8 @@ RPCOwnedDoneHandler::~RPCOwnedDoneHandler() {
 	if (_owner) _owner->_rpcUnregHandler(this);
 }
 
-RPCOwnedFailHandler::RPCOwnedFailHandler(RPCSender *owner) : _owner(owner) {
+RPCOwnedFailHandler::RPCOwnedFailHandler(RPCSender *owner)
+    : _owner(owner) {
 	_owner->_rpcRegHandler(this);
 }
 
diff --git a/Telegram/SourceFiles/mtproto/rpc_sender.h b/Telegram/SourceFiles/mtproto/rpc_sender.h
index c43fe16e3..29ca6e3a6 100644
--- a/Telegram/SourceFiles/mtproto/rpc_sender.h
+++ b/Telegram/SourceFiles/mtproto/rpc_sender.h
@@ -20,16 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
-#include <QSet>
 #include "base/lambda_guard.h"
 #include "core/basic_types.h"
 #include "core/utils.h"
 #include "scheme.h"
+#include <QSet>
+#include <QString>
 
 class RPCError {
 public:
-	RPCError(const MTPrpcError &error) : _code(error.c_rpc_error().verror_code.v) {
+	RPCError(const MTPrpcError &error)
+	    : _code(error.c_rpc_error().verror_code.v) {
 		QString text = qs(error.c_rpc_error().verror_message);
 		if (_code < 0 || _code >= 500) {
 			_type = qsl("INTERNAL_SERVER_ERROR");
@@ -58,13 +59,9 @@ public:
 		return _description;
 	}
 
-	enum {
-		NoError,
-		TimeoutError
-	};
+	enum { NoError, TimeoutError };
 
 private:
-
 	qint32 _code;
 	QString _type, _description;
 };
@@ -88,65 +85,58 @@ inline bool isDefaultHandledError(const RPCError &error) {
 class RPCAbstractDoneHandler { // abstract done
 public:
 	virtual void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) = 0;
-	virtual ~RPCAbstractDoneHandler() {
-	}
-
+	virtual ~RPCAbstractDoneHandler() {}
 };
 using RPCDoneHandlerPtr = QSharedPointer<RPCAbstractDoneHandler>;
 
 class RPCAbstractFailHandler { // abstract fail
 public:
 	virtual bool operator()(mtpRequestId requestId, const RPCError &e) = 0;
-	virtual ~RPCAbstractFailHandler() {
-	}
+	virtual ~RPCAbstractFailHandler() {}
 };
 using RPCFailHandlerPtr = QSharedPointer<RPCAbstractFailHandler>;
 
 struct RPCResponseHandler {
-	RPCResponseHandler() {
-	}
-	RPCResponseHandler(const RPCDoneHandlerPtr &ondone, const RPCFailHandlerPtr &onfail) : onDone(ondone), onFail(onfail) {
-	}
+	RPCResponseHandler() {}
+	RPCResponseHandler(const RPCDoneHandlerPtr &ondone, const RPCFailHandlerPtr &onfail)
+	    : onDone(ondone)
+	    , onFail(onfail) {}
 
 	RPCDoneHandlerPtr onDone;
 	RPCFailHandlerPtr onFail;
-
 };
 
-inline RPCResponseHandler rpcCb(const RPCDoneHandlerPtr &onDone = RPCDoneHandlerPtr(), const RPCFailHandlerPtr &onFail = RPCFailHandlerPtr()) {
+inline RPCResponseHandler rpcCb(const RPCDoneHandlerPtr &onDone = RPCDoneHandlerPtr(),
+                                const RPCFailHandlerPtr &onFail = RPCFailHandlerPtr()) {
 	return RPCResponseHandler(onDone, onFail);
 }
 
-template <typename TReturn>
-class RPCDoneHandlerBare : public RPCAbstractDoneHandler { // done(from, end)
+template <typename TReturn> class RPCDoneHandlerBare : public RPCAbstractDoneHandler { // done(from, end)
 	using CallbackType = TReturn (*)(const mtpPrime *, const mtpPrime *);
 
 public:
-    RPCDoneHandlerBare(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerBare(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		(*_onDone)(from, end);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
-template <typename TReturn>
-class RPCDoneHandlerBareReq : public RPCAbstractDoneHandler { // done(from, end, req_id)
+template <typename TReturn> class RPCDoneHandlerBareReq : public RPCAbstractDoneHandler { // done(from, end, req_id)
 	using CallbackType = TReturn (*)(const mtpPrime *, const mtpPrime *, mtpRequestId);
 
 public:
-    RPCDoneHandlerBareReq(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerBareReq(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		(*_onDone)(from, end, requestId);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TResponse>
@@ -154,8 +144,8 @@ class RPCDoneHandlerPlain : public RPCAbstractDoneHandler { // done(result)
 	using CallbackType = TReturn (*)(const TResponse &);
 
 public:
-    RPCDoneHandlerPlain(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerPlain(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		auto response = TResponse();
 		response.read(from, end);
@@ -164,7 +154,6 @@ public:
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TResponse>
@@ -172,8 +161,8 @@ class RPCDoneHandlerReq : public RPCAbstractDoneHandler { // done(result, req_id
 	using CallbackType = TReturn (*)(const TResponse &, mtpRequestId);
 
 public:
-    RPCDoneHandlerReq(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerReq(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		auto response = TResponse();
 		response.read(from, end);
@@ -182,111 +171,102 @@ public:
 
 private:
 	CallbackType _onDone;
-
 };
 
-template <typename TReturn>
-class RPCDoneHandlerNo : public RPCAbstractDoneHandler { // done()
+template <typename TReturn> class RPCDoneHandlerNo : public RPCAbstractDoneHandler { // done()
 	using CallbackType = TReturn (*)();
 
 public:
-    RPCDoneHandlerNo(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerNo(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		(*_onDone)();
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
-template <typename TReturn>
-class RPCDoneHandlerNoReq : public RPCAbstractDoneHandler { // done(req_id)
+template <typename TReturn> class RPCDoneHandlerNoReq : public RPCAbstractDoneHandler { // done(req_id)
 	using CallbackType = TReturn (*)(mtpRequestId);
 
 public:
-    RPCDoneHandlerNoReq(CallbackType onDone) : _onDone(onDone) {
-	}
+	RPCDoneHandlerNoReq(CallbackType onDone)
+	    : _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		(*_onDone)(requestId);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 class RPCFailHandlerPlain : public RPCAbstractFailHandler { // fail(error)
 	using CallbackType = bool (*)(const RPCError &);
 
 public:
-	RPCFailHandlerPlain(CallbackType onFail) : _onFail(onFail) {
-	}
+	RPCFailHandlerPlain(CallbackType onFail)
+	    : _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
 		return (*_onFail)(e);
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
 class RPCFailHandlerReq : public RPCAbstractFailHandler { // fail(error, req_id)
 	using CallbackType = bool (*)(const RPCError &, mtpRequestId);
 
 public:
-	RPCFailHandlerReq(CallbackType onFail) : _onFail(onFail) {
-	}
+	RPCFailHandlerReq(CallbackType onFail)
+	    : _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
 		return (*_onFail)(e, requestId);
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
 class RPCFailHandlerNo : public RPCAbstractFailHandler { // fail()
 	using CallbackType = bool (*)();
 
 public:
-	RPCFailHandlerNo(CallbackType onFail) : _onFail(onFail) {
-	}
+	RPCFailHandlerNo(CallbackType onFail)
+	    : _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
 		return (*_onFail)();
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
 class RPCFailHandlerNoReq : public RPCAbstractFailHandler { // fail(req_id)
 	using CallbackType = bool (*)(mtpRequestId);
 
 public:
-	RPCFailHandlerNoReq(CallbackType onFail) : _onFail(onFail) {
-	}
+	RPCFailHandlerNoReq(CallbackType onFail)
+	    : _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
 		return (*_onFail)(requestId);
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
 struct RPCCallbackClear {
-	RPCCallbackClear(mtpRequestId id = 0, qint32 code = RPCError::NoError) : requestId(id), errorCode(code) {
-	}
+	RPCCallbackClear(mtpRequestId id = 0, qint32 code = RPCError::NoError)
+	    : requestId(id)
+	    , errorCode(code) {}
 
 	mtpRequestId requestId;
 	qint32 errorCode;
-
 };
 
-using RPCCallbackClears = QVector<RPCCallbackClear> ;
+using RPCCallbackClears = QVector<RPCCallbackClear>;
 
 template <typename TReturn>
 inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(const mtpPrime *, const mtpPrime *)) { // done(from, end)
@@ -294,7 +274,8 @@ inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(const mtpPrime *, const mtpPr
 }
 
 template <typename TReturn>
-inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(const mtpPrime *, const mtpPrime *, mtpRequestId)) { // done(from, end, req_id)
+inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(const mtpPrime *, const mtpPrime *,
+                                                   mtpRequestId)) { // done(from, end, req_id)
 	return RPCDoneHandlerPtr(new RPCDoneHandlerBareReq<TReturn>(onDone));
 }
 
@@ -308,13 +289,11 @@ inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(const TResponse &, mtpRequest
 	return RPCDoneHandlerPtr(new RPCDoneHandlerReq<TReturn, TResponse>(onDone));
 }
 
-template <typename TReturn>
-inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)()) { // done()
+template <typename TReturn> inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)()) { // done()
 	return RPCDoneHandlerPtr(new RPCDoneHandlerNo<TReturn>(onDone));
 }
 
-template <typename TReturn>
-inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(mtpRequestId)) { // done(req_id)
+template <typename TReturn> inline RPCDoneHandlerPtr rpcDone(TReturn (*onDone)(mtpRequestId)) { // done(req_id)
 	return RPCDoneHandlerPtr(new RPCDoneHandlerNoReq<TReturn>(onDone));
 }
 
@@ -346,7 +325,6 @@ public:
 
 protected:
 	RPCSender *_owner = nullptr;
-
 };
 
 class RPCOwnedFailHandler : public RPCAbstractFailHandler { // abstract fail
@@ -359,7 +337,6 @@ public:
 
 protected:
 	RPCSender *_owner = nullptr;
-
 };
 
 template <typename TReturn, typename TReceiver>
@@ -367,15 +344,15 @@ class RPCDoneHandlerBareOwned : public RPCOwnedDoneHandler { // done(from, end)
 	using CallbackType = TReturn (TReceiver::*)(const mtpPrime *, const mtpPrime *);
 
 public:
-    RPCDoneHandlerBareOwned(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerBareOwned(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(from, end);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(from, end);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TReceiver>
@@ -383,15 +360,15 @@ class RPCDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { // done(from, en
 	using CallbackType = TReturn (TReceiver::*)(const mtpPrime *, const mtpPrime *, mtpRequestId);
 
 public:
-    RPCDoneHandlerBareOwnedReq(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerBareOwnedReq(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(from, end, requestId);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(from, end, requestId);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TReceiver, typename TResponse>
@@ -399,19 +376,19 @@ class RPCDoneHandlerOwned : public RPCOwnedDoneHandler { // done(result)
 	using CallbackType = TReturn (TReceiver::*)(const TResponse &);
 
 public:
-    RPCDoneHandlerOwned(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerOwned(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (_owner) {
 			auto response = TResponse();
 			response.read(from, end);
-			(static_cast<TReceiver*>(_owner)->*_onDone)(std::move(response));
+			(static_cast<TReceiver *>(_owner)->*_onDone)(std::move(response));
 		}
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TReceiver, typename TResponse>
@@ -419,35 +396,34 @@ class RPCDoneHandlerOwnedReq : public RPCOwnedDoneHandler { // done(result, req_
 	using CallbackType = TReturn (TReceiver::*)(const TResponse &, mtpRequestId);
 
 public:
-    RPCDoneHandlerOwnedReq(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerOwnedReq(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (_owner) {
 			auto response = TResponse();
 			response.read(from, end);
-			(static_cast<TReceiver*>(_owner)->*_onDone)(std::move(response), requestId);
+			(static_cast<TReceiver *>(_owner)->*_onDone)(std::move(response), requestId);
 		}
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
-template <typename TReturn, typename TReceiver>
-class RPCDoneHandlerOwnedNo : public RPCOwnedDoneHandler { // done()
+template <typename TReturn, typename TReceiver> class RPCDoneHandlerOwnedNo : public RPCOwnedDoneHandler { // done()
 	using CallbackType = TReturn (TReceiver::*)();
 
 public:
-    RPCDoneHandlerOwnedNo(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerOwnedNo(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)();
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)();
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename TReturn, typename TReceiver>
@@ -455,15 +431,15 @@ class RPCDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { // done(req_id)
 	using CallbackType = TReturn (TReceiver::*)(mtpRequestId);
 
 public:
-    RPCDoneHandlerOwnedNoReq(TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone) {
-	}
+	RPCDoneHandlerOwnedNoReq(TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(requestId);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(requestId);
 	}
 
 private:
 	CallbackType _onDone;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver>
@@ -471,16 +447,17 @@ class RPCBindedDoneHandlerBareOwned : public RPCOwnedDoneHandler { // done(b, fr
 	using CallbackType = TReturn (TReceiver::*)(T, const mtpPrime *, const mtpPrime *);
 
 public:
-    RPCBindedDoneHandlerBareOwned(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _b(b), _onDone(onDone) {
-	}
+	RPCBindedDoneHandlerBareOwned(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _b(b)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(_b, from, end);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(_b, from, end);
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver>
@@ -488,16 +465,17 @@ class RPCBindedDoneHandlerBareOwnedReq : public RPCOwnedDoneHandler { // done(b,
 	using CallbackType = TReturn (TReceiver::*)(T, const mtpPrime *, const mtpPrime *, mtpRequestId);
 
 public:
-    RPCBindedDoneHandlerBareOwnedReq(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _b(b), _onDone(onDone) {
-	}
+	RPCBindedDoneHandlerBareOwnedReq(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _b(b)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(_b, from, end, requestId);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(_b, from, end, requestId);
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver, typename TResponse>
@@ -505,20 +483,21 @@ class RPCBindedDoneHandlerOwned : public RPCOwnedDoneHandler { // done(b, result
 	using CallbackType = TReturn (TReceiver::*)(T, const TResponse &);
 
 public:
-    RPCBindedDoneHandlerOwned(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone), _b(b) {
-	}
+	RPCBindedDoneHandlerOwned(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone)
+	    , _b(b) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (_owner) {
 			auto response = TResponse();
 			response.read(from, end);
-			(static_cast<TReceiver*>(_owner)->*_onDone)(_b, std::move(response));
+			(static_cast<TReceiver *>(_owner)->*_onDone)(_b, std::move(response));
 		}
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver, typename TResponse>
@@ -526,20 +505,21 @@ class RPCBindedDoneHandlerOwnedReq : public RPCOwnedDoneHandler { // done(b, res
 	using CallbackType = TReturn (TReceiver::*)(T, const TResponse &, mtpRequestId);
 
 public:
-    RPCBindedDoneHandlerOwnedReq(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _onDone(onDone), _b(b) {
-	}
+	RPCBindedDoneHandlerOwnedReq(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _onDone(onDone)
+	    , _b(b) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (_owner) {
 			auto response = TResponse();
 			response.read(from, end);
-			(static_cast<TReceiver*>(_owner)->*_onDone)(_b, std::move(response), requestId);
+			(static_cast<TReceiver *>(_owner)->*_onDone)(_b, std::move(response), requestId);
 		}
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver>
@@ -547,16 +527,17 @@ class RPCBindedDoneHandlerOwnedNo : public RPCOwnedDoneHandler { // done(b)
 	using CallbackType = TReturn (TReceiver::*)(T);
 
 public:
-    RPCBindedDoneHandlerOwnedNo(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _b(b), _onDone(onDone) {
-	}
+	RPCBindedDoneHandlerOwnedNo(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _b(b)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(_b);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(_b);
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
 template <typename T, typename TReturn, typename TReceiver>
@@ -564,80 +545,77 @@ class RPCBindedDoneHandlerOwnedNoReq : public RPCOwnedDoneHandler { // done(b, r
 	using CallbackType = TReturn (TReceiver::*)(T, mtpRequestId);
 
 public:
-    RPCBindedDoneHandlerOwnedNoReq(T b, TReceiver *receiver, CallbackType onDone) : RPCOwnedDoneHandler(receiver), _b(b), _onDone(onDone) {
-	}
+	RPCBindedDoneHandlerOwnedNoReq(T b, TReceiver *receiver, CallbackType onDone)
+	    : RPCOwnedDoneHandler(receiver)
+	    , _b(b)
+	    , _onDone(onDone) {}
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
-		if (_owner) (static_cast<TReceiver*>(_owner)->*_onDone)(_b, requestId);
+		if (_owner) (static_cast<TReceiver *>(_owner)->*_onDone)(_b, requestId);
 	}
 
 private:
 	CallbackType _onDone;
 	T _b;
-
 };
 
-template <typename TReceiver>
-class RPCFailHandlerOwned : public RPCOwnedFailHandler { // fail(error)
+template <typename TReceiver> class RPCFailHandlerOwned : public RPCOwnedFailHandler { // fail(error)
 	using CallbackType = bool (TReceiver::*)(const RPCError &);
 
 public:
-	RPCFailHandlerOwned(TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail) {
-	}
+	RPCFailHandlerOwned(TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(e) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(e) : true;
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
-template <typename TReceiver>
-class RPCFailHandlerOwnedReq : public RPCOwnedFailHandler { // fail(error, req_id)
+template <typename TReceiver> class RPCFailHandlerOwnedReq : public RPCOwnedFailHandler { // fail(error, req_id)
 	using CallbackType = bool (TReceiver::*)(const RPCError &, mtpRequestId);
 
 public:
-	RPCFailHandlerOwnedReq(TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail) {
-	}
+	RPCFailHandlerOwnedReq(TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(e, requestId) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(e, requestId) : true;
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
-template <typename TReceiver>
-class RPCFailHandlerOwnedNo : public RPCOwnedFailHandler { // fail()
+template <typename TReceiver> class RPCFailHandlerOwnedNo : public RPCOwnedFailHandler { // fail()
 	using CallbackType = bool (TReceiver::*)();
 
 public:
-	RPCFailHandlerOwnedNo(TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail) {
-	}
+	RPCFailHandlerOwnedNo(TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)() : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)() : true;
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
-template <typename TReceiver>
-class RPCFailHandlerOwnedNoReq : public RPCOwnedFailHandler { // fail(req_id)
+template <typename TReceiver> class RPCFailHandlerOwnedNoReq : public RPCOwnedFailHandler { // fail(req_id)
 	using CallbackType = bool (TReceiver::*)(mtpRequestId);
 
 public:
-	RPCFailHandlerOwnedNoReq(TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail) {
-	}
+	RPCFailHandlerOwnedNoReq(TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(requestId) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(requestId) : true;
 	}
 
 private:
 	CallbackType _onFail;
-
 };
 
 template <typename T, typename TReceiver>
@@ -645,16 +623,17 @@ class RPCBindedFailHandlerOwned : public RPCOwnedFailHandler { // fail(b, error)
 	using CallbackType = bool (TReceiver::*)(T, const RPCError &);
 
 public:
-	RPCBindedFailHandlerOwned(T b, TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail), _b(b) {
-	}
+	RPCBindedFailHandlerOwned(T b, TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail)
+	    , _b(b) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(_b, e) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(_b, e) : true;
 	}
 
 private:
 	CallbackType _onFail;
 	T _b;
-
 };
 
 template <typename T, typename TReceiver>
@@ -662,33 +641,34 @@ class RPCBindedFailHandlerOwnedReq : public RPCOwnedFailHandler { // fail(b, err
 	using CallbackType = bool (TReceiver::*)(T, const RPCError &, mtpRequestId);
 
 public:
-	RPCBindedFailHandlerOwnedReq(T b, TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail), _b(b) {
-	}
+	RPCBindedFailHandlerOwnedReq(T b, TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail)
+	    , _b(b) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(_b, e, requestId) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(_b, e, requestId) : true;
 	}
 
 private:
 	CallbackType _onFail;
 	T _b;
-
 };
 
-template <typename T, typename TReceiver>
-class RPCBindedFailHandlerOwnedNo : public RPCOwnedFailHandler { // fail(b)
+template <typename T, typename TReceiver> class RPCBindedFailHandlerOwnedNo : public RPCOwnedFailHandler { // fail(b)
 	using CallbackType = bool (TReceiver::*)(T);
 
 public:
-	RPCBindedFailHandlerOwnedNo(T b, TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail), _b(b) {
-	}
+	RPCBindedFailHandlerOwnedNo(T b, TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail)
+	    , _b(b) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(_b) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(_b) : true;
 	}
 
 private:
 	CallbackType _onFail;
 	T _b;
-
 };
 
 template <typename T, typename TReceiver>
@@ -696,22 +676,23 @@ class RPCBindedFailHandlerOwnedNoReq : public RPCOwnedFailHandler { // fail(b, r
 	using CallbackType = bool (TReceiver::*)(T, mtpRequestId);
 
 public:
-	RPCBindedFailHandlerOwnedNoReq(T b, TReceiver *receiver, CallbackType onFail) : RPCOwnedFailHandler(receiver), _onFail(onFail), _b(b) {
-	}
+	RPCBindedFailHandlerOwnedNoReq(T b, TReceiver *receiver, CallbackType onFail)
+	    : RPCOwnedFailHandler(receiver)
+	    , _onFail(onFail)
+	    , _b(b) {}
 	bool operator()(mtpRequestId requestId, const RPCError &e) override {
-		return _owner ? (static_cast<TReceiver*>(_owner)->*_onFail)(_b, requestId) : true;
+		return _owner ? (static_cast<TReceiver *>(_owner)->*_onFail)(_b, requestId) : true;
 	}
 
 private:
 	CallbackType _onFail;
 	T _b;
-
 };
 
 class RPCSender {
-	using DoneHandlers = QSet<RPCOwnedDoneHandler*>;
+	using DoneHandlers = QSet<RPCOwnedDoneHandler *>;
 	DoneHandlers _rpcDoneHandlers;
-	using FailHandlers = QSet<RPCOwnedFailHandler*>;
+	using FailHandlers = QSet<RPCOwnedFailHandler *>;
 	FailHandlers _rpcFailHandlers;
 
 	void _rpcRegHandler(RPCOwnedDoneHandler *handler) {
@@ -736,102 +717,117 @@ class RPCSender {
 public:
 	template <typename TReturn, typename TReceiver> // done(from, end)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(const mtpPrime *, const mtpPrime *)) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerBareOwned<TReturn, TReceiver>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCDoneHandlerBareOwned<TReturn, TReceiver>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReturn, typename TReceiver> // done(from, end, req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(const mtpPrime *, const mtpPrime *, mtpRequestId)) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerBareOwnedReq<TReturn, TReceiver>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCDoneHandlerBareOwnedReq<TReturn, TReceiver>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReturn, typename TReceiver, typename TResponse> // done(result)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(const TResponse &)) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerOwned<TReturn, TReceiver, TResponse>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCDoneHandlerOwned<TReturn, TReceiver, TResponse>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReturn, typename TReceiver, typename TResponse> // done(result, req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(const TResponse &, mtpRequestId)) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerOwnedReq<TReturn, TReceiver, TResponse>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCDoneHandlerOwnedReq<TReturn, TReceiver, TResponse>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReturn, typename TReceiver> // done()
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)()) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerOwnedNo<TReturn, TReceiver>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(new RPCDoneHandlerOwnedNo<TReturn, TReceiver>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReturn, typename TReceiver> // done(req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(mtpRequestId)) {
-		return RPCDoneHandlerPtr(new RPCDoneHandlerOwnedNoReq<TReturn, TReceiver>(static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCDoneHandlerOwnedNoReq<TReturn, TReceiver>(static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename TReceiver> // fail(error)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(const RPCError &)) {
-		return RPCFailHandlerPtr(new RPCFailHandlerOwned<TReceiver>(static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(new RPCFailHandlerOwned<TReceiver>(static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename TReceiver> // fail(error, req_id)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(const RPCError &, mtpRequestId)) {
-		return RPCFailHandlerPtr(new RPCFailHandlerOwnedReq<TReceiver>(static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(new RPCFailHandlerOwnedReq<TReceiver>(static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename TReceiver> // fail()
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)()) {
-		return RPCFailHandlerPtr(new RPCFailHandlerOwnedNo<TReceiver>(static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(new RPCFailHandlerOwnedNo<TReceiver>(static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename TReceiver> // fail(req_id)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(mtpRequestId)) {
-		return RPCFailHandlerPtr(new RPCFailHandlerOwnedNo<TReceiver>(static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(new RPCFailHandlerOwnedNo<TReceiver>(static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver> // done(b, from, end)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T, const mtpPrime *, const mtpPrime *), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerBareOwned<T, TReturn, TReceiver>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCBindedDoneHandlerBareOwned<T, TReturn, TReceiver>(b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver> // done(b, from, end, req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T, const mtpPrime *, const mtpPrime *, mtpRequestId), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerBareOwnedReq<T, TReturn, TReceiver>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCBindedDoneHandlerBareOwnedReq<T, TReturn, TReceiver>(b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver, typename TResponse> // done(b, result)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T, const TResponse &), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerOwned<T, TReturn, TReceiver, TResponse>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCBindedDoneHandlerOwned<T, TReturn, TReceiver, TResponse>(b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver, typename TResponse> // done(b, result, req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T, const TResponse &, mtpRequestId), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerOwnedReq<T, TReturn, TReceiver, TResponse>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerOwnedReq<T, TReturn, TReceiver, TResponse>(
+		    b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver> // done(b)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerOwnedNo<T, TReturn, TReceiver>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCBindedDoneHandlerOwnedNo<T, TReturn, TReceiver>(b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReturn, typename TReceiver> // done(b, req_id)
 	RPCDoneHandlerPtr rpcDone(TReturn (TReceiver::*onDone)(T, mtpRequestId), T b) {
-		return RPCDoneHandlerPtr(new RPCBindedDoneHandlerOwnedNoReq<T, TReturn, TReceiver>(b, static_cast<TReceiver*>(this), onDone));
+		return RPCDoneHandlerPtr(
+		    new RPCBindedDoneHandlerOwnedNoReq<T, TReturn, TReceiver>(b, static_cast<TReceiver *>(this), onDone));
 	}
 
 	template <typename T, typename TReceiver> // fail(b, error)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(T, const RPCError &), T b) {
-		return RPCFailHandlerPtr(new RPCBindedFailHandlerOwned<T, TReceiver>(b, static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(
+		    new RPCBindedFailHandlerOwned<T, TReceiver>(b, static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename T, typename TReceiver> // fail(b, error, req_id)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(T, const RPCError &, mtpRequestId), T b) {
-		return RPCFailHandlerPtr(new RPCBindedFailHandlerOwnedReq<T, TReceiver>(b, static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(
+		    new RPCBindedFailHandlerOwnedReq<T, TReceiver>(b, static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename T, typename TReceiver> // fail(b)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(T), T b) {
-		return RPCFailHandlerPtr(new RPCBindedFailHandlerOwnedNo<T, TReceiver>(b, static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(
+		    new RPCBindedFailHandlerOwnedNo<T, TReceiver>(b, static_cast<TReceiver *>(this), onFail));
 	}
 
 	template <typename T, typename TReceiver> // fail(b, req_id)
 	RPCFailHandlerPtr rpcFail(bool (TReceiver::*onFail)(T, mtpRequestId), T b) {
-		return RPCFailHandlerPtr(new RPCBindedFailHandlerOwnedNo<T, TReceiver>(b, static_cast<TReceiver*>(this), onFail));
+		return RPCFailHandlerPtr(
+		    new RPCBindedFailHandlerOwnedNo<T, TReceiver>(b, static_cast<TReceiver *>(this), onFail));
 	}
 
 	virtual void rpcClear() {
@@ -851,54 +847,52 @@ protected:
 			handler->invalidate();
 		}
 	}
-
 };
 
 using MTPStateChangedHandler = void (*)(qint32 dcId, qint32 state);
 using MTPSessionResetHandler = void (*)(qint32 dcId);
 
-template <typename Base, typename FunctionType>
-class RPCHandlerImplementation : public Base {
+template <typename Base, typename FunctionType> class RPCHandlerImplementation : public Base {
 protected:
 	using Lambda = base::lambda_once<FunctionType>;
 	using Parent = RPCHandlerImplementation<Base, FunctionType>;
 
 public:
-	RPCHandlerImplementation(Lambda handler) : _handler(std::move(handler)) {
-	}
+	RPCHandlerImplementation(Lambda handler)
+	    : _handler(std::move(handler)) {}
 
 protected:
 	Lambda _handler;
-
 };
 
 template <typename FunctionType>
 using RPCDoneHandlerImplementation = RPCHandlerImplementation<RPCAbstractDoneHandler, FunctionType>;
 
 template <typename R>
-class RPCDoneHandlerImplementationBare : public RPCDoneHandlerImplementation<R(const mtpPrime*, const mtpPrime*)> { // done(from, end)
+class RPCDoneHandlerImplementationBare
+    : public RPCDoneHandlerImplementation<R(const mtpPrime *, const mtpPrime *)> { // done(from, end)
 public:
-	using RPCDoneHandlerImplementation<R(const mtpPrime*, const mtpPrime*)>::Parent::Parent;
+	using RPCDoneHandlerImplementation<R(const mtpPrime *, const mtpPrime *)>::Parent::Parent;
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		return this->_handler ? this->_handler(from, end) : void(0);
 	}
-
 };
 
 template <typename R>
-class RPCDoneHandlerImplementationBareReq : public RPCDoneHandlerImplementation<R(const mtpPrime*, const mtpPrime*, mtpRequestId)> { // done(from, end, req_id)
+class RPCDoneHandlerImplementationBareReq
+    : public RPCDoneHandlerImplementation<R(const mtpPrime *, const mtpPrime *,
+                                            mtpRequestId)> { // done(from, end, req_id)
 public:
-	using RPCDoneHandlerImplementation<R(const mtpPrime*, const mtpPrime*, mtpRequestId)>::Parent::Parent;
+	using RPCDoneHandlerImplementation<R(const mtpPrime *, const mtpPrime *, mtpRequestId)>::Parent::Parent;
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		return this->_handler ? this->_handler(from, end, requestId) : void(0);
 	}
-
 };
 
 template <typename R, typename TResponse>
-class RPCDoneHandlerImplementationPlain : public RPCDoneHandlerImplementation<R(const TResponse&)> { // done(result)
+class RPCDoneHandlerImplementationPlain : public RPCDoneHandlerImplementation<R(const TResponse &)> { // done(result)
 public:
-	using RPCDoneHandlerImplementation<R(const TResponse&)>::Parent::Parent;
+	using RPCDoneHandlerImplementation<R(const TResponse &)>::Parent::Parent;
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (this->_handler) {
 			auto response = TResponse();
@@ -906,13 +900,13 @@ public:
 			this->_handler(std::move(response));
 		}
 	}
-
 };
 
 template <typename R, typename TResponse>
-class RPCDoneHandlerImplementationReq : public RPCDoneHandlerImplementation<R(const TResponse&, mtpRequestId)> { // done(result, req_id)
+class RPCDoneHandlerImplementationReq
+    : public RPCDoneHandlerImplementation<R(const TResponse &, mtpRequestId)> { // done(result, req_id)
 public:
-	using RPCDoneHandlerImplementation<R(const TResponse&, mtpRequestId)>::Parent::Parent;
+	using RPCDoneHandlerImplementation<R(const TResponse &, mtpRequestId)>::Parent::Parent;
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		if (this->_handler) {
 			auto response = TResponse();
@@ -920,17 +914,14 @@ public:
 			this->_handler(std::move(response), requestId);
 		}
 	}
-
 };
 
-template <typename R>
-class RPCDoneHandlerImplementationNo : public RPCDoneHandlerImplementation<R()> { // done()
+template <typename R> class RPCDoneHandlerImplementationNo : public RPCDoneHandlerImplementation<R()> { // done()
 public:
 	using RPCDoneHandlerImplementation<R()>::Parent::Parent;
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		return this->_handler ? this->_handler() : void(0);
 	}
-
 };
 
 template <typename R>
@@ -940,63 +931,59 @@ public:
 	void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 		return this->_handler ? this->_handler(requestId) : void(0);
 	}
-
 };
 
 template <typename R>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const mtpPrime*, const mtpPrime*)> lambda) {
+inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const mtpPrime *, const mtpPrime *)> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBare<R>(std::move(lambda)));
 }
 
 template <typename R>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const mtpPrime*, const mtpPrime*, mtpRequestId)> lambda) {
+inline RPCDoneHandlerPtr
+rpcDone_lambda_wrap_helper(base::lambda_once<R(const mtpPrime *, const mtpPrime *, mtpRequestId)> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationBareReq<R>(std::move(lambda)));
 }
 
 template <typename R, typename T>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const T&)> lambda) {
+inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const T &)> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationPlain<R, T>(std::move(lambda)));
 }
 
 template <typename R, typename T>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const T&, mtpRequestId)> lambda) {
+inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(const T &, mtpRequestId)> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationReq<R, T>(std::move(lambda)));
 }
 
-template <typename R>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R()> lambda) {
+template <typename R> inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R()> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNo<R>(std::move(lambda)));
 }
 
-template <typename R>
-inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(mtpRequestId)> lambda) {
+template <typename R> inline RPCDoneHandlerPtr rpcDone_lambda_wrap_helper(base::lambda_once<R(mtpRequestId)> lambda) {
 	return RPCDoneHandlerPtr(new RPCDoneHandlerImplementationNoReq<R>(std::move(lambda)));
 }
 
-template <typename Lambda>
-RPCDoneHandlerPtr rpcDone(Lambda lambda) {
+template <typename Lambda> RPCDoneHandlerPtr rpcDone(Lambda lambda) {
 	return rpcDone_lambda_wrap_helper(base::lambda_type<Lambda>(std::move(lambda)));
 }
 
 template <typename FunctionType>
 using RPCFailHandlerImplementation = RPCHandlerImplementation<RPCAbstractFailHandler, FunctionType>;
 
-class RPCFailHandlerImplementationPlain : public RPCFailHandlerImplementation<bool(const RPCError&)> { // fail(error)
+class RPCFailHandlerImplementationPlain : public RPCFailHandlerImplementation<bool(const RPCError &)> { // fail(error)
 public:
 	using Parent::Parent;
 	bool operator()(mtpRequestId requestId, const RPCError &error) override {
 		return _handler ? _handler(error) : true;
 	}
-
 };
 
-class RPCFailHandlerImplementationReq : public RPCFailHandlerImplementation<bool(const RPCError&, mtpRequestId)> { // fail(error, req_id)
+class RPCFailHandlerImplementationReq
+    : public RPCFailHandlerImplementation<bool(const RPCError &, mtpRequestId)> { // fail(error, req_id)
 public:
 	using Parent::Parent;
 	bool operator()(mtpRequestId requestId, const RPCError &error) override {
 		return this->_handler ? this->_handler(error, requestId) : true;
 	}
-
 };
 
 class RPCFailHandlerImplementationNo : public RPCFailHandlerImplementation<bool()> { // fail()
@@ -1005,7 +992,6 @@ public:
 	bool operator()(mtpRequestId requestId, const RPCError &error) override {
 		return this->_handler ? this->_handler() : true;
 	}
-
 };
 
 class RPCFailHandlerImplementationNoReq : public RPCFailHandlerImplementation<bool(mtpRequestId)> { // fail(req_id)
@@ -1014,14 +1000,13 @@ public:
 	bool operator()(mtpRequestId requestId, const RPCError &error) override {
 		return this->_handler ? this->_handler(requestId) : true;
 	}
-
 };
 
-inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_once<bool(const RPCError&)> lambda) {
+inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_once<bool(const RPCError &)> lambda) {
 	return RPCFailHandlerPtr(new RPCFailHandlerImplementationPlain(std::move(lambda)));
 }
 
-inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_once<bool(const RPCError&, mtpRequestId)> lambda) {
+inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_once<bool(const RPCError &, mtpRequestId)> lambda) {
 	return RPCFailHandlerPtr(new RPCFailHandlerImplementationReq(std::move(lambda)));
 }
 
@@ -1033,7 +1018,6 @@ inline RPCFailHandlerPtr rpcFail_lambda_wrap_helper(base::lambda_once<bool(mtpRe
 	return RPCFailHandlerPtr(new RPCFailHandlerImplementationNoReq(std::move(lambda)));
 }
 
-template <typename Lambda>
-RPCFailHandlerPtr rpcFail(Lambda lambda) {
+template <typename Lambda> RPCFailHandlerPtr rpcFail(Lambda lambda) {
 	return rpcFail_lambda_wrap_helper(base::lambda_type<Lambda>(std::move(lambda)));
 }
diff --git a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp
index 37bfd2318..1c2e06b6c 100644
--- a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp
+++ b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp
@@ -22,10 +22,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/openssl_help.h"
 #include "mtproto/core_types.h"
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
 
 using std::string;
 
@@ -67,20 +67,20 @@ void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM
 }
 
 #endif
-}
+} // namespace
 
 namespace internal {
 
 class RSAPublicKey::Private {
 public:
 	Private(base::const_byte_span key)
-	: _rsa(PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<gsl::byte*>(key.data()), key.size()), 0, 0, 0)) {
+	    : _rsa(PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<gsl::byte *>(key.data()), key.size()), 0, 0, 0)) {
 		if (_rsa) {
 			computeFingerprint();
 		}
 	}
 	Private(base::const_byte_span nBytes, base::const_byte_span eBytes)
-	: _rsa(RSA_new()) {
+	    : _rsa(RSA_new()) {
 		if (_rsa) {
 			auto n = openssl::BigNum(nBytes).takeRaw();
 			auto e = openssl::BigNum(eBytes).takeRaw();
@@ -116,16 +116,20 @@ public:
 		Expects(isValid());
 
 		constexpr auto kEncryptSize = 256;
-		auto result = base::byte_vector(kEncryptSize, gsl::byte {});
-		auto res = RSA_public_encrypt(kEncryptSize, reinterpret_cast<const unsigned char*>(data.data()), reinterpret_cast<unsigned char*>(result.data()), _rsa, RSA_NO_PADDING);
+		auto result = base::byte_vector(kEncryptSize, gsl::byte{});
+		auto res = RSA_public_encrypt(kEncryptSize, reinterpret_cast<const unsigned char *>(data.data()),
+		                              reinterpret_cast<unsigned char *>(result.data()), _rsa, RSA_NO_PADDING);
 		if (res < 0 || res > kEncryptSize) {
 			ERR_load_crypto_strings();
-			LOG(("RSA Error: RSA_public_encrypt failed, key fp: %1, result: %2, error: %3").arg(getFingerPrint()).arg(res).arg(ERR_error_string(ERR_get_error(), 0)));
+			LOG(("RSA Error: RSA_public_encrypt failed, key fp: %1, result: %2, error: %3")
+			        .arg(getFingerPrint())
+			        .arg(res)
+			        .arg(ERR_error_string(ERR_get_error(), 0)));
 			return base::byte_vector();
 		} else if (auto zeroBytes = kEncryptSize - res) {
 			auto resultBytes = gsl::make_span(result);
 			base::move_bytes(resultBytes.subspan(zeroBytes, res), resultBytes.subspan(0, res));
-			base::set_bytes(resultBytes.subspan(0, zeroBytes), gsl::byte {});
+			base::set_bytes(resultBytes.subspan(0, zeroBytes), gsl::byte{});
 		}
 		return result;
 	}
@@ -133,16 +137,20 @@ public:
 		Expects(isValid());
 
 		constexpr auto kDecryptSize = 256;
-		auto result = base::byte_vector(kDecryptSize, gsl::byte {});
-		auto res = RSA_public_decrypt(kDecryptSize, reinterpret_cast<const unsigned char*>(data.data()), reinterpret_cast<unsigned char*>(result.data()), _rsa, RSA_NO_PADDING);
+		auto result = base::byte_vector(kDecryptSize, gsl::byte{});
+		auto res = RSA_public_decrypt(kDecryptSize, reinterpret_cast<const unsigned char *>(data.data()),
+		                              reinterpret_cast<unsigned char *>(result.data()), _rsa, RSA_NO_PADDING);
 		if (res < 0 || res > kDecryptSize) {
 			ERR_load_crypto_strings();
-			LOG(("RSA Error: RSA_public_encrypt failed, key fp: %1, result: %2, error: %3").arg(getFingerPrint()).arg(res).arg(ERR_error_string(ERR_get_error(), 0)));
+			LOG(("RSA Error: RSA_public_encrypt failed, key fp: %1, result: %2, error: %3")
+			        .arg(getFingerPrint())
+			        .arg(res)
+			        .arg(ERR_error_string(ERR_get_error(), 0)));
 			return base::byte_vector();
 		} else if (auto zeroBytes = kDecryptSize - res) {
 			auto resultBytes = gsl::make_span(result);
 			base::move_bytes(resultBytes.subspan(zeroBytes - res, res), resultBytes.subspan(0, res));
-			base::set_bytes(resultBytes.subspan(0, zeroBytes - res), gsl::byte {});
+			base::set_bytes(resultBytes.subspan(0, zeroBytes - res), gsl::byte{});
 		}
 		return result;
 	}
@@ -161,25 +169,24 @@ private:
 		MTP_bytes(toBytes(e)).write(string);
 
 		uchar sha1Buffer[20];
-		_fingerprint = *(quint64*)(hashSha1(&string[0], string.size() * sizeof(mtpPrime), sha1Buffer) + 3);
+		_fingerprint = *(quint64 *)(hashSha1(&string[0], string.size() * sizeof(mtpPrime), sha1Buffer) + 3);
 	}
 	static base::byte_vector toBytes(const BIGNUM *number) {
 		auto size = BN_num_bytes(number);
-		auto result = base::byte_vector(size, gsl::byte {});
-		BN_bn2bin(number, reinterpret_cast<unsigned char*>(result.data()));
+		auto result = base::byte_vector(size, gsl::byte{});
+		BN_bn2bin(number, reinterpret_cast<unsigned char *>(result.data()));
 		return result;
 	}
 
 	RSA *_rsa = nullptr;
 	quint64 _fingerprint = 0;
-
 };
 
-RSAPublicKey::RSAPublicKey(base::const_byte_span key) : _private(std::make_shared<Private>(key)) {
-}
+RSAPublicKey::RSAPublicKey(base::const_byte_span key)
+    : _private(std::make_shared<Private>(key)) {}
 
-RSAPublicKey::RSAPublicKey(base::const_byte_span nBytes, base::const_byte_span eBytes) : _private(std::make_shared<Private>(nBytes, eBytes)) {
-}
+RSAPublicKey::RSAPublicKey(base::const_byte_span nBytes, base::const_byte_span eBytes)
+    : _private(std::make_shared<Private>(nBytes, eBytes)) {}
 
 bool RSAPublicKey::isValid() const {
 	return _private && _private->isValid();
diff --git a/Telegram/SourceFiles/mtproto/rsa_public_key.h b/Telegram/SourceFiles/mtproto/rsa_public_key.h
index b3556052a..fb6b1cb10 100644
--- a/Telegram/SourceFiles/mtproto/rsa_public_key.h
+++ b/Telegram/SourceFiles/mtproto/rsa_public_key.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <memory>
 #include "core/utils.h"
+#include <memory>
 
 namespace MTP {
 namespace internal {
@@ -52,7 +52,6 @@ public:
 private:
 	class Private;
 	std::shared_ptr<Private> _private;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/sender.h b/Telegram/SourceFiles/mtproto/sender.h
index cf853cba8..7f3189450 100644
--- a/Telegram/SourceFiles/mtproto/sender.h
+++ b/Telegram/SourceFiles/mtproto/sender.h
@@ -22,8 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/lambda.h"
 #include "base/variant.h"
-#include "mtproto/rpc_sender.h"
 #include "facades.h"
+#include "mtproto/rpc_sender.h"
 
 namespace MTP {
 
@@ -45,21 +45,17 @@ class Sender {
 			HandleFlood,
 			HandleAll,
 		};
-		template <typename Response>
-		struct DonePlainPolicy {
+		template <typename Response> struct DonePlainPolicy {
 			using Callback = base::lambda_once<void(const Response &result)>;
 			static void handle(Callback &&handler, mtpRequestId requestId, Response &&result) {
 				handler(result);
 			}
-
 		};
-		template <typename Response>
-		struct DoneRequestIdPolicy {
+		template <typename Response> struct DoneRequestIdPolicy {
 			using Callback = base::lambda_once<void(const Response &result, mtpRequestId requestId)>;
 			static void handle(Callback &&handler, mtpRequestId requestId, Response &&result) {
 				handler(result, requestId);
 			}
-
 		};
 		template <typename Response, template <typename> typename PolicyTemplate>
 		class DoneHandler : public RPCAbstractDoneHandler {
@@ -67,8 +63,9 @@ class Sender {
 			using Callback = typename Policy::Callback;
 
 		public:
-			DoneHandler(not_null<Sender*> sender, Callback handler) : _sender(sender), _handler(std::move(handler)) {
-			}
+			DoneHandler(not_null<Sender *> sender, Callback handler)
+			    : _sender(sender)
+			    , _handler(std::move(handler)) {}
 
 			void operator()(mtpRequestId requestId, const mtpPrime *from, const mtpPrime *end) override {
 				auto handler = std::move(_handler);
@@ -82,9 +79,8 @@ class Sender {
 			}
 
 		private:
-			not_null<Sender*> _sender;
+			not_null<Sender *> _sender;
 			Callback _handler;
-
 		};
 
 		struct FailPlainPolicy {
@@ -92,25 +88,21 @@ class Sender {
 			static void handle(Callback &&handler, mtpRequestId requestId, const RPCError &error) {
 				handler(error);
 			}
-
 		};
 		struct FailRequestIdPolicy {
 			using Callback = base::lambda_once<void(const RPCError &error, mtpRequestId requestId)>;
 			static void handle(Callback &&handler, mtpRequestId requestId, const RPCError &error) {
 				handler(error, requestId);
 			}
-
 		};
-		template <typename Policy>
-		class FailHandler : public RPCAbstractFailHandler {
+		template <typename Policy> class FailHandler : public RPCAbstractFailHandler {
 			using Callback = typename Policy::Callback;
 
 		public:
-			FailHandler(not_null<Sender*> sender, Callback handler, FailSkipPolicy skipPolicy)
-				: _sender(sender)
-				, _handler(std::move(handler))
-				, _skipPolicy(skipPolicy) {
-			}
+			FailHandler(not_null<Sender *> sender, Callback handler, FailSkipPolicy skipPolicy)
+			    : _sender(sender)
+			    , _handler(std::move(handler))
+			    , _skipPolicy(skipPolicy) {}
 
 			bool operator()(mtpRequestId requestId, const RPCError &error) override {
 				if (_skipPolicy == FailSkipPolicy::Simple) {
@@ -133,14 +125,13 @@ class Sender {
 			}
 
 		private:
-			not_null<Sender*> _sender;
+			not_null<Sender *> _sender;
 			Callback _handler;
 			FailSkipPolicy _skipPolicy = FailSkipPolicy::Simple;
-
 		};
 
-		explicit RequestBuilder(not_null<Sender*> sender) noexcept : _sender(sender) {
-		}
+		explicit RequestBuilder(not_null<Sender *> sender) noexcept
+		    : _sender(sender) {}
 		RequestBuilder(RequestBuilder &&other) = default;
 
 		void setToDC(ShiftedDcId dcId) noexcept {
@@ -186,7 +177,7 @@ class Sender {
 			return _afterRequestId;
 		}
 
-		not_null<Sender*> sender() const noexcept {
+		not_null<Sender *> sender() const noexcept {
 			return _sender;
 		}
 		void registerRequest(mtpRequestId requestId) {
@@ -194,26 +185,24 @@ class Sender {
 		}
 
 	private:
-		not_null<Sender*> _sender;
+		not_null<Sender *> _sender;
 		ShiftedDcId _dcId = 0;
 		TimeMs _canWait = 0;
 		RPCDoneHandlerPtr _done;
 		base::variant<FailPlainHandler, FailRequestIdHandler> _fail;
 		FailSkipPolicy _failSkipPolicy = FailSkipPolicy::Simple;
 		mtpRequestId _afterRequestId = 0;
-
 	};
 
 public:
-	Sender() noexcept {
-	}
+	Sender() noexcept {}
 
-	template <typename Request>
-	class SpecificRequestBuilder : public RequestBuilder {
+	template <typename Request> class SpecificRequestBuilder : public RequestBuilder {
 	private:
 		friend class Sender;
-		SpecificRequestBuilder(not_null<Sender*> sender, Request &&request) noexcept : RequestBuilder(sender), _request(std::move(request)) {
-		}
+		SpecificRequestBuilder(not_null<Sender *> sender, Request &&request) noexcept
+		    : RequestBuilder(sender)
+		    , _request(std::move(request)) {}
 		SpecificRequestBuilder(SpecificRequestBuilder &&other) = default;
 
 	public:
@@ -225,19 +214,26 @@ public:
 			setCanWait(ms);
 			return *this;
 		}
-		SpecificRequestBuilder &done(base::lambda_once<void(const typename Request::ResponseType &result)> callback) WARN_UNUSED_RESULT {
-			setDoneHandler(MakeShared<DoneHandler<typename Request::ResponseType, DonePlainPolicy>>(sender(), std::move(callback)));
+		SpecificRequestBuilder &
+		done(base::lambda_once<void(const typename Request::ResponseType &result)> callback) WARN_UNUSED_RESULT {
+			setDoneHandler(MakeShared<DoneHandler<typename Request::ResponseType, DonePlainPolicy>>(
+			    sender(), std::move(callback)));
 			return *this;
 		}
-		SpecificRequestBuilder &done(base::lambda_once<void(const typename Request::ResponseType &result, mtpRequestId requestId)> callback) WARN_UNUSED_RESULT {
-			setDoneHandler(MakeShared<DoneHandler<typename Request::ResponseType, DoneRequestIdPolicy>>(sender(), std::move(callback)));
+		SpecificRequestBuilder &
+		done(base::lambda_once<void(const typename Request::ResponseType &result, mtpRequestId requestId)> callback)
+		    WARN_UNUSED_RESULT {
+			setDoneHandler(MakeShared<DoneHandler<typename Request::ResponseType, DoneRequestIdPolicy>>(
+			    sender(), std::move(callback)));
 			return *this;
 		}
-		SpecificRequestBuilder &fail(base::lambda_once<void(const RPCError &error)> callback) noexcept WARN_UNUSED_RESULT {
+		SpecificRequestBuilder &
+		fail(base::lambda_once<void(const RPCError &error)> callback) noexcept WARN_UNUSED_RESULT {
 			setFailHandler(std::move(callback));
 			return *this;
 		}
-		SpecificRequestBuilder &fail(base::lambda_once<void(const RPCError &error, mtpRequestId requestId)> callback) noexcept WARN_UNUSED_RESULT {
+		SpecificRequestBuilder &fail(base::lambda_once<void(const RPCError &error, mtpRequestId requestId)>
+		                                 callback) noexcept WARN_UNUSED_RESULT {
 			setFailHandler(std::move(callback));
 			return *this;
 		}
@@ -255,21 +251,22 @@ public:
 		}
 
 		mtpRequestId send() {
-			auto id = MainInstance()->send(_request, takeOnDone(), takeOnFail(), takeDcId(), takeCanWait(), takeAfter());
+			auto id =
+			    MainInstance()->send(_request, takeOnDone(), takeOnFail(), takeDcId(), takeCanWait(), takeAfter());
 			registerRequest(id);
 			return id;
 		}
 
 	private:
 		Request _request;
-
 	};
 
 	class SentRequestWrap {
 	private:
 		friend class Sender;
-		SentRequestWrap(not_null<Sender*> sender, mtpRequestId requestId) : _sender(sender), _requestId(requestId) {
-		}
+		SentRequestWrap(not_null<Sender *> sender, mtpRequestId requestId)
+		    : _sender(sender)
+		    , _requestId(requestId) {}
 
 	public:
 		void cancel() {
@@ -277,20 +274,18 @@ public:
 		}
 
 	private:
-		not_null<Sender*> _sender;
+		not_null<Sender *> _sender;
 		mtpRequestId _requestId = 0;
-
 	};
 
-	template <typename Request, typename = std::enable_if_t<std::is_rvalue_reference<Request&&>::value>, typename = typename Request::Unboxed>
+	template <typename Request, typename = std::enable_if_t<std::is_rvalue_reference<Request &&>::value>,
+	          typename = typename Request::Unboxed>
 	SpecificRequestBuilder<Request> request(Request &&request) noexcept WARN_UNUSED_RESULT;
 
 	SentRequestWrap request(mtpRequestId requestId) noexcept WARN_UNUSED_RESULT;
 
 	decltype(auto) requestCanceller() noexcept WARN_UNUSED_RESULT {
-		return [this](mtpRequestId requestId) {
-			request(requestId).cancel();
-		};
+		return [this](mtpRequestId requestId) { request(requestId).cancel(); };
 	}
 
 	void requestSendDelayed() {
@@ -301,21 +296,20 @@ public:
 			request.handled();
 		}
 	}
-	not_null<Instance*> requestMTP() const {
+	not_null<Instance *> requestMTP() const {
 		return MainInstance();
 	}
 
 private:
 	class RequestWrap {
 	public:
-		RequestWrap(Instance *instance, mtpRequestId requestId) noexcept : _id(requestId) {
-		}
+		RequestWrap(Instance *instance, mtpRequestId requestId) noexcept
+		    : _id(requestId) {}
 
 		mtpRequestId id() const noexcept {
 			return _id;
 		}
-		void handled() const noexcept {
-		}
+		void handled() const noexcept {}
 
 		~RequestWrap() {
 			if (auto instance = MainInstance()) {
@@ -325,7 +319,6 @@ private:
 
 	private:
 		mtpRequestId _id = 0;
-
 	};
 
 	struct RequestWrapComparator {
@@ -336,10 +329,10 @@ private:
 
 			helper() = default;
 			helper(const helper &other) = default;
-			helper(mtpRequestId requestId) noexcept : requestId(requestId) {
-			}
-			helper(const RequestWrap &request) noexcept : requestId(request.id()) {
-			}
+			helper(mtpRequestId requestId) noexcept
+			    : requestId(requestId) {}
+			helper(const RequestWrap &request) noexcept
+			    : requestId(request.id()) {}
 			bool operator<(helper other) const {
 				return requestId < other.requestId;
 			}
@@ -347,11 +340,9 @@ private:
 		bool operator()(const helper &&lhs, const helper &&rhs) const {
 			return lhs < rhs;
 		}
-
 	};
 
-	template <typename Request>
-	friend class SpecialRequestBuilder;
+	template <typename Request> friend class SpecialRequestBuilder;
 	friend class RequestBuilder;
 	friend class RequestWrap;
 	friend class SentRequestWrap;
@@ -374,7 +365,6 @@ private:
 	}
 
 	std::set<RequestWrap, RequestWrapComparator> _requests; // Better to use flatmap.
-
 };
 
 template <typename Request, typename, typename>
diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp
index ebed2073e..61cd75b80 100644
--- a/Telegram/SourceFiles/mtproto/session.cpp
+++ b/Telegram/SourceFiles/mtproto/session.cpp
@@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mtproto/session.h"
 #include "mtproto/mtp_instance.h"
 
+#include "facade.h"
+#include "mtproto/auth_key.h"
 #include "mtproto/connection.h"
 #include "mtproto/dcenter.h"
-#include "mtproto/auth_key.h"
 #include "scheme.h"
-#include "facade.h"
 
 namespace MTP {
 namespace internal {
@@ -35,7 +35,9 @@ void SessionData::setKey(const AuthKeyPtr &key) {
 		quint64 session = rand_value<quint64>();
 		_authKey = key;
 
-		DEBUG_LOG(("MTP Info: new auth key set in SessionData, id %1, setting random server_session %2").arg(key ? key->keyId() : 0).arg(session));
+		DEBUG_LOG(("MTP Info: new auth key set in SessionData, id %1, setting random server_session %2")
+		              .arg(key ? key->keyId() : 0)
+		              .arg(session));
 		QWriteLocker locker(&_lock);
 		if (_session != session) {
 			_session = session;
@@ -48,7 +50,8 @@ void SessionData::setKey(const AuthKeyPtr &key) {
 void SessionData::clear(Instance *instance) {
 	RPCCallbackClears clearCallbacks;
 	{
-		QReadLocker locker1(haveSentMutex()), locker2(toResendMutex()), locker3(haveReceivedMutex()), locker4(wereAckedMutex());
+		QReadLocker locker1(haveSentMutex()), locker2(toResendMutex()), locker3(haveReceivedMutex()),
+		    locker4(wereAckedMutex());
 		auto receivedResponsesEnd = _receivedResponses.cend();
 		clearCallbacks.reserve(_haveSent.size() + _wereAcked.size());
 		for (auto i = _haveSent.cbegin(), e = _haveSent.cend(); i != e; ++i) {
@@ -89,10 +92,11 @@ void SessionData::clear(Instance *instance) {
 	instance->clearCallbacksDelayed(clearCallbacks);
 }
 
-Session::Session(not_null<Instance*> instance, ShiftedDcId shiftedDcId) : QObject()
-, _instance(instance)
-, data(this)
-, dcWithShift(shiftedDcId) {
+Session::Session(not_null<Instance *> instance, ShiftedDcId shiftedDcId)
+    : QObject()
+    , _instance(instance)
+    , data(this)
+    , dcWithShift(shiftedDcId) {
 	connect(&timeouter, SIGNAL(timeout()), this, SLOT(checkRequestsByTimer()));
 	timeouter.start(1000);
 
@@ -139,7 +143,8 @@ mtpRequest Session::getRequest(mtpRequestId requestId) {
 	return _instance->getRequest(requestId);
 }
 
-bool Session::rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail, const RPCError &err) { // return true if need to clean request data
+bool Session::rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail,
+                              const RPCError &err) { // return true if need to clean request data
 	return _instance->rpcErrorOccured(requestId, onFail, err);
 }
 
@@ -197,11 +202,17 @@ void Session::sendAnything(qint64 msCanWait) {
 		msWait = msCanWait;
 	}
 	if (msWait) {
-		DEBUG_LOG(("MTP Info: dcWithShift %1 can wait for %2ms from current %3").arg(dcWithShift).arg(msWait).arg(msSendCall));
+		DEBUG_LOG(("MTP Info: dcWithShift %1 can wait for %2ms from current %3")
+		              .arg(dcWithShift)
+		              .arg(msWait)
+		              .arg(msSendCall));
 		msSendCall = ms;
 		sender.start(msWait);
 	} else {
-		DEBUG_LOG(("MTP Info: dcWithShift %1 stopped send timer, can wait for %2ms from current %3").arg(dcWithShift).arg(msWait).arg(msSendCall));
+		DEBUG_LOG(("MTP Info: dcWithShift %1 stopped send timer, can wait for %2ms from current %3")
+		              .arg(dcWithShift)
+		              .arg(msWait)
+		              .arg(msSendCall));
 		sender.stop();
 		msSendCall = 0;
 		needToResumeAndSend();
@@ -236,7 +247,7 @@ void Session::sendMsgsStateInfo(quint64 msgId, QByteArray data) {
 	if (!data.isEmpty()) {
 		info.resize(data.size());
 		auto src = gsl::as_bytes(gsl::make_span(data));
-//		auto dst = gsl::as_writeable_bytes(gsl::make_span(info));
+		//		auto dst = gsl::as_writeable_bytes(gsl::make_span(info));
 		auto dst = gsl::as_writeable_bytes(gsl::make_span(&info[0], info.size()));
 		base::copy_bytes(dst, src);
 	}
@@ -453,13 +464,14 @@ void Session::resendAll() {
 	}
 }
 
-void Session::sendPrepared(const mtpRequest &request, TimeMs msCanWait, bool newRequest) { // returns true, if emit of needToSend() is needed
+void Session::sendPrepared(const mtpRequest &request, TimeMs msCanWait,
+                           bool newRequest) { // returns true, if emit of needToSend() is needed
 	{
 		QWriteLocker locker(data.toSendMutex());
 		data.toSendMap().insert(request->requestId, request);
 
 		if (newRequest) {
-			*(mtpMsgId*)(request->data() + 4) = 0;
+			*(mtpMsgId *)(request->data() + 4) = 0;
 			*(request->data() + 6) = 0;
 		}
 	}
@@ -474,7 +486,8 @@ QReadWriteLock *Session::keyMutex() const {
 }
 
 void Session::authKeyCreatedForDC() {
-	DEBUG_LOG(("AuthKey Info: Session::authKeyCreatedForDC slot, emitting authKeyCreated(), dcWithShift %1").arg(dcWithShift));
+	DEBUG_LOG(("AuthKey Info: Session::authKeyCreatedForDC slot, emitting authKeyCreated(), dcWithShift %1")
+	              .arg(dcWithShift));
 	data.setKey(dc->getKey());
 	emit authKeyCreated();
 }
@@ -490,7 +503,8 @@ void Session::layerWasInitedForDC(bool wasInited) {
 }
 
 void Session::notifyLayerInited(bool wasInited) {
-	DEBUG_LOG(("MTP Info: emitting MTProtoDC::layerWasInited(%1), dcWithShift %2").arg(Logs::b(wasInited)).arg(dcWithShift));
+	DEBUG_LOG(
+	    ("MTP Info: emitting MTProtoDC::layerWasInited(%1), dcWithShift %2").arg(Logs::b(wasInited)).arg(dcWithShift));
 	dc->setConnectionInited(wasInited);
 	emit dc->layerWasInited(wasInited);
 }
@@ -559,7 +573,9 @@ Session::~Session() {
 }
 
 MTPrpcError rpcClientError(const QString &type, const QString &description) {
-	return MTP_rpc_error(MTP_int(0), MTP_string(("CLIENT_" + type + (description.length() ? (": " + description) : "")).toUtf8().constData()));
+	return MTP_rpc_error(
+	    MTP_int(0),
+	    MTP_string(("CLIENT_" + type + (description.length() ? (": " + description) : "")).toUtf8().constData()));
 }
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/mtproto/session.h b/Telegram/SourceFiles/mtproto/session.h
index c5f877e4e..66f736333 100644
--- a/Telegram/SourceFiles/mtproto/session.h
+++ b/Telegram/SourceFiles/mtproto/session.h
@@ -85,7 +85,6 @@ public:
 
 private:
 	QMap<mtpMsgId, bool> _idsNeedAck;
-
 };
 
 using SerializedMessage = mtpBuffer;
@@ -94,15 +93,15 @@ inline bool ResponseNeedsAck(const SerializedMessage &response) {
 	if (response.size() < 8) {
 		return false;
 	}
-	auto seqNo = *(quint32*)(response.constData() + 6);
+	auto seqNo = *(quint32 *)(response.constData() + 6);
 	return (seqNo & 0x01) ? true : false;
 }
 
 class Session;
 class SessionData {
 public:
-	SessionData(not_null<Session*> creator) : _owner(creator) {
-	}
+	SessionData(not_null<Session *> creator)
+	    : _owner(creator) {}
 
 	void setSession(quint64 session) {
 		DEBUG_LOG(("MTP Info: setting server_session: %1").arg(session));
@@ -166,27 +165,27 @@ public:
 		_keyChecked = checked;
 	}
 
-	not_null<QReadWriteLock*> keyMutex() const;
+	not_null<QReadWriteLock *> keyMutex() const;
 
-	not_null<QReadWriteLock*> toSendMutex() const {
+	not_null<QReadWriteLock *> toSendMutex() const {
 		return &_toSendLock;
 	}
-	not_null<QReadWriteLock*> haveSentMutex() const {
+	not_null<QReadWriteLock *> haveSentMutex() const {
 		return &_haveSentLock;
 	}
-	not_null<QReadWriteLock*> toResendMutex() const {
+	not_null<QReadWriteLock *> toResendMutex() const {
 		return &_toResendLock;
 	}
-	not_null<QReadWriteLock*> wereAckedMutex() const {
+	not_null<QReadWriteLock *> wereAckedMutex() const {
 		return &_wereAckedLock;
 	}
-	not_null<QReadWriteLock*> receivedIdsMutex() const {
+	not_null<QReadWriteLock *> receivedIdsMutex() const {
 		return &_receivedIdsLock;
 	}
-	not_null<QReadWriteLock*> haveReceivedMutex() const {
+	not_null<QReadWriteLock *> haveReceivedMutex() const {
 		return &_haveReceivedLock;
 	}
-	not_null<QReadWriteLock*> stateRequestMutex() const {
+	not_null<QReadWriteLock *> stateRequestMutex() const {
 		return &_stateRequestLock;
 	}
 
@@ -239,10 +238,10 @@ public:
 		return _stateRequest;
 	}
 
-	not_null<Session*> owner() {
+	not_null<Session *> owner() {
 		return _owner;
 	}
-	not_null<const Session*> owner() const {
+	not_null<const Session *> owner() const {
 		return _owner;
 	}
 
@@ -261,7 +260,7 @@ private:
 
 	quint32 _messagesSent = 0;
 
-	not_null<Session*> _owner;
+	not_null<Session *> _owner;
 
 	AuthKeyPtr _authKey;
 	bool _keyChecked = false;
@@ -270,13 +269,16 @@ private:
 	QString _cloudLangCode;
 
 	mtpPreRequestMap _toSend; // map of request_id -> request, that is waiting to be sent
-	mtpRequestMap _haveSent; // map of msg_id -> request, that was sent, msDate = 0 for msgs_state_req (no resend / state req), msDate = 0, seqNo = 0 for containers
-	mtpRequestIdsMap _toResend; // map of msg_id -> request_id, that request_id -> request lies in toSend and is waiting to be resent
+	mtpRequestMap _haveSent; // map of msg_id -> request, that was sent, msDate = 0 for msgs_state_req (no resend /
+	                         // state req), msDate = 0, seqNo = 0 for containers
+	mtpRequestIdsMap
+	    _toResend; // map of msg_id -> request_id, that request_id -> request lies in toSend and is waiting to be resent
 	ReceivedMsgIds _receivedIds; // set of received msg_id's, for checking new msg_ids
 	mtpRequestIdsMap _wereAcked; // map of msg_id -> request_id, this msg_ids already were acked or do not need ack
 	mtpMsgIdsSet _stateRequest; // set of msg_id's, whose state should be requested
 
-	QMap<mtpRequestId, SerializedMessage> _receivedResponses; // map of request_id -> response that should be processed in the main thread
+	QMap<mtpRequestId, SerializedMessage>
+	    _receivedResponses; // map of request_id -> response that should be processed in the main thread
 	QList<SerializedMessage> _receivedUpdates; // list of updates that should be processed in the main thread
 
 	// mutexes
@@ -288,14 +290,13 @@ private:
 	mutable QReadWriteLock _wereAckedLock;
 	mutable QReadWriteLock _haveReceivedLock;
 	mutable QReadWriteLock _stateRequestLock;
-
 };
 
 class Session : public QObject {
 	Q_OBJECT
 
 public:
-	Session(not_null<Instance*> instance, ShiftedDcId shiftedDcId);
+	Session(not_null<Instance *> instance, ShiftedDcId shiftedDcId);
 
 	void start();
 	void restart();
@@ -312,7 +313,9 @@ public:
 	void notifyLayerInited(bool wasInited);
 
 	template <typename TRequest>
-	mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(), TimeMs msCanWait = 0, bool needsLayer = false, bool toMainDC = false, mtpRequestId after = 0); // send mtp request
+	mtpRequestId send(const TRequest &request, RPCResponseHandler callbacks = RPCResponseHandler(),
+	                  TimeMs msCanWait = 0, bool needsLayer = false, bool toMainDC = false,
+	                  mtpRequestId after = 0); // send mtp request
 
 	void ping();
 	void cancel(mtpRequestId requestId, mtpMsgId msgId);
@@ -320,7 +323,8 @@ public:
 	qint32 getState() const;
 	QString transport() const;
 
-	void sendPrepared(const mtpRequest &request, TimeMs msCanWait = 0, bool newRequest = true); // nulls msgId and seqNo in request, if newRequest = true
+	void sendPrepared(const mtpRequest &request, TimeMs msCanWait = 0,
+	                  bool newRequest = true); // nulls msgId and seqNo in request, if newRequest = true
 
 	~Session();
 
@@ -333,7 +337,8 @@ signals:
 public slots:
 	void needToResumeAndSend();
 
-	mtpRequestId resend(quint64 msgId, qint64 msCanWait = 0, bool forceContainer = false, bool sendMsgStateInfo = false);
+	mtpRequestId resend(quint64 msgId, qint64 msCanWait = 0, bool forceContainer = false,
+	                    bool sendMsgStateInfo = false);
 	void resendMany(QVector<quint64> msgIds, qint64 msCanWait, bool forceContainer, bool sendMsgStateInfo);
 	void resendAll(); // after connection restart
 
@@ -357,7 +362,7 @@ private:
 	mtpRequest getRequest(mtpRequestId requestId);
 	bool rpcErrorOccured(mtpRequestId requestId, const RPCFailHandlerPtr &onFail, const RPCError &err);
 
-	not_null<Instance*> _instance;
+	not_null<Instance *> _instance;
 	std::unique_ptr<Connection> _connection;
 
 	bool _killed = false;
@@ -375,10 +380,9 @@ private:
 
 	QTimer timeouter;
 	SingleTimer sender;
-
 };
 
-inline not_null<QReadWriteLock*> SessionData::keyMutex() const {
+inline not_null<QReadWriteLock *> SessionData::keyMutex() const {
 	return _owner->keyMutex();
 }
 
diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp
index 3f0c2f272..4598d633b 100644
--- a/Telegram/SourceFiles/mtproto/special_config_request.cpp
+++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp
@@ -20,21 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/special_config_request.h"
 
-#include "mtproto/rsa_public_key.h"
-#include "mtproto/dc_options.h"
-#include "mtproto/auth_key.h"
-#include "base/openssl_help.h"
-#include <openssl/aes.h>
 #include "app.h"
+#include "base/openssl_help.h"
+#include "mtproto/auth_key.h"
+#include "mtproto/dc_options.h"
+#include "mtproto/rsa_public_key.h"
+#include <openssl/aes.h>
 
 #include <QJsonArray>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
 
 namespace MTP {
 namespace {
 
-constexpr auto kPublicKey = str_const("\
+constexpr auto kPublicKey = str_const(
+    "\
 -----BEGIN RSA PUBLIC KEY-----\n\
 MIIBCgKCAQEAyr+18Rex2ohtVy8sroGPBwXD3DOoKCSpjDqYoXgCqB7ioln4eDCF\n\
 fOBUlfXUEvM/fnKCpF46VkAftlb4VuPDeQSS/ZxZYEGqHaywlroVnXHIjgqoxiAd\n\
@@ -47,7 +48,8 @@ Y1hZCxdv6cs5UnW9+PWvS+WIbkh+GaWYxwIDAQAB\n\
 
 } // namespace
 
-SpecialConfigRequest::SpecialConfigRequest(base::lambda<void(DcId dcId, const std::string &ip, int port)> callback) : _callback(std::move(callback)) {
+SpecialConfigRequest::SpecialConfigRequest(base::lambda<void(DcId dcId, const std::string &ip, int port)> callback)
+    : _callback(std::move(callback)) {
 	App::setProxySettings(_manager);
 
 	performAppRequest();
@@ -98,7 +100,7 @@ void SpecialConfigRequest::dnsFinished() {
 	// Read and store to "entries" map all the data bytes from this response:
 	// { .., "Answer": [ { .., "data": "bytes1", .. }, { .., "data": "bytes2", .. } ], .. }
 	auto entries = QMap<int, QString>();
-	auto error = QJsonParseError { 0, QJsonParseError::NoError };
+	auto error = QJsonParseError{0, QJsonParseError::NoError};
 	auto document = QJsonDocument::fromJson(result, &error);
 	if (error.error != QJsonParseError::NoError) {
 		LOG(("Config Error: Failed to parse dns response JSON, error: %1").arg(error.errorString()));
@@ -137,10 +139,8 @@ void SpecialConfigRequest::dnsFinished() {
 bool SpecialConfigRequest::decryptSimpleConfig(const QByteArray &bytes) {
 	auto cleanBytes = bytes;
 	auto removeFrom = std::remove_if(cleanBytes.begin(), cleanBytes.end(), [](char ch) {
-		auto isGoodBase64 = (ch == '+') || (ch == '=') || (ch == '/')
-			|| (ch >= 'a' && ch <= 'z')
-			|| (ch >= 'A' && ch <= 'Z')
-			|| (ch >= '0' && ch <= '9');
+		auto isGoodBase64 = (ch == '+') || (ch == '=') || (ch == '/') || (ch >= 'a' && ch <= 'z') ||
+		                    (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9');
 		return !isGoodBase64;
 	});
 	if (removeFrom != cleanBytes.end()) {
@@ -169,8 +169,11 @@ bool SpecialConfigRequest::decryptSimpleConfig(const QByteArray &bytes) {
 	base::byte_array<kAesIvecSize> aesivec;
 	base::copy_bytes(aesivec, decryptedBytes.subspan(CTRState::KeySize - CTRState::IvecSize, CTRState::IvecSize));
 	AES_KEY aeskey;
-	AES_set_decrypt_key(reinterpret_cast<const unsigned char*>(decryptedBytes.data()), kAesKeySize * CHAR_BIT, &aeskey);
-	AES_cbc_encrypt(reinterpret_cast<const unsigned char*>(aesEncryptedBytes.data()), reinterpret_cast<unsigned char*>(aesEncryptedBytes.data()), aesEncryptedBytes.size(), &aeskey, reinterpret_cast<unsigned char*>(aesivec.data()), AES_DECRYPT);
+	AES_set_decrypt_key(reinterpret_cast<const unsigned char *>(decryptedBytes.data()), kAesKeySize * CHAR_BIT,
+	                    &aeskey);
+	AES_cbc_encrypt(reinterpret_cast<const unsigned char *>(aesEncryptedBytes.data()),
+	                reinterpret_cast<unsigned char *>(aesEncryptedBytes.data()), aesEncryptedBytes.size(), &aeskey,
+	                reinterpret_cast<unsigned char *>(aesivec.data()), AES_DECRYPT);
 
 	constexpr auto kDigestSize = 16;
 	auto dataSize = aesEncryptedBytes.size() - kDigestSize;
@@ -199,7 +202,9 @@ bool SpecialConfigRequest::decryptSimpleConfig(const QByteArray &bytes) {
 		return false;
 	}
 	if ((end - from) * sizeof(mtpPrime) != (dataSize - realLength)) {
-		LOG(("Config Error: Bad read length %1, should be %2.").arg((end - from) * sizeof(mtpPrime)).arg(dataSize - realLength));
+		LOG(("Config Error: Bad read length %1, should be %2.")
+		        .arg((end - from) * sizeof(mtpPrime))
+		        .arg(dataSize - realLength));
 		return false;
 	}
 	return true;
@@ -213,7 +218,10 @@ void SpecialConfigRequest::handleResponse(const QByteArray &bytes) {
 	auto &config = _simpleConfig.c_help_configSimple();
 	auto now = unixtime();
 	if (now < config.vdate.v || now > config.vexpires.v) {
-		LOG(("Config Error: Bad date frame for simple config: %1-%2, our time is %3.").arg(config.vdate.v).arg(config.vexpires.v).arg(now));
+		LOG(("Config Error: Bad date frame for simple config: %1-%2, our time is %3.")
+		        .arg(config.vdate.v)
+		        .arg(config.vexpires.v)
+		        .arg(now));
 		return;
 	}
 	if (config.vip_port_list.v.empty()) {
@@ -223,8 +231,9 @@ void SpecialConfigRequest::handleResponse(const QByteArray &bytes) {
 	for (auto &entry : config.vip_port_list.v) {
 		Assert(entry.type() == mtpc_ipPort);
 		auto &ipPort = entry.c_ipPort();
-		auto ip = *reinterpret_cast<const quint32*>(&ipPort.vipv4.v);
-		auto ipString = qsl("%1.%2.%3.%4").arg((ip >> 24) & 0xFF).arg((ip >> 16) & 0xFF).arg((ip >> 8) & 0xFF).arg(ip & 0xFF);
+		auto ip = *reinterpret_cast<const quint32 *>(&ipPort.vipv4.v);
+		auto ipString =
+		    qsl("%1.%2.%3.%4").arg((ip >> 24) & 0xFF).arg((ip >> 16) & 0xFF).arg((ip >> 8) & 0xFF).arg(ip & 0xFF);
 		_callback(config.vdc_id.v, ipString.toStdString(), ipPort.vport.v);
 	}
 }
diff --git a/Telegram/SourceFiles/mtproto/special_config_request.h b/Telegram/SourceFiles/mtproto/special_config_request.h
index 16395e266..2f7d55270 100644
--- a/Telegram/SourceFiles/mtproto/special_config_request.h
+++ b/Telegram/SourceFiles/mtproto/special_config_request.h
@@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "base/lambda.h"
 
+#include "mtproto/mtp_instance.h"
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include "mtproto/mtp_instance.h"
 
 namespace MTP {
 
@@ -51,7 +51,6 @@ private:
 
 	std::unique_ptr<DcOptions> _localOptions;
 	std::unique_ptr<Instance> _localInstance;
-
 };
 
 } // namespace MTP
diff --git a/Telegram/SourceFiles/mtproto/type_utils.cpp b/Telegram/SourceFiles/mtproto/type_utils.cpp
index 021ffaf4c..d1b0f4723 100644
--- a/Telegram/SourceFiles/mtproto/type_utils.cpp
+++ b/Telegram/SourceFiles/mtproto/type_utils.cpp
@@ -22,4 +22,5 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 const MTPReplyMarkup MTPnullMarkup = MTP_replyKeyboardMarkup(MTP_flags(0), MTP_vector<MTPKeyboardButtonRow>(0));
 const MTPVector<MTPMessageEntity> MTPnullEntities = MTP_vector<MTPMessageEntity>(0);
-const MTPMessageFwdHeader MTPnullFwdHeader = MTP_messageFwdHeader(MTP_flags(0), MTPint(), MTPint(), MTPint(), MTPint(), MTPstring());
+const MTPMessageFwdHeader MTPnullFwdHeader =
+    MTP_messageFwdHeader(MTP_flags(0), MTPint(), MTPint(), MTPint(), MTPint(), MTPstring());
diff --git a/Telegram/SourceFiles/mtproto/type_utils.h b/Telegram/SourceFiles/mtproto/type_utils.h
index b163ae915..6eee054c6 100644
--- a/Telegram/SourceFiles/mtproto/type_utils.h
+++ b/Telegram/SourceFiles/mtproto/type_utils.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "scheme.h"
 #include "base/flags.h"
+#include "scheme.h"
 
 inline MTPbool MTP_bool(bool v) {
 	return v ? MTP_boolTrue() : MTP_boolFalse();
@@ -36,15 +36,12 @@ inline bool mtpIsFalse(const MTPBool &v) {
 
 // we must validate that MTProto scheme flags don't intersect with client side flags
 // and define common bit operators which allow use Type_ClientFlag together with Type::Flag
-#define DEFINE_MTP_CLIENT_FLAGS(Type) \
-static_assert(Type::Flags(Type::Flag::MAX_FIELD) < static_cast<Type::Flag>(Type##_ClientFlag::MIN_FIELD), \
-	"MTProto flags conflict with client side flags!"); \
-namespace base {\
-	template<>\
-	struct extended_flags<Type##_ClientFlag> {\
-		using type = Type::Flag;\
-	};\
-}
+#define DEFINE_MTP_CLIENT_FLAGS(Type)                                                                                  \
+	static_assert(Type::Flags(Type::Flag::MAX_FIELD) < static_cast<Type::Flag>(Type##_ClientFlag::MIN_FIELD),          \
+	              "MTProto flags conflict with client side flags!");                                                   \
+	namespace base {                                                                                                   \
+	template <> struct extended_flags<Type##_ClientFlag> { using type = Type::Flag; };                                 \
+	}
 
 // we use the same flags field for some additional client side flags
 enum class MTPDmessage_ClientFlag : qint32 {
diff --git a/Telegram/SourceFiles/observer_peer.cpp b/Telegram/SourceFiles/observer_peer.cpp
index bdaed0373..495857dc1 100644
--- a/Telegram/SourceFiles/observer_peer.cpp
+++ b/Telegram/SourceFiles/observer_peer.cpp
@@ -28,7 +28,7 @@ namespace {
 
 using SmallUpdatesList = QVector<PeerUpdate>;
 NeverFreedPointer<SmallUpdatesList> SmallUpdates;
-using AllUpdatesList = QMap<PeerData*, PeerUpdate>;
+using AllUpdatesList = QMap<PeerData *, PeerUpdate>;
 NeverFreedPointer<AllUpdatesList> AllUpdates;
 
 void StartCallback() {
diff --git a/Telegram/SourceFiles/observer_peer.h b/Telegram/SourceFiles/observer_peer.h
index 3c47ad04b..463ef78f4 100644
--- a/Telegram/SourceFiles/observer_peer.h
+++ b/Telegram/SourceFiles/observer_peer.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/observer.h"
 #include "base/flags.h"
+#include "base/observer.h"
 
-#include "structs.h"
 #include "history/history.h"
+#include "structs.h"
 
 namespace Notify {
 
@@ -33,53 +33,55 @@ namespace Notify {
 // 0x0000FFFFU for general peer updates (valid for any peer).
 // 0xFFFF0000U for specific peer updates (valid for user / chat / channel).
 struct PeerUpdate {
-	PeerUpdate(PeerData *updated = nullptr) : peer(updated) {
-	}
+	PeerUpdate(PeerData *updated = nullptr)
+	    : peer(updated) {}
 	PeerData *peer;
 
 	enum class Flag : quint32 {
-		None                      = 0,
+		None = 0,
 
 		// Common flags
-		NameChanged               = (1 << 0),
-		UsernameChanged           = (1 << 1),
-		PhotoChanged              = (1 << 2),
-		AboutChanged              = (1 << 3),
-		NotificationsEnabled      = (1 << 4),
-		SharedMediaChanged        = (1 << 5),
-		MigrationChanged          = (1 << 6),
-		PinnedChanged             = (1 << 7),
-		RestrictionReasonChanged  = (1 << 8),
+		NameChanged = (1 << 0),
+		UsernameChanged = (1 << 1),
+		PhotoChanged = (1 << 2),
+		AboutChanged = (1 << 3),
+		NotificationsEnabled = (1 << 4),
+		SharedMediaChanged = (1 << 5),
+		MigrationChanged = (1 << 6),
+		PinnedChanged = (1 << 7),
+		RestrictionReasonChanged = (1 << 8),
 
 		// For chats and channels
-		InviteLinkChanged         = (1 << 9),
-		MembersChanged            = (1 << 10),
-		AdminsChanged             = (1 << 11),
-		BannedUsersChanged        = (1 << 12),
-		UnreadMentionsChanged     = (1 << 13),
+		InviteLinkChanged = (1 << 9),
+		MembersChanged = (1 << 10),
+		AdminsChanged = (1 << 11),
+		BannedUsersChanged = (1 << 12),
+		UnreadMentionsChanged = (1 << 13),
 
 		// For users
-		UserCanShareContact       = (1 << 16),
-		UserIsContact             = (1 << 17),
-		UserPhoneChanged          = (1 << 18),
-		UserIsBlocked             = (1 << 19),
-		BotCommandsChanged        = (1 << 20),
-		UserOnlineChanged         = (1 << 21),
-		BotCanAddToGroups         = (1 << 22),
-		UserCommonChatsChanged    = (1 << 23),
-		UserHasCalls              = (1 << 24),
+		UserCanShareContact = (1 << 16),
+		UserIsContact = (1 << 17),
+		UserPhoneChanged = (1 << 18),
+		UserIsBlocked = (1 << 19),
+		BotCommandsChanged = (1 << 20),
+		UserOnlineChanged = (1 << 21),
+		BotCanAddToGroups = (1 << 22),
+		UserCommonChatsChanged = (1 << 23),
+		UserHasCalls = (1 << 24),
 
 		// For chats
-		ChatCanEdit               = (1 << 16),
+		ChatCanEdit = (1 << 16),
 
 		// For channels
-		ChannelAmIn               = (1 << 16),
-		ChannelRightsChanged      = (1 << 17),
-		ChannelStickersChanged    = (1 << 18),
-		ChannelPinnedChanged      = (1 << 19),
+		ChannelAmIn = (1 << 16),
+		ChannelRightsChanged = (1 << 17),
+		ChannelStickersChanged = (1 << 18),
+		ChannelPinnedChanged = (1 << 19),
 	};
 	using Flags = base::flags<Flag>;
-	friend inline constexpr auto is_flag_type(Flag) { return true; }
+	friend inline constexpr auto is_flag_type(Flag) {
+		return true;
+	}
 
 	Flags flags = 0;
 
@@ -89,7 +91,6 @@ struct PeerUpdate {
 
 	// SharedMediaChanged data
 	qint32 mediaTypesMask = 0;
-
 };
 
 void peerUpdatedDelayed(const PeerUpdate &update);
@@ -110,8 +111,9 @@ inline void mediaOverviewUpdated(PeerData *peer, MediaOverviewType type) {
 class PeerUpdatedHandler {
 public:
 	template <typename Lambda>
-	PeerUpdatedHandler(PeerUpdate::Flags events, Lambda &&handler) : _events(events), _handler(std::move(handler)) {
-	}
+	PeerUpdatedHandler(PeerUpdate::Flags events, Lambda &&handler)
+	    : _events(events)
+	    , _handler(std::move(handler)) {}
 	void operator()(const PeerUpdate &update) const {
 		if (update.flags & _events) {
 			_handler(update);
@@ -120,8 +122,7 @@ public:
 
 private:
 	PeerUpdate::Flags _events;
-	base::lambda<void(const PeerUpdate&)> _handler;
-
+	base::lambda<void(const PeerUpdate &)> _handler;
 };
 base::Observable<PeerUpdate, PeerUpdatedHandler> &PeerUpdated();
 
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 15e90d5c3..6eb336f2e 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -20,20 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "overview/overview_layout.h"
 
-#include "styles/style_overview.h"
-#include "styles/style_history.h"
-#include "core/file_utilities.h"
+#include "application.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
+#include "history/history_media_types.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
-#include "application.h"
-#include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "media/media_audio.h"
 #include "media/player/media_player_instance.h"
+#include "storage/file_upload.h"
 #include "storage/localstorage.h"
-#include "history/history_media_types.h"
+#include "styles/style_history.h"
+#include "styles/style_overview.h"
 #include "ui/effects/round_checkbox.h"
 
 namespace Overview {
@@ -41,10 +41,10 @@ namespace Layout {
 namespace {
 
 TextParseOptions _documentNameOptions = {
-	TextParseMultiline | TextParseRichText | TextParseLinks | TextParseMarkdown, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline | TextParseRichText | TextParseLinks | TextParseMarkdown, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 TextWithEntities ComposeNameWithEntities(DocumentData *document) {
@@ -52,13 +52,14 @@ TextWithEntities ComposeNameWithEntities(DocumentData *document) {
 	auto song = document->song();
 	if (!song || (song->title.isEmpty() && song->performer.isEmpty())) {
 		result.text = document->name.isEmpty() ? qsl("Unknown File") : document->name;
-		result.entities.push_back({ EntityInTextBold, 0, result.text.size() });
+		result.entities.push_back({EntityInTextBold, 0, result.text.size()});
 	} else if (song->performer.isEmpty()) {
 		result.text = song->title;
-		result.entities.push_back({ EntityInTextBold, 0, result.text.size() });
+		result.entities.push_back({EntityInTextBold, 0, result.text.size()});
 	} else {
-		result.text = song->performer + QString::fromUtf8(" \xe2\x80\x93 ") + (song->title.isEmpty() ? qsl("Unknown Track") : song->title);
-		result.entities.push_back({ EntityInTextBold, 0, song->performer.size() });
+		result.text = song->performer + QString::fromUtf8(" \xe2\x80\x93 ") +
+		              (song->title.isEmpty() ? qsl("Unknown Track") : song->title);
+		result.entities.push_back({EntityInTextBold, 0, song->performer.size()});
 	}
 	return result;
 }
@@ -79,7 +80,8 @@ void RadialProgressItem::clickHandlerActiveChanged(const ClickHandlerPtr &action
 	ItemBase::clickHandlerActiveChanged(action, active);
 	if (action == _openl || action == _savel || action == _cancell) {
 		if (iconAnimated()) {
-			_a_iconOver.start([this] { Ui::repaintHistoryItem(_parent); }, active ? 0. : 1., active ? 1. : 0., st::msgFileOverDuration);
+			_a_iconOver.start([this] { Ui::repaintHistoryItem(_parent); }, active ? 0. : 1., active ? 1. : 0.,
+			                  st::msgFileOverDuration);
 		}
 	}
 }
@@ -103,7 +105,8 @@ void RadialProgressItem::step_radial(TimeMs ms, bool timer) {
 
 void RadialProgressItem::ensureRadial() {
 	if (!_radial) {
-		_radial = std::make_unique<Ui::RadialAnimation>(animation(const_cast<RadialProgressItem*>(this), &RadialProgressItem::step_radial));
+		_radial = std::make_unique<Ui::RadialAnimation>(
+		    animation(const_cast<RadialProgressItem *>(this), &RadialProgressItem::step_radial));
 	}
 }
 
@@ -118,9 +121,11 @@ RadialProgressItem::~RadialProgressItem() = default;
 void StatusText::update(int newSize, int fullSize, int duration, TimeMs realDuration) {
 	setSize(newSize);
 	if (_size == FileStatusSizeReady) {
-		_text = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) : (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
+		_text = (duration >= 0) ? formatDurationAndSizeText(duration, fullSize) :
+		                          (duration < -1 ? formatGifAndSizeText(fullSize) : formatSizeText(fullSize));
 	} else if (_size == FileStatusSizeLoaded) {
-		_text = (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
+		_text =
+		    (duration >= 0) ? formatDurationText(duration) : (duration < -1 ? qsl("GIF") : formatSizeText(fullSize));
 	} else if (_size == FileStatusSizeFailed) {
 		_text = lang(lng_attach_failed);
 	} else if (_size >= 0) {
@@ -135,8 +140,8 @@ void StatusText::setSize(int newSize) {
 }
 
 Date::Date(const QDate &date, bool month)
-: _date(date)
-, _text(month ? langMonthFull(date) : langDayOfMonthFull(date)) {
+    : _date(date)
+    , _text(month ? langMonthFull(date) : langDayOfMonthFull(date)) {
 	AddComponents(Info::Bit());
 }
 
@@ -156,8 +161,9 @@ void Date::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 class PhotoVideoCheckbox {
 public:
 	template <typename UpdateCallback>
-	PhotoVideoCheckbox(UpdateCallback callback) : _updateCallback(callback), _check(st::overviewCheck, _updateCallback) {
-	}
+	PhotoVideoCheckbox(UpdateCallback callback)
+	    : _updateCallback(callback)
+	    , _check(st::overviewCheck, _updateCallback) {}
 
 	void paint(Painter &p, TimeMs ms, int width, int height, bool selected, bool selecting);
 
@@ -177,7 +183,6 @@ private:
 	Animation _pression;
 	bool _active = false;
 	bool _pressed = false;
-
 };
 
 void PhotoVideoCheckbox::paint(Painter &p, TimeMs ms, int width, int height, bool selected, bool selecting) {
@@ -188,7 +193,8 @@ void PhotoVideoCheckbox::paint(Painter &p, TimeMs ms, int width, int height, boo
 	_check.setChecked(selected);
 	auto pression = _pression.current(ms, (_active && _pressed) ? 1. : 0.);
 	auto masterScale = 1. - (1. - st::overviewCheckPressedSize) * pression;
-	_check.paint(p, ms, width - st::overviewCheckSkip - st::overviewCheck.size, height - st::overviewCheckSkip - st::overviewCheck.size, width, masterScale);
+	_check.paint(p, ms, width - st::overviewCheckSkip - st::overviewCheck.size,
+	             height - st::overviewCheckSkip - st::overviewCheck.size, width, masterScale);
 }
 
 void PhotoVideoCheckbox::setActive(bool active) {
@@ -210,10 +216,10 @@ void PhotoVideoCheckbox::startAnimation() {
 	_pression.start(_updateCallback, showPressed ? 0. : 1., showPressed ? 1. : 0., st::overviewCheck.duration);
 }
 
-Photo::Photo(PhotoData *photo, HistoryItem *parent) : ItemBase(parent)
-, _data(photo)
-, _link(new PhotoOpenClickHandler(photo)) {
-}
+Photo::Photo(PhotoData *photo, HistoryItem *parent)
+    : ItemBase(parent)
+    , _data(photo)
+    , _link(new PhotoOpenClickHandler(photo)) {}
 
 void Photo::initDimensions() {
 	_maxw = 2 * st::overviewPhotoMinSize;
@@ -240,7 +246,9 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 
 		qint32 size = _width * cIntRetinaFactor();
 		if (_goodLoaded || _data->thumb->loaded()) {
-			auto img = (_data->loaded() ? _data->full : (_data->medium->loaded() ? _data->medium : _data->thumb))->pix().toImage();
+			auto img = (_data->loaded() ? _data->full : (_data->medium->loaded() ? _data->medium : _data->thumb))
+			               ->pix()
+			               .toImage();
 			if (!_goodLoaded) {
 				img = Images::prepareBlur(std::move(img));
 			}
@@ -249,9 +257,11 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 					img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 				}
 			} else if (img.width() > img.height()) {
-				img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+				img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height())
+				          .scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 			} else {
-				img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+				img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width())
+				          .scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 			}
 			img.setDevicePixelRatio(cRetinaFactor());
 			_data->forget();
@@ -277,9 +287,7 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 }
 
 void Photo::ensureCheckboxCreated() {
-	if (!_check) _check = std::make_unique<PhotoVideoCheckbox>([this] {
-		Ui::repaintHistoryItem(_parent);
-	});
+	if (!_check) _check = std::make_unique<PhotoVideoCheckbox>([this] { Ui::repaintHistoryItem(_parent); });
 }
 
 void Photo::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint point) const {
@@ -308,10 +316,11 @@ void Photo::invalidateCache() {
 	}
 }
 
-Video::Video(DocumentData *video, HistoryItem *parent) : RadialProgressItem(parent)
-, _data(video)
-, _duration(formatDurationText(_data->duration()))
-, _thumbLoaded(false) {
+Video::Video(DocumentData *video, HistoryItem *parent)
+    : RadialProgressItem(parent)
+    , _data(video)
+    , _duration(formatDurationText(_data->duration()))
+    , _thumbLoaded(false) {
 	setDocumentLinks(_data);
 }
 
@@ -351,9 +360,11 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 					img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 				}
 			} else if (img.width() > img.height()) {
-				img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+				img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height())
+				          .scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 			} else {
-				img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+				img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width())
+				          .scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 			}
 			img.setDevicePixelRatio(cRetinaFactor());
 			_data->forget();
@@ -376,11 +387,14 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 
 	if (!selected && !context->selecting && !loaded) {
 		if (clip.intersects(QRect(0, _height - st::normalFont->height, _width, st::normalFont->height))) {
-			qint32 statusX = st::msgDateImgPadding.x(), statusY = _height - st::normalFont->height - st::msgDateImgPadding.y();
+			qint32 statusX = st::msgDateImgPadding.x(),
+			       statusY = _height - st::normalFont->height - st::msgDateImgPadding.y();
 			qint32 statusW = st::normalFont->width(_status.text()) + 2 * st::msgDateImgPadding.x();
 			qint32 statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
 			statusX = _width - statusW + statusX;
-			p.fillRect(rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgDateImgBgSelected : st::msgDateImgBg);
+			p.fillRect(rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW,
+			                   statusH, _width),
+			           selected ? st::msgDateImgBgSelected : st::msgDateImgBg);
 			p.setFont(st::normalFont);
 			p.setPen(st::msgDateImgFg);
 			p.drawTextLeft(statusX, statusY, _width, _status.text(), statusW - 2 * st::msgDateImgPadding.x());
@@ -390,7 +404,9 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		qint32 statusX = st::msgDateImgPadding.x(), statusY = st::msgDateImgPadding.y();
 		qint32 statusW = st::normalFont->width(_duration) + 2 * st::msgDateImgPadding.x();
 		qint32 statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-		p.fillRect(rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgDateImgBgSelected : st::msgDateImgBg);
+		p.fillRect(
+		    rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width),
+		    selected ? st::msgDateImgBgSelected : st::msgDateImgBg);
 		p.setFont(st::normalFont);
 		p.setPen(st::msgDateImgFg);
 		p.drawTextLeft(statusX, statusY, _width, _duration, statusW - 2 * st::msgDateImgPadding.x());
@@ -403,7 +419,8 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			p.setBrush(st::msgDateImgBgSelected);
 		} else {
 			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _savel));
-			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
+			p.setBrush(
+			    anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
 		}
 
 		{
@@ -423,8 +440,10 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		icon->paintInCenter(p, inner);
 		if (radial) {
 			p.setOpacity(1);
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-			_radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			_radial->draw(p, rinner, st::msgFileRadialLine,
+			              selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 		}
 	}
 
@@ -437,9 +456,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 }
 
 void Video::ensureCheckboxCreated() {
-	if (!_check) _check = std::make_unique<PhotoVideoCheckbox>([this] {
-		Ui::repaintHistoryItem(_parent);
-	});
+	if (!_check) _check = std::make_unique<PhotoVideoCheckbox>([this] { Ui::repaintHistoryItem(_parent); });
 }
 
 void Video::clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) {
@@ -495,10 +512,11 @@ void Video::updateStatusText() {
 	}
 }
 
-Voice::Voice(DocumentData *voice, HistoryItem *parent, const style::OverviewFileLayout &st) : RadialProgressItem(parent)
-, _data(voice)
-, _namel(new DocumentOpenClickHandler(_data))
-, _st(st) {
+Voice::Voice(DocumentData *voice, HistoryItem *parent, const style::OverviewFileLayout &st)
+    : RadialProgressItem(parent)
+    , _data(voice)
+    , _namel(new DocumentOpenClickHandler(_data))
+    , _st(st) {
 	AddComponents(Info::Bit());
 
 	Assert(_data->voice() != 0);
@@ -507,8 +525,10 @@ Voice::Voice(DocumentData *voice, HistoryItem *parent, const style::OverviewFile
 
 	updateName();
 	QString d = textcmdLink(1, TextUtilities::EscapeForRichParsing(langDateTime(date(_data->date))));
-	TextParseOptions opts = { TextParseRichText, 0, 0, Qt::LayoutDirectionAuto };
-	_details.setText(st::defaultTextStyle, lng_date_and_duration(lt_date, d, lt_duration, formatDurationText(_data->voice()->duration)), opts);
+	TextParseOptions opts = {TextParseRichText, 0, 0, Qt::LayoutDirectionAuto};
+	_details.setText(st::defaultTextStyle,
+	                 lng_date_and_duration(lt_date, d, lt_duration, formatDurationText(_data->voice()->duration)),
+	                 opts);
 	_details.setLink(1, goToMessageClickHandler(parent));
 }
 
@@ -554,7 +574,8 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			p.setBrush(st::msgFileInBgSelected);
 		} else {
 			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
-			p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
+			p.setBrush(
+			    anim::brush(st::msgFileInBg, st::msgFileInBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.)));
 		}
 
 		{
@@ -563,7 +584,8 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		}
 
 		if (radial) {
-			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
+			QRect rinner(inner.marginsRemoved(
+			    QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 			auto &bg = selected ? st::msgInBgSelected : st::msgInBg;
 			_radial->draw(p, rinner, st::msgFileRadialLine, bg);
 		}
@@ -608,7 +630,8 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(rtlrect(unreadx + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
+				p.drawEllipse(rtlrect(unreadx + st::mediaUnreadSkip, statustop + st::mediaUnreadTop,
+				                      st::mediaUnreadSize, st::mediaUnreadSize, _width));
 			}
 		}
 	}
@@ -646,9 +669,11 @@ void Voice::updateName() {
 	auto version = 0;
 	if (auto forwarded = _parent->Get<HistoryMessageForwarded>()) {
 		if (_parent->fromOriginal()->isChannel()) {
-			_name.setText(st::semiboldTextStyle, lng_forwarded_channel(lt_channel, App::peerName(_parent->fromOriginal())), _textNameOptions);
+			_name.setText(st::semiboldTextStyle,
+			              lng_forwarded_channel(lt_channel, App::peerName(_parent->fromOriginal())), _textNameOptions);
 		} else {
-			_name.setText(st::semiboldTextStyle, lng_forwarded(lt_user, App::peerName(_parent->fromOriginal())), _textNameOptions);
+			_name.setText(st::semiboldTextStyle, lng_forwarded(lt_user, App::peerName(_parent->fromOriginal())),
+			              _textNameOptions);
 		}
 	} else {
 		_name.setText(st::semiboldTextStyle, App::peerName(_parent->from()), _textNameOptions);
@@ -669,7 +694,8 @@ bool Voice::updateStatusText() {
 		if (state.id == AudioMsgId(_data, _parent->fullId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 			statusSize = -1 - (state.position / state.frequency);
 			realDuration = (state.length / state.frequency);
-			showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+			showPause =
+			    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 		}
 	} else {
 		statusSize = FileStatusSizeReady;
@@ -680,14 +706,15 @@ bool Voice::updateStatusText() {
 	return showPause;
 }
 
-Document::Document(DocumentData *document, HistoryItem *parent, const style::OverviewFileLayout &st) : RadialProgressItem(parent)
-, _data(document)
-, _msgl(goToMessageClickHandler(parent))
-, _namel(new DocumentOpenClickHandler(_data))
-, _st(st)
-, _date(langDateTime(date(_data->date)))
-, _datew(st::normalFont->width(_date))
-, _colorIndex(documentColorIndex(_data, _ext)) {
+Document::Document(DocumentData *document, HistoryItem *parent, const style::OverviewFileLayout &st)
+    : RadialProgressItem(parent)
+    , _data(document)
+    , _msgl(goToMessageClickHandler(parent))
+    , _namel(new DocumentOpenClickHandler(_data))
+    , _st(st)
+    , _date(langDateTime(date(_data->date)))
+    , _datew(st::normalFont->width(_date))
+    , _colorIndex(documentColorIndex(_data, _ext)) {
 	_name.setMarkedText(st::defaultTextStyle, ComposeNameWithEntities(_data), _documentNameOptions);
 
 	AddComponents(Info::Bit());
@@ -710,7 +737,8 @@ Document::Document(DocumentData *document, HistoryItem *parent, const style::Ove
 
 	_extw = st::overviewFileExtFont->width(_ext);
 	if (_extw > _st.fileThumbSize - st::overviewFileExtPadding * 2) {
-		_ext = st::overviewFileExtFont->elided(_ext, _st.fileThumbSize - st::overviewFileExtPadding * 2, Qt::ElideMiddle);
+		_ext =
+		    st::overviewFileExtFont->elided(_ext, _st.fileThumbSize - st::overviewFileExtPadding * 2, Qt::ElideMiddle);
 		_extw = st::overviewFileExtFont->width(_ext);
 	}
 }
@@ -728,7 +756,8 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 	bool selected = (selection == FullSelection);
 
 	_data->automaticLoad(_parent);
-	bool loaded = _data->loaded() || Local::willStickerImageLoad(_data->mediaKey()), displayLoading = _data->displayLoading();
+	bool loaded = _data->loaded() || Local::willStickerImageLoad(_data->mediaKey()),
+	     displayLoading = _data->displayLoading();
 
 	if (displayLoading) {
 		ensureRadial();
@@ -753,14 +782,16 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 			p.fillRect(QRect(0, 0, _width, _height), st::msgInBgSelected);
 		}
 
-		auto inner = rtlrect(_st.songPadding.left(), _st.songPadding.top(), _st.songThumbSize, _st.songThumbSize, _width);
+		auto inner =
+		    rtlrect(_st.songPadding.left(), _st.songPadding.top(), _st.songThumbSize, _st.songThumbSize, _width);
 		if (clip.intersects(inner)) {
 			p.setPen(Qt::NoPen);
 			if (selected) {
 				p.setBrush(st::msgFileInBgSelected);
 			} else {
 				auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
-				p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.current(context->ms, over ? 1. : 0.)));
+				p.setBrush(
+				    anim::brush(_st.songIconBg, _st.songOverBg, _a_iconOver.current(context->ms, over ? 1. : 0.)));
 			}
 
 			{
@@ -769,7 +800,8 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 			}
 
 			if (radial) {
-				auto rinner = inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine));
+				auto rinner = inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine,
+				                                            st::msgFileRadialLine, st::msgFileRadialLine));
 				auto &bg = selected ? st::msgInBgSelected : st::msgInBg;
 				_radial->draw(p, rinner, st::msgFileRadialLine, bg);
 			}
@@ -805,7 +837,8 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 						_thumbForLoaded = loaded;
 						auto options = Images::Option::Smooth | Images::Option::None;
 						if (!_thumbForLoaded) options |= Images::Option::Blurred;
-						_thumb = _data->thumb->pixNoCache(_thumbw * cIntRetinaFactor(), 0, options, _st.fileThumbSize, _st.fileThumbSize);
+						_thumb = _data->thumb->pixNoCache(_thumbw * cIntRetinaFactor(), 0, options, _st.fileThumbSize,
+						                                  _st.fileThumbSize);
 					}
 					p.drawPixmap(rthumb.topLeft(), _thumb);
 				} else {
@@ -816,7 +849,8 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 				if (!radial && loaded && !_ext.isEmpty()) {
 					p.setFont(st::overviewFileExtFont);
 					p.setPen(st::overviewFileExtFg);
-					p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2, rthumb.top() + st::overviewFileExtTop + st::overviewFileExtFont->ascent, _ext);
+					p.drawText(rthumb.left() + (rthumb.width() - _extw) / 2,
+					           rthumb.top() + st::overviewFileExtTop + st::overviewFileExtFont->ascent, _ext);
 				}
 			}
 			if (selected) {
@@ -824,7 +858,9 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 			}
 
 			if (radial || (!loaded && !_data->loading())) {
-				QRect inner(rthumb.x() + (rthumb.width() - _st.songThumbSize) / 2, rthumb.y() + (rthumb.height() - _st.songThumbSize) / 2, _st.songThumbSize, _st.songThumbSize);
+				QRect inner(rthumb.x() + (rthumb.width() - _st.songThumbSize) / 2,
+				            rthumb.y() + (rthumb.height() - _st.songThumbSize) / 2, _st.songThumbSize,
+				            _st.songThumbSize);
 				if (clip.intersects(inner)) {
 					auto radialOpacity = (radial && loaded && !_data->uploading()) ? _radial->opacity() : 1;
 					p.setPen(Qt::NoPen);
@@ -832,7 +868,9 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 						p.setBrush(wthumb ? st::msgDateImgBgSelected : documentSelectedColor(_colorIndex));
 					} else {
 						auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
-						p.setBrush(anim::brush(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex), wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex), _a_iconOver.current(context->ms, over ? 1. : 0.)));
+						p.setBrush(anim::brush(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex),
+						                       wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex),
+						                       _a_iconOver.current(context->ms, over ? 1. : 0.)));
 					}
 					p.setOpacity(radialOpacity * p.opacity());
 
@@ -852,15 +890,22 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 					if (radial) {
 						p.setOpacity(1);
 
-						QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
-						_radial->draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
+						QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine,
+						                                           st::msgFileRadialLine, st::msgFileRadialLine)));
+						_radial->draw(p, rinner, st::msgFileRadialLine,
+						              selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 					}
 				}
 			}
 			if (selected || context->selecting) {
-				QRect check(rthumb.topLeft() + QPoint(rtl() ? 0 : (rthumb.width() - st::defaultCheck.diameter), rthumb.height() - st::defaultCheck.diameter), QSize(st::defaultCheck.diameter, st::defaultCheck.diameter));
+				QRect check(rthumb.topLeft() + QPoint(rtl() ? 0 : (rthumb.width() - st::defaultCheck.diameter),
+				                                      rthumb.height() - st::defaultCheck.diameter),
+				            QSize(st::defaultCheck.diameter, st::defaultCheck.diameter));
 				p.fillRect(check, selected ? st::overviewFileChecked : st::overviewFileCheck);
-				st::defaultCheck.icon.paint(p, QPoint(rthumb.width() - st::defaultCheck.diameter, rthumb.y() + rthumb.height() - st::defaultCheck.diameter), _width);
+				st::defaultCheck.icon.paint(p,
+				                            QPoint(rthumb.width() - st::defaultCheck.diameter,
+				                                   rthumb.y() + rthumb.height() - st::defaultCheck.diameter),
+				                            _width);
 			}
 		}
 	}
@@ -896,7 +941,8 @@ void Document::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoin
 		nametop = _st.songNameTop;
 		statustop = _st.songStatusTop;
 
-		auto inner = rtlrect(_st.songPadding.left(), _st.songPadding.top(), _st.songThumbSize, _st.songThumbSize, _width);
+		auto inner =
+		    rtlrect(_st.songPadding.left(), _st.songPadding.top(), _st.songThumbSize, _st.songThumbSize, _width);
 		if (inner.contains(point)) {
 			link = loaded ? _openl : ((_data->loading() || _data->status == FileUploading) ? _cancell : _openl);
 			return;
@@ -929,7 +975,9 @@ void Document::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoin
 				link = _namel;
 				return;
 			}
-			if (rtlrect(nameleft, nametop, std::min(_width - nameleft - nameright, _name.maxWidth()), st::semiboldFont->height, _width).contains(point)) {
+			if (rtlrect(nameleft, nametop, std::min(_width - nameleft - nameright, _name.maxWidth()),
+			            st::semiboldFont->height, _width)
+			        .contains(point)) {
 				link = _namel;
 				return;
 			}
@@ -954,9 +1002,11 @@ bool Document::updateStatusText() {
 			if (state.id == AudioMsgId(_data, _parent->fullId()) && !Media::Player::IsStoppedOrStopping(state.state)) {
 				statusSize = -1 - (state.position / state.frequency);
 				realDuration = (state.length / state.frequency);
-				showPause = (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
+				showPause =
+				    (state.state == State::Playing || state.state == State::Resuming || state.state == State::Starting);
 			}
-			if (!showPause && (state.id == AudioMsgId(_data, _parent->fullId())) && Media::Player::instance()->isSeeking(AudioMsgId::Type::Song)) {
+			if (!showPause && (state.id == AudioMsgId(_data, _parent->fullId())) &&
+			    Media::Player::instance()->isSeeking(AudioMsgId::Type::Song)) {
 				showPause = true;
 			}
 		} else {
@@ -971,7 +1021,8 @@ bool Document::updateStatusText() {
 	return showPause;
 }
 
-Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
+Link::Link(HistoryMedia *media, HistoryItem *parent)
+    : ItemBase(parent) {
 	AddComponents(Info::Bit());
 
 	auto textWithEntities = _parent->originalText();
@@ -1002,7 +1053,9 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
 		}
 		qint32 afterLinkStart = entity.offset() + entity.length();
 		if (till > afterLinkStart) {
-			if (!QRegularExpression(qsl("^[,.\\s_=+\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$")).match(text.mid(afterLinkStart, till - afterLinkStart)).hasMatch()) {
+			if (!QRegularExpression(qsl("^[,.\\s_=+\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$"))
+			         .match(text.mid(afterLinkStart, till - afterLinkStart))
+			         .hasMatch()) {
 				++lnk;
 				break;
 			}
@@ -1010,12 +1063,15 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
 		till = entity.offset();
 	}
 	if (!lnk) {
-		if (QRegularExpression(qsl("^[,.\\s\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$")).match(text.mid(from, till - from)).hasMatch()) {
+		if (QRegularExpression(qsl("^[,.\\s\\-;:`'\"\\(\\)\\[\\]\\{\\}<>*&^%\\$#@!\\\\/]+$"))
+		        .match(text.mid(from, till - from))
+		        .hasMatch()) {
 			till = from;
 		}
 	}
 
-	_page = (media && media->type() == MediaTypeWebPage) ? static_cast<HistoryWebPage*>(media)->webpage().get() : nullptr;
+	_page =
+	    (media && media->type() == MediaTypeWebPage) ? static_cast<HistoryWebPage *>(media)->webpage().get() : nullptr;
 	if (_page) {
 		mainUrl = _page->url;
 		if (_page->document) {
@@ -1023,7 +1079,8 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
 		} else if (_page->photo) {
 			if (_page->type == WebPageProfile || _page->type == WebPageVideo) {
 				_photol = MakeShared<UrlClickHandler>(_page->url);
-			} else if (_page->type == WebPagePhoto || _page->siteName == qstr("Twitter") || _page->siteName == qstr("Facebook")) {
+			} else if (_page->type == WebPagePhoto || _page->siteName == qstr("Twitter") ||
+			           _page->siteName == qstr("Facebook")) {
 				_photol = MakeShared<PhotoOpenClickHandler>(_page->photo);
 			} else {
 				_photol = MakeShared<UrlClickHandler>(_page->url);
@@ -1040,7 +1097,8 @@ Link::Link(HistoryMedia *media, HistoryItem *parent) : ItemBase(parent) {
 		till = text.size();
 	}
 	if (till > from) {
-		TextParseOptions opts = { TextParseMultiline, qint32(st::linksMaxWidth), 3 * st::normalFont->height, Qt::LayoutDirectionAuto };
+		TextParseOptions opts = {TextParseMultiline, qint32(st::linksMaxWidth), 3 * st::normalFont->height,
+		                         Qt::LayoutDirectionAuto};
 		_text.setText(st::defaultTextStyle, text.mid(from, till - from), opts);
 	}
 	qint32 tw = 0, th = 0;
@@ -1101,10 +1159,12 @@ void Link::initDimensions() {
 		_minh += st::semiboldFont->height;
 	}
 	if (!_text.isEmpty()) {
-		_minh += std::min(3 * st::normalFont->height, _text.countHeight(_maxw - st::linksPhotoSize - st::linksPhotoPadding));
+		_minh +=
+		    std::min(3 * st::normalFont->height, _text.countHeight(_maxw - st::linksPhotoSize - st::linksPhotoPadding));
 	}
 	_minh += _links.size() * st::normalFont->height;
-	_minh = std::max(_minh, qint32(st::linksPhotoSize)) + st::linksMargin.top() + st::linksMargin.bottom() + st::linksBorder;
+	_minh = std::max(_minh, qint32(st::linksPhotoSize)) + st::linksMargin.top() + st::linksMargin.bottom() +
+	        st::linksBorder;
 }
 
 qint32 Link::resizeGetHeight(qint32 width) {
@@ -1119,36 +1179,56 @@ qint32 Link::resizeGetHeight(qint32 width) {
 		_height += st::semiboldFont->height;
 	}
 	if (!_text.isEmpty()) {
-		_height += std::min(3 * st::normalFont->height, _text.countHeight(_width - st::linksPhotoSize - st::linksPhotoPadding));
+		_height += std::min(3 * st::normalFont->height,
+		                    _text.countHeight(_width - st::linksPhotoSize - st::linksPhotoPadding));
 	}
 	_height += _links.size() * st::normalFont->height;
-	_height = std::max(_height, qint32(st::linksPhotoSize)) + st::linksMargin.top() + st::linksMargin.bottom() + st::linksBorder;
+	_height = std::max(_height, qint32(st::linksPhotoSize)) + st::linksMargin.top() + st::linksMargin.bottom() +
+	          st::linksBorder;
 	return _height;
 }
 
 void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
-	qint32 left = st::linksPhotoSize + st::linksPhotoPadding, top = st::linksMargin.top() + st::linksBorder, w = _width - left;
+	qint32 left = st::linksPhotoSize + st::linksPhotoPadding, top = st::linksMargin.top() + st::linksBorder,
+	       w = _width - left;
 	if (clip.intersects(rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width))) {
 		if (_page && _page->photo) {
 			QPixmap pix;
 			if (_page->photo->medium->loaded()) {
-				pix = _page->photo->medium->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
+				pix = _page->photo->medium->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize,
+				                                      ImageRoundRadius::Small);
 			} else if (_page->photo->loaded()) {
-				pix = _page->photo->full->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
+				pix = _page->photo->full->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize,
+				                                    ImageRoundRadius::Small);
 			} else {
-				pix = _page->photo->thumb->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, ImageRoundRadius::Small);
+				pix = _page->photo->thumb->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize,
+				                                     ImageRoundRadius::Small);
 			}
 			p.drawPixmapLeft(0, top, _width, pix);
 		} else if (_page && _page->document && !_page->document->thumb->isNull()) {
 			auto roundRadius = _page->document->isRoundVideo() ? ImageRoundRadius::Ellipse : ImageRoundRadius::Small;
-			p.drawPixmapLeft(0, top, _width, _page->document->thumb->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, roundRadius));
+			p.drawPixmapLeft(
+			    0, top, _width,
+			    _page->document->thumb->pixSingle(_pixw, _pixh, st::linksPhotoSize, st::linksPhotoSize, roundRadius));
 		} else {
 			qint32 index = _letter.isEmpty() ? 0 : (_letter.at(0).unicode() % 4);
 			switch (index) {
-			case 0: App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile1Bg, Doc1Corners); break;
-			case 1: App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile2Bg, Doc2Corners); break;
-			case 2: App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile3Bg, Doc3Corners); break;
-			case 3: App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile4Bg, Doc4Corners); break;
+			case 0:
+				App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile1Bg,
+				               Doc1Corners);
+				break;
+			case 1:
+				App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile2Bg,
+				               Doc2Corners);
+				break;
+			case 2:
+				App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile3Bg,
+				               Doc3Corners);
+				break;
+			case 3:
+				App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::msgFile4Bg,
+				               Doc4Corners);
+				break;
 			}
 
 			if (!_letter.isEmpty()) {
@@ -1159,10 +1239,17 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 		}
 
 		if (selection == FullSelection) {
-			App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width), st::overviewPhotoSelectOverlay, PhotoSelectOverlayCorners);
-			st::overviewLinksChecked.paint(p, QPoint(st::linksPhotoSize - st::overviewLinksChecked.width(), top + st::linksPhotoSize - st::overviewLinksChecked.height()), _width);
+			App::roundRect(p, rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width),
+			               st::overviewPhotoSelectOverlay, PhotoSelectOverlayCorners);
+			st::overviewLinksChecked.paint(p,
+			                               QPoint(st::linksPhotoSize - st::overviewLinksChecked.width(),
+			                                      top + st::linksPhotoSize - st::overviewLinksChecked.height()),
+			                               _width);
 		} else if (context->selecting) {
-			st::overviewLinksCheck.paint(p, QPoint(st::linksPhotoSize - st::overviewLinksCheck.width(), top + st::linksPhotoSize - st::overviewLinksCheck.height()), _width);
+			st::overviewLinksCheck.paint(p,
+			                             QPoint(st::linksPhotoSize - st::overviewLinksCheck.width(),
+			                                    top + st::linksPhotoSize - st::overviewLinksCheck.height()),
+			                             _width);
 		}
 	}
 
@@ -1193,7 +1280,8 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 	for (qint32 i = 0, l = _links.size(); i < l; ++i) {
 		if (clip.intersects(rtlrect(left, top, std::min(w, _links.at(i).width), st::normalFont->height, _width))) {
 			p.setFont(ClickHandler::showAsActive(_links.at(i).lnk) ? st::normalFont->underline() : st::normalFont);
-			p.drawTextLeft(left, top, _width, (w < _links.at(i).width) ? st::normalFont->elided(_links.at(i).text, w) : _links.at(i).text);
+			p.drawTextLeft(left, top, _width,
+			               (w < _links.at(i).width) ? st::normalFont->elided(_links.at(i).text, w) : _links.at(i).text);
 		}
 		top += st::normalFont->height;
 	}
@@ -1205,7 +1293,8 @@ void Link::paint(Painter &p, const QRect &clip, TextSelection selection, const P
 }
 
 void Link::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint point) const {
-	qint32 left = st::linksPhotoSize + st::linksPhotoPadding, top = st::linksMargin.top() + st::linksBorder, w = _width - left;
+	qint32 left = st::linksPhotoSize + st::linksPhotoPadding, top = st::linksMargin.top() + st::linksBorder,
+	       w = _width - left;
 	if (rtlrect(0, top, st::linksPhotoSize, st::linksPhotoSize, _width).contains(point)) {
 		link = _photol;
 		return;
@@ -1234,10 +1323,9 @@ void Link::getState(ClickHandlerPtr &link, HistoryCursorState &cursor, QPoint po
 }
 
 Link::LinkEntry::LinkEntry(const QString &url, const QString &text)
-: text(text)
-, width(st::normalFont->width(text))
-, lnk(MakeShared<UrlClickHandler>(url)) {
-}
+    : text(text)
+    , width(st::normalFont->width(text))
+    , lnk(MakeShared<UrlClickHandler>(url)) {}
 
 } // namespace Layout
 } // namespace Overview
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index e1e60737b..0229e1160 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -20,20 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "layout.h"
 #include "core/click_handler_types.h"
-#include "ui/effects/radial_animation.h"
+#include "layout.h"
 #include "styles/style_overview.h"
+#include "ui/effects/radial_animation.h"
 
 namespace Overview {
 namespace Layout {
 
 class PaintContext : public PaintContextBase {
 public:
-	PaintContext(TimeMs ms, bool selecting) : PaintContextBase(ms, selecting), isAfterDate(false) {
-	}
+	PaintContext(TimeMs ms, bool selecting)
+	    : PaintContextBase(ms, selecting)
+	    , isAfterDate(false) {}
 	bool isAfterDate;
-
 };
 
 class ItemBase;
@@ -59,15 +59,13 @@ public:
 		return item ? item->id : 0;
 	}
 
-	virtual void invalidateCache() {
-	}
-
+	virtual void invalidateCache() {}
 };
 
 class ItemBase : public AbstractItem {
 public:
-	ItemBase(HistoryItem *parent) : _parent(parent) {
-	}
+	ItemBase(HistoryItem *parent)
+	    : _parent(parent) {}
 
 	ItemBase *toMediaItem() override {
 		return this;
@@ -84,13 +82,12 @@ public:
 
 protected:
 	HistoryItem *_parent;
-
 };
 
 class RadialProgressItem : public ItemBase {
 public:
-	RadialProgressItem(HistoryItem *parent) : ItemBase(parent) {
-	}
+	RadialProgressItem(HistoryItem *parent)
+	    : ItemBase(parent) {}
 	RadialProgressItem(const RadialProgressItem &other) = delete;
 
 	void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;
@@ -107,7 +104,8 @@ protected:
 		} else {
 			save.reset(new DocumentSaveClickHandler(document));
 		}
-		setLinks(MakeShared<DocumentOpenClickHandler>(document), std::move(save), MakeShared<DocumentCancelClickHandler>(document));
+		setLinks(MakeShared<DocumentOpenClickHandler>(document), std::move(save),
+		         MakeShared<DocumentCancelClickHandler>(document));
 	}
 
 	void step_radial(TimeMs ms, bool timer);
@@ -131,7 +129,6 @@ protected:
 
 	std::unique_ptr<Ui::RadialAnimation> _radial;
 	Animation _a_iconOver;
-
 };
 
 class StatusText {
@@ -155,7 +152,6 @@ private:
 	// 0x7FFFFFF2 will contain status for failed to download / upload file
 	int _size = 0;
 	QString _text;
-
 };
 
 struct Info : public RuntimeComponent<Info> {
@@ -172,7 +168,6 @@ public:
 private:
 	QDate _date;
 	QString _text;
-
 };
 
 class PhotoVideoCheckbox;
@@ -201,7 +196,6 @@ private:
 
 	QPixmap _pix;
 	bool _goodLoaded = false;
-
 };
 
 class Video : public RadialProgressItem {
@@ -245,7 +239,6 @@ private:
 	bool _thumbLoaded = false;
 
 	void updateStatusText();
-
 };
 
 class Voice : public RadialProgressItem {
@@ -282,7 +275,6 @@ private:
 
 	void updateName();
 	bool updateStatusText();
-
 };
 
 class Document : public RadialProgressItem {
@@ -327,10 +319,10 @@ private:
 	qint32 _thumbw, _colorIndex;
 
 	bool withThumb() const {
-		return !_data->song() && !_data->thumb->isNull() && _data->thumb->width() && _data->thumb->height() && !documentIsExecutableName(_data->name);
+		return !_data->song() && !_data->thumb->isNull() && _data->thumb->width() && _data->thumb->height() &&
+		       !documentIsExecutableName(_data->name);
 	}
 	bool updateStatusText();
-
 };
 
 class Link : public ItemBase {
@@ -350,18 +342,17 @@ private:
 	WebPageData *_page = nullptr;
 	int _pixw = 0;
 	int _pixh = 0;
-	Text _text = { int(st::msgMinWidth) };
+	Text _text = {int(st::msgMinWidth)};
 
 	struct LinkEntry {
-		LinkEntry() : width(0) {
-		}
+		LinkEntry()
+		    : width(0) {}
 		LinkEntry(const QString &url, const QString &text);
 		QString text;
 		qint32 width;
 		TextClickHandlerPtr lnk;
 	};
 	QVector<LinkEntry> _links;
-
 };
 
 } // namespace Layout
diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp
index 8dd82c480..56d8ba25a 100644
--- a/Telegram/SourceFiles/overviewwidget.cpp
+++ b/Telegram/SourceFiles/overviewwidget.cpp
@@ -18,55 +18,54 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "styles/style_overview.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_window.h"
-#include "styles/style_settings.h"
+#include "overviewwidget.h"
+#include "application.h"
+#include "auth_session.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
 #include "boxes/photo_crop_box.h"
 #include "core/file_utilities.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/tooltip.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/input_fields.h"
-#include "window/top_bar_widget.h"
-#include "window/themes/window_theme.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "overviewwidget.h"
-#include "application.h"
-#include "overview/overview_layout.h"
-#include "history/history_message.h"
 #include "history/history_media_types.h"
+#include "history/history_message.h"
 #include "history/history_service_layout.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "media/media_audio.h"
 #include "observer_peer.h"
-#include "auth_session.h"
+#include "overview/overview_layout.h"
 #include "storage/file_download.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_overview.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/dropdown_menu.h"
+#include "ui/widgets/input_fields.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/tooltip.h"
+#include "window/themes/window_theme.h"
+#include "window/top_bar_widget.h"
 
 // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
 
-OverviewInner::OverviewInner(OverviewWidget *overview, Ui::ScrollArea *scroll, PeerData *peer, MediaOverviewType type) : TWidget(nullptr)
-, _overview(overview)
-, _scroll(scroll)
-, _peer(peer->migrateTo() ? peer->migrateTo() : peer)
-, _type(type)
-, _reversed(_type != OverviewFiles && _type != OverviewLinks)
-, _history(App::history(_peer))
-, _migrated(_history->migrateFrom())
-, _channel(peerToChannel(_peer->id))
-, _rowWidth(st::msgMinWidth)
-, _search(this, st::overviewFilter, langFactory(lng_dlg_filter))
-, _cancelSearch(this, st::dialogsCancelSearch)
-, _itemsToBeLoaded(LinksOverviewPerPage * 2)
-, _width(st::windowMinWidth) {
+OverviewInner::OverviewInner(OverviewWidget *overview, Ui::ScrollArea *scroll, PeerData *peer, MediaOverviewType type)
+    : TWidget(nullptr)
+    , _overview(overview)
+    , _scroll(scroll)
+    , _peer(peer->migrateTo() ? peer->migrateTo() : peer)
+    , _type(type)
+    , _reversed(_type != OverviewFiles && _type != OverviewLinks)
+    , _history(App::history(_peer))
+    , _migrated(_history->migrateFrom())
+    , _channel(peerToChannel(_peer->id))
+    , _rowWidth(st::msgMinWidth)
+    , _search(this, st::overviewFilter, langFactory(lng_dlg_filter))
+    , _cancelSearch(this, st::dialogsCancelSearch)
+    , _itemsToBeLoaded(LinksOverviewPerPage * 2)
+    , _width(st::windowMinWidth) {
 	subscribe(Auth().downloader().taskFinished(), [this] { update(); });
-	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) {
-		itemRemoved(item);
-	});
+	subscribe(Global::RefItemRemoved(), [this](HistoryItem *item) { itemRemoved(item); });
 
 	resize(_width, st::windowMinHeight);
 
@@ -93,12 +92,9 @@ OverviewInner::OverviewInner(OverviewWidget *overview, Ui::ScrollArea *scroll, P
 			invalidateCache();
 		}
 	});
-	subscribe(App::wnd()->dragFinished(), [this] {
-		dragActionUpdate(QCursor::pos());
-	});
-	subscribe(Auth().messageIdChanging, [this](std::pair<HistoryItem*, MsgId> update) {
-		changingMsgId(update.first, update.second);
-	});
+	subscribe(App::wnd()->dragFinished(), [this] { dragActionUpdate(QCursor::pos()); });
+	subscribe(Auth().messageIdChanging,
+	          [this](std::pair<HistoryItem *, MsgId> update) { changingMsgId(update.first, update.second); });
 
 	if (_type == OverviewLinks || _type == OverviewFiles) {
 		_search->show();
@@ -108,17 +104,14 @@ OverviewInner::OverviewInner(OverviewWidget *overview, Ui::ScrollArea *scroll, P
 }
 
 void OverviewInner::invalidateCache() {
-	for_const (auto item, _layoutItems) {
-		item->invalidateCache();
-	}
-	for_const (auto item, _layoutDates) {
-		item->invalidateCache();
-	}
+	for_const (auto item, _layoutItems) { item->invalidateCache(); }
+	for_const (auto item, _layoutDates) { item->invalidateCache(); }
 }
 
 bool OverviewInner::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return true;
@@ -143,8 +136,9 @@ void OverviewInner::touchUpdateSpeed() {
 			if (_touchScrollState == Ui::TouchScrollState::Auto) {
 				const int oldSpeedY = _touchSpeed.y();
 				const int oldSpeedX = _touchSpeed.x();
-				if ((oldSpeedY <= 0 && newSpeedY <= 0) || ((oldSpeedY >= 0 && newSpeedY >= 0)
-					&& (oldSpeedX <= 0 && newSpeedX <= 0)) || (oldSpeedX >= 0 && newSpeedX >= 0)) {
+				if ((oldSpeedY <= 0 && newSpeedY <= 0) ||
+				    ((oldSpeedY >= 0 && newSpeedY >= 0) && (oldSpeedX <= 0 && newSpeedX <= 0)) ||
+				    (oldSpeedX >= 0 && newSpeedX >= 0)) {
 					_touchSpeed.setY(snap((oldSpeedY + (newSpeedY / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 					_touchSpeed.setX(snap((oldSpeedX + (newSpeedX / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 				} else {
@@ -153,8 +147,10 @@ void OverviewInner::touchUpdateSpeed() {
 			} else {
 				// we average the speed to avoid strange effects with the last delta
 				if (!_touchSpeed.isNull()) {
-					_touchSpeed.setX(snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
-					_touchSpeed.setY(snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setX(
+					    snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setY(
+					    snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
 				} else {
 					_touchSpeed = QPoint(newSpeedX, newSpeedY);
 				}
@@ -235,7 +231,9 @@ void OverviewInner::searchReceived(SearchRequestType type, const MTPmessages_Mes
 			if (_peer && _peer->isChannel()) {
 				_peer->asChannel()->ptsReceived(d.vpts.v);
 			} else {
-				LOG(("API Error: received messages.channelMessages when no channel was passed! (OverviewInner::searchReceived)"));
+				LOG(
+				    ("API Error: received messages.channelMessages when no channel was passed! "
+				     "(OverviewInner::searchReceived)"));
 			}
 			App::feedUsers(d.vusers);
 			App::feedChats(d.vchats);
@@ -528,7 +526,8 @@ void OverviewInner::dragActionFinish(const QPoint &screenPos, Qt::MouseButton bu
 		App::activateClickHandler(activated, button);
 		return;
 	}
-	if (_dragAction == PrepareSelect && !_dragWasInactive && !_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
+	if (_dragAction == PrepareSelect && !_dragWasInactive && !_selected.isEmpty() &&
+	    _selected.cbegin().value() == FullSelection) {
 		SelectedItems::iterator i = _selected.find(_dragItem);
 		if (i == _selected.cend() && itemMsgId(_dragItem) > 0) {
 			if (_selected.size() < MaxSelectedItems) {
@@ -546,7 +545,8 @@ void OverviewInner::dragActionFinish(const QPoint &screenPos, Qt::MouseButton bu
 		if (i != _selected.cend() && i.value() == FullSelection) {
 			_selected.erase(i);
 			repaintItem(_dragItem, _dragItemIndex);
-		} else if (i == _selected.cend() && itemMsgId(_dragItem) > 0 && !_selected.isEmpty() && _selected.cbegin().value() == FullSelection) {
+		} else if (i == _selected.cend() && itemMsgId(_dragItem) > 0 && !_selected.isEmpty() &&
+		           _selected.cbegin().value() == FullSelection) {
 			if (_selected.size() < MaxSelectedItems) {
 				_selected.insert(_dragItem, FullSelection);
 				repaintItem(_dragItem, _dragItemIndex);
@@ -595,7 +595,7 @@ void OverviewInner::performDrag() {
 		}
 	} else if (pressedHandler) {
 		sel = pressedHandler->dragText();
-		//if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
+		// if (!sel.isEmpty() && sel.at(0) != '/' && sel.at(0) != '@' && sel.at(0) != '#') {
 		//	urls.push_back(QUrl::fromEncoded(sel.toUtf8())); // Google Chrome crashes in Mac OS X O_o
 		//}
 	}
@@ -729,7 +729,9 @@ void OverviewInner::clear() {
 qint32 OverviewInner::itemTop(const FullMsgId &msgId) const {
 	if (_type == OverviewMusicFiles) {
 		qint32 itemIndex = -1;
-		fixItemIndex(itemIndex, (msgId.channel == _channel) ? msgId.msg : ((_migrated && msgId.channel == _migrated->channelId()) ? -msgId.msg : 0));
+		fixItemIndex(itemIndex, (msgId.channel == _channel) ?
+		                            msgId.msg :
+		                            ((_migrated && msgId.channel == _migrated->channelId()) ? -msgId.msg : 0));
 		if (itemIndex >= 0) {
 			qint32 top = _items.at(itemIndex)->Get<Overview::Layout::Info>()->top;
 			if (_reversed) top = _height - top;
@@ -744,12 +746,25 @@ void OverviewInner::preloadMore() {
 		if (!_searchRequest) {
 			auto filter = (_type == OverviewLinks) ? MTP_inputMessagesFilterUrl() : MTP_inputMessagesFilterDocument();
 			if (!_searchFull) {
-				_searchRequest = MTP::send(MTPmessages_Search(MTP_flags(0), _history->peer->input, MTP_string(_searchQuery), MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(_lastSearchId), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&OverviewInner::searchReceived, _lastSearchId ? SearchFromOffset : SearchFromStart), rpcFail(&OverviewInner::searchFailed, _lastSearchId ? SearchFromOffset : SearchFromStart));
+				_searchRequest = MTP::send(
+				    MTPmessages_Search(MTP_flags(0), _history->peer->input, MTP_string(_searchQuery),
+				                       MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(_lastSearchId),
+				                       MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)),
+				    rpcDone(&OverviewInner::searchReceived, _lastSearchId ? SearchFromOffset : SearchFromStart),
+				    rpcFail(&OverviewInner::searchFailed, _lastSearchId ? SearchFromOffset : SearchFromStart));
 				if (!_lastSearchId) {
 					_searchQueries.insert(_searchRequest, _searchQuery);
 				}
 			} else if (_migrated && !_searchFullMigrated) {
-				_searchRequest = MTP::send(MTPmessages_Search(MTP_flags(0), _migrated->peer->input, MTP_string(_searchQuery), MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(_lastSearchMigratedId), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&OverviewInner::searchReceived, _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart), rpcFail(&OverviewInner::searchFailed, _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart));
+				_searchRequest =
+				    MTP::send(MTPmessages_Search(MTP_flags(0), _migrated->peer->input, MTP_string(_searchQuery),
+				                                 MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0),
+				                                 MTP_int(_lastSearchMigratedId), MTP_int(0), MTP_int(SearchPerPage),
+				                                 MTP_int(0), MTP_int(0)),
+				              rpcDone(&OverviewInner::searchReceived,
+				                      _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart),
+				              rpcFail(&OverviewInner::searchFailed,
+				                      _lastSearchMigratedId ? SearchMigratedFromOffset : SearchMigratedFromStart));
 			}
 		}
 	} else if (App::main()) {
@@ -776,7 +791,7 @@ TextSelection OverviewInner::itemSelectedValue(qint32 index) const {
 	}
 	if (_items.at(index)->toMediaItem()) { // draw item
 		if (index >= _dragSelToIndex && index <= _dragSelFromIndex && _dragSelToIndex >= 0) {
-			return (_dragSelecting && _items.at(index)->msgId() > 0) ? FullSelection : TextSelection{ 0, 0 };
+			return (_dragSelecting && _items.at(index)->msgId() > 0) ? FullSelection : TextSelection{0, 0};
 		} else if (!_selected.isEmpty()) {
 			SelectedItems::const_iterator j = _selected.constFind(complexMsgId(_items.at(index)->getItem()));
 			if (j != _selected.cend()) {
@@ -784,7 +799,7 @@ TextSelection OverviewInner::itemSelectedValue(qint32 index) const {
 			}
 		}
 	}
-	return { 0, 0 };
+	return {0, 0};
 }
 
 void OverviewInner::paintEvent(QPaintEvent *e) {
@@ -800,10 +815,12 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 	auto ms = getms();
 	Overview::Layout::PaintContext context(ms, _selMode);
 
-	if (_history->overview(_type).isEmpty() && (!_migrated || !_history->overviewLoaded(_type) || _migrated->overview(_type).isEmpty())) {
+	if (_history->overview(_type).isEmpty() &&
+	    (!_migrated || !_history->overviewLoaded(_type) || _migrated->overview(_type).isEmpty())) {
 		HistoryLayout::paintEmpty(p, _width, height());
 		return;
-	} else if (_inSearch && _searchResults.isEmpty() && _searchFull && (!_migrated || _searchFullMigrated) && !_searchTimer.isActive()) {
+	} else if (_inSearch && _searchResults.isEmpty() && _searchFull && (!_migrated || _searchFullMigrated) &&
+	           !_searchTimer.isActive()) {
 		p.setFont(st::noContactsFont->f);
 		p.setPen(st::noContactsColor->p);
 		p.drawText(QRect(_rowsLeft, _marginTop, _rowWidth, _marginTop), lang(lng_search_no_results), style::al_center);
@@ -821,8 +838,10 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 
 	if (_type == OverviewPhotos || _type == OverviewVideos) {
 		qint32 count = _items.size(), rowsCount = count / _photosInRow + ((count % _photosInRow) ? 1 : 0);
-		qint32 rowFrom = floorclamp(r.y() - _marginTop - st::overviewPhotoSkip, _rowWidth + st::overviewPhotoSkip, 0, rowsCount);
-		qint32 rowTo = ceilclamp(r.y() + r.height() - _marginTop - st::overviewPhotoSkip, _rowWidth + st::overviewPhotoSkip, 0, rowsCount);
+		qint32 rowFrom =
+		    floorclamp(r.y() - _marginTop - st::overviewPhotoSkip, _rowWidth + st::overviewPhotoSkip, 0, rowsCount);
+		qint32 rowTo = ceilclamp(r.y() + r.height() - _marginTop - st::overviewPhotoSkip,
+		                         _rowWidth + st::overviewPhotoSkip, 0, rowsCount);
 		double w = double(_width - st::overviewPhotoSkip) / _photosInRow;
 		for (qint32 row = rowFrom; row < rowTo; ++row) {
 			if (row * _photosInRow >= count) break;
@@ -831,7 +850,8 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 				if (i < 0) continue;
 				if (i >= count) break;
 
-				QPoint pos(qint32(col * w + st::overviewPhotoSkip), _marginTop + row * (_rowWidth + st::overviewPhotoSkip) + st::overviewPhotoSkip);
+				QPoint pos(qint32(col * w + st::overviewPhotoSkip),
+				           _marginTop + row * (_rowWidth + st::overviewPhotoSkip) + st::overviewPhotoSkip);
 				p.translate(pos.x(), pos.y());
 				_items.at(i)->paint(p, r.translated(-pos.x(), -pos.y()), itemSelectedValue(i), &context);
 				p.translate(-pos.x(), -pos.y());
@@ -842,7 +862,8 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 		qint32 y = 0, w = _rowWidth;
 		for (qint32 j = 0, l = _items.size(); j < l; ++j) {
 			qint32 i = _reversed ? (l - j - 1) : j, nexti = _reversed ? (i - 1) : (i + 1);
-			qint32 nextItemTop = (j + 1 == l) ? (_reversed ? 0 : _height) : _items.at(nexti)->Get<Overview::Layout::Info>()->top;
+			qint32 nextItemTop =
+			    (j + 1 == l) ? (_reversed ? 0 : _height) : _items.at(nexti)->Get<Overview::Layout::Info>()->top;
 			if (_reversed) nextItemTop = _height - nextItemTop;
 			if (_marginTop + nextItemTop > r.top()) {
 				auto info = _items.at(i)->Get<Overview::Layout::Info>();
@@ -900,7 +921,9 @@ void OverviewInner::onUpdateSelected() {
 				item = media->getItem();
 				index = i;
 				if (upon) {
-					media->getState(lnk, cursorState, m - QPoint(col * w + st::overviewPhotoSkip, _marginTop + row * vsize + st::overviewPhotoSkip));
+					media->getState(
+					    lnk, cursorState,
+					    m - QPoint(col * w + st::overviewPhotoSkip, _marginTop + row * vsize + st::overviewPhotoSkip));
 					lnkhost = media;
 				}
 			}
@@ -909,7 +932,8 @@ void OverviewInner::onUpdateSelected() {
 		for (qint32 j = 0, l = _items.size(); j < l; ++j) {
 			bool lastItem = (j + 1 == l);
 			qint32 i = _reversed ? (l - j - 1) : j, nexti = _reversed ? (i - 1) : (i + 1);
-			qint32 nextItemTop = lastItem ? (_reversed ? 0 : _height) : _items.at(nexti)->Get<Overview::Layout::Info>()->top;
+			qint32 nextItemTop =
+			    lastItem ? (_reversed ? 0 : _height) : _items.at(nexti)->Get<Overview::Layout::Info>()->top;
 			if (_reversed) nextItemTop = _height - nextItemTop;
 			if (_marginTop + nextItemTop > m.y() || lastItem) {
 				qint32 top = _items.at(i)->Get<Overview::Layout::Info>()->top;
@@ -992,33 +1016,47 @@ void OverviewInner::onUpdateSelected() {
 		}
 		if (_dragAction == Selecting) {
 			bool canSelectMany = (_peer != 0);
-			if (_mousedItem == _dragItem && lnk && !_selected.isEmpty() && _selected.cbegin().value() != FullSelection) {
+			if (_mousedItem == _dragItem && lnk && !_selected.isEmpty() &&
+			    _selected.cbegin().value() != FullSelection) {
 				bool afterSymbol = false, uponSymbol = false;
 				quint16 second = 0;
-				_selected[_dragItem] = { 0, 0 };
+				_selected[_dragItem] = {0, 0};
 				updateDragSelection(0, -1, 0, -1, false);
 			} else if (canSelectMany) {
-				bool selectingDown = (_reversed ? (_mousedItemIndex < _dragItemIndex) : (_mousedItemIndex > _dragItemIndex)) || (_mousedItemIndex == _dragItemIndex && ((_type == OverviewPhotos || _type == OverviewVideos) ? (_dragStartPos.x() < m.x()) : (_dragStartPos.y() < m.y())));
+				bool selectingDown =
+				    (_reversed ? (_mousedItemIndex < _dragItemIndex) : (_mousedItemIndex > _dragItemIndex)) ||
+				    (_mousedItemIndex == _dragItemIndex &&
+				     ((_type == OverviewPhotos || _type == OverviewVideos) ? (_dragStartPos.x() < m.x()) :
+				                                                             (_dragStartPos.y() < m.y())));
 				MsgId dragSelFrom = _dragItem, dragSelTo = _mousedItem;
 				qint32 dragSelFromIndex = _dragItemIndex, dragSelToIndex = _mousedItemIndex;
-				if (!itemHasPoint(dragSelFrom, dragSelFromIndex, _dragStartPos.x(), _dragStartPos.y())) { // maybe exclude dragSelFrom
+				if (!itemHasPoint(dragSelFrom, dragSelFromIndex, _dragStartPos.x(),
+				                  _dragStartPos.y())) { // maybe exclude dragSelFrom
 					if (selectingDown) {
 						if (_type == OverviewPhotos || _type == OverviewVideos) {
-							if (_dragStartPos.x() >= _rowWidth || ((_mousedItem == dragSelFrom) && (m.x() < _dragStartPos.x() + QApplication::startDragDistance()))) {
+							if (_dragStartPos.x() >= _rowWidth ||
+							    ((_mousedItem == dragSelFrom) &&
+							     (m.x() < _dragStartPos.x() + QApplication::startDragDistance()))) {
 								moveToNextItem(dragSelFrom, dragSelFromIndex, dragSelTo, 1);
 							}
 						} else {
-							if (_dragStartPos.y() >= itemHeight(dragSelFrom, dragSelFromIndex) || ((_mousedItem == dragSelFrom) && (m.y() < _dragStartPos.y() + QApplication::startDragDistance()))) {
+							if (_dragStartPos.y() >= itemHeight(dragSelFrom, dragSelFromIndex) ||
+							    ((_mousedItem == dragSelFrom) &&
+							     (m.y() < _dragStartPos.y() + QApplication::startDragDistance()))) {
 								moveToNextItem(dragSelFrom, dragSelFromIndex, dragSelTo, _reversed ? -1 : 1);
 							}
 						}
 					} else {
 						if (_type == OverviewPhotos || _type == OverviewVideos) {
-							if (_dragStartPos.x() < 0 || ((_mousedItem == dragSelFrom) && (m.x() >= _dragStartPos.x() - QApplication::startDragDistance()))) {
+							if (_dragStartPos.x() < 0 ||
+							    ((_mousedItem == dragSelFrom) &&
+							     (m.x() >= _dragStartPos.x() - QApplication::startDragDistance()))) {
 								moveToNextItem(dragSelFrom, dragSelFromIndex, dragSelTo, -1);
 							}
 						} else {
-							if (_dragStartPos.y() < 0 || ((_mousedItem == dragSelFrom) && (m.y() >= _dragStartPos.y() - QApplication::startDragDistance()))) {
+							if (_dragStartPos.y() < 0 ||
+							    ((_mousedItem == dragSelFrom) &&
+							     (m.y() >= _dragStartPos.y() - QApplication::startDragDistance()))) {
 								moveToNextItem(dragSelFrom, dragSelFromIndex, dragSelTo, _reversed ? 1 : -1);
 							}
 						}
@@ -1051,7 +1089,8 @@ void OverviewInner::onUpdateSelected() {
 				MsgId dragFirstAffected = dragSelFrom;
 				qint32 dragFirstAffectedIndex = dragSelFromIndex;
 				while (dragFirstAffectedIndex >= 0 && itemMsgId(dragFirstAffected) <= 0) {
-					moveToNextItem(dragFirstAffected, dragFirstAffectedIndex, dragSelTo, selectingDown ? (_reversed ? -1 : 1) : (_reversed ? 1 : -1));
+					moveToNextItem(dragFirstAffected, dragFirstAffectedIndex, dragSelTo,
+					               selectingDown ? (_reversed ? -1 : 1) : (_reversed ? 1 : -1));
 				}
 				if (dragFirstAffectedIndex >= 0) {
 					SelectedItems::const_iterator i = _selected.constFind(dragFirstAffected);
@@ -1097,8 +1136,10 @@ QString OverviewInner::tooltipText() const {
 	return QString();
 }
 
-void OverviewInner::updateDragSelection(MsgId dragSelFrom, qint32 dragSelFromIndex, MsgId dragSelTo, qint32 dragSelToIndex, bool dragSelecting) {
-	if (_dragSelFrom != dragSelFrom || _dragSelFromIndex != dragSelFromIndex || _dragSelTo != dragSelTo || _dragSelToIndex != dragSelToIndex || _dragSelecting != dragSelecting) {
+void OverviewInner::updateDragSelection(MsgId dragSelFrom, qint32 dragSelFromIndex, MsgId dragSelTo,
+                                        qint32 dragSelToIndex, bool dragSelecting) {
+	if (_dragSelFrom != dragSelFrom || _dragSelFromIndex != dragSelFromIndex || _dragSelTo != dragSelTo ||
+	    _dragSelToIndex != dragSelToIndex || _dragSelecting != dragSelecting) {
 		_dragSelFrom = dragSelFrom;
 		_dragSelFromIndex = dragSelFromIndex;
 		_dragSelTo = dragSelTo;
@@ -1185,7 +1226,10 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		isUponSelected = -1;
 		if (_selected.cbegin().value() == FullSelection) {
 			hasSelected = 2;
-			if (!ignoreMousedItem && App::mousedItem() && _selected.constFind(App::mousedItem()->history() == _migrated ? -App::mousedItem()->id : App::mousedItem()->id) != _selected.cend()) {
+			if (!ignoreMousedItem && App::mousedItem() &&
+			    _selected.constFind(App::mousedItem()->history() == _migrated ?
+			                            -App::mousedItem()->id :
+			                            App::mousedItem()->id) != _selected.cend()) {
 				isUponSelected = 2;
 			} else {
 				isUponSelected = -2;
@@ -1197,8 +1241,8 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	}
 
 	_contextMenuLnk = ClickHandler::getActive();
-	PhotoClickHandler *lnkPhoto = dynamic_cast<PhotoClickHandler*>(_contextMenuLnk.data());
-	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLnk.data());
+	PhotoClickHandler *lnkPhoto = dynamic_cast<PhotoClickHandler *>(_contextMenuLnk.data());
+	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLnk.data());
 	bool lnkIsVideo = lnkDocument ? lnkDocument->document()->isVideo() : false;
 	bool lnkIsAudio = lnkDocument ? (lnkDocument->document()->voice() != nullptr) : false;
 	bool lnkIsSong = lnkDocument ? (lnkDocument->document()->song() != nullptr) : false;
@@ -1211,14 +1255,25 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		} else {
 			if (auto document = lnkDocument->document()) {
 				if (document->loading()) {
-					_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))->setEnabled(true);
+					_menu->addAction(lang(lng_context_cancel_download), this, SLOT(cancelContextDownload()))
+					    ->setEnabled(true);
 				} else {
 					if (!document->filepath(DocumentData::FilePathResolveChecked).isEmpty()) {
-						_menu->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_context_show_in_finder : lng_context_show_in_folder), this, SLOT(showContextInFolder()))->setEnabled(true);
+						_menu
+						    ->addAction(lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ?
+						                         lng_context_show_in_finder :
+						                         lng_context_show_in_folder),
+						                this, SLOT(showContextInFolder()))
+						    ->setEnabled(true);
 					}
-					_menu->addAction(lang(lnkIsVideo ? lng_context_save_video : (lnkIsAudio ? lng_context_save_audio : (lnkIsSong ? lng_context_save_audio_file : lng_context_save_file))), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
-						saveDocumentToFile(document);
-					}))->setEnabled(true);
+					_menu
+					    ->addAction(lang(lnkIsVideo ? lng_context_save_video :
+					                                  (lnkIsAudio ? lng_context_save_audio :
+					                                                (lnkIsSong ? lng_context_save_audio_file :
+					                                                             lng_context_save_file))),
+					                App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this,
+					                                   [this, document] { saveDocumentToFile(document); }))
+					    ->setEnabled(true);
 				}
 			}
 		}
@@ -1227,9 +1282,8 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				_menu->addAction(lang(lng_context_forward_selected), _overview, SLOT(onForwardSelected()));
 			}
 			if (selectedState.count > 0 && selectedState.count == selectedState.canDeleteCount) {
-				_menu->addAction(lang(lng_context_delete_selected), base::lambda_guarded(this, [this] {
-					_overview->confirmDeleteSelectedItems();
-				}));
+				_menu->addAction(lang(lng_context_delete_selected),
+				                 base::lambda_guarded(this, [this] { _overview->confirmDeleteSelectedItems(); }));
 			}
 			_menu->addAction(lang(lng_context_clear_selection), _overview, SLOT(onClearSelected()));
 		} else if (App::hoveredLinkItem()) {
@@ -1238,9 +1292,8 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					_menu->addAction(lang(lng_context_forward_msg), this, SLOT(forwardMessage()))->setEnabled(true);
 				}
 				if (App::hoveredLinkItem()->canDelete()) {
-					_menu->addAction(lang(lng_context_delete_msg), base::lambda_guarded(this, [this] {
-						_overview->confirmDeleteContextItem();
-					}));
+					_menu->addAction(lang(lng_context_delete_msg),
+					                 base::lambda_guarded(this, [this] { _overview->confirmDeleteContextItem(); }));
 				}
 			}
 			if (App::hoveredLinkItem()->id > 0) {
@@ -1250,9 +1303,11 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		App::contextItem(App::hoveredLinkItem());
 		repaintItem(App::contextItem());
 		if (_selectedMsgId) repaintItem(_selectedMsgId, -1);
-	} else if (!ignoreMousedItem && App::mousedItem() && App::mousedItem()->channelId() == itemChannel(_mousedItem) && App::mousedItem()->id == itemMsgId(_mousedItem)) {
+	} else if (!ignoreMousedItem && App::mousedItem() && App::mousedItem()->channelId() == itemChannel(_mousedItem) &&
+	           App::mousedItem()->id == itemMsgId(_mousedItem)) {
 		_menu = new Ui::PopupMenu(nullptr);
-		QString linkCopyToClipboardText = _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItemText() : QString();
+		QString linkCopyToClipboardText =
+		    _contextMenuLnk ? _contextMenuLnk->copyToClipboardContextItemText() : QString();
 		if (!linkCopyToClipboardText.isEmpty()) {
 			_menu->addAction(linkCopyToClipboardText, this, SLOT(copyContextUrl()))->setEnabled(true);
 		}
@@ -1262,9 +1317,8 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				_menu->addAction(lang(lng_context_forward_selected), _overview, SLOT(onForwardSelected()));
 			}
 			if (selectedState.count > 0 && selectedState.count == selectedState.canDeleteCount) {
-				_menu->addAction(lang(lng_context_delete_selected), base::lambda_guarded(this, [this] {
-					_overview->confirmDeleteSelectedItems();
-				}));
+				_menu->addAction(lang(lng_context_delete_selected),
+				                 base::lambda_guarded(this, [this] { _overview->confirmDeleteSelectedItems(); }));
 			}
 			_menu->addAction(lang(lng_context_clear_selection), _overview, SLOT(onClearSelected()));
 		} else {
@@ -1273,9 +1327,8 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					_menu->addAction(lang(lng_context_forward_msg), this, SLOT(forwardMessage()))->setEnabled(true);
 				}
 				if (App::mousedItem()->canDelete()) {
-					_menu->addAction(lang(lng_context_delete_msg), base::lambda_guarded(this, [this] {
-						_overview->confirmDeleteContextItem();
-					}));
+					_menu->addAction(lang(lng_context_delete_msg),
+					                 base::lambda_guarded(this, [this] { _overview->confirmDeleteContextItem(); }));
 				}
 			}
 			if (App::mousedItem()->id > 0) {
@@ -1287,7 +1340,7 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		if (_selectedMsgId) repaintItem(_selectedMsgId, -1);
 	}
 	if (_menu) {
-		connect(_menu, SIGNAL(destroyed(QObject*)), this, SLOT(onMenuDestroy(QObject*)));
+		connect(_menu, SIGNAL(destroyed(QObject *)), this, SLOT(onMenuDestroy(QObject *)));
 		_menu->popup(e->globalPos());
 		e->accept();
 	}
@@ -1297,14 +1350,17 @@ qint32 OverviewInner::resizeToWidth(qint32 nwidth, qint32 scrollTop, qint32 minH
 	if (!force && _width == nwidth && minHeight == _minHeight) return scrollTop;
 
 	if ((_type == OverviewPhotos || _type == OverviewVideos) && _resizeIndex < 0) {
-		_resizeIndex = _photosInRow * ((scrollTop + minHeight) / qint32(_rowWidth + st::overviewPhotoSkip)) + _photosInRow - 1;
-		_resizeSkip = (scrollTop + minHeight) - ((scrollTop + minHeight) / qint32(_rowWidth + st::overviewPhotoSkip)) * qint32(_rowWidth + st::overviewPhotoSkip);
+		_resizeIndex =
+		    _photosInRow * ((scrollTop + minHeight) / qint32(_rowWidth + st::overviewPhotoSkip)) + _photosInRow - 1;
+		_resizeSkip = (scrollTop + minHeight) - ((scrollTop + minHeight) / qint32(_rowWidth + st::overviewPhotoSkip)) *
+		                                            qint32(_rowWidth + st::overviewPhotoSkip);
 	}
 
 	_width = nwidth;
 	_minHeight = minHeight;
 	if (_type == OverviewPhotos || _type == OverviewVideos) {
-		_photosInRow = qint32(_width - st::overviewPhotoSkip) / qint32(st::overviewPhotoMinSize + st::overviewPhotoSkip);
+		_photosInRow =
+		    qint32(_width - st::overviewPhotoSkip) / qint32(st::overviewPhotoMinSize + st::overviewPhotoSkip);
 		_rowWidth = (qint32(_width - st::overviewPhotoSkip) / _photosInRow) - st::overviewPhotoSkip;
 		_rowsLeft = st::overviewPhotoSkip;
 	} else {
@@ -1316,7 +1372,8 @@ qint32 OverviewInner::resizeToWidth(qint32 nwidth, qint32 scrollTop, qint32 minH
 		}
 		auto widthWithMin = st::windowMinWidth;
 		auto widthWithMax = st::overviewFileLayout.maxWidth + 2 * contentLeftMax;
-		_rowsLeft = anim::interpolate(contentLeftMax, contentLeftMin, std::max(widthWithMax - _width, 0) / double(widthWithMax - widthWithMin));
+		_rowsLeft = anim::interpolate(contentLeftMax, contentLeftMin,
+		                              std::max(widthWithMax - _width, 0) / double(widthWithMax - widthWithMin));
 		_rowWidth = std::min(_width - 2 * _rowsLeft, st::overviewFileLayout.maxWidth);
 	}
 
@@ -1329,10 +1386,10 @@ qint32 OverviewInner::resizeToWidth(qint32 nwidth, qint32 scrollTop, qint32 minH
 	resize(_width, _marginTop + _height + _marginBottom);
 
 	if (_type == OverviewPhotos || _type == OverviewVideos) {
-        qint32 newRow = _resizeIndex / _photosInRow;
-        return newRow * qint32(_rowWidth + st::overviewPhotoSkip) + _resizeSkip - minHeight;
-    }
-    return scrollTop;
+		qint32 newRow = _resizeIndex / _photosInRow;
+		return newRow * qint32(_rowWidth + st::overviewPhotoSkip) + _resizeSkip - minHeight;
+	}
+	return scrollTop;
 }
 
 void OverviewInner::resizeItems() {
@@ -1446,14 +1503,14 @@ void OverviewInner::selectMessage() {
 }
 
 void OverviewInner::cancelContextDownload() {
-	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLnk.data());
+	DocumentClickHandler *lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLnk.data());
 	if (lnkDocument) {
 		lnkDocument->document()->cancel();
 	}
 }
 
 void OverviewInner::showContextInFolder() {
-	if (auto lnkDocument = dynamic_cast<DocumentClickHandler*>(_contextMenuLnk.data())) {
+	if (auto lnkDocument = dynamic_cast<DocumentClickHandler *>(_contextMenuLnk.data())) {
 		auto filepath = lnkDocument->document()->filepath(DocumentData::FilePathResolveChecked);
 		if (!filepath.isEmpty()) {
 			File::ShowInFolder(filepath);
@@ -1485,7 +1542,11 @@ bool OverviewInner::onSearchMessages(bool searchCache) {
 		_searchQuery = q;
 		_searchFull = _searchFullMigrated = false;
 		auto filter = (_type == OverviewLinks) ? MTP_inputMessagesFilterUrl() : MTP_inputMessagesFilterDocument();
-		_searchRequest = MTP::send(MTPmessages_Search(MTP_flags(0), _history->peer->input, MTP_string(_searchQuery), MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)), rpcDone(&OverviewInner::searchReceived, SearchFromStart), rpcFail(&OverviewInner::searchFailed, SearchFromStart));
+		_searchRequest = MTP::send(MTPmessages_Search(MTP_flags(0), _history->peer->input, MTP_string(_searchQuery),
+		                                              MTP_inputUserEmpty(), filter, MTP_int(0), MTP_int(0), MTP_int(0),
+		                                              MTP_int(0), MTP_int(SearchPerPage), MTP_int(0), MTP_int(0)),
+		                           rpcDone(&OverviewInner::searchReceived, SearchFromStart),
+		                           rpcFail(&OverviewInner::searchFailed, SearchFromStart));
 		_searchQueries.insert(_searchRequest, _searchQuery);
 	}
 	return false;
@@ -1553,7 +1614,7 @@ void OverviewInner::onMenuDestroy(QObject *obj) {
 }
 
 Window::TopBarWidget::SelectedState OverviewInner::getSelectionState() const {
-	auto result = Window::TopBarWidget::SelectedState {};
+	auto result = Window::TopBarWidget::SelectedState{};
 	for (auto i = _selected.cbegin(), e = _selected.cend(); i != e; ++i) {
 		if (i.value() == FullSelection) {
 			if (auto item = App::histItemById(itemChannel(i.key()), itemMsgId(i.key()))) {
@@ -1604,10 +1665,12 @@ void OverviewInner::onTouchSelect() {
 
 void OverviewInner::onTouchScrollTimer() {
 	auto nowTime = getms();
-	if (_touchScrollState == Ui::TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
+	if (_touchScrollState == Ui::TouchScrollState::Acceleration && _touchWaitingAcceleration &&
+	    (nowTime - _touchAccelerationTime) > 40) {
 		_touchScrollState = Ui::TouchScrollState::Manual;
 		touchResetSpeed();
-	} else if (_touchScrollState == Ui::TouchScrollState::Auto || _touchScrollState == Ui::TouchScrollState::Acceleration) {
+	} else if (_touchScrollState == Ui::TouchScrollState::Auto ||
+	           _touchScrollState == Ui::TouchScrollState::Acceleration) {
 		qint32 elapsed = qint32(nowTime - _touchTime);
 		QPoint delta = _touchSpeed * elapsed / 1000;
 		bool hasScrolled = _overview->touchScroll(delta);
@@ -1704,7 +1767,8 @@ void OverviewInner::mediaOverviewUpdated() {
 					++count;
 					continue;
 				}
-				if (_items.size() > count + 1 && !_items.at(count)->toMediaItem() && complexMsgId(_items.at(count + 1)->getItem()) == msgid) { // day item
+				if (_items.size() > count + 1 && !_items.at(count)->toMediaItem() &&
+				    complexMsgId(_items.at(count + 1)->getItem()) == msgid) { // day item
 					++count;
 					if (withDates) prevDate = _items.at(count)->getItem()->date.date();
 					top = _items.at(count)->Get<Overview::Layout::Info>()->top;
@@ -1722,7 +1786,9 @@ void OverviewInner::mediaOverviewUpdated() {
 
 			if (withDates) {
 				QDate date = item->date.date();
-				if (!count || (count > 0 && (dateEveryMonth ? (date.month() != prevDate.month() || date.year() != prevDate.year()) : (date != prevDate)))) {
+				if (!count || (count > 0 &&
+				               (dateEveryMonth ? (date.month() != prevDate.month() || date.year() != prevDate.year()) :
+				                                 (date != prevDate)))) {
 					top += setLayoutItem(count, layoutPrepare(date, dateEveryMonth), top);
 					++count;
 					prevDate = date;
@@ -1888,7 +1954,8 @@ Overview::Layout::ItemBase *OverviewInner::layoutPrepare(HistoryItem *item) {
 	if (_type == OverviewPhotos) {
 		if (media && media->type() == MediaTypePhoto) {
 			if ((i = _layoutItems.constFind(item)) == _layoutItems.cend()) {
-				i = _layoutItems.insert(item, new Overview::Layout::Photo(static_cast<HistoryPhoto*>(media)->photo(), item));
+				i = _layoutItems.insert(item,
+				                        new Overview::Layout::Photo(static_cast<HistoryPhoto *>(media)->photo(), item));
 				i.value()->initDimensions();
 			}
 		}
@@ -1902,14 +1969,17 @@ Overview::Layout::ItemBase *OverviewInner::layoutPrepare(HistoryItem *item) {
 	} else if (_type == OverviewVoiceFiles) {
 		if (media && (media->type() == MediaTypeVoiceFile)) {
 			if ((i = _layoutItems.constFind(item)) == _layoutItems.cend()) {
-				i = _layoutItems.insert(item, new Overview::Layout::Voice(media->getDocument(), item, st::overviewFileLayout));
+				i = _layoutItems.insert(
+				    item, new Overview::Layout::Voice(media->getDocument(), item, st::overviewFileLayout));
 				i.value()->initDimensions();
 			}
 		}
 	} else if (_type == OverviewFiles || _type == OverviewMusicFiles) {
-		if (media && (media->type() == MediaTypeFile || media->type() == MediaTypeMusicFile || media->type() == MediaTypeGif)) {
+		if (media &&
+		    (media->type() == MediaTypeFile || media->type() == MediaTypeMusicFile || media->type() == MediaTypeGif)) {
 			if ((i = _layoutItems.constFind(item)) == _layoutItems.cend()) {
-				i = _layoutItems.insert(item, new Overview::Layout::Document(media->getDocument(), item, st::overviewFileLayout));
+				i = _layoutItems.insert(
+				    item, new Overview::Layout::Document(media->getDocument(), item, st::overviewFileLayout));
 				i.value()->initDimensions();
 			}
 		}
@@ -1950,11 +2020,13 @@ OverviewInner::~OverviewInner() {
 	clear();
 }
 
-OverviewWidget::OverviewWidget(QWidget *parent, not_null<Window::Controller*> controller, PeerData *peer, MediaOverviewType type) : Window::AbstractSectionWidget(parent, controller)
-, _topBar(this, controller)
-, _scroll(this, st::settingsScroll, false)
-, _mediaType(this, st::defaultDropdownMenu)
-, _topShadow(this, st::shadowFg) {
+OverviewWidget::OverviewWidget(QWidget *parent, not_null<Window::Controller *> controller, PeerData *peer,
+                               MediaOverviewType type)
+    : Window::AbstractSectionWidget(parent, controller)
+    , _topBar(this, controller)
+    , _scroll(this, st::settingsScroll, false)
+    , _mediaType(this, st::defaultDropdownMenu)
+    , _topShadow(this, st::shadowFg) {
 	_inner = _scroll->setOwnedWidget(object_ptr<OverviewInner>(this, _scroll, peer, type));
 	_scroll->move(0, 0);
 	_inner->move(0, 0);
@@ -1984,7 +2056,9 @@ void OverviewWidget::onScroll() {
 	qint32 preloadThreshold = _scroll->height() * 5;
 	bool needToPreload = false;
 	do {
-		needToPreload = (type() == OverviewMusicFiles || type() == OverviewVoiceFiles) ? (_scroll->scrollTop() < preloadThreshold) : (_scroll->scrollTop() + preloadThreshold > _scroll->scrollTopMax());
+		needToPreload = (type() == OverviewMusicFiles || type() == OverviewVoiceFiles) ?
+		                    (_scroll->scrollTop() < preloadThreshold) :
+		                    (_scroll->scrollTop() + preloadThreshold > _scroll->scrollTopMax());
 		if (!needToPreload || !_inner->preloadLocal()) {
 			break;
 		}
@@ -2027,16 +2101,19 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
 	if (_a_show.animating()) {
 		auto retina = cIntRetinaFactor();
 		auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);
-		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
+		auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) :
+		                             anim::interpolate(0, -st::slideShift, progress);
 		auto coordOver = fromLeft ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
 		auto shadow = fromLeft ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, height() * retina));
+			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder,
+			             QRect(-coordUnder * retina, 0, coordOver * retina, height() * retina));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
 			p.setOpacity(1);
 		}
-		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, 0, _cacheOver.width(), height() * retina));
+		p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver,
+		             QRect(0, 0, _cacheOver.width(), height() * retina));
 		p.setOpacity(shadow);
 		st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), height()));
 		return;
@@ -2062,10 +2139,12 @@ void OverviewWidget::scrollReset() {
 }
 
 bool OverviewWidget::paintTopBar(Painter &p, int decreaseWidth) {
-	st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2, (st::topBarHeight - st::topBarBack.height()) / 2, width());
+	st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2,
+	                     (st::topBarHeight - st::topBarBack.height()) / 2, width());
 	p.setFont(st::defaultLightButton.font);
 	p.setPen(st::defaultLightButton.textFg);
-	p.drawTextLeft(st::topBarArrowPadding.left(), st::topBarButton.padding.top() + st::topBarButton.textTop, width(), _header);
+	p.drawTextLeft(st::topBarArrowPadding.left(), st::topBarButton.padding.top() + st::topBarButton.textTop, width(),
+	               _header);
 	return true;
 }
 
@@ -2101,7 +2180,7 @@ void OverviewWidget::switchType(MediaOverviewType type) {
 	_header = _header.toUpper();
 
 	noSelectingScroll();
-	_topBar->showSelected(Window::TopBarWidget::SelectedState {});
+	_topBar->showSelected(Window::TopBarWidget::SelectedState{});
 	updateTopBarSelection();
 	scrollReset();
 
@@ -2159,7 +2238,10 @@ qint32 OverviewWidget::countBestScroll() const {
 		if (state.id) {
 			qint32 top = _inner->itemTop(state.id.contextId());
 			if (top >= 0) {
-				return snap(top - int(_scroll->height() - (st::msgPadding.top() + st::mediaThumbSize + st::msgPadding.bottom())) / 2, 0, _scroll->scrollTopMax());
+				return snap(top - int(_scroll->height() -
+				                      (st::msgPadding.top() + st::mediaThumbSize + st::msgPadding.bottom())) /
+				                      2,
+				            0, _scroll->scrollTopMax());
 			}
 		}
 	} else if (type() == OverviewLinks || type() == OverviewFiles) {
@@ -2237,7 +2319,8 @@ void OverviewWidget::mediaOverviewUpdated(const Notify::PeerUpdate &update) {
 		updateTopBarSelection();
 	}
 	qint32 mask = 0;
-	History *h = update.peer ? App::historyLoaded(update.peer->migrateTo() ? update.peer->migrateTo() : update.peer) : nullptr;
+	History *h =
+	    update.peer ? App::historyLoaded(update.peer->migrateTo() ? update.peer->migrateTo() : update.peer) : nullptr;
 	History *m = (update.peer && update.peer->migrateFrom()) ? App::historyLoaded(update.peer->migrateFrom()->id) : 0;
 	if (h) {
 		for (qint32 i = 0; i < OverviewCount; ++i) {
@@ -2290,7 +2373,7 @@ void OverviewWidget::grabFinish() {
 	_topShadow->show();
 }
 
-void OverviewWidget::ui_repaintHistoryItem(not_null<const HistoryItem*> item) {
+void OverviewWidget::ui_repaintHistoryItem(not_null<const HistoryItem *> item) {
 	if (peer() == item->history()->peer || migratePeer() == item->history()->peer) {
 		_inner->repaintItem(item);
 	}
@@ -2334,7 +2417,8 @@ QPoint OverviewWidget::clampMousePosition(QPoint point) {
 }
 
 void OverviewWidget::onScrollTimer() {
-	qint32 d = (_scrollDelta > 0) ? std::min(_scrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) : std::max(_scrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
+	qint32 d = (_scrollDelta > 0) ? std::min(_scrollDelta * 3 / 20 + 1, qint32(MaxScrollSpeed)) :
+	                                std::max(_scrollDelta * 3 / 20 - 1, -qint32(MaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + d);
 }
 
@@ -2418,7 +2502,7 @@ void OverviewWidget::deleteSelectedItems(bool forEveryone) {
 	auto selected = _inner->getSelectedItems();
 	if (selected.isEmpty()) return;
 
-	QMap<PeerData*, QVector<MTPint>> idsByPeer;
+	QMap<PeerData *, QVector<MTPint>> idsByPeer;
 	for_const (auto item, selected) {
 		if (item->id > 0) {
 			idsByPeer[item->history()->peer].push_back(MTP_int(item->id));
@@ -2426,9 +2510,7 @@ void OverviewWidget::deleteSelectedItems(bool forEveryone) {
 	}
 
 	onClearSelected();
-	for_const (auto item, selected) {
-		item->destroy();
-	}
+	for_const (auto item, selected) { item->destroy(); }
 
 	for (auto i = idsByPeer.cbegin(), e = idsByPeer.cend(); i != e; ++i) {
 		App::main()->deleteMessages(i.key(), i.value(), forEveryone);
diff --git a/Telegram/SourceFiles/overviewwidget.h b/Telegram/SourceFiles/overviewwidget.h
index 32e451eed..963a574fc 100644
--- a/Telegram/SourceFiles/overviewwidget.h
+++ b/Telegram/SourceFiles/overviewwidget.h
@@ -20,14 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "history/history_item.h"
 #include "history/history.h"
+#include "history/history_item.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/tooltip.h"
 #include "window/section_widget.h"
 #include "window/top_bar_widget.h"
-#include "ui/widgets/tooltip.h"
-#include "ui/widgets/scroll_area.h"
 
 namespace Overview {
 namespace Layout {
@@ -81,7 +79,8 @@ public:
 	void touchScrollUpdated(const QPoint &screenPos);
 	QPoint mapMouseToItem(QPoint p, MsgId itemId, qint32 itemIndex);
 
-	qint32 resizeToWidth(qint32 nwidth, qint32 scrollTop, qint32 minHeight, bool force = false); // returns new scroll top
+	qint32 resizeToWidth(qint32 nwidth, qint32 scrollTop, qint32 minHeight,
+	                     bool force = false); // returns new scroll top
 	void dropResizeIndex();
 
 	PeerData *peer() const;
@@ -159,7 +158,8 @@ private:
 	qint32 itemHeight(MsgId msgId, qint32 index) const;
 	void moveToNextItem(MsgId &msgId, qint32 &index, MsgId upTo, qint32 delta) const;
 
-	void updateDragSelection(MsgId dragSelFrom, qint32 dragSelFromIndex, MsgId dragSelTo, qint32 dragSelToIndex, bool dragSelecting);
+	void updateDragSelection(MsgId dragSelFrom, qint32 dragSelFromIndex, MsgId dragSelTo, qint32 dragSelToIndex,
+	                         bool dragSelecting);
 
 	void repaintItem(MsgId itemId, qint32 itemIndex);
 
@@ -191,11 +191,11 @@ private:
 	int _rowsLeft = 0;
 	int _rowWidth = 0;
 
-	typedef QVector<Overview::Layout::AbstractItem*> Items;
+	typedef QVector<Overview::Layout::AbstractItem *> Items;
 	Items _items;
-	typedef QMap<HistoryItem*, Overview::Layout::ItemBase*> LayoutItems;
+	typedef QMap<HistoryItem *, Overview::Layout::ItemBase *> LayoutItems;
 	LayoutItems _layoutItems;
-	typedef QMap<qint32, Overview::Layout::Date*> LayoutDates;
+	typedef QMap<qint32, Overview::Layout::Date *> LayoutDates;
 	LayoutDates _layoutDates;
 	Overview::Layout::ItemBase *layoutPrepare(HistoryItem *item);
 	Overview::Layout::AbstractItem *layoutPrepare(const QDate &date, bool month);
@@ -219,12 +219,7 @@ private:
 	MsgId _lastSearchId = 0;
 	MsgId _lastSearchMigratedId = 0;
 	int _searchedCount = 0;
-	enum SearchRequestType {
-		SearchFromStart,
-		SearchFromOffset,
-		SearchMigratedFromStart,
-		SearchMigratedFromOffset
-	};
+	enum SearchRequestType { SearchFromStart, SearchFromOffset, SearchMigratedFromStart, SearchMigratedFromOffset };
 	void searchReceived(SearchRequestType type, const MTPmessages_Messages &result, mtpRequestId req);
 	bool searchFailed(SearchRequestType type, const RPCError &error, mtpRequestId req);
 
@@ -294,7 +289,7 @@ class OverviewWidget : public Window::AbstractSectionWidget, public RPCSender {
 	Q_OBJECT
 
 public:
-	OverviewWidget(QWidget *parent, not_null<Window::Controller*> controller, PeerData *peer, MediaOverviewType type);
+	OverviewWidget(QWidget *parent, not_null<Window::Controller *> controller, PeerData *peer, MediaOverviewType type);
 
 	void clear();
 
@@ -340,7 +335,7 @@ public:
 		_inGrab = true;
 		resizeEvent(0);
 	}
-	void grapWithoutTopBarShadow();//@fixme grab?
+	void grapWithoutTopBarShadow(); //@fixme grab?
 	void grabFinish() override;
 	void rpcClear() override {
 		_inner->rpcClear();
@@ -356,7 +351,7 @@ public:
 	bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) override;
 	QRect rectForFloatPlayer(Window::Column myColumn, Window::Column playerColumn) override;
 
-	void ui_repaintHistoryItem(not_null<const HistoryItem*> item);
+	void ui_repaintHistoryItem(not_null<const HistoryItem *> item);
 
 	void notify_historyItemLayoutChanged(const HistoryItem *item);
 
@@ -380,7 +375,7 @@ private:
 	void topBarClick();
 	void animationCallback();
 
-	object_ptr<Ui::AbstractButton> _backAnimationButton = { nullptr };
+	object_ptr<Ui::AbstractButton> _backAnimationButton = {nullptr};
 	object_ptr<Window::TopBarWidget> _topBar;
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<OverviewInner> _inner;
@@ -402,6 +397,4 @@ private:
 
 	object_ptr<Ui::PlainShadow> _topShadow;
 	bool _inGrab = false;
-
 };
-
diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp
index e5c130771..cdf193e29 100644
--- a/Telegram/SourceFiles/passcodewidget.cpp
+++ b/Telegram/SourceFiles/passcodewidget.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "passcodewidget.h"
 
+#include "app.h"
+#include "auth_session.h"
+#include "base/observer.h"
 #include "lang/lang_keys.h"
-#include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "messenger.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
 #include "ui/text/text.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "styles/style_boxes.h"
-#include "window/window_slide_animation.h"
 #include "window/window_controller.h"
-#include "auth_session.h"
-#include "base/observer.h"
-#include "app.h"
+#include "window/window_slide_animation.h"
 
 #include <QWidget>
 
-PasscodeWidget::PasscodeWidget(QWidget *parent) : TWidget(parent)
-, _passcode(this, st::passcodeInput, langFactory(lng_passcode_ph))
-, _submit(this, langFactory(lng_passcode_submit), st::passcodeSubmit)
-, _logout(this, lang(lng_passcode_logout)) {
+PasscodeWidget::PasscodeWidget(QWidget *parent)
+    : TWidget(parent)
+    , _passcode(this, st::passcodeInput, langFactory(lng_passcode_ph))
+    , _submit(this, langFactory(lng_passcode_submit), st::passcodeSubmit)
+    , _logout(this, lang(lng_passcode_logout)) {
 	connect(_passcode, SIGNAL(changed()), this, SLOT(onChanged()));
 	connect(_passcode, SIGNAL(submitted(bool)), this, SLOT(onSubmit()));
 
@@ -155,11 +156,14 @@ void PasscodeWidget::paintEvent(QPaintEvent *e) {
 
 	auto progress = _a_show.current(getms(), 1.);
 	if (_a_show.animating()) {
-		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
+		auto coordUnder = _showBack ? anim::interpolate(-st::slideShift, 0, progress) :
+		                              anim::interpolate(0, -st::slideShift, progress);
 		auto coordOver = _showBack ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
 		auto shadow = _showBack ? (1. - progress) : progress;
 		if (coordOver > 0) {
-			p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
+			p.drawPixmap(
+			    QRect(0, 0, coordOver, height()), _cacheUnder,
+			    QRect(-coordUnder * cRetinaFactor(), 0, coordOver * cRetinaFactor(), height() * cRetinaFactor()));
 			p.setOpacity(shadow);
 			p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
 			p.setOpacity(1);
@@ -172,12 +176,14 @@ void PasscodeWidget::paintEvent(QPaintEvent *e) {
 
 		p.setFont(st::passcodeHeaderFont);
 		p.setPen(st::windowFg);
-		p.drawText(QRect(0, _passcode->y() - st::passcodeHeaderHeight, width(), st::passcodeHeaderHeight), lang(lng_passcode_enter), style::al_center);
+		p.drawText(QRect(0, _passcode->y() - st::passcodeHeaderHeight, width(), st::passcodeHeaderHeight),
+		           lang(lng_passcode_enter), style::al_center);
 
 		if (!_error.isEmpty()) {
 			p.setFont(st::boxTextFont);
 			p.setPen(st::boxTextFgError);
-			p.drawText(QRect(0, _passcode->y() + _passcode->height(), width(), st::passcodeSubmitSkip), _error, style::al_center);
+			p.drawText(QRect(0, _passcode->y() + _passcode->height(), width(), st::passcodeSubmitSkip), _error,
+			           style::al_center);
 		}
 	}
 }
@@ -185,7 +191,8 @@ void PasscodeWidget::paintEvent(QPaintEvent *e) {
 void PasscodeWidget::resizeEvent(QResizeEvent *e) {
 	_passcode->move((width() - _passcode->width()) / 2, (height() / 3));
 	_submit->move(_passcode->x(), _passcode->y() + _passcode->height() + st::passcodeSubmitSkip);
-	_logout->move(_passcode->x() + (_passcode->width() - _logout->width()) / 2, _submit->y() + _submit->height() + st::linkFont->ascent);
+	_logout->move(_passcode->x() + (_passcode->width() - _logout->width()) / 2,
+	              _submit->y() + _submit->height() + st::linkFont->ascent);
 }
 
 void PasscodeWidget::setInnerFocus() {
diff --git a/Telegram/SourceFiles/passcodewidget.h b/Telegram/SourceFiles/passcodewidget.h
index ad4a049aa..d89549339 100644
--- a/Telegram/SourceFiles/passcodewidget.h
+++ b/Telegram/SourceFiles/passcodewidget.h
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QWidget>
-#include <QResizeEvent>
-#include <QPaintEvent>
 #include "base/object_ptr.h"
 #include "ui/animation.h"
 #include "ui/twidget.h"
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QWidget>
 
 namespace Ui {
 class PasswordInput;
@@ -66,5 +66,4 @@ private:
 	object_ptr<Ui::RoundButton> _submit;
 	object_ptr<Ui::LinkButton> _logout;
 	QString _error;
-
 };
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index ac5c81458..0542beb27 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -21,12 +21,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "platform/linux/file_utilities_linux.h"
 
 // #include <private/qguiapplication_p.h>
-#include "platform/linux/linux_libs.h"
-#include "platform/linux/linux_gdk_helper.h"
-#include "messenger.h"
-#include "mainwindow.h"
-#include "storage/localstorage.h"
 #include "facades.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "platform/linux/linux_gdk_helper.h"
+#include "platform/linux/linux_libs.h"
+#include "storage/localstorage.h"
 
 #include <QProcess>
 
@@ -69,7 +69,9 @@ void UnsafeShowInFolder(const QString &filepath) {
 
 	auto absolutePath = QFileInfo(filepath).absoluteFilePath();
 	QProcess process;
-	process.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory");
+	process.start("xdg-mime", QStringList() << "query"
+	                                        << "default"
+	                                        << "inode/directory");
 	process.waitForFinished();
 	auto output = QString::fromLatin1(process.readLine().simplified());
 	auto command = qsl("xdg-open");
@@ -77,7 +79,8 @@ void UnsafeShowInFolder(const QString &filepath) {
 	if (output == qstr("dolphin.desktop") || output == qstr("org.kde.dolphin.desktop")) {
 		command = qsl("dolphin");
 		arguments << "--select" << absolutePath;
-	} else if (output == qstr("nautilus.desktop") || output == qstr("org.gnome.Nautilus.desktop") || output == qstr("nautilus-folder-handler.desktop")) {
+	} else if (output == qstr("nautilus.desktop") || output == qstr("org.gnome.Nautilus.desktop") ||
+	           output == qstr("nautilus-folder-handler.desktop")) {
 		command = qsl("nautilus");
 		arguments << "--no-desktop" << absolutePath;
 	} else if (output == qstr("nemo.desktop")) {
@@ -103,14 +106,14 @@ using Type = ::FileDialog::internal::Type;
 
 } // namespace
 
-bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, Type type, QString startFile) {
+bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, Type type,
+         QString startFile) {
 	return ::FileDialog::internal::GetDefault(files, remoteContent, caption, filter, type, startFile);
 }
 
 namespace {
 
-const char *filterRegExp =
-"^(.*)\\(([a-zA-Z0-9_.,*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
+const char *filterRegExp = "^(.*)\\(([a-zA-Z0-9_.,*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
 
 // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)"
 QStringList cleanFilterList(const QString &filter) {
@@ -118,8 +121,7 @@ QStringList cleanFilterList(const QString &filter) {
 	Q_ASSERT(regexp.isValid());
 	QString f = filter;
 	int i = regexp.indexIn(f);
-	if (i >= 0)
-		f = regexp.cap(2);
+	if (i >= 0) f = regexp.cap(2);
 	return f.split(QLatin1Char(' '), QString::SkipEmptyParts);
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
index 4139b76a3..cd8362657 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
@@ -55,8 +55,7 @@ inline void UnsafeLaunch(const QString &filepath) {
 	return ::File::internal::UnsafeLaunchDefault(filepath);
 }
 
-inline void PostprocessDownloaded(const QString &filepath) {
-}
+inline void PostprocessDownloaded(const QString &filepath) {}
 
 } // namespace File
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
index 1b9d1f973..e7eaf4842 100644
--- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
@@ -45,7 +45,7 @@ Type Compute() {
 		if (list.contains("unity")) {
 			// gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity
 			// DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz
-            if (desktopSession.indexOf(QString("gnome-fallback")) >= 0) {
+			if (desktopSession.indexOf(QString("gnome-fallback")) >= 0) {
 				return Type::Gnome;
 			}
 			return Type::Unity;
@@ -56,7 +56,7 @@ Type Compute() {
 		} else if (list.contains("gnome")) {
 			return Type::Gnome;
 		} else if (list.contains("kde")) {
-            if (kdeSession == QString("5")) {
+			if (kdeSession == QString("5")) {
 				return Type::KDE5;
 			}
 			return Type::KDE4;
@@ -125,8 +125,7 @@ bool TryQtTrayIcon() {
 }
 
 bool PreferAppIndicatorTrayIcon() {
-	return IsXFCE() || IsUnity() ||
-	       (IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid());
+	return IsXFCE() || IsUnity() || (IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid());
 }
 
 bool TryUnityCounter() {
diff --git a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h
index e86499c57..b17f9050d 100644
--- a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h
+++ b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.h
@@ -21,4 +21,3 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <QtCore/QObject>
-
diff --git a/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp b/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp
index 422cc85c3..38e46a04f 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp
@@ -29,19 +29,19 @@ namespace Libs {
 namespace {
 
 bool loadLibrary(QLibrary &lib, const char *name, int version) {
-    DEBUG_LOG(("Loading '%1' with version %2...").arg(QLatin1String(name)).arg(version));
-    lib.setFileNameAndVersion(QLatin1String(name), version);
-    if (lib.load()) {
-        DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version));
-        return true;
-    }
-    lib.setFileNameAndVersion(QLatin1String(name), QString());
-    if (lib.load()) {
-        DEBUG_LOG(("Loaded '%1' without version!").arg(QLatin1String(name)));
-        return true;
-    }
-    LOG(("Could not load '%1' with version %2 :(").arg(QLatin1String(name)).arg(version));
-    return false;
+	DEBUG_LOG(("Loading '%1' with version %2...").arg(QLatin1String(name)).arg(version));
+	lib.setFileNameAndVersion(QLatin1String(name), version);
+	if (lib.load()) {
+		DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version));
+		return true;
+	}
+	lib.setFileNameAndVersion(QLatin1String(name), QString());
+	if (lib.load()) {
+		DEBUG_LOG(("Loaded '%1' without version!").arg(QLatin1String(name)));
+		return true;
+	}
+	LOG(("Could not load '%1' with version %2 :(").arg(QLatin1String(name)).arg(version));
+	return false;
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 1b8f792c5..794373f0a 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -20,28 +20,28 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/linux/linux_libs.h"
 
+#include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/linux_gdk_helper.h"
 #include "platform/linux/linux_libnotify.h"
-#include "platform/linux/linux_desktop_environment.h"
 
 namespace Platform {
 namespace Libs {
 namespace {
 
 bool loadLibrary(QLibrary &lib, const char *name, int version) {
-    DEBUG_LOG(("Loading '%1' with version %2...").arg(QLatin1String(name)).arg(version));
-    lib.setFileNameAndVersion(QLatin1String(name), version);
-    if (lib.load()) {
-        DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version));
-        return true;
-    }
-    lib.setFileNameAndVersion(QLatin1String(name), QString());
-    if (lib.load()) {
-        DEBUG_LOG(("Loaded '%1' without version!").arg(QLatin1String(name)));
-        return true;
-    }
-    LOG(("Could not load '%1' with version %2 :(").arg(QLatin1String(name)).arg(version));
-    return false;
+	DEBUG_LOG(("Loading '%1' with version %2...").arg(QLatin1String(name)).arg(version));
+	lib.setFileNameAndVersion(QLatin1String(name), version);
+	if (lib.load()) {
+		DEBUG_LOG(("Loaded '%1' with version %2!").arg(QLatin1String(name)).arg(version));
+		return true;
+	}
+	lib.setFileNameAndVersion(QLatin1String(name), QString());
+	if (lib.load()) {
+		DEBUG_LOG(("Loaded '%1' without version!").arg(QLatin1String(name)));
+		return true;
+	}
+	LOG(("Could not load '%1' with version %2 :(").arg(QLatin1String(name)).arg(version));
+	return false;
 }
 
 
@@ -50,7 +50,6 @@ bool loadLibrary(QLibrary &lib, const char *name, int version) {
 
 void start() {
 	DEBUG_LOG(("Loading libraries"));
-
 }
 
 } // namespace Libs
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index f4ea4148e..ecbaf6162 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -29,8 +29,7 @@ namespace Libs {
 
 void start();
 
-template <typename Function>
-bool load(QLibrary &lib, const char *name, Function &func) {
+template <typename Function> bool load(QLibrary &lib, const char *name, Function &func) {
 	func = nullptr;
 	if (!lib.isLoaded()) {
 		return false;
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 1ace31ec6..dec6afdb5 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/linux/main_window_linux.h"
 
-#include "styles/style_window.h"
-#include "platform/linux/linux_libs.h"
-#include "platform/linux/linux_desktop_environment.h"
-#include "platform/platform_notifications_manager.h"
+#include "app.h"
+#include "application.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "messenger.h"
-#include "application.h"
-#include "lang/lang_keys.h"
+#include "platform/linux/linux_desktop_environment.h"
+#include "platform/linux/linux_libs.h"
+#include "platform/platform_notifications_manager.h"
 #include "storage/localstorage.h"
-#include "app.h"
-#include "facades.h"
+#include "styles/style_window.h"
 
 namespace Platform {
 namespace {
@@ -52,20 +52,24 @@ QImage _trayIconImageBack, _trayIconImage;
 
 
 QImage _trayIconImageGen() {
-	qint32 counter = App::histories().unreadBadge(), counterSlice = (counter >= 1000) ? (1000 + (counter % 100)) : counter;
+	qint32 counter = App::histories().unreadBadge(),
+	       counterSlice = (counter >= 1000) ? (1000 + (counter % 100)) : counter;
 	bool muted = App::histories().unreadOnlyMuted();
-	if (_trayIconImage.isNull() || _trayIconImage.width() != _trayIconSize || muted != _trayIconMuted || counterSlice != _trayIconCount) {
+	if (_trayIconImage.isNull() || _trayIconImage.width() != _trayIconSize || muted != _trayIconMuted ||
+	    counterSlice != _trayIconCount) {
 		if (_trayIconImageBack.isNull() || _trayIconImageBack.width() != _trayIconSize) {
-			_trayIconImageBack = Messenger::Instance().logo().scaled(_trayIconSize, _trayIconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+			_trayIconImageBack = Messenger::Instance().logo().scaled(_trayIconSize, _trayIconSize,
+			                                                         Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 			_trayIconImageBack = _trayIconImageBack.convertToFormat(QImage::Format_ARGB32);
-			int w = _trayIconImageBack.width(), h = _trayIconImageBack.height(), perline = _trayIconImageBack.bytesPerLine();
+			int w = _trayIconImageBack.width(), h = _trayIconImageBack.height(),
+			    perline = _trayIconImageBack.bytesPerLine();
 			uchar *bytes = _trayIconImageBack.bits();
 			for (qint32 y = 0; y < h; ++y) {
 				for (qint32 x = 0; x < w; ++x) {
 					qint32 srcoff = y * perline + x * 4;
-					bytes[srcoff + QT_RED  ] = qMax(bytes[srcoff + QT_RED  ], uchar(224));
+					bytes[srcoff + QT_RED] = qMax(bytes[srcoff + QT_RED], uchar(224));
 					bytes[srcoff + QT_GREEN] = qMax(bytes[srcoff + QT_GREEN], uchar(165));
-					bytes[srcoff + QT_BLUE ] = qMax(bytes[srcoff + QT_BLUE ], uchar(44));
+					bytes[srcoff + QT_BLUE] = qMax(bytes[srcoff + QT_BLUE], uchar(44));
 				}
 			}
 		}
@@ -83,17 +87,20 @@ QImage _trayIconImageGen() {
 			auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
 			auto &fg = st::trayCounterFg;
 			auto layer = App::wnd()->iconWithCounter(layerSize, counter, bg, fg, false);
-			p.drawImage(_trayIconImage.width() - layer.width() - 1, _trayIconImage.height() - layer.height() - 1, layer);
+			p.drawImage(_trayIconImage.width() - layer.width() - 1, _trayIconImage.height() - layer.height() - 1,
+			            layer);
 		}
 	}
 	return _trayIconImage;
 }
 
 QString _trayIconImageFile() {
-	qint32 counter = App::histories().unreadBadge(), counterSlice = (counter >= 1000) ? (1000 + (counter % 100)) : counter;
+	qint32 counter = App::histories().unreadBadge(),
+	       counterSlice = (counter >= 1000) ? (1000 + (counter % 100)) : counter;
 	bool muted = App::histories().unreadOnlyMuted();
 
-	QString name = cWorkingDir() + qsl("tdata/ticons/ico%1_%2_%3.png").arg(muted ? "mute" : "").arg(_trayIconSize).arg(counterSlice);
+	QString name = cWorkingDir() +
+	               qsl("tdata/ticons/ico%1_%2_%3.png").arg(muted ? "mute" : "").arg(_trayIconSize).arg(counterSlice);
 	QFileInfo info(name);
 	if (info.exists()) return name;
 
@@ -131,11 +138,9 @@ void MainWindow::psStatusIconCheck() {
 	}
 }
 
-void MainWindow::psShowTrayMenu() {
-}
+void MainWindow::psShowTrayMenu() {}
 
-void MainWindow::psTrayMenuUpdated() {
-}
+void MainWindow::psTrayMenuUpdated() {}
 
 void MainWindow::psSetupTrayIcon() {
 	if (noQtTrayIcon) {
@@ -156,7 +161,8 @@ void MainWindow::psSetupTrayIcon() {
 			trayIcon->setIcon(icon);
 
 			trayIcon->setToolTip(str_const_toString(AppName));
-			connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
+			connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this,
+			        SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
 
 			// This is very important for native notifications via libnotify!
 			// Some notification servers compose several notifications with a "Reply"
@@ -193,8 +199,7 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 	}
 }
 
-void MainWindow::psUpdateIndicator() {
-}
+void MainWindow::psUpdateIndicator() {}
 
 void MainWindow::unreadCounterChangedHook() {
 	setWindowTitle(titleText());
@@ -233,7 +238,6 @@ void MainWindow::LibsLoaded() {
 	LOG(("Tray Icon: Try Qt = %1, Prefer appindicator = %2").arg(Logs::b(!noQtTrayIcon)).arg(Logs::b(tryAppIndicator)));
 
 	if (noQtTrayIcon) cSetSupportTray(false);
-
 }
 
 void MainWindow::psCreateTrayIcon() {
@@ -274,13 +278,10 @@ void MainWindow::psFirstShow() {
 	setPositionInited();
 }
 
-void MainWindow::psInitSysMenu() {
-}
+void MainWindow::psInitSysMenu() {}
 
-void MainWindow::psUpdateMargins() {
-}
+void MainWindow::psUpdateMargins() {}
 
-MainWindow::~MainWindow() {
-}
+MainWindow::~MainWindow() {}
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index 45fe7adce..3d59667b0 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -39,8 +39,7 @@ public:
 	void psInitSysMenu();
 	void psUpdateMargins();
 
-	void psRefreshTaskbarIcon() {
-	}
+	void psRefreshTaskbarIcon() {}
 
 	virtual QImage iconWithCounter(int size, int count, style::color bg, style::color fg, bool smallIcon) = 0;
 
@@ -67,7 +66,8 @@ protected:
 	void psTrayMenuUpdated();
 	void psSetupTrayIcon();
 
-	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) = 0;
+	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift,
+	                               style::color color) = 0;
 
 private:
 	void updateIconCounters();
@@ -78,7 +78,6 @@ private:
 
 	QTimer _psUpdateIndicatorTimer;
 	TimeMs _psLastIndicatorUpdate = 0;
-
 };
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 9b839005d..a47fdf348 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/linux/notifications_manager_linux.h"
 
+#include "base/task_queue.h"
 #include "config.h"
-#include "window/notifications_utilities.h"
+#include "lang/lang_keys.h"
 #include "platform/linux/linux_libnotify.h"
 #include "platform/linux/linux_libs.h"
-#include "lang/lang_keys.h"
-#include "base/task_queue.h"
+#include "window/notifications_utilities.h"
 
 namespace Platform {
 namespace Notifications {
@@ -38,8 +38,7 @@ std::unique_ptr<Window::Notifications::Manager> Create(Window::Notifications::Sy
 	return nullptr;
 }
 
-void Finish() {
-}
+void Finish() {}
 
 } // namespace Notifications
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
index d70bcffea..3b0d0037a 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
@@ -33,8 +33,7 @@ inline bool SkipToast() {
 	return false;
 }
 
-inline void FlashBounce() {
-}
+inline void FlashBounce() {}
 
 void Finish();
 
@@ -49,14 +48,14 @@ public:
 	~Manager();
 
 protected:
-	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
+	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+	                              const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
 	void doClearAllFast() override;
 	void doClearFromHistory(History *history) override;
 
 private:
 	class Private;
 	const std::unique_ptr<Private> _private;
-
 };
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ab950157e..b86717b18 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -17,21 +17,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/linux/specific_linux.h"
 
-#include "platform/linux/linux_libs.h"
-#include "lang/lang_keys.h"
 #include "application.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "platform/linux/file_utilities_linux.h"
+#include "platform/linux/linux_libs.h"
 #include "platform/platform_notifications_manager.h"
 #include "storage/localstorage.h"
 
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <cstdlib>
-#include <unistd.h>
 #include <dirent.h>
 #include <pwd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <iostream>
 
@@ -48,7 +48,7 @@ namespace Platform {
 
 QString CurrentExecutablePath(int argc, char *argv[]) {
 	constexpr auto kMaxPath = 1024;
-	char result[kMaxPath] = { 0 };
+	char result[kMaxPath] = {0};
 	auto count = readlink("/proc/self/exe", result, kMaxPath);
 	if (count > 0) {
 		auto filename = QFile::decodeName(result);
@@ -70,8 +70,8 @@ namespace {
 class _PsEventFilter : public QAbstractNativeEventFilter {
 public:
 	bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
-		//auto wnd = App::wnd();
-		//if (!wnd) return false;
+		// auto wnd = App::wnd();
+		// if (!wnd) return false;
 
 		return false;
 	}
@@ -106,8 +106,7 @@ QAbstractNativeEventFilter *psNativeEventFilter() {
 	return _psEventFilter;
 }
 
-void psWriteDump() {
-}
+void psWriteDump() {}
 
 QString demanglestr(const QString &mangled) {
 	if (mangled.isEmpty()) return mangled;
@@ -117,7 +116,7 @@ QString demanglestr(const QString &mangled) {
 	if (!f) return "BAD_SYMBOL_" + mangled;
 
 	QString result;
-	char buffer[4096] = { 0 };
+	char buffer[4096] = {0};
 	while (!feof(f)) {
 		if (fgets(buffer, 4096, f) != NULL) {
 			result += buffer;
@@ -152,7 +151,8 @@ QStringList addr2linestr(quint64 *addresses, int count) {
 	}
 	for (int i = 0, j = 0; i < count; ++i) {
 		if (addresses[i]) {
-			if (j < addr2lineResult.size() && !addr2lineResult.at(j).isEmpty() && !addr2lineResult.at(j).startsWith(qstr("0x"))) {
+			if (j < addr2lineResult.size() && !addr2lineResult.at(j).isEmpty() &&
+			    !addr2lineResult.at(j).startsWith(qstr("0x"))) {
 				QString res = addr2lineResult.at(j).trimmed();
 				if (int index = res.indexOf(qstr("/Telegram/"))) {
 					if (index > 0) {
@@ -178,7 +178,7 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 	qint32 i = 0, l = lines.size();
 
 	while (i < l) {
-		quint64 addresses[1024] = { 0 };
+		quint64 addresses[1024] = {0};
 		for (; i < l; ++i) {
 			result.append(lines.at(i)).append('\n');
 			QString line = lines.at(i).trimmed();
@@ -193,11 +193,13 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 			QString line = lines.at(i).trimmed();
 			if (line.isEmpty()) break;
 
-			QRegularExpressionMatch m1 = QRegularExpression(qsl("^(.+)\\(([^+]+)\\+([^\\)]+)\\)\\[(.+)\\]$")).match(line);
+			QRegularExpressionMatch m1 =
+			    QRegularExpression(qsl("^(.+)\\(([^+]+)\\+([^\\)]+)\\)\\[(.+)\\]$")).match(line);
 			QRegularExpressionMatch m2 = QRegularExpression(qsl("^(.+)\\[(.+)\\]$")).match(line);
 			QString addrstr = m1.hasMatch() ? m1.captured(4) : (m2.hasMatch() ? m2.captured(2) : QString());
 			if (!addrstr.isEmpty()) {
-				quint64 addr = addrstr.startsWith(qstr("0x")) ? addrstr.mid(2).toULongLong(0, 16) : addrstr.toULongLong();
+				quint64 addr =
+				    addrstr.startsWith(qstr("0x")) ? addrstr.mid(2).toULongLong(0, 16) : addrstr.toULongLong();
 				if (addr > 1) {
 					addresses[i - start] = addr;
 				}
@@ -227,7 +229,12 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 			}
 
 			if (m1.hasMatch()) {
-				result.append(demanglestr(m1.captured(2))).append(qsl(" + ")).append(m1.captured(3)).append(qsl(" [")).append(m1.captured(1)).append(qsl("] "));
+				result.append(demanglestr(m1.captured(2)))
+				    .append(qsl(" + "))
+				    .append(m1.captured(3))
+				    .append(qsl(" ["))
+				    .append(m1.captured(1))
+				    .append(qsl("] "));
 				if (!addr2line.at(i - start).isEmpty() && addr2line.at(i - start) != qsl("??:0")) {
 					result.append(qsl(" (")).append(addr2line.at(i - start)).append(qsl(")\n"));
 				} else {
@@ -246,7 +253,10 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 	return result;
 }
 
-bool _removeDirectory(const QString &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c
+bool _removeDirectory(
+    const QString
+        &path) { // from
+	             // http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c
 	QByteArray pathRaw = QFile::encodeName(path);
 	DIR *d = opendir(pathRaw.constData());
 	if (!d) return false;
@@ -300,7 +310,7 @@ TimeMs psIdleTime() {
 }
 
 void psActivateProcess(quint64 pid) {
-//	objc_activateProgram();
+	//	objc_activateProgram();
 }
 
 namespace {
@@ -344,8 +354,7 @@ int psCleanup() {
 	return 0;
 }
 
-void psDoFixPrevious() {
-}
+void psDoFixPrevious() {}
 
 int psFixPrevious() {
 	psDoFixPrevious();
@@ -354,8 +363,7 @@ int psFixPrevious() {
 
 namespace Platform {
 
-void start() {
-}
+void start() {}
 
 void finish() {
 	Notifications::Finish();
@@ -365,12 +373,13 @@ void finish() {
 }
 
 bool TranslucentWindowsSupported(QPoint globalPosition) {
-	if (auto app = static_cast<QGuiApplication*>(QCoreApplication::instance())) {
+	if (auto app = static_cast<QGuiApplication *>(QCoreApplication::instance())) {
 		if (auto native = app->platformNativeInterface()) {
 			if (auto desktop = QApplication::desktop()) {
 				auto index = desktop->screenNumber(globalPosition);
 				auto screens = QGuiApplication::screens();
-				if (auto screen = (index >= 0 && index < screens.size()) ? screens[index] : QGuiApplication::primaryScreen()) {
+				if (auto screen =
+				        (index >= 0 && index < screens.size()) ? screens[index] : QGuiApplication::primaryScreen()) {
 					if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) {
 						return true;
 					}
@@ -378,10 +387,16 @@ bool TranslucentWindowsSupported(QPoint globalPosition) {
 					static OrderedSet<int> WarnedAbout;
 					if (!WarnedAbout.contains(index)) {
 						WarnedAbout.insert(index);
-						LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
+						LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)")
+						        .arg(index)
+						        .arg(globalPosition.x())
+						        .arg(globalPosition.y()));
 					}
 				} else {
-					LOG(("WARNING: Could not get screen for index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
+					LOG(("WARNING: Could not get screen for index %1 (for position %2,%3)")
+					        .arg(index)
+					        .arg(globalPosition.x())
+					        .arg(globalPosition.y()));
 				}
 			}
 		}
@@ -404,8 +419,7 @@ void start() {
 	MainWindow::LibsLoaded();
 }
 
-void finish() {
-}
+void finish() {}
 
 } // namespace ThirdParty
 
@@ -473,11 +487,14 @@ void psRegisterCustomScheme() {
 			s << "MimeType=x-scheme-handler/tg;\n";
 			f.close();
 
-			if (_psRunCommand("desktop-file-install --dir=" + EscapeShell(QFile::encodeName(home + qsl(".local/share/applications"))) + " --delete-original " + EscapeShell(QFile::encodeName(file)))) {
+			if (_psRunCommand("desktop-file-install --dir=" +
+			                  EscapeShell(QFile::encodeName(home + qsl(".local/share/applications"))) +
+			                  " --delete-original " + EscapeShell(QFile::encodeName(file)))) {
 				DEBUG_LOG(("App Info: removing old .desktop file"));
 				QFile(qsl("%1.local/share/applications/telegram.desktop").arg(home)).remove();
 
-				_psRunCommand("update-desktop-database " + EscapeShell(QFile::encodeName(home + qsl(".local/share/applications"))));
+				_psRunCommand("update-desktop-database " +
+				              EscapeShell(QFile::encodeName(home + qsl(".local/share/applications"))));
 				_psRunCommand("xdg-mime default telegramdesktop.desktop x-scheme-handler/tg");
 			}
 		} else {
@@ -487,7 +504,8 @@ void psRegisterCustomScheme() {
 #endif // !TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
 
 	DEBUG_LOG(("App Info: registerting for Gnome"));
-	if (_psRunCommand("gconftool-2 -t string -s /desktop/gnome/url-handlers/tg/command " + EscapeShell(EscapeShell(QFile::encodeName(cExeDir() + cExeName())) + " -- %s"))) {
+	if (_psRunCommand("gconftool-2 -t string -s /desktop/gnome/url-handlers/tg/command " +
+	                  EscapeShell(EscapeShell(QFile::encodeName(cExeDir() + cExeName())) + " -- %s"))) {
 		_psRunCommand("gconftool-2 -t bool -s /desktop/gnome/url-handlers/tg/needs_terminal false");
 		_psRunCommand("gconftool-2 -t bool -s /desktop/gnome/url-handlers/tg/enabled true");
 	}
@@ -540,23 +558,23 @@ bool _execUpdater(bool update = true, const QString &crashreport = QString()) {
 	QByteArray data(QFile::encodeName(cExeDir() + (update ? "Updater" : cExeName())));
 	memcpy(path, data.constData(), data.size());
 
-	char *args[MaxArgsCount] = { 0 };
+	char *args[MaxArgsCount] = {0};
 	char p_noupdate[] = "-noupdate";
 	char p_autostart[] = "-autostart";
 	char p_debug[] = "-debug";
 	char p_tosettings[] = "-tosettings";
 	char p_key[] = "-key";
-	char p_datafile[MaxLen] = { 0 };
+	char p_datafile[MaxLen] = {0};
 	char p_path[] = "-workpath";
-	char p_pathbuf[MaxLen] = { 0 };
+	char p_pathbuf[MaxLen] = {0};
 	char p_startintray[] = "-startintray";
 	char p_testmode[] = "-testmode";
 	char p_crashreport[] = "-crashreport";
-	char p_crashreportbuf[MaxLen] = { 0 };
+	char p_crashreportbuf[MaxLen] = {0};
 	char p_exe[] = "-exename";
-	char p_exebuf[MaxLen] = { 0 };
+	char p_exebuf[MaxLen] = {0};
 	char p_exepath[] = "-exepath";
-	char p_exepathbuf[MaxLen] = { 0 };
+	char p_exepathbuf[MaxLen] = {0};
 	int argIndex = 0;
 	args[argIndex++] = path;
 	if (!update) {
@@ -626,14 +644,11 @@ bool psShowOpenWithMenu(int x, int y, const QString &file) {
 	return false;
 }
 
-void psAutoStart(bool start, bool silent) {
-}
+void psAutoStart(bool start, bool silent) {}
 
-void psSendToMenu(bool send, bool silent) {
-}
+void psSendToMenu(bool send, bool silent) {}
 
-void psUpdateOverlayed(QWidget *widget) {
-}
+void psUpdateOverlayed(QWidget *widget) {}
 
 bool linuxMoveFile(const char *from, const char *to) {
 	FILE *ffrom = fopen(from, "rb"), *fto = fopen(to, "wb");
@@ -651,20 +666,22 @@ bool linuxMoveFile(const char *from, const char *to) {
 		fwrite(buf, 1, size, fto);
 	}
 
-	struct stat fst; // from http://stackoverflow.com/questions/5486774/keeping-fileowner-and-permissions-after-copying-file-in-c
-	//let's say this wont fail since you already worked OK on that fp
+	struct stat
+	    fst; // from
+	         // http://stackoverflow.com/questions/5486774/keeping-fileowner-and-permissions-after-copying-file-in-c
+	// let's say this wont fail since you already worked OK on that fp
 	if (fstat(fileno(ffrom), &fst) != 0) {
 		fclose(ffrom);
 		fclose(fto);
 		return false;
 	}
-	//update to the same uid/gid
+	// update to the same uid/gid
 	if (fchown(fileno(fto), fst.st_uid, fst.st_gid) != 0) {
 		fclose(ffrom);
 		fclose(fto);
 		return false;
 	}
-	//update the permissions
+	// update the permissions
 	if (fchmod(fileno(fto), fst.st_mode) != 0) {
 		fclose(ffrom);
 		fclose(fto);
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index fa8561958..02f0fdc12 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -33,30 +33,25 @@ class LocationCoords;
 
 namespace Platform {
 
-inline void SetWatchingMediaKeys(bool watching) {
-}
+inline void SetWatchingMediaKeys(bool watching) {}
 
-inline void StartTranslucentPaint(QPainter &p, QPaintEvent *e) {
-}
+inline void StartTranslucentPaint(QPainter &p, QPaintEvent *e) {}
 
-inline void InitOnTopPanel(QWidget *panel) {
-}
+inline void InitOnTopPanel(QWidget *panel) {}
 
-inline void DeInitOnTopPanel(QWidget *panel) {
-}
+inline void DeInitOnTopPanel(QWidget *panel) {}
 
-inline void ReInitOnTopPanel(QWidget *panel) {
-}
+inline void ReInitOnTopPanel(QWidget *panel) {}
 
 QString CurrentExecutablePath(int argc, char *argv[]);
 
 } // namespace Platform
 
 inline QString psServerPrefix() {
-    return QStringLiteral("/tmp/");
+	return QStringLiteral("/tmp/");
 }
 inline void psCheckLocalSocket(const QString &serverName) {
-    QFile address(serverName);
+	QFile address(serverName);
 	if (address.exists()) {
 		address.remove();
 	}
@@ -102,28 +97,24 @@ inline QByteArray psDownloadPathBookmark(const QString &path) {
 inline QByteArray psPathBookmark(const QString &path) {
 	return QByteArray();
 }
-inline void psDownloadPathEnableAccess() {
-}
+inline void psDownloadPathEnableAccess() {}
 
 class PsFileBookmark {
 public:
-	PsFileBookmark(const QByteArray &bookmark) {
-	}
+	PsFileBookmark(const QByteArray &bookmark) {}
 	bool check() const {
 		return true;
 	}
 	bool enable() const {
 		return true;
 	}
-	void disable() const {
-	}
+	void disable() const {}
 	const QString &name(const QString &original) const {
 		return original;
 	}
 	QByteArray bookmark() const {
 		return QByteArray();
 	}
-
 };
 
 bool linuxMoveFile(const char *from, const char *to);
diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.h b/Telegram/SourceFiles/platform/mac/file_utilities_mac.h
index 5ffd2f917..d51d1b370 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.h
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.h
@@ -29,8 +29,7 @@ inline void UnsafeOpenEmailLink(const QString &email) {
 	return ::File::internal::UnsafeOpenEmailLinkDefault(email);
 }
 
-inline void PostprocessDownloaded(const QString &filepath) {
-}
+inline void PostprocessDownloaded(const QString &filepath) {}
 
 } // namespace File
 
@@ -40,7 +39,8 @@ inline void InitLastPath() {
 	::FileDialog::internal::InitLastPathDefault();
 }
 
-inline bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, ::FileDialog::internal::Type type, QString startFile) {
+inline bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter,
+                ::FileDialog::internal::Type type, QString startFile) {
 	return ::FileDialog::internal::GetDefault(files, remoteContent, caption, filter, type, startFile);
 }
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index 22d7daaa4..b32a77230 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "platform/platform_main_window.h"
-#include "platform/mac/specific_mac_p.h"
 #include "base/timer.h"
+#include "platform/mac/specific_mac_p.h"
+#include "platform/platform_main_window.h"
 
 #include <QMenuBar>
-#include <QTimer>
 #include <QSystemTrayIcon>
+#include <QTimer>
 
 namespace Platform {
 
@@ -40,8 +40,7 @@ public:
 	void psInitSysMenu();
 	void psUpdateMargins();
 
-	void psRefreshTaskbarIcon() {
-	}
+	void psRefreshTaskbarIcon() {}
 
 	bool psFilterNativeEvent(void *event);
 
@@ -91,7 +90,8 @@ protected:
 
 	void psTrayMenuUpdated();
 	void psSetupTrayIcon();
-	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) = 0;
+	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift,
+	                               style::color color) = 0;
 
 	QTimer psUpdatedPositionTimer;
 
@@ -127,7 +127,6 @@ private:
 	QAction *psShowTelegram = nullptr;
 
 	int _customTitleHeight = 0;
-
 };
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
index 57c79cd98..6c58c6d1e 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "platform/platform_notifications_manager.h"
 #include "base/weak_unique_ptr.h"
+#include "platform/platform_notifications_manager.h"
 
 namespace Platform {
 namespace Notifications {
@@ -35,14 +35,14 @@ public:
 	~Manager();
 
 protected:
-	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
+	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+	                              const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
 	void doClearAllFast() override;
 	void doClearFromHistory(History *history) override;
 
 private:
 	class Private;
 	const std::unique_ptr<Private> _private;
-
 };
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 433843dc7..8721250a6 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -17,9 +17,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "platform/mac/specific_mac_p.h"
-#include "core/utils.h" // TimeMs
 #include "core/basic_types.h" // qsl()
+#include "core/utils.h" // TimeMs
+#include "platform/mac/specific_mac_p.h"
 #include <QFile>
 
 class QAbstractNativeEventFilter;
@@ -35,24 +35,22 @@ QString CurrentExecutablePath(int argc, char *argv[]);
 
 namespace ThirdParty {
 
-inline void start() {
-}
+inline void start() {}
 
-inline void finish() {
-}
+inline void finish() {}
 
 } // namespace ThirdParty
 } // namespace Platform
 
 inline QString psServerPrefix() {
 #ifndef OS_MAC_STORE
-    return qsl("/tmp/");
+	return qsl("/tmp/");
 #else // OS_MAC_STORE
 	return objc_documentsPath();
 #endif // OS_MAC_STORE
 }
 inline void psCheckLocalSocket(const QString &serverName) {
-    QFile address(serverName);
+	QFile address(serverName);
 	if (address.exists()) {
 		address.remove();
 	}
@@ -101,8 +99,8 @@ QByteArray psPathBookmark(const QString &path);
 
 class PsFileBookmark {
 public:
-	PsFileBookmark(const QByteArray &bookmark) : _inner(bookmark) {
-	}
+	PsFileBookmark(const QByteArray &bookmark)
+	    : _inner(bookmark) {}
 	bool check() const {
 		return _inner.valid();
 	}
@@ -121,7 +119,6 @@ public:
 
 private:
 	objc_FileBookmark _inner;
-
 };
 
 QString strNotificationAboutThemeChange();
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
index 45e8a8ca4..6ab5bad9e 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
@@ -18,8 +18,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "core/utils.h" // TimeMs
-#include <QString>
 #include <QByteArray>
+#include <QString>
 #include <QWindow> // WId
 
 // e is NSEvent*
@@ -72,5 +72,4 @@ private:
 	class objc_FileBookmarkData;
 	objc_FileBookmarkData *data = nullptr;
 #endif // OS_MAC_STORE
-
 };
diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.h b/Telegram/SourceFiles/platform/mac/window_title_mac.h
index 6ecb5b905..f8e4c2ea9 100644
--- a/Telegram/SourceFiles/platform/mac/window_title_mac.h
+++ b/Telegram/SourceFiles/platform/mac/window_title_mac.h
@@ -42,7 +42,6 @@ protected:
 private:
 	object_ptr<Ui::PlainShadow> _shadow;
 	QFont _font;
-
 };
 
 object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent);
diff --git a/Telegram/SourceFiles/platform/platform_audio.h b/Telegram/SourceFiles/platform/platform_audio.h
index 516398a1c..c7889ad4f 100644
--- a/Telegram/SourceFiles/platform/platform_audio.h
+++ b/Telegram/SourceFiles/platform/platform_audio.h
@@ -36,11 +36,9 @@ void DeInit();
 namespace Platform {
 namespace Audio {
 
-inline void Init() {
-}
+inline void Init() {}
 
-inline void DeInit() {
-}
+inline void DeInit() {}
 
 } // namespace Audio
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/platform_file_utilities.h b/Telegram/SourceFiles/platform/platform_file_utilities.h
index 593ab286d..3039a9c74 100644
--- a/Telegram/SourceFiles/platform/platform_file_utilities.h
+++ b/Telegram/SourceFiles/platform/platform_file_utilities.h
@@ -42,7 +42,8 @@ namespace FileDialog {
 
 void InitLastPath();
 
-bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, ::FileDialog::internal::Type type, QString startFile = QString());
+bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter,
+         ::FileDialog::internal::Type type, QString startFile = QString());
 
 } // namespace FileDialog
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index e735afed7..c750939e9 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include <QPainter>
 #include <QPoint>
 #include <QString>
-#include <QPainter>
 
 class QPaintEvent;
 
diff --git a/Telegram/SourceFiles/platform/platform_window_title.h b/Telegram/SourceFiles/platform/platform_window_title.h
index 1d0d892a6..b49f0050e 100644
--- a/Telegram/SourceFiles/platform/platform_window_title.h
+++ b/Telegram/SourceFiles/platform/platform_window_title.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/window_title.h"
 #include "window/themes/window_theme_preview.h"
+#include "window/window_title.h"
 
 namespace Platform {
 
@@ -43,7 +43,7 @@ void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRe
 namespace Platform {
 
 inline object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent) {
-	return { nullptr };
+	return {nullptr};
 }
 
 inline int PreviewTitleHeight() {
diff --git a/Telegram/SourceFiles/platform/win/audio_win.cpp b/Telegram/SourceFiles/platform/win/audio_win.cpp
index 249f48029..703a36a03 100644
--- a/Telegram/SourceFiles/platform/win/audio_win.cpp
+++ b/Telegram/SourceFiles/platform/win/audio_win.cpp
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/win/audio_win.h"
 
-#include "platform/win/windows_dlls.h"
 #include "media/media_audio.h"
+#include "platform/win/windows_dlls.h"
 #include <mmdeviceapi.h>
-#include <wrl/client.h>   // Microsoft::WRL::ComPtr<T>
+#include <wrl/client.h> // Microsoft::WRL::ComPtr<T>
 
 using namespace Microsoft::WRL;
 
@@ -50,7 +50,7 @@ private:
 	STDMETHOD_(ULONG, Release)() override {
 		return 1;
 	}
-	STDMETHOD(QueryInterface)(REFIID iid, void** object) override;
+	STDMETHOD(QueryInterface)(REFIID iid, void **object) override;
 	STDMETHOD(OnPropertyValueChanged)(LPCWSTR device_id, const PROPERTYKEY key) override;
 	STDMETHOD(OnDeviceAdded)(LPCWSTR device_id) override {
 		return S_OK;
@@ -60,12 +60,11 @@ private:
 	}
 	STDMETHOD(OnDeviceStateChanged)(LPCWSTR device_id, DWORD new_state) override;
 	STDMETHOD(OnDefaultDeviceChanged)(EDataFlow flow, ERole role, LPCWSTR new_default_device_id) override;
-
 };
 
-STDMETHODIMP DeviceListener::QueryInterface(REFIID iid, void** object) {
+STDMETHODIMP DeviceListener::QueryInterface(REFIID iid, void **object) {
 	if (iid == IID_IUnknown || iid == __uuidof(IMMNotificationClient)) {
-		*object = static_cast<IMMNotificationClient*>(this);
+		*object = static_cast<IMMNotificationClient *>(this);
 		return S_OK;
 	}
 
@@ -77,9 +76,11 @@ STDMETHODIMP DeviceListener::OnPropertyValueChanged(LPCWSTR device_id, const PRO
 	auto deviceName = device_id ? '"' + QString::fromWCharArray(device_id) + '"' : QString("nullptr");
 
 	constexpr auto kKeyBufferSize = 1024;
-	WCHAR keyBuffer[kKeyBufferSize] = { 0 };
+	WCHAR keyBuffer[kKeyBufferSize] = {0};
 	auto hr = Dlls::PSStringFromPropertyKey ? Dlls::PSStringFromPropertyKey(key, keyBuffer, kKeyBufferSize) : E_FAIL;
-	auto keyName = Dlls::PSStringFromPropertyKey ? (SUCCEEDED(hr) ? '"' + QString::fromWCharArray(keyBuffer) + '"' : QString("unknown")) : QString("unsupported");
+	auto keyName = Dlls::PSStringFromPropertyKey ?
+	                   (SUCCEEDED(hr) ? '"' + QString::fromWCharArray(keyBuffer) + '"' : QString("unknown")) :
+	                   QString("unsupported");
 
 	// BAD GUID { 0xD4EF3098, 0xC967, 0x4A4E, { 0xB2, 0x19, 0xAC, 0xB6, 0xDA, 0x1D, 0xC3, 0x73 } };
 	// BAD GUID { 0x3DE556E2, 0xE087, 0x4721, { 0xBE, 0x97, 0xEC, 0x16, 0x2D, 0x54, 0x81, 0xF8 } };
@@ -93,19 +94,24 @@ STDMETHODIMP DeviceListener::OnPropertyValueChanged(LPCWSTR device_id, const PRO
 	// We have logs of PKEY_AudioEndpoint_Disable_SysFx property change 3-5 times each second.
 	// So for now we disable PKEY_AudioEndpoint and both PKEY_AudioUnknown changes handling
 	//.
-	// constexpr GUID pkey_AudioEndpoint = { 0x1da5d803, 0xd492, 0x4edd, { 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e } };
-	constexpr GUID pkey_AudioEngine_Device = { 0xf19f064d, 0x82c, 0x4e27, { 0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c } };
-	constexpr GUID pkey_AudioEngine_OEM = { 0xe4870e26, 0x3cc5, 0x4cd2, { 0xba, 0x46, 0xca, 0xa, 0x9a, 0x70, 0xed, 0x4 } };
-	// constexpr GUID pkey_AudioUnknown1 = { 0x3d6e1656, 0x2e50, 0x4c4c, { 0x8d, 0x85, 0xd0, 0xac, 0xae, 0x3c, 0x6c, 0x68 } };
-	// constexpr GUID pkey_AudioUnknown2 = { 0x624f56de, 0xfd24, 0x473e, { 0x81, 0x4a, 0xde, 0x40, 0xaa, 0xca, 0xed, 0x16 } };
+	// constexpr GUID pkey_AudioEndpoint = { 0x1da5d803, 0xd492, 0x4edd, { 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f,
+	// 0x0e } };
+	constexpr GUID pkey_AudioEngine_Device = {
+	    0xf19f064d, 0x82c, 0x4e27, {0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c}};
+	constexpr GUID pkey_AudioEngine_OEM = {0xe4870e26, 0x3cc5, 0x4cd2, {0xba, 0x46, 0xca, 0xa, 0x9a, 0x70, 0xed, 0x4}};
+	// constexpr GUID pkey_AudioUnknown1 = { 0x3d6e1656, 0x2e50, 0x4c4c, { 0x8d, 0x85, 0xd0, 0xac, 0xae, 0x3c, 0x6c,
+	// 0x68 } }; constexpr GUID pkey_AudioUnknown2 = { 0x624f56de, 0xfd24, 0x473e, { 0x81, 0x4a, 0xde, 0x40, 0xaa, 0xca,
+	// 0xed, 0x16 } };
 	if (false
-//		|| key.fmtid == pkey_AudioEndpoint
-		|| key.fmtid == pkey_AudioEngine_Device
-		|| key.fmtid == pkey_AudioEngine_OEM
-//		|| key.fmtid == pkey_AudioUnknown1
-//		|| key.fmtid == pkey_AudioUnknown2
-		|| false) {
-		LOG(("Audio Info: OnPropertyValueChanged(%1, %2) scheduling detach from audio device.").arg(deviceName).arg(keyName));
+	    //		|| key.fmtid == pkey_AudioEndpoint
+	    || key.fmtid == pkey_AudioEngine_Device ||
+	    key.fmtid == pkey_AudioEngine_OEM
+	    //		|| key.fmtid == pkey_AudioUnknown1
+	    //		|| key.fmtid == pkey_AudioUnknown2
+	    || false) {
+		LOG(("Audio Info: OnPropertyValueChanged(%1, %2) scheduling detach from audio device.")
+		        .arg(deviceName)
+		        .arg(keyName));
 		Media::Audio::ScheduleDetachFromDeviceSafe();
 	} else {
 		DEBUG_LOG(("Audio Info: OnPropertyValueChanged(%1, %2) unknown, skipping.").arg(deviceName).arg(keyName));
@@ -115,7 +121,9 @@ STDMETHODIMP DeviceListener::OnPropertyValueChanged(LPCWSTR device_id, const PRO
 
 STDMETHODIMP DeviceListener::OnDeviceStateChanged(LPCWSTR device_id, DWORD new_state) {
 	auto deviceName = device_id ? '"' + QString::fromWCharArray(device_id) + '"' : QString("nullptr");
-	LOG(("Audio Info: OnDeviceStateChanged(%1, %2) scheduling detach from audio device.").arg(deviceName).arg(new_state));
+	LOG(("Audio Info: OnDeviceStateChanged(%1, %2) scheduling detach from audio device.")
+	        .arg(deviceName)
+	        .arg(new_state));
 	Media::Audio::ScheduleDetachFromDeviceSafe();
 	return S_OK;
 }
@@ -123,11 +131,20 @@ STDMETHODIMP DeviceListener::OnDeviceStateChanged(LPCWSTR device_id, DWORD new_s
 STDMETHODIMP DeviceListener::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR new_default_device_id) {
 	// Only listen for console and communication device changes.
 	if ((role != eConsole && role != eCommunications) || (flow != eRender && flow != eCapture)) {
-		LOG(("Audio Info: skipping OnDefaultDeviceChanged() flow %1, role %2, new_default_device_id: %3").arg(flow).arg(role).arg(new_default_device_id ? '"' + QString::fromWCharArray(new_default_device_id) + '"' : QString("nullptr")));
+		LOG(("Audio Info: skipping OnDefaultDeviceChanged() flow %1, role %2, new_default_device_id: %3")
+		        .arg(flow)
+		        .arg(role)
+		        .arg(new_default_device_id ? '"' + QString::fromWCharArray(new_default_device_id) + '"' :
+		                                     QString("nullptr")));
 		return S_OK;
 	}
 
-	LOG(("Audio Info: OnDefaultDeviceChanged() scheduling detach from audio device, flow %1, role %2, new_default_device_id: %3").arg(flow).arg(role).arg(new_default_device_id ? '"' + QString::fromWCharArray(new_default_device_id) + '"' : QString("nullptr")));
+	LOG(("Audio Info: OnDefaultDeviceChanged() scheduling detach from audio device, flow %1, role %2, "
+	     "new_default_device_id: %3")
+	        .arg(flow)
+	        .arg(role)
+	        .arg(new_default_device_id ? '"' + QString::fromWCharArray(new_default_device_id) + '"' :
+	                                     QString("nullptr")));
 	Media::Audio::ScheduleDetachFromDeviceSafe();
 
 	return S_OK;
@@ -150,7 +167,8 @@ void Init() {
 			hr = CoInitialize(nullptr);
 			if (SUCCEEDED(hr)) {
 				WasCoInitialized = true;
-				hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&Enumerator));
+				hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_INPROC_SERVER,
+				                      IID_PPV_ARGS(&Enumerator));
 				if (FAILED(hr)) {
 					Enumerator.Reset();
 
diff --git a/Telegram/SourceFiles/platform/win/audio_win.h b/Telegram/SourceFiles/platform/win/audio_win.h
index ac707ef4b..68161e62f 100644
--- a/Telegram/SourceFiles/platform/win/audio_win.h
+++ b/Telegram/SourceFiles/platform/win/audio_win.h
@@ -28,4 +28,3 @@ void DeInit();
 
 } // namespace Audio
 } // namespace Platform
-
diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
index 7528dc238..6e48139f1 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@@ -18,26 +18,26 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
+#include <ShlGuid.h>
 #include <windows.h>
 #include <windowsx.h>
-#include <ShlGuid.h>
 
-#include <QDialog>
-#include <QSettings>
-#include <QFileDialog>
-#include <QStandardPaths>
 #include <QDesktopServices>
+#include <QDialog>
+#include <QFileDialog>
+#include <QSettings>
+#include <QStandardPaths>
 
 #include "platform/win/file_utilities_win.h"
 
-#include "mainwindow.h"
-#include "storage/localstorage.h"
-#include "platform/win/windows_dlls.h"
-#include "lang/lang_keys.h"
-#include "messenger.h"
 #include "app.h"
-#include <winerror.h>
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "platform/win/windows_dlls.h"
+#include "storage/localstorage.h"
 #include <Shlwapi.h>
+#include <winerror.h>
 
 
 HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &, int hbitmapFormat);
@@ -49,15 +49,13 @@ namespace {
 class OpenWithApp {
 public:
 	OpenWithApp(const QString &name, IAssocHandler *handler, HBITMAP icon = nullptr)
-		: _name(name)
-		, _handler(handler)
-		, _icon(icon) {
-	}
+	    : _name(name)
+	    , _handler(handler)
+	    , _icon(icon) {}
 	OpenWithApp(OpenWithApp &&other)
-		: _name(base::take(other._name))
-		, _handler(base::take(other._handler))
-		, _icon(base::take(other._icon)) {
-	}
+	    : _name(base::take(other._name))
+	    , _handler(base::take(other._handler))
+	    , _icon(base::take(other._icon)) {}
 	OpenWithApp &operator=(OpenWithApp &&other) {
 		_name = base::take(other._name);
 		_icon = base::take(other._icon);
@@ -91,7 +89,6 @@ private:
 	QString _name;
 	IAssocHandler *_handler = nullptr;
 	HBITMAP _icon = nullptr;
-
 };
 
 HBITMAP IconToBitmap(LPWSTR icon, int iconindex) {
@@ -107,7 +104,9 @@ HBITMAP IconToBitmap(LPWSTR icon, int iconindex) {
 		if (!iconindex) { // try to read image
 			QImage img(QString::fromWCharArray(icon));
 			if (!img.isNull()) {
-				return qt_pixmapToWinHBITMAP(App::pixmapFromImageInPlace(img.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)), /* HBitmapAlpha */ 2);
+				return qt_pixmapToWinHBITMAP(
+				    App::pixmapFromImageInPlace(img.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)),
+				    /* HBitmapAlpha */ 2);
 			}
 		}
 		return 0;
@@ -134,7 +133,8 @@ void UnsafeOpenEmailLink(const QString &email) {
 		auto wstringUrl = url.toString(QUrl::FullyEncoded).toStdWString();
 		if (Dlls::SHOpenWithDialog) {
 			OPENASINFO info;
-			info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT | OAIF_EXEC | OAIF_FILE_IS_URI | OAIF_URL_PROTOCOL;
+			info.oaifInFlags =
+			    OAIF_ALLOW_REGISTRATION | OAIF_REGISTER_EXT | OAIF_EXEC | OAIF_FILE_IS_URI | OAIF_URL_PROTOCOL;
 			info.pcszClass = NULL;
 			info.pcszFile = wstringUrl.c_str();
 			Dlls::SHOpenWithDialog(0, &info);
@@ -161,7 +161,7 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 
 	auto result = false;
 	std::vector<OpenWithApp> handlers;
-	IShellItem* pItem = nullptr;
+	IShellItem *pItem = nullptr;
 	if (SUCCEEDED(Dlls::SHCreateItemFromParsingName(wstringPath.c_str(), nullptr, IID_PPV_ARGS(&pItem)))) {
 		IEnumAssocHandlers *assocHandlers = nullptr;
 		if (SUCCEEDED(pItem->BindToHandler(nullptr, BHID_EnumAssocHandlers, IID_PPV_ARGS(&assocHandlers)))) {
@@ -177,7 +177,8 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 					LPWSTR icon = 0;
 					int iconindex = 0;
 					if (SUCCEEDED(handler->GetIconLocation(&icon, &iconindex)) && icon) {
-						handlers.push_back(OpenWithApp(QString::fromWCharArray(name), handler, IconToBitmap(icon, iconindex)));
+						handlers.push_back(
+						    OpenWithApp(QString::fromWCharArray(name), handler, IconToBitmap(icon, iconindex)));
 						CoTaskMemFree(icon);
 					} else {
 						handlers.push_back(OpenWithApp(QString::fromWCharArray(name), handler));
@@ -192,11 +193,10 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 
 		if (!handlers.empty()) {
 			HMENU menu = CreatePopupMenu();
-			std::sort(handlers.begin(), handlers.end(), [](const OpenWithApp &a, const OpenWithApp &b) {
-				return a.name() < b.name();
-			});
+			std::sort(handlers.begin(), handlers.end(),
+			          [](const OpenWithApp &a, const OpenWithApp &b) { return a.name() < b.name(); });
 			for (qint32 i = 0, l = handlers.size(); i < l; ++i) {
-				MENUITEMINFO menuInfo = { 0 };
+				MENUITEMINFO menuInfo = {0};
 				menuInfo.cbSize = sizeof(menuInfo);
 				menuInfo.fMask = MIIM_STRING | MIIM_DATA | MIIM_ID;
 				menuInfo.fType = MFT_STRING;
@@ -214,13 +214,13 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 				menuInfo.dwTypeData = nameArr;
 				InsertMenuItem(menu, GetMenuItemCount(menu), TRUE, &menuInfo);
 			}
-			MENUITEMINFO sepInfo = { 0 };
+			MENUITEMINFO sepInfo = {0};
 			sepInfo.cbSize = sizeof(sepInfo);
 			sepInfo.fMask = MIIM_STRING | MIIM_DATA;
 			sepInfo.fType = MFT_SEPARATOR;
 			InsertMenuItem(menu, GetMenuItemCount(menu), true, &sepInfo);
 
-			MENUITEMINFO menuInfo = { 0 };
+			MENUITEMINFO menuInfo = {0};
 			menuInfo.cbSize = sizeof(menuInfo);
 			menuInfo.fMask = MIIM_STRING | MIIM_DATA | MIIM_ID;
 			menuInfo.fType = MFT_STRING;
@@ -234,7 +234,8 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 			menuInfo.dwTypeData = nameArr;
 			InsertMenuItem(menu, GetMenuItemCount(menu), TRUE, &menuInfo);
 
-			int sel = TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON | TPM_RETURNCMD, menuPosition.x(), menuPosition.y(), 0, parentHWND, 0);
+			int sel = TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON | TPM_RETURNCMD,
+			                         menuPosition.x(), menuPosition.y(), 0, parentHWND, 0);
 			DestroyMenu(menu);
 
 			if (sel > 0) {
@@ -292,7 +293,8 @@ void UnsafeShowInFolder(const QString &filepath) {
 
 void PostprocessDownloaded(const QString &filepath) {
 	auto wstringZoneFile = QDir::toNativeSeparators(filepath).toStdWString() + L":Zone.Identifier";
-	auto f = CreateFile(wstringZoneFile.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+	auto f = CreateFile(wstringZoneFile.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+	                    0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 	if (f == INVALID_HANDLE_VALUE) { // :(
 		return;
 	}
@@ -336,12 +338,7 @@ void InitLastPath() {
 		stream >> marker;
 		stream >> v;
 		if (marker == _QFileDialogMagic && v == version) {
-			stream >> splitterState
-				>> bookmarks
-				>> history
-				>> currentDirectory
-				>> headerData
-				>> viewMode;
+			stream >> splitterState >> bookmarks >> history >> currentDirectory >> headerData >> viewMode;
 			cSetDialogLastPath(currentDirectory);
 		}
 	}
@@ -357,7 +354,8 @@ void InitLastPath() {
 	}
 }
 
-bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter, ::FileDialog::internal::Type type, QString startFile) {
+bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption, const QString &filter,
+         ::FileDialog::internal::Type type, QString startFile) {
 	if (cDialogLastPath().isEmpty()) {
 		Platform::FileDialog::InitLastPath();
 	}
@@ -431,9 +429,9 @@ bool Get(QStringList &files, QByteArray &remoteContent, const QString &caption,
 		} else {
 			files = dialog.selectedFiles().mid(0, 1);
 		}
-//		if (type == Type::ReadFile || type == Type::ReadFiles) {
-//			remoteContent = dialog.selectedRemoteContent();
-//		}
+		//		if (type == Type::ReadFile || type == Type::ReadFiles) {
+		//			remoteContent = dialog.selectedRemoteContent();
+		//		}
 		return true;
 	}
 
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 46f3229db..06832e04f 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/win/main_window_win.h"
 
-#include "styles/style_window.h"
-#include "platform/platform_notifications_manager.h"
-#include "platform/win/windows_dlls.h"
-#include "window/notifications_manager.h"
-#include "mainwindow.h"
-#include "messenger.h"
+#include "app.h"
 #include "application.h"
 #include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "platform/platform_notifications_manager.h"
+#include "platform/win/windows_dlls.h"
 #include "storage/localstorage.h"
+#include "styles/style_window.h"
 #include "ui/widgets/popup_menu.h"
+#include "window/notifications_manager.h"
 #include "window/themes/window_theme.h"
-#include "app.h"
 
 #include <qpa/qplatformnativeinterface.h>
 
@@ -41,15 +41,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #undef min
 #undef max
 
-#include <windowsx.h>
-#include <Wtsapi32.h>
 #include <ShObjIdl.h>
+#include <Wtsapi32.h>
+#include <windowsx.h>
 #include <wrl/client.h>
 
-#include <QWindow>
+#include "facades.h"
 #include <QStyleFactory>
 #include <QWidget>
-#include "facades.h"
+#include <QWindow>
 
 HICON qt_pixmapToWinHICON(const QPixmap &);
 
@@ -109,11 +109,12 @@ enum {
 qint32 _psSize = 0;
 class _PsShadowWindows {
 public:
-
 	using Change = MainWindow::ShadowsChange;
 	using Changes = MainWindow::ShadowsChanges;
 
-	_PsShadowWindows() : screenDC(0), noKeyColor(RGB(255, 255, 255)) {
+	_PsShadowWindows()
+	    : screenDC(0)
+	    , noKeyColor(RGB(255, 255, 255)) {
 		for (int i = 0; i < 4; ++i) {
 			dcs[i] = 0;
 			bitmaps[i] = 0;
@@ -157,7 +158,10 @@ public:
 		_colors.reserve(_metaSize * _metaSize);
 		for (qint32 j = 0; j < _metaSize; ++j) {
 			for (qint32 i = 0; i < _metaSize; ++i) {
-				_colors.push_back((i < 2 * _shift || j < 2 * _shift) ? 1 : qMax(BYTE(1), BYTE(cornersImage.pixel(QPoint(i - 2 * _shift, j - 2 * _shift)) >> 24)));
+				_colors.push_back(
+				    (i < 2 * _shift || j < 2 * _shift) ?
+				        1 :
+				        qMax(BYTE(1), BYTE(cornersImage.pixel(QPoint(i - 2 * _shift, j - 2 * _shift)) >> 24)));
 			}
 		}
 		uchar prev = 0;
@@ -218,14 +222,18 @@ public:
 			wc.lpszClassName = _cn;
 			wc.hIconSm = 0;
 			if (!RegisterClassEx(&wc)) {
-				LOG(("Application Error: could not register shadow window class %1, error: %2").arg(i).arg(GetLastError()));
+				LOG(("Application Error: could not register shadow window class %1, error: %2")
+				        .arg(i)
+				        .arg(GetLastError()));
 				destroy();
 				return false;
 			}
 
 			hwnds[i] = CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, _cn, 0, WS_POPUP, 0, 0, 0, 0, 0, 0, appinst, 0);
 			if (!hwnds[i]) {
-				LOG(("Application Error: could not create shadow window class %1, error: %2").arg(i).arg(GetLastError()));
+				LOG(("Application Error: could not create shadow window class %1, error: %2")
+				        .arg(i)
+				        .arg(GetLastError()));
 				destroy();
 				return false;
 			}
@@ -233,14 +241,18 @@ public:
 
 			dcs[i] = CreateCompatibleDC(screenDC);
 			if (!dcs[i]) {
-				LOG(("Application Error: could not create dc for shadow window class %1, error: %2").arg(i).arg(GetLastError()));
+				LOG(("Application Error: could not create dc for shadow window class %1, error: %2")
+				        .arg(i)
+				        .arg(GetLastError()));
 				destroy();
 				return false;
 			}
 
 			bitmaps[i] = CreateCompatibleBitmap(screenDC, (i % 2) ? _size : max_w, (i % 2) ? max_h : _size);
 			if (!bitmaps[i]) {
-				LOG(("Application Error: could not create bitmap for shadow window class %1, error: %2").arg(i).arg(GetLastError()));
+				LOG(("Application Error: could not create bitmap for shadow window class %1, error: %2")
+				        .arg(i)
+				        .arg(GetLastError()));
 				destroy();
 				return false;
 			}
@@ -249,9 +261,7 @@ public:
 		}
 
 		QStringList alphasForLog;
-		for_const (auto alpha, _alphas) {
-			alphasForLog.append(QString::number(alpha));
-		}
+		for_const (auto alpha, _alphas) { alphasForLog.append(QString::number(alpha)); }
 		LOG(("Window Shadow: %1").arg(alphasForLog.join(", ")));
 
 		initCorners();
@@ -315,7 +325,8 @@ public:
 	}
 	void horCorners(int w, Gdiplus::Graphics *pgraphics0, Gdiplus::Graphics *pgraphics2) {
 		Gdiplus::SolidBrush brush(Gdiplus::Color(_alphas[0], r, g, b));
-		pgraphics0->FillRectangle(&brush, w - 2 * _size - (_fullsize - (_size - _shift)), 0, _fullsize - (_size - _shift), 2 * _shift);
+		pgraphics0->FillRectangle(&brush, w - 2 * _size - (_fullsize - (_size - _shift)), 0,
+		                          _fullsize - (_size - _shift), 2 * _shift);
 		for (int j = 2 * _shift; j < _size; ++j) {
 			for (int k = 0; k < _fullsize - (_size - _shift); ++k) {
 				brush.SetColor(Gdiplus::Color(_colors[j * _metaSize + k + (_size + _shift)], r, g, b));
@@ -384,7 +395,8 @@ public:
 		}
 
 		if (w != _w) {
-			int from = (_w > 2 * (_fullsize + _shift)) ? (_w - _size - _fullsize - _shift) : (_fullsize - (_size - _shift));
+			int from =
+			    (_w > 2 * (_fullsize + _shift)) ? (_w - _size - _fullsize - _shift) : (_fullsize - (_size - _shift));
 			int to = w - _size - _fullsize - _shift;
 			if (w > max_w) {
 				from = _fullsize - (_size - _shift);
@@ -417,16 +429,16 @@ public:
 				graphics2.FillRectangle(&brush, w - _size - _fullsize - _shift, 0, _fullsize - (_size - _shift), _size);
 			}
 			horCorners(w, &graphics0, &graphics2);
-			POINT p0 = { x + _size, y }, p2 = { x + _size, y + h - _size }, f = { 0, 0 };
-			SIZE s = { w - 2 * _size, _size };
+			POINT p0 = {x + _size, y}, p2 = {x + _size, y + h - _size}, f = {0, 0};
+			SIZE s = {w - 2 * _size, _size};
 			updateWindow(0, &p0, &s);
 			updateWindow(2, &p2, &s);
 		} else if (x != _x || y != _y) {
-			POINT p0 = { x + _size, y }, p2 = { x + _size, y + h - _size };
+			POINT p0 = {x + _size, y}, p2 = {x + _size, y + h - _size};
 			updateWindow(0, &p0);
 			updateWindow(2, &p2);
 		} else if (h != _h) {
-			POINT p2 = { x + _size, y + h - _size };
+			POINT p2 = {x + _size, y + h - _size};
 			updateWindow(2, &p2);
 		}
 
@@ -463,16 +475,16 @@ public:
 			}
 			verCorners(h, &graphics1, &graphics3);
 
-			POINT p1 = { x + w - _size, y }, p3 = { x, y }, f = { 0, 0 };
-			SIZE s = { _size, h };
+			POINT p1 = {x + w - _size, y}, p3 = {x, y}, f = {0, 0};
+			SIZE s = {_size, h};
 			updateWindow(1, &p1, &s);
 			updateWindow(3, &p3, &s);
 		} else if (x != _x || y != _y) {
-			POINT p1 = { x + w - _size, y }, p3 = { x, y };
+			POINT p1 = {x + w - _size, y}, p3 = {x, y};
 			updateWindow(1, &p1);
 			updateWindow(3, &p3);
 		} else if (w != _w) {
-			POINT p1 = { x + w - _size, y };
+			POINT p1 = {x + w - _size, y};
 			updateWindow(1, &p1);
 		}
 		_x = x;
@@ -489,9 +501,10 @@ public:
 	}
 
 	void updateWindow(int i, POINT *p, SIZE *s = 0) {
-		static POINT f = { 0, 0 };
+		static POINT f = {0, 0};
 		if (s) {
-			UpdateLayeredWindow(hwnds[i], (s ? screenDC : 0), p, s, (s ? dcs[i] : 0), (s ? (&f) : 0), noKeyColor, &blend, ULW_ALPHA);
+			UpdateLayeredWindow(hwnds[i], (s ? screenDC : 0), p, s, (s ? dcs[i] : 0), (s ? (&f) : 0), noKeyColor,
+			                    &blend, ULW_ALPHA);
 		} else {
 			SetWindowPos(hwnds[i], 0, p->x, p->y, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER);
 		}
@@ -510,7 +523,6 @@ public:
 	}
 
 private:
-
 	int _x = 0, _y = 0, _w = 0, _h = 0;
 	int _metaSize = 0, _fullsize = 0, _size = 0, _shift = 0;
 	QVector<BYTE> _alphas, _colors;
@@ -527,7 +539,6 @@ private:
 	COLORREF noKeyColor;
 
 	static LRESULT CALLBACK _PsShadowWindows::wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
 };
 _PsShadowWindows _psShadowWindows;
 
@@ -544,17 +555,21 @@ LRESULT CALLBACK _PsShadowWindows::wndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	if (i == 4) return DefWindowProc(hwnd, msg, wParam, lParam);
 
 	switch (msg) {
-	case WM_CLOSE:
-	App::wnd()->close();
-	break;
+	case WM_CLOSE: App::wnd()->close(); break;
 
 	case WM_NCHITTEST: {
 		qint32 xPos = GET_X_LPARAM(lParam), yPos = GET_Y_LPARAM(lParam);
 		switch (i) {
 		case 0: return HTTOP;
-		case 1: return (yPos < _psShadowWindows._y + _psSize) ? HTTOPRIGHT : ((yPos >= _psShadowWindows._y + _psShadowWindows._h - _psSize) ? HTBOTTOMRIGHT : HTRIGHT);
+		case 1:
+			return (yPos < _psShadowWindows._y + _psSize) ?
+			           HTTOPRIGHT :
+			           ((yPos >= _psShadowWindows._y + _psShadowWindows._h - _psSize) ? HTBOTTOMRIGHT : HTRIGHT);
 		case 2: return HTBOTTOM;
-		case 3: return (yPos < _psShadowWindows._y + _psSize) ? HTTOPLEFT : ((yPos >= _psShadowWindows._y + _psShadowWindows._h - _psSize) ? HTBOTTOMLEFT : HTLEFT);
+		case 3:
+			return (yPos < _psShadowWindows._y + _psSize) ?
+			           HTTOPLEFT :
+			           ((yPos >= _psShadowWindows._y + _psShadowWindows._h - _psSize) ? HTBOTTOMLEFT : HTLEFT);
 		}
 		return HTTRANSPARENT;
 	} break;
@@ -578,26 +593,25 @@ LRESULT CALLBACK _PsShadowWindows::wndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	case WM_NCPOINTERUPDATE:
 	case WM_NCPOINTERDOWN:
 	case WM_NCPOINTERUP:
-	if (App::wnd() && App::wnd()->psHwnd()) {
-		if (msg == WM_NCLBUTTONDOWN) {
-			::SetForegroundWindow(App::wnd()->psHwnd());
+		if (App::wnd() && App::wnd()->psHwnd()) {
+			if (msg == WM_NCLBUTTONDOWN) {
+				::SetForegroundWindow(App::wnd()->psHwnd());
+			}
+			LRESULT res = SendMessage(App::wnd()->psHwnd(), msg, wParam, lParam);
+			return res;
 		}
-		LRESULT res = SendMessage(App::wnd()->psHwnd(), msg, wParam, lParam);
-		return res;
-	}
-	return 0;
-	break;
+		return 0;
+		break;
 	case WM_ACTIVATE:
-	if (App::wnd() && App::wnd()->psHwnd() && wParam == WA_ACTIVE) {
-		if ((HWND)lParam != App::wnd()->psHwnd()) {
-			::SetForegroundWindow(hwnd);
-			::SetWindowPos(App::wnd()->psHwnd(), hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+		if (App::wnd() && App::wnd()->psHwnd() && wParam == WA_ACTIVE) {
+			if ((HWND)lParam != App::wnd()->psHwnd()) {
+				::SetForegroundWindow(hwnd);
+				::SetWindowPos(App::wnd()->psHwnd(), hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+			}
 		}
-	}
-	return DefWindowProc(hwnd, msg, wParam, lParam);
-	break;
-	default:
-	return DefWindowProc(hwnd, msg, wParam, lParam);
+		return DefWindowProc(hwnd, msg, wParam, lParam);
+		break;
+	default: return DefWindowProc(hwnd, msg, wParam, lParam);
 	}
 	return 0;
 }
@@ -611,7 +625,7 @@ bool handleSessionNotification = false;
 UINT MainWindow::_taskbarCreatedMsgId = 0;
 
 MainWindow::MainWindow()
-: ps_tbHider_hWnd(createTaskbarHider()) {
+    : ps_tbHider_hWnd(createTaskbarHider()) {
 	if (!_taskbarCreatedMsgId) {
 		_taskbarCreatedMsgId = RegisterWindowMessage(L"TaskbarButtonCreated");
 	}
@@ -634,12 +648,12 @@ void MainWindow::shadowsUpdate(ShadowsChanges changes, WINDOWPOS *position) {
 }
 
 void MainWindow::shadowsActivate() {
-//	_psShadowWindows.setColor(_shActive);
+	//	_psShadowWindows.setColor(_shActive);
 	shadowsUpdate(ShadowsChange::Activate);
 }
 
 void MainWindow::shadowsDeactivate() {
-//	_psShadowWindows.setColor(_shInactive);
+	//	_psShadowWindows.setColor(_shInactive);
 }
 
 void MainWindow::psShowTrayMenu() {
@@ -648,7 +662,7 @@ void MainWindow::psShowTrayMenu() {
 
 qint32 MainWindow::screenNameChecksum(const QString &name) const {
 	constexpr int DeviceNameSize = base::array_size(MONITORINFOEX().szDevice);
-	wchar_t buffer[DeviceNameSize] = { 0 };
+	wchar_t buffer[DeviceNameSize] = {0};
 	if (name.size() < DeviceNameSize) {
 		name.toWCharArray(buffer);
 	} else {
@@ -659,9 +673,7 @@ qint32 MainWindow::screenNameChecksum(const QString &name) const {
 
 void MainWindow::psRefreshTaskbarIcon() {
 	auto refresher = object_ptr<QWidget>(this);
-	auto guard = gsl::finally([&refresher] {
-		refresher.destroy();
-	});
+	auto guard = gsl::finally([&refresher] { refresher.destroy(); });
 	refresher->setWindowFlags(static_cast<Qt::WindowFlags>(Qt::Tool) | Qt::FramelessWindowHint);
 	refresher->setGeometry(x() + 1, y() + 1, 1, 1);
 	auto palette = refresher->palette();
@@ -673,8 +685,7 @@ void MainWindow::psRefreshTaskbarIcon() {
 	updateIconCounters();
 }
 
-void MainWindow::psTrayMenuUpdated() {
-}
+void MainWindow::psTrayMenuUpdated() {}
 
 void MainWindow::psSetupTrayIcon() {
 	if (!trayIcon) {
@@ -684,7 +695,8 @@ void MainWindow::psSetupTrayIcon() {
 
 		trayIcon->setIcon(icon);
 		trayIcon->setToolTip(str_const_toString(AppName));
-		connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
+		connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this,
+		        SLOT(toggleTray(QSystemTrayIcon::ActivationReason)), Qt::UniqueConnection);
 		connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(showFromTray()));
 		App::wnd()->updateTrayMenu();
 	}
@@ -695,7 +707,8 @@ void MainWindow::psSetupTrayIcon() {
 
 void MainWindow::showTrayTooltip() {
 	if (trayIcon && !cSeenTrayTooltip()) {
-		trayIcon->showMessage(str_const_toString(AppName), lng_tray_icon_text(lt_appname, lang(appname)), QSystemTrayIcon::Information, 10000);
+		trayIcon->showMessage(str_const_toString(AppName), lng_tray_icon_text(lt_appname, lang(appname)),
+		                      QSystemTrayIcon::Information, 10000);
 		cSetSeenTrayTooltip(true);
 		Local::writeSettings();
 	}
@@ -774,7 +787,8 @@ void MainWindow::updateIconCounters() {
 			QIcon iconOverlay;
 			iconOverlay.addPixmap(App::pixmapFromImageInPlace(iconWithCounter(-16, counter, bg, fg, false)));
 			iconOverlay.addPixmap(App::pixmapFromImageInPlace(iconWithCounter(-32, counter, bg, fg, false)));
-			ps_iconOverlay = createHIconFromQIcon(iconOverlay, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
+			ps_iconOverlay =
+			    createHIconFromQIcon(iconOverlay, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
 		}
 		auto description = (counter > 0) ? lng_unread_bar(lt_count, counter) : QString();
 		taskbarList->SetOverlayIcon(ps_hWnd, ps_iconOverlay, description.toStdWString().c_str());
@@ -784,11 +798,13 @@ void MainWindow::updateIconCounters() {
 
 void MainWindow::initHook() {
 	auto platformInterface = QGuiApplication::platformNativeInterface();
-	ps_hWnd = static_cast<HWND>(platformInterface->nativeResourceForWindow(QByteArrayLiteral("handle"), windowHandle()));
+	ps_hWnd =
+	    static_cast<HWND>(platformInterface->nativeResourceForWindow(QByteArrayLiteral("handle"), windowHandle()));
 
 	if (!ps_hWnd) return;
 
-	handleSessionNotification = (Dlls::WTSRegisterSessionNotification != nullptr) && (Dlls::WTSUnRegisterSessionNotification != nullptr);
+	handleSessionNotification =
+	    (Dlls::WTSRegisterSessionNotification != nullptr) && (Dlls::WTSUnRegisterSessionNotification != nullptr);
 	if (handleSessionNotification) {
 		Dlls::WTSRegisterSessionNotification(ps_hWnd, NOTIFY_FOR_THIS_SESSION);
 	}
@@ -852,7 +868,7 @@ void MainWindow::updateSystemMenu(Qt::WindowState state) {
 	}
 	int itemCount = GetMenuItemCount(ps_menu);
 	for (int i = 0; i < itemCount; ++i) {
-		MENUITEMINFO itemInfo = { 0 };
+		MENUITEMINFO itemInfo = {0};
 		itemInfo.cbSize = sizeof(itemInfo);
 		itemInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID;
 		if (GetMenuItemInfo(ps_menu, i, TRUE, &itemInfo)) {
@@ -863,20 +879,28 @@ void MainWindow::updateSystemMenu(Qt::WindowState state) {
 				UINT fOldState = itemInfo.fState, fState = itemInfo.fState & ~MFS_DISABLED;
 				if (itemInfo.wID == SC_CLOSE) {
 					fState |= MFS_DEFAULT;
-				} else if (itemInfo.wID == menuToDisable || (itemInfo.wID != SC_MINIMIZE && itemInfo.wID != SC_MAXIMIZE && itemInfo.wID != SC_RESTORE)) {
+				} else if (itemInfo.wID == menuToDisable ||
+				           (itemInfo.wID != SC_MINIMIZE && itemInfo.wID != SC_MAXIMIZE && itemInfo.wID != SC_RESTORE)) {
 					fState |= MFS_DISABLED;
 				}
 				itemInfo.fMask = MIIM_STATE;
 				itemInfo.fState = fState;
 				if (!SetMenuItemInfo(ps_menu, i, TRUE, &itemInfo)) {
-					DEBUG_LOG(("PS Error: could not set state %1 to menu item %2, old state %3, error %4").arg(fState).arg(itemInfo.wID).arg(fOldState).arg(GetLastError()));
+					DEBUG_LOG(("PS Error: could not set state %1 to menu item %2, old state %3, error %4")
+					              .arg(fState)
+					              .arg(itemInfo.wID)
+					              .arg(fOldState)
+					              .arg(GetLastError()));
 					DestroyMenu(ps_menu);
 					ps_menu = 0;
 					break;
 				}
 			}
 		} else {
-			DEBUG_LOG(("PS Error: could not get state, menu item %1 of %2, error %3").arg(i).arg(itemCount).arg(GetLastError()));
+			DEBUG_LOG(("PS Error: could not get state, menu item %1 of %2, error %3")
+			              .arg(i)
+			              .arg(itemCount)
+			              .arg(GetLastError()));
 			DestroyMenu(ps_menu);
 			ps_menu = 0;
 			break;
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h
index bb27cafe2..145dd6fc8 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.h
+++ b/Telegram/SourceFiles/platform/win/main_window_win.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/flags.h"
+#include "platform/platform_main_window.h"
 #include <QSystemTrayIcon>
 #include <QTimer>
-#include "platform/platform_main_window.h"
-#include "base/flags.h"
 #include <windows.h>
 
 namespace Ui {
@@ -57,14 +57,16 @@ public:
 
 	// Custom shadows.
 	enum class ShadowsChange {
-		Moved    = (1 << 0),
-		Resized  = (1 << 1),
-		Shown    = (1 << 2),
-		Hidden   = (1 << 3),
+		Moved = (1 << 0),
+		Resized = (1 << 1),
+		Shown = (1 << 2),
+		Hidden = (1 << 3),
 		Activate = (1 << 4),
 	};
 	using ShadowsChanges = base::flags<ShadowsChange>;
-	friend inline constexpr auto is_flag_type(ShadowsChange) { return true; };
+	friend inline constexpr auto is_flag_type(ShadowsChange) {
+		return true;
+	};
 
 	bool shadowsWorking() const {
 		return _shadowsWorking;
@@ -101,7 +103,8 @@ protected:
 
 	void psTrayMenuUpdated();
 	void psSetupTrayIcon();
-	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) = 0;
+	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift,
+	                               style::color color) = 0;
 
 	void showTrayTooltip() override;
 
@@ -128,7 +131,6 @@ private:
 
 	int _deltaLeft = 0;
 	int _deltaTop = 0;
-
 };
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index 1a426dc69..eb8e65bc2 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -20,24 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/win/notifications_manager_win.h"
 
-#include "window/notifications_utilities.h"
-#include "platform/win/windows_app_user_model_id.h"
-#include "platform/win/windows_event_filter.h"
-#include "platform/win/windows_dlls.h"
-#include "mainwindow.h"
 #include "base/task_queue.h"
+#include "mainwindow.h"
+#include "platform/win/windows_app_user_model_id.h"
+#include "platform/win/windows_dlls.h"
+#include "platform/win/windows_event_filter.h"
+#include "window/notifications_utilities.h"
 
-#include <strsafe.h>
 #include <intsafe.h>
+#include <strsafe.h>
 
-#include <wrl/client.h>
-#include <windows.ui.notifications.h>
 #include <windows.foundation.collections.h>
+#include <windows.ui.notifications.h>
+#include <wrl/client.h>
 #include <wrl/implements.h>
 
-#include "history/history.h"
 #include "app.h"
 #include "facades.h"
+#include "history/history.h"
 
 HICON qt_pixmapToWinHICON(const QPixmap &);
 
@@ -63,8 +63,7 @@ public:
 		Dlls::WindowsDeleteString(_hstring);
 	}
 
-	template <size_t N>
-	StringReferenceWrapper(_In_reads_(N) wchar_t const (&stringRef)[N]) throw() {
+	template <size_t N> StringReferenceWrapper(_In_reads_(N) wchar_t const (&stringRef)[N]) throw() {
 		UINT32 length = N - 1;
 		HRESULT hr = Dlls::WindowsCreateStringReference(stringRef, length, &_header, &_hstring);
 		if (!SUCCEEDED(hr)) {
@@ -72,8 +71,7 @@ public:
 		}
 	}
 
-	template <size_t _>
-	StringReferenceWrapper(_In_reads_(_) wchar_t(&stringRef)[_]) throw() {
+	template <size_t _> StringReferenceWrapper(_In_reads_(_) wchar_t (&stringRef)[_]) throw() {
 		UINT32 length;
 		HRESULT hr = SizeTToUInt32(wcslen(stringRef), &length);
 		if (!SUCCEEDED(hr)) {
@@ -90,16 +88,16 @@ public:
 private:
 	HSTRING _hstring;
 	HSTRING_HEADER _header;
-
 };
 
-template<class T>
-_Check_return_ __inline HRESULT _1_GetActivationFactory(_In_ HSTRING activatableClassId, _COM_Outptr_ T** factory) {
+template <class T>
+_Check_return_ __inline HRESULT _1_GetActivationFactory(_In_ HSTRING activatableClassId, _COM_Outptr_ T **factory) {
 	return Dlls::RoGetActivationFactory(activatableClassId, IID_INS_ARGS(factory));
 }
 
-template<typename T>
-inline HRESULT wrap_GetActivationFactory(_In_ HSTRING activatableClassId, _Inout_ Details::ComPtrRef<T> factory) throw() {
+template <typename T>
+inline HRESULT wrap_GetActivationFactory(_In_ HSTRING activatableClassId,
+                                         _Inout_ Details::ComPtrRef<T> factory) throw() {
 	return _1_GetActivationFactory(activatableClassId, factory.ReleaseAndGetAddressOf());
 }
 
@@ -107,11 +105,9 @@ bool init() {
 	if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS8) {
 		return false;
 	}
-	if ((Dlls::SetCurrentProcessExplicitAppUserModelID == nullptr)
-		|| (Dlls::PropVariantToString == nullptr)
-		|| (Dlls::RoGetActivationFactory == nullptr)
-		|| (Dlls::WindowsCreateStringReference == nullptr)
-		|| (Dlls::WindowsDeleteString == nullptr)) {
+	if ((Dlls::SetCurrentProcessExplicitAppUserModelID == nullptr) || (Dlls::PropVariantToString == nullptr) ||
+	    (Dlls::RoGetActivationFactory == nullptr) || (Dlls::WindowsCreateStringReference == nullptr) ||
+	    (Dlls::WindowsDeleteString == nullptr)) {
 		return false;
 	}
 
@@ -206,18 +202,21 @@ HRESULT SetImageSrc(_In_z_ const wchar_t *imagePath, _In_ IXmlDocument *toastXml
 	return SetNodeValueString(StringReferenceWrapper(imageSrc).Get(), srcAttribute.Get(), toastXml);
 }
 
-typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification*, ::IInspectable *> DesktopToastActivatedEventHandler;
-typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification*, ToastDismissedEventArgs*> DesktopToastDismissedEventHandler;
-typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification*, ToastFailedEventArgs*> DesktopToastFailedEventHandler;
+typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification *, ::IInspectable *>
+    DesktopToastActivatedEventHandler;
+typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification *, ToastDismissedEventArgs *>
+    DesktopToastDismissedEventHandler;
+typedef ABI::Windows::Foundation::ITypedEventHandler<ToastNotification *, ToastFailedEventArgs *>
+    DesktopToastFailedEventHandler;
 
-class ToastEventHandler : public Implements<DesktopToastActivatedEventHandler, DesktopToastDismissedEventHandler, DesktopToastFailedEventHandler> {
+class ToastEventHandler : public Implements<DesktopToastActivatedEventHandler, DesktopToastDismissedEventHandler,
+                                            DesktopToastFailedEventHandler> {
 public:
 	// We keep a weak pointer to a member field of native notifications manager.
-	ToastEventHandler::ToastEventHandler(const std::shared_ptr<Manager*> &guarded, const PeerId &peer, MsgId msg)
-	: _peerId(peer)
-	, _msgId(msg)
-	, _weak(guarded) {
-	}
+	ToastEventHandler::ToastEventHandler(const std::shared_ptr<Manager *> &guarded, const PeerId &peer, MsgId msg)
+	    : _peerId(peer)
+	    , _msgId(msg)
+	    , _weak(guarded) {}
 	~ToastEventHandler() = default;
 
 	void performOnMainQueue(base::lambda_once<void(Manager *manager)> task) {
@@ -229,10 +228,9 @@ public:
 	}
 
 	// DesktopToastActivatedEventHandler
-	IFACEMETHODIMP Invoke(_In_ IToastNotification *sender, _In_ IInspectable* args) {
-		performOnMainQueue([peerId = _peerId, msgId = _msgId](Manager *manager) {
-			manager->notificationActivated(peerId, msgId);
-		});
+	IFACEMETHODIMP Invoke(_In_ IToastNotification *sender, _In_ IInspectable *args) {
+		performOnMainQueue(
+		    [peerId = _peerId, msgId = _msgId](Manager *manager) { manager->notificationActivated(peerId, msgId); });
 		return S_OK;
 	}
 
@@ -241,15 +239,14 @@ public:
 		ToastDismissalReason tdr;
 		if (SUCCEEDED(e->get_Reason(&tdr))) {
 			switch (tdr) {
-			case ToastDismissalReason_ApplicationHidden:
-			break;
+			case ToastDismissalReason_ApplicationHidden: break;
 			case ToastDismissalReason_UserCanceled:
 			case ToastDismissalReason_TimedOut:
 			default:
 				performOnMainQueue([peerId = _peerId, msgId = _msgId](Manager *manager) {
 					manager->clearNotification(peerId, msgId);
 				});
-			break;
+				break;
 			}
 		}
 		return S_OK;
@@ -257,9 +254,8 @@ public:
 
 	// DesktopToastFailedEventHandler
 	IFACEMETHODIMP Invoke(_In_ IToastNotification *sender, _In_ IToastFailedEventArgs *e) {
-		performOnMainQueue([peerId = _peerId, msgId = _msgId](Manager *manager) {
-			manager->clearNotification(peerId, msgId);
-		});
+		performOnMainQueue(
+		    [peerId = _peerId, msgId = _msgId](Manager *manager) { manager->clearNotification(peerId, msgId); });
 		return S_OK;
 	}
 
@@ -278,17 +274,18 @@ public:
 
 	IFACEMETHODIMP QueryInterface(_In_ REFIID riid, _COM_Outptr_ void **ppv) {
 		if (IsEqualIID(riid, IID_IUnknown))
-			*ppv = static_cast<IUnknown*>(static_cast<DesktopToastActivatedEventHandler*>(this));
+			*ppv = static_cast<IUnknown *>(static_cast<DesktopToastActivatedEventHandler *>(this));
 		else if (IsEqualIID(riid, __uuidof(DesktopToastActivatedEventHandler)))
-			*ppv = static_cast<DesktopToastActivatedEventHandler*>(this);
+			*ppv = static_cast<DesktopToastActivatedEventHandler *>(this);
 		else if (IsEqualIID(riid, __uuidof(DesktopToastDismissedEventHandler)))
-			*ppv = static_cast<DesktopToastDismissedEventHandler*>(this);
+			*ppv = static_cast<DesktopToastDismissedEventHandler *>(this);
 		else if (IsEqualIID(riid, __uuidof(DesktopToastFailedEventHandler)))
-			*ppv = static_cast<DesktopToastFailedEventHandler*>(this);
-		else *ppv = nullptr;
+			*ppv = static_cast<DesktopToastFailedEventHandler *>(this);
+		else
+			*ppv = nullptr;
 
 		if (*ppv) {
-			reinterpret_cast<IUnknown*>(*ppv)->AddRef();
+			reinterpret_cast<IUnknown *>(*ppv)->AddRef();
 			return S_OK;
 		}
 
@@ -299,8 +296,7 @@ private:
 	ULONG _refCount = 0;
 	PeerId _peerId = 0;
 	MsgId _msgId = 0;
-	std::weak_ptr<Manager*> _weak;
-
+	std::weak_ptr<Manager *> _weak;
 };
 
 auto Checked = false;
@@ -352,7 +348,8 @@ public:
 	explicit Private(Manager *instance, Type type);
 	bool init();
 
-	bool showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton);
+	bool showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+	                      const QString &msg, bool hideNameAndPhoto, bool hideReplyButton);
 	void clearAll();
 	void clearFromHistory(History *history);
 	void beforeNotificationActivated(PeerId peerId, MsgId msgId);
@@ -364,40 +361,42 @@ public:
 private:
 	Window::Notifications::CachedUserpics _cachedUserpics;
 
-	std::shared_ptr<Manager*> _guarded;
+	std::shared_ptr<Manager *> _guarded;
 
 	ComPtr<IToastNotificationManagerStatics> _notificationManager;
 	ComPtr<IToastNotifier> _notifier;
 	ComPtr<IToastNotificationFactory> _notificationFactory;
 
 	struct NotificationPtr {
-		NotificationPtr() {
-		}
-		NotificationPtr(const ComPtr<IToastNotification> &ptr) : p(ptr) {
-		}
+		NotificationPtr() {}
+		NotificationPtr(const ComPtr<IToastNotification> &ptr)
+		    : p(ptr) {}
 
 		ComPtr<IToastNotification> p;
 	};
 	QMap<PeerId, QMap<MsgId, NotificationPtr>> _notifications;
-
 };
 
 Manager::Private::Private(Manager *instance, Type type)
-: _guarded(std::make_shared<Manager*>(instance))
-, _cachedUserpics(type) {
-}
+    : _guarded(std::make_shared<Manager *>(instance))
+    , _cachedUserpics(type) {}
 
 bool Manager::Private::init() {
-	if (!SUCCEEDED(wrap_GetActivationFactory(StringReferenceWrapper(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(), &_notificationManager))) {
+	if (!SUCCEEDED(wrap_GetActivationFactory(
+	        StringReferenceWrapper(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
+	        &_notificationManager))) {
 		return false;
 	}
 
 	auto appUserModelId = AppUserModelId::getId();
-	if (!SUCCEEDED(_notificationManager->CreateToastNotifierWithId(StringReferenceWrapper(appUserModelId, wcslen(appUserModelId)).Get(), &_notifier))) {
+	if (!SUCCEEDED(_notificationManager->CreateToastNotifierWithId(
+	        StringReferenceWrapper(appUserModelId, wcslen(appUserModelId)).Get(), &_notifier))) {
 		return false;
 	}
 
-	if (!SUCCEEDED(wrap_GetActivationFactory(StringReferenceWrapper(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(), &_notificationFactory))) {
+	if (!SUCCEEDED(wrap_GetActivationFactory(
+	        StringReferenceWrapper(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(),
+	        &_notificationFactory))) {
 		return false;
 	}
 	return true;
@@ -417,9 +416,7 @@ void Manager::Private::clearAll() {
 
 	auto temp = base::take(_notifications);
 	for_const (auto &notifications, temp) {
-		for_const (auto &notification, notifications) {
-			_notifier->Hide(notification.p.Get());
-		}
+		for_const (auto &notification, notifications) { _notifier->Hide(notification.p.Get()); }
 	}
 }
 
@@ -431,9 +428,7 @@ void Manager::Private::clearFromHistory(History *history) {
 		auto temp = base::take(i.value());
 		_notifications.erase(i);
 
-		for_const (auto &notification, temp) {
-			_notifier->Hide(notification.p.Get());
-		}
+		for_const (auto &notification, temp) { _notifier->Hide(notification.p.Get()); }
 	}
 }
 
@@ -457,13 +452,15 @@ void Manager::Private::clearNotification(PeerId peerId, MsgId msgId) {
 	}
 }
 
-bool Manager::Private::showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) {
+bool Manager::Private::showNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+                                        const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) {
 	if (!_notificationManager || !_notifier || !_notificationFactory) return false;
 
 	ComPtr<IXmlDocument> toastXml;
 	bool withSubtitle = !subtitle.isEmpty();
 
-	HRESULT hr = _notificationManager->GetTemplateContent(withSubtitle ? ToastTemplateType_ToastImageAndText04 : ToastTemplateType_ToastImageAndText02, &toastXml);
+	HRESULT hr = _notificationManager->GetTemplateContent(
+	    withSubtitle ? ToastTemplateType_ToastImageAndText04 : ToastTemplateType_ToastImageAndText02, &toastXml);
 	if (!SUCCEEDED(hr)) return false;
 
 	hr = SetAudioSilent(toastXml.Get());
@@ -497,7 +494,8 @@ bool Manager::Private::showNotification(PeerData *peer, MsgId msgId, const QStri
 		if (!SUCCEEDED(hr)) return false;
 
 		std::wstring wtitle = title.toStdWString();
-		hr = SetNodeValueString(StringReferenceWrapper(wtitle.data(), wtitle.size()).Get(), textNode.Get(), toastXml.Get());
+		hr = SetNodeValueString(StringReferenceWrapper(wtitle.data(), wtitle.size()).Get(), textNode.Get(),
+		                        toastXml.Get());
 		if (!SUCCEEDED(hr)) return false;
 	}
 	if (withSubtitle) {
@@ -506,7 +504,8 @@ bool Manager::Private::showNotification(PeerData *peer, MsgId msgId, const QStri
 		if (!SUCCEEDED(hr)) return false;
 
 		std::wstring wsubtitle = subtitle.toStdWString();
-		hr = SetNodeValueString(StringReferenceWrapper(wsubtitle.data(), wsubtitle.size()).Get(), textNode.Get(), toastXml.Get());
+		hr = SetNodeValueString(StringReferenceWrapper(wsubtitle.data(), wsubtitle.size()).Get(), textNode.Get(),
+		                        toastXml.Get());
 		if (!SUCCEEDED(hr)) return false;
 	}
 	{
@@ -559,9 +558,9 @@ bool Manager::Private::showNotification(PeerData *peer, MsgId msgId, const QStri
 	return true;
 }
 
-Manager::Manager(Window::Notifications::System *system) : NativeManager(system)
-, _private(std::make_unique<Private>(this, Private::Type::Rounded)) {
-}
+Manager::Manager(Window::Notifications::System *system)
+    : NativeManager(system)
+    , _private(std::make_unique<Private>(this, Private::Type::Rounded)) {}
 
 bool Manager::init() {
 	return _private->init();
@@ -573,7 +572,8 @@ void Manager::clearNotification(PeerId peerId, MsgId msgId) {
 
 Manager::~Manager() = default;
 
-void Manager::doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) {
+void Manager::doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+                                       const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) {
 	_private->showNotification(peer, msgId, title, subtitle, msg, hideNameAndPhoto, hideReplyButton);
 }
 
@@ -675,7 +675,8 @@ bool SkipAudio() {
 bool SkipToast() {
 	querySystemNotificationSettings();
 
-	if (UserNotificationState == QUNS_PRESENTATION_MODE || UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN/* || UserNotificationState == QUNS_BUSY*/) {
+	if (UserNotificationState == QUNS_PRESENTATION_MODE ||
+	    UserNotificationState == QUNS_RUNNING_D3D_FULL_SCREEN /* || UserNotificationState == QUNS_BUSY*/) {
 		return true;
 	}
 	if (QuietHoursEnabled) {
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.h b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
index 48516a402..cc533d1ac 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.h
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.h
@@ -36,7 +36,8 @@ public:
 	~Manager();
 
 protected:
-	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
+	void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+	                              const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) override;
 	void doClearAllFast() override;
 	void doClearFromHistory(History *history) override;
 	void onBeforeNotificationActivated(PeerId peerId, MsgId msgId) override;
@@ -45,7 +46,6 @@ protected:
 private:
 	class Private;
 	const std::unique_ptr<Private> _private;
-
 };
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index e28d6a657..8cf3ab7fb 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -20,21 +20,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/win/specific_win.h"
 
+#include "base/task_queue.h"
+#include "history/history_location_manager.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "passcodewidget.h"
 #include "platform/win/main_window_win.h"
 #include "platform/win/notifications_manager_win.h"
 #include "platform/win/windows_app_user_model_id.h"
 #include "platform/win/windows_dlls.h"
 #include "platform/win/windows_event_filter.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "history/history_location_manager.h"
 #include "storage/localstorage.h"
-#include "passcodewidget.h"
-#include "base/task_queue.h"
 
 #pragma warning(push)
-#pragma warning(disable:4091)
+#pragma warning(disable : 4091)
 #include <dbghelp.h>
 #include <shlobj.h>
 #pragma warning(pop)
@@ -43,13 +43,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <strsafe.h>
 
 #include <ObjIdl.h>
-#include <wrl/client.h>
 #include <propvarutil.h>
+#include <wrl/client.h>
 
-#include <qpa/qplatformnativeinterface.h>
-#include <QStandardPaths>
 #include <QDesktopServices>
 #include <QDesktopWidget>
+#include <QStandardPaths>
+#include <qpa/qplatformnativeinterface.h>
 
 
 #ifndef DCX_USESTYLE
@@ -57,9 +57,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #endif
 
 #ifndef WM_NCPOINTERUPDATE
-#define WM_NCPOINTERUPDATE              0x0241
-#define WM_NCPOINTERDOWN                0x0242
-#define WM_NCPOINTERUP                  0x0243
+#define WM_NCPOINTERUPDATE 0x0241
+#define WM_NCPOINTERDOWN 0x0242
+#define WM_NCPOINTERUP 0x0243
 #endif
 
 using namespace Microsoft::WRL;
@@ -67,22 +67,22 @@ using namespace Windows::Foundation;
 using namespace Platform;
 
 namespace {
-    QStringList _initLogs;
+QStringList _initLogs;
 
-	bool themeInited = false;
-	bool finished = true;
-	QMargins simpleMargins, margins;
-	HICON bigIcon = 0, smallIcon = 0, overlayIcon = 0;
-
-	class _PsInitializer {
-	public:
-		_PsInitializer() {
-			Dlls::start();
-		}
-	};
-	_PsInitializer _psInitializer;
+bool themeInited = false;
+bool finished = true;
+QMargins simpleMargins, margins;
+HICON bigIcon = 0, smallIcon = 0, overlayIcon = 0;
 
+class _PsInitializer {
+public:
+	_PsInitializer() {
+		Dlls::start();
+	}
 };
+_PsInitializer _psInitializer;
+
+}; // namespace
 
 QAbstractNativeEventFilter *psNativeEventFilter() {
 	return EventFilter::createInstance();
@@ -93,43 +93,35 @@ void psDeleteDir(const QString &dir) {
 	WCHAR path[4096];
 	memcpy(path, wDir.c_str(), (wDir.size() + 1) * sizeof(WCHAR));
 	path[wDir.size() + 1] = 0;
-	SHFILEOPSTRUCT file_op = {
-		NULL,
-		FO_DELETE,
-		path,
-		L"",
-		FOF_NOCONFIRMATION |
-		FOF_NOERRORUI |
-		FOF_SILENT,
-		false,
-		0,
-		L""
-	};
+	SHFILEOPSTRUCT file_op = {NULL,  FO_DELETE, path, L"", FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT,
+	                          false, 0,         L""};
 	int res = SHFileOperation(&file_op);
 }
 
 namespace {
-	BOOL CALLBACK _ActivateProcess(HWND hWnd, LPARAM lParam) {
-		quint64 &processId(*(quint64*)lParam);
+BOOL CALLBACK _ActivateProcess(HWND hWnd, LPARAM lParam) {
+	quint64 &processId(*(quint64 *)lParam);
 
-		DWORD dwProcessId;
-		::GetWindowThreadProcessId(hWnd, &dwProcessId);
+	DWORD dwProcessId;
+	::GetWindowThreadProcessId(hWnd, &dwProcessId);
 
-		if ((quint64)dwProcessId == processId) { // found top-level window
-			static const qint32 nameBufSize = 1024;
-			WCHAR nameBuf[nameBufSize];
-			qint32 len = GetWindowText(hWnd, nameBuf, nameBufSize);
-			if (len && len < nameBufSize) {
-				if (QRegularExpression(qsl("^Telegram(\\s*\\(\\d+\\))?$")).match(QString::fromStdWString(nameBuf)).hasMatch()) {
-					BOOL res = ::SetForegroundWindow(hWnd);
-					::SetFocus(hWnd);
-					return FALSE;
-				}
+	if ((quint64)dwProcessId == processId) { // found top-level window
+		static const qint32 nameBufSize = 1024;
+		WCHAR nameBuf[nameBufSize];
+		qint32 len = GetWindowText(hWnd, nameBuf, nameBufSize);
+		if (len && len < nameBufSize) {
+			if (QRegularExpression(qsl("^Telegram(\\s*\\(\\d+\\))?$"))
+			        .match(QString::fromStdWString(nameBuf))
+			        .hasMatch()) {
+				BOOL res = ::SetForegroundWindow(hWnd);
+				::SetFocus(hWnd);
+				return FALSE;
 			}
 		}
-		return TRUE;
 	}
+	return TRUE;
 }
+} // namespace
 
 namespace {
 
@@ -155,11 +147,11 @@ TimeMs psIdleTime() {
 }
 
 QStringList psInitLogs() {
-    return _initLogs;
+	return _initLogs;
 }
 
 void psClearInitLogs() {
-    _initLogs = QStringList();
+	_initLogs = QStringList();
 }
 
 void psActivateProcess(quint64 pid) {
@@ -211,7 +203,8 @@ QRect psDesktopRect() {
 			MONITORINFOEX info;
 			info.cbSize = sizeof(info);
 			GetMonitorInfo(hMonitor, &info);
-			_monitorRect = QRect(info.rcWork.left, info.rcWork.top, info.rcWork.right - info.rcWork.left, info.rcWork.bottom - info.rcWork.top);
+			_monitorRect = QRect(info.rcWork.left, info.rcWork.top, info.rcWork.right - info.rcWork.left,
+			                     info.rcWork.bottom - info.rcWork.top);
 		} else {
 			_monitorRect = QApplication::desktop()->availableGeometry(App::wnd());
 		}
@@ -219,19 +212,14 @@ QRect psDesktopRect() {
 	return _monitorRect;
 }
 
-void psShowOverAll(QWidget *w, bool canFocus) {
-}
+void psShowOverAll(QWidget *w, bool canFocus) {}
 
-void psBringToBack(QWidget *w) {
-}
+void psBringToBack(QWidget *w) {}
 
 int psCleanup() {
-	__try
-	{
+	__try {
 		psDoCleanup();
-	}
-	__except(EXCEPTION_EXECUTE_HANDLER)
-	{
+	} __except (EXCEPTION_EXECUTE_HANDLER) {
 		return 0;
 	}
 	return 0;
@@ -244,9 +232,11 @@ void psDoFixPrevious() {
 		WCHAR checkStr[bufSize];
 
 		QString appId = str_const_toString(AppId);
-		QString newKeyStr1 = QString("Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
+		QString newKeyStr1 =
+		    QString("Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
 		QString newKeyStr2 = QString("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
-		QString oldKeyStr1 = QString("SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
+		QString oldKeyStr1 =
+		    QString("SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
 		QString oldKeyStr2 = QString("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\%1_is1").arg(appId);
 		HKEY newKey1, newKey2, oldKey1, oldKey2;
 		LSTATUS newKeyRes1 = RegOpenKeyEx(HKEY_CURRENT_USER, newKeyStr1.toStdWString().c_str(), 0, KEY_READ, &newKey1);
@@ -254,10 +244,22 @@ void psDoFixPrevious() {
 		LSTATUS oldKeyRes1 = RegOpenKeyEx(HKEY_LOCAL_MACHINE, oldKeyStr1.toStdWString().c_str(), 0, KEY_READ, &oldKey1);
 		LSTATUS oldKeyRes2 = RegOpenKeyEx(HKEY_LOCAL_MACHINE, oldKeyStr2.toStdWString().c_str(), 0, KEY_READ, &oldKey2);
 
-		bool existNew1 = (newKeyRes1 == ERROR_SUCCESS) && (RegQueryValueEx(newKey1, L"InstallDate", 0, &checkType, (BYTE*)checkStr, &checkSize) == ERROR_SUCCESS); checkSize = bufSize * 2;
-		bool existNew2 = (newKeyRes2 == ERROR_SUCCESS) && (RegQueryValueEx(newKey2, L"InstallDate", 0, &checkType, (BYTE*)checkStr, &checkSize) == ERROR_SUCCESS); checkSize = bufSize * 2;
-		bool existOld1 = (oldKeyRes1 == ERROR_SUCCESS) && (RegQueryValueEx(oldKey1, L"InstallDate", 0, &checkType, (BYTE*)checkStr, &checkSize) == ERROR_SUCCESS); checkSize = bufSize * 2;
-		bool existOld2 = (oldKeyRes2 == ERROR_SUCCESS) && (RegQueryValueEx(oldKey2, L"InstallDate", 0, &checkType, (BYTE*)checkStr, &checkSize) == ERROR_SUCCESS); checkSize = bufSize * 2;
+		bool existNew1 =
+		    (newKeyRes1 == ERROR_SUCCESS) &&
+		    (RegQueryValueEx(newKey1, L"InstallDate", 0, &checkType, (BYTE *)checkStr, &checkSize) == ERROR_SUCCESS);
+		checkSize = bufSize * 2;
+		bool existNew2 =
+		    (newKeyRes2 == ERROR_SUCCESS) &&
+		    (RegQueryValueEx(newKey2, L"InstallDate", 0, &checkType, (BYTE *)checkStr, &checkSize) == ERROR_SUCCESS);
+		checkSize = bufSize * 2;
+		bool existOld1 =
+		    (oldKeyRes1 == ERROR_SUCCESS) &&
+		    (RegQueryValueEx(oldKey1, L"InstallDate", 0, &checkType, (BYTE *)checkStr, &checkSize) == ERROR_SUCCESS);
+		checkSize = bufSize * 2;
+		bool existOld2 =
+		    (oldKeyRes2 == ERROR_SUCCESS) &&
+		    (RegQueryValueEx(oldKey2, L"InstallDate", 0, &checkType, (BYTE *)checkStr, &checkSize) == ERROR_SUCCESS);
+		checkSize = bufSize * 2;
 
 		if (newKeyRes1 == ERROR_SUCCESS) RegCloseKey(newKey1);
 		if (newKeyRes2 == ERROR_SUCCESS) RegCloseKey(newKey2);
@@ -265,14 +267,17 @@ void psDoFixPrevious() {
 		if (oldKeyRes2 == ERROR_SUCCESS) RegCloseKey(oldKey2);
 
 		if (existNew1 || existNew2) {
-			oldKeyRes1 = existOld1 ? RegDeleteKey(HKEY_LOCAL_MACHINE, oldKeyStr1.toStdWString().c_str()) : ERROR_SUCCESS;
-			oldKeyRes2 = existOld2 ? RegDeleteKey(HKEY_LOCAL_MACHINE, oldKeyStr2.toStdWString().c_str()) : ERROR_SUCCESS;
+			oldKeyRes1 =
+			    existOld1 ? RegDeleteKey(HKEY_LOCAL_MACHINE, oldKeyStr1.toStdWString().c_str()) : ERROR_SUCCESS;
+			oldKeyRes2 =
+			    existOld2 ? RegDeleteKey(HKEY_LOCAL_MACHINE, oldKeyStr2.toStdWString().c_str()) : ERROR_SUCCESS;
 		}
 
 		QString userDesktopLnk, commonDesktopLnk;
 		WCHAR userDesktopFolder[MAX_PATH], commonDesktopFolder[MAX_PATH];
 		HRESULT userDesktopRes = SHGetFolderPath(0, CSIDL_DESKTOPDIRECTORY, 0, SHGFP_TYPE_CURRENT, userDesktopFolder);
-		HRESULT commonDesktopRes = SHGetFolderPath(0, CSIDL_COMMON_DESKTOPDIRECTORY, 0, SHGFP_TYPE_CURRENT, commonDesktopFolder);
+		HRESULT commonDesktopRes =
+		    SHGetFolderPath(0, CSIDL_COMMON_DESKTOPDIRECTORY, 0, SHGFP_TYPE_CURRENT, commonDesktopFolder);
 		if (SUCCEEDED(userDesktopRes)) {
 			userDesktopLnk = QString::fromWCharArray(userDesktopFolder) + "\\Telegram.lnk";
 		}
@@ -288,12 +293,9 @@ void psDoFixPrevious() {
 }
 
 int psFixPrevious() {
-	__try
-	{
+	__try {
 		psDoFixPrevious();
-	}
-	__except(EXCEPTION_EXECUTE_HANDLER)
-	{
+	} __except (EXCEPTION_EXECUTE_HANDLER) {
 		return 0;
 	}
 	return 0;
@@ -322,7 +324,7 @@ QString SystemCountry() {
 }
 
 QString CurrentExecutablePath(int argc, char *argv[]) {
-	WCHAR result[MAX_PATH + 1] = { 0 };
+	WCHAR result[MAX_PATH + 1] = {0};
 	auto count = GetModuleFileName(nullptr, result, MAX_PATH + 1);
 	if (count < MAX_PATH + 1) {
 		auto info = QFileInfo(QDir::fromNativeSeparators(QString::fromWCharArray(result)));
@@ -356,13 +358,13 @@ QString GetLangCodeById(unsigned lngId) {
 	case 0x2D: return qsl("eu");
 	case 0x23: return qsl("be");
 	case 0x1A:
-	if (lngId == LANG_CROATIAN) {
-		return qsl("hr");
-	} else if (lngId == LANG_BOSNIAN_NEUTRAL || lngId == LANG_BOSNIAN) {
-		return qsl("bs");
-	}
-	return qsl("sr");
-	break;
+		if (lngId == LANG_CROATIAN) {
+			return qsl("hr");
+		} else if (lngId == LANG_BOSNIAN_NEUTRAL || lngId == LANG_BOSNIAN) {
+			return qsl("bs");
+		}
+		return qsl("sr");
+		break;
 	case 0x7E: return qsl("br");
 	case 0x02: return qsl("bg");
 	case 0x92: return qsl("ku");
@@ -468,7 +470,7 @@ QString SystemLanguage() {
 	auto uiLanguageId = GetUserDefaultUILanguage();
 	auto uiLanguageLength = GetLocaleInfo(uiLanguageId, LOCALE_SNAME, nullptr, 0);
 	if (uiLanguageLength > 0 && uiLanguageLength < kMaxLanguageLength) {
-		WCHAR uiLanguageWideString[kMaxLanguageLength] = { 0 };
+		WCHAR uiLanguageWideString[kMaxLanguageLength] = {0};
 		uiLanguageLength = GetLocaleInfo(uiLanguageId, LOCALE_SNAME, uiLanguageWideString, uiLanguageLength);
 		if (uiLanguageLength <= 0) {
 			return QString();
@@ -477,8 +479,9 @@ QString SystemLanguage() {
 	}
 	auto uiLanguageCodeLength = GetLocaleInfo(uiLanguageId, LOCALE_ILANGUAGE, nullptr, 0);
 	if (uiLanguageCodeLength > 0 && uiLanguageCodeLength < kMaxLanguageLength) {
-		WCHAR uiLanguageCodeWideString[kMaxLanguageLength] = { 0 };
-		uiLanguageCodeLength = GetLocaleInfo(uiLanguageId, LOCALE_ILANGUAGE, uiLanguageCodeWideString, uiLanguageCodeLength);
+		WCHAR uiLanguageCodeWideString[kMaxLanguageLength] = {0};
+		uiLanguageCodeLength =
+		    GetLocaleInfo(uiLanguageId, LOCALE_ILANGUAGE, uiLanguageCodeWideString, uiLanguageCodeLength);
 		if (uiLanguageCodeLength <= 0) {
 			return QString();
 		}
@@ -506,56 +509,65 @@ QString SystemLanguage() {
 } // namespace Platform
 
 namespace {
-	void _psLogError(const char *str, LSTATUS code) {
-		LPTSTR errorText = NULL, errorTextDefault = L"(Unknown error)";
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errorText, 0, 0);
-		if (!errorText) {
-			errorText = errorTextDefault;
-		}
-		LOG((str).arg(code).arg(QString::fromStdWString(errorText)));
-		if (errorText != errorTextDefault) {
-			LocalFree(errorText);
-		}
+void _psLogError(const char *str, LSTATUS code) {
+	LPTSTR errorText = NULL, errorTextDefault = L"(Unknown error)";
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+	              code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errorText, 0, 0);
+	if (!errorText) {
+		errorText = errorTextDefault;
 	}
-
-	bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) {
-		DEBUG_LOG(("App Info: opening reg key %1...").arg(QString::fromStdWString(key)));
-		LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey);
-		if (status != ERROR_SUCCESS) {
-			if (status == ERROR_FILE_NOT_FOUND) {
-				status = RegCreateKeyEx(HKEY_CURRENT_USER, key, 0, 0, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_WRITE, 0, rkey, 0);
-				if (status != ERROR_SUCCESS) {
-					QString msg = qsl("App Error: could not create '%1' registry key, error %2").arg(QString::fromStdWString(key)).arg(qsl("%1: %2"));
-					_psLogError(msg.toUtf8().constData(), status);
-					return false;
-				}
-			} else {
-				QString msg = qsl("App Error: could not open '%1' registry key, error %2").arg(QString::fromStdWString(key)).arg(qsl("%1: %2"));
-				_psLogError(msg.toUtf8().constData(), status);
-				return false;
-			}
-		}
-		return true;
-	}
-
-	bool _psSetKeyValue(HKEY rkey, LPCWSTR value, QString v) {
-		static const int bufSize = 4096;
-		DWORD defaultType, defaultSize = bufSize * 2;
-		WCHAR defaultStr[bufSize] = { 0 };
-		if (RegQueryValueEx(rkey, value, 0, &defaultType, (BYTE*)defaultStr, &defaultSize) != ERROR_SUCCESS || defaultType != REG_SZ || defaultSize != (v.size() + 1) * 2 || QString::fromStdWString(defaultStr) != v) {
-			WCHAR tmp[bufSize] = { 0 };
-			if (!v.isEmpty()) wsprintf(tmp, v.replace(QChar('%'), qsl("%%")).toStdWString().c_str());
-			LSTATUS status = RegSetValueEx(rkey, value, 0, REG_SZ, (BYTE*)tmp, (wcslen(tmp) + 1) * sizeof(WCHAR));
-			if (status != ERROR_SUCCESS) {
-				QString msg = qsl("App Error: could not set %1, error %2").arg(value ? ('\'' + QString::fromStdWString(value) + '\'') : qsl("(Default)")).arg("%1: %2");
-				_psLogError(msg.toUtf8().constData(), status);
-				return false;
-			}
-		}
-		return true;
+	LOG((str).arg(code).arg(QString::fromStdWString(errorText)));
+	if (errorText != errorTextDefault) {
+		LocalFree(errorText);
 	}
 }
 
+bool _psOpenRegKey(LPCWSTR key, PHKEY rkey) {
+	DEBUG_LOG(("App Info: opening reg key %1...").arg(QString::fromStdWString(key)));
+	LSTATUS status = RegOpenKeyEx(HKEY_CURRENT_USER, key, 0, KEY_QUERY_VALUE | KEY_WRITE, rkey);
+	if (status != ERROR_SUCCESS) {
+		if (status == ERROR_FILE_NOT_FOUND) {
+			status = RegCreateKeyEx(HKEY_CURRENT_USER, key, 0, 0, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_WRITE,
+			                        0, rkey, 0);
+			if (status != ERROR_SUCCESS) {
+				QString msg = qsl("App Error: could not create '%1' registry key, error %2")
+				                  .arg(QString::fromStdWString(key))
+				                  .arg(qsl("%1: %2"));
+				_psLogError(msg.toUtf8().constData(), status);
+				return false;
+			}
+		} else {
+			QString msg = qsl("App Error: could not open '%1' registry key, error %2")
+			                  .arg(QString::fromStdWString(key))
+			                  .arg(qsl("%1: %2"));
+			_psLogError(msg.toUtf8().constData(), status);
+			return false;
+		}
+	}
+	return true;
+}
+
+bool _psSetKeyValue(HKEY rkey, LPCWSTR value, QString v) {
+	static const int bufSize = 4096;
+	DWORD defaultType, defaultSize = bufSize * 2;
+	WCHAR defaultStr[bufSize] = {0};
+	if (RegQueryValueEx(rkey, value, 0, &defaultType, (BYTE *)defaultStr, &defaultSize) != ERROR_SUCCESS ||
+	    defaultType != REG_SZ || defaultSize != (v.size() + 1) * 2 || QString::fromStdWString(defaultStr) != v) {
+		WCHAR tmp[bufSize] = {0};
+		if (!v.isEmpty()) wsprintf(tmp, v.replace(QChar('%'), qsl("%%")).toStdWString().c_str());
+		LSTATUS status = RegSetValueEx(rkey, value, 0, REG_SZ, (BYTE *)tmp, (wcslen(tmp) + 1) * sizeof(WCHAR));
+		if (status != ERROR_SUCCESS) {
+			QString msg = qsl("App Error: could not set %1, error %2")
+			                  .arg(value ? ('\'' + QString::fromStdWString(value) + '\'') : qsl("(Default)"))
+			                  .arg("%1: %2");
+			_psLogError(msg.toUtf8().constData(), status);
+			return false;
+		}
+	}
+	return true;
+}
+} // namespace
+
 void RegisterCustomScheme() {
 	if (cExeName().isEmpty()) {
 		return;
@@ -625,14 +637,20 @@ void psExecUpdater() {
 	if (cStartInTray()) targs += qsl(" -startintray");
 	if (cWriteProtected()) targs += qsl(" -writeprotected \"") + cExeDir() + '"';
 
-	QString updaterPath = cWriteProtected() ? (cWorkingDir() + qsl("tupdates/temp/Updater.exe")) : (cExeDir() + qsl("Updater.exe"));
+	QString updaterPath =
+	    cWriteProtected() ? (cWorkingDir() + qsl("tupdates/temp/Updater.exe")) : (cExeDir() + qsl("Updater.exe"));
 
 	QString updater(QDir::toNativeSeparators(updaterPath)), wdir(QDir::toNativeSeparators(cWorkingDir()));
 
 	DEBUG_LOG(("Application Info: executing %1 %2").arg(cExeDir() + "Updater.exe").arg(targs));
-	HINSTANCE r = ShellExecute(0, cWriteProtected() ? L"runas" : 0, updater.toStdWString().c_str(), targs.toStdWString().c_str(), wdir.isEmpty() ? 0 : wdir.toStdWString().c_str(), SW_SHOWNORMAL);
+	HINSTANCE r =
+	    ShellExecute(0, cWriteProtected() ? L"runas" : 0, updater.toStdWString().c_str(), targs.toStdWString().c_str(),
+	                 wdir.isEmpty() ? 0 : wdir.toStdWString().c_str(), SW_SHOWNORMAL);
 	if (long(r) < 32) {
-		DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3").arg(updater).arg(wdir).arg(long(r)));
+		DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3")
+		              .arg(updater)
+		              .arg(wdir)
+		              .arg(long(r)));
 		psDeleteDir(cWorkingDir() + qsl("tupdates/temp"));
 	}
 }
@@ -655,9 +673,13 @@ void psExecTelegram(const QString &crashreport) {
 	DEBUG_LOG(("Application Info: executing %1 %2").arg(cExeDir() + cExeName()).arg(targs));
 	Logs::closeMain();
 	SignalHandlers::finish();
-	HINSTANCE r = ShellExecute(0, 0, telegram.toStdWString().c_str(), targs.toStdWString().c_str(), wdir.isEmpty() ? 0 : wdir.toStdWString().c_str(), SW_SHOWNORMAL);
+	HINSTANCE r = ShellExecute(0, 0, telegram.toStdWString().c_str(), targs.toStdWString().c_str(),
+	                           wdir.isEmpty() ? 0 : wdir.toStdWString().c_str(), SW_SHOWNORMAL);
 	if (long(r) < 32) {
-		DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3").arg(telegram).arg(wdir).arg(long(r)));
+		DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3")
+		              .arg(telegram)
+		              .arg(wdir)
+		              .arg(long(r)));
 	}
 }
 
@@ -675,7 +697,8 @@ void _manageAppLnk(bool create, bool silent, int path_csidl, const wchar_t *args
 			if (SUCCEEDED(hr)) {
 				ComPtr<IPersistFile> persistFile;
 
-				QString exe = QDir::toNativeSeparators(cExeDir() + cExeName()), dir = QDir::toNativeSeparators(QDir(cWorkingDir()).absolutePath());
+				QString exe = QDir::toNativeSeparators(cExeDir() + cExeName()),
+				        dir = QDir::toNativeSeparators(QDir(cWorkingDir()).absolutePath());
 				shellLink->SetArguments(args);
 				shellLink->SetPath(exe.toStdWString().c_str());
 				shellLink->SetWorkingDirectory(dir.toStdWString().c_str());
@@ -713,11 +736,13 @@ void _manageAppLnk(bool create, bool silent, int path_csidl, const wchar_t *args
 }
 
 void psAutoStart(bool start, bool silent) {
-	_manageAppLnk(start, silent, CSIDL_STARTUP, L"-autostart", L"Telegram autorun link.\nYou can disable autorun in Telegram settings.");
+	_manageAppLnk(start, silent, CSIDL_STARTUP, L"-autostart",
+	              L"Telegram autorun link.\nYou can disable autorun in Telegram settings.");
 }
 
 void psSendToMenu(bool send, bool silent) {
-	_manageAppLnk(send, silent, CSIDL_SENDTO, L"-sendpath", L"Telegram send to link.\nYou can disable send to menu item in Telegram settings.");
+	_manageAppLnk(send, silent, CSIDL_SENDTO, L"-sendpath",
+	              L"Telegram send to link.\nYou can disable send to menu item in Telegram settings.");
 }
 
 void psUpdateOverlayed(TWidget *widget) {
@@ -735,108 +760,62 @@ void psUpdateOverlayed(TWidget *widget) {
 
 static const int StackEntryMaxNameLength = MAX_SYM_NAME + 1;
 
-typedef BOOL(FAR STDAPICALLTYPE *t_SymCleanup)(
-	_In_ HANDLE hProcess
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymCleanup)(_In_ HANDLE hProcess);
 t_SymCleanup symCleanup = 0;
 
-typedef PVOID (FAR STDAPICALLTYPE *t_SymFunctionTableAccess64)(
-    _In_ HANDLE hProcess,
-    _In_ DWORD64 AddrBase
-);
+typedef PVOID(FAR STDAPICALLTYPE *t_SymFunctionTableAccess64)(_In_ HANDLE hProcess, _In_ DWORD64 AddrBase);
 t_SymFunctionTableAccess64 symFunctionTableAccess64 = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_SymGetLineFromAddr64)(
-    _In_ HANDLE hProcess,
-    _In_ DWORD64 dwAddr,
-    _Out_ PDWORD pdwDisplacement,
-    _Out_ PIMAGEHLP_LINEW64 Line
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymGetLineFromAddr64)(_In_ HANDLE hProcess, _In_ DWORD64 dwAddr,
+                                                         _Out_ PDWORD pdwDisplacement, _Out_ PIMAGEHLP_LINEW64 Line);
 t_SymGetLineFromAddr64 symGetLineFromAddr64 = 0;
 
-typedef DWORD64 (FAR STDAPICALLTYPE *t_SymGetModuleBase64)(
-    _In_ HANDLE hProcess,
-    _In_ DWORD64 qwAddr
-);
+typedef DWORD64(FAR STDAPICALLTYPE *t_SymGetModuleBase64)(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr);
 t_SymGetModuleBase64 symGetModuleBase64 = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_SymGetModuleInfo64)(
-    _In_ HANDLE hProcess,
-    _In_ DWORD64 qwAddr,
-    _Out_ PIMAGEHLP_MODULEW64 ModuleInfo
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymGetModuleInfo64)(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr,
+                                                       _Out_ PIMAGEHLP_MODULEW64 ModuleInfo);
 t_SymGetModuleInfo64 symGetModuleInfo64 = 0;
 
-typedef DWORD (FAR STDAPICALLTYPE *t_SymGetOptions)(
-	VOID
-);
+typedef DWORD(FAR STDAPICALLTYPE *t_SymGetOptions)(VOID);
 t_SymGetOptions symGetOptions = 0;
 
-typedef DWORD (FAR STDAPICALLTYPE *t_SymSetOptions)(
-    _In_ DWORD SymOptions
-);
+typedef DWORD(FAR STDAPICALLTYPE *t_SymSetOptions)(_In_ DWORD SymOptions);
 t_SymSetOptions symSetOptions = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_SymGetSymFromAddr64)(
-	IN HANDLE hProcess,
-	IN DWORD64 dwAddr,
-	OUT PDWORD64 pdwDisplacement,
-	OUT PIMAGEHLP_SYMBOL64 Symbol
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymGetSymFromAddr64)(IN HANDLE hProcess, IN DWORD64 dwAddr,
+                                                        OUT PDWORD64 pdwDisplacement, OUT PIMAGEHLP_SYMBOL64 Symbol);
 t_SymGetSymFromAddr64 symGetSymFromAddr64 = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_SymInitialize)(
-	_In_ HANDLE hProcess,
-	_In_opt_ PCWSTR UserSearchPath,
-	_In_ BOOL fInvadeProcess
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymInitialize)(_In_ HANDLE hProcess, _In_opt_ PCWSTR UserSearchPath,
+                                                  _In_ BOOL fInvadeProcess);
 t_SymInitialize symInitialize = 0;
 
-typedef DWORD64 (FAR STDAPICALLTYPE *t_SymLoadModule64)(
-	_In_ HANDLE hProcess,
-	_In_opt_ HANDLE hFile,
-	_In_opt_ PCSTR ImageName,
-	_In_opt_ PCSTR ModuleName,
-	_In_ DWORD64 BaseOfDll,
-	_In_ DWORD SizeOfDll
-);
+typedef DWORD64(FAR STDAPICALLTYPE *t_SymLoadModule64)(_In_ HANDLE hProcess, _In_opt_ HANDLE hFile,
+                                                       _In_opt_ PCSTR ImageName, _In_opt_ PCSTR ModuleName,
+                                                       _In_ DWORD64 BaseOfDll, _In_ DWORD SizeOfDll);
 t_SymLoadModule64 symLoadModule64;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_StackWalk64)(
-	_In_ DWORD MachineType,
-	_In_ HANDLE hProcess,
-	_In_ HANDLE hThread,
-	_Inout_ LPSTACKFRAME64 StackFrame,
-	_Inout_ PVOID ContextRecord,
-	_In_opt_ PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine,
-	_In_opt_ PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine,
-	_In_opt_ PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine,
-	_In_opt_ PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_StackWalk64)(_In_ DWORD MachineType, _In_ HANDLE hProcess, _In_ HANDLE hThread,
+                                                _Inout_ LPSTACKFRAME64 StackFrame, _Inout_ PVOID ContextRecord,
+                                                _In_opt_ PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine,
+                                                _In_opt_ PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine,
+                                                _In_opt_ PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine,
+                                                _In_opt_ PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress);
 t_StackWalk64 stackWalk64 = 0;
 
-typedef DWORD (FAR STDAPICALLTYPE *t_UnDecorateSymbolName)(
-	PCSTR DecoratedName,
-	PSTR UnDecoratedName,
-	DWORD UndecoratedLength,
-	DWORD Flags
-);
+typedef DWORD(FAR STDAPICALLTYPE *t_UnDecorateSymbolName)(PCSTR DecoratedName, PSTR UnDecoratedName,
+                                                          DWORD UndecoratedLength, DWORD Flags);
 t_UnDecorateSymbolName unDecorateSymbolName = 0;
 
-typedef BOOL(FAR STDAPICALLTYPE *t_SymGetSearchPath)(
-	_In_ HANDLE hProcess,
-	_Out_writes_(SearchPathLength) PWSTR SearchPath,
-	_In_ DWORD SearchPathLength
-);
+typedef BOOL(FAR STDAPICALLTYPE *t_SymGetSearchPath)(_In_ HANDLE hProcess,
+                                                     _Out_writes_(SearchPathLength) PWSTR SearchPath,
+                                                     _In_ DWORD SearchPathLength);
 t_SymGetSearchPath symGetSearchPath = 0;
 
-BOOL __stdcall ReadProcessMemoryRoutine64(
-	_In_ HANDLE hProcess,
-	_In_ DWORD64 qwBaseAddress,
-	_Out_writes_bytes_(nSize) PVOID lpBuffer,
-	_In_ DWORD nSize,
-	_Out_ LPDWORD lpNumberOfBytesRead
-) {
+BOOL __stdcall ReadProcessMemoryRoutine64(_In_ HANDLE hProcess, _In_ DWORD64 qwBaseAddress,
+                                          _Out_writes_bytes_(nSize) PVOID lpBuffer, _In_ DWORD nSize,
+                                          _Out_ LPDWORD lpNumberOfBytesRead) {
 	SIZE_T st;
 	BOOL bRet = ReadProcessMemory(hProcess, (LPVOID)qwBaseAddress, lpBuffer, nSize, &st);
 	*lpNumberOfBytesRead = (DWORD)st;
@@ -846,32 +825,31 @@ BOOL __stdcall ReadProcessMemoryRoutine64(
 
 // **************************************** ToolHelp32 ************************
 #define MAX_MODULE_NAME32 255
-#define TH32CS_SNAPMODULE   0x00000008
-#pragma pack( push, 8 )
-typedef struct tagMODULEENTRY32
-{
-	DWORD   dwSize;
-	DWORD   th32ModuleID;       // This module
-	DWORD   th32ProcessID;      // owning process
-	DWORD   GlblcntUsage;       // Global usage count on the module
-	DWORD   ProccntUsage;       // Module usage count in th32ProcessID's context
-	BYTE  * modBaseAddr;        // Base address of module in th32ProcessID's context
-	DWORD   modBaseSize;        // Size in bytes of module starting at modBaseAddr
-	HMODULE hModule;            // The hModule of this module in th32ProcessID's context
-	char    szModule[MAX_MODULE_NAME32 + 1];
-	char    szExePath[MAX_PATH];
+#define TH32CS_SNAPMODULE 0x00000008
+#pragma pack(push, 8)
+typedef struct tagMODULEENTRY32 {
+	DWORD dwSize;
+	DWORD th32ModuleID; // This module
+	DWORD th32ProcessID; // owning process
+	DWORD GlblcntUsage; // Global usage count on the module
+	DWORD ProccntUsage; // Module usage count in th32ProcessID's context
+	BYTE *modBaseAddr; // Base address of module in th32ProcessID's context
+	DWORD modBaseSize; // Size in bytes of module starting at modBaseAddr
+	HMODULE hModule; // The hModule of this module in th32ProcessID's context
+	char szModule[MAX_MODULE_NAME32 + 1];
+	char szExePath[MAX_PATH];
 } MODULEENTRY32;
 typedef MODULEENTRY32 *PMODULEENTRY32;
 typedef MODULEENTRY32 *LPMODULEENTRY32;
-#pragma pack( pop )
+#pragma pack(pop)
 
-typedef HANDLE (FAR STDAPICALLTYPE *t_CreateToolhelp32Snapshot)(DWORD dwFlags, DWORD th32ProcessID);
+typedef HANDLE(FAR STDAPICALLTYPE *t_CreateToolhelp32Snapshot)(DWORD dwFlags, DWORD th32ProcessID);
 t_CreateToolhelp32Snapshot createToolhelp32Snapshot = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_Module32First)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
+typedef BOOL(FAR STDAPICALLTYPE *t_Module32First)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
 t_Module32First module32First = 0;
 
-typedef BOOL (FAR STDAPICALLTYPE *t_Module32Next)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
+typedef BOOL(FAR STDAPICALLTYPE *t_Module32Next)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
 t_Module32Next module32Next = 0;
 
 bool LoadDbgHelp(bool extended = false) {
@@ -883,7 +861,8 @@ bool LoadDbgHelp(bool extended = false) {
 	if (GetModuleFileName(NULL, szTemp, 4096) > 0) {
 		wcscat_s(szTemp, L".local");
 		if (GetFileAttributes(szTemp) == INVALID_FILE_ATTRIBUTES) {
-			// ".local" file does not exist, so we can try to load the dbghelp.dll from the "Debugging Tools for Windows"
+			// ".local" file does not exist, so we can try to load the dbghelp.dll from the "Debugging Tools for
+			// Windows"
 			if (GetEnvironmentVariable(L"ProgramFiles", szTemp, 4096) > 0) {
 				wcscat_s(szTemp, L"\\Debugging Tools for Windows\\dbghelp.dll");
 				// now check if the file exists:
@@ -910,9 +889,7 @@ bool LoadDbgHelp(bool extended = false) {
 	symFunctionTableAccess64 = (t_SymFunctionTableAccess64)GetProcAddress(hDll, "SymFunctionTableAccess64");
 	symGetModuleBase64 = (t_SymGetModuleBase64)GetProcAddress(hDll, "SymGetModuleBase64");
 
-	if (!stackWalk64 ||
-		!symFunctionTableAccess64 ||
-		!symGetModuleBase64) {
+	if (!stackWalk64 || !symFunctionTableAccess64 || !symGetModuleBase64) {
 		stackWalk64 = 0;
 		return false;
 	}
@@ -931,38 +908,31 @@ bool LoadDbgHelp(bool extended = false) {
 		symGetOptions = (t_SymGetOptions)GetProcAddress(hDll, "SymGetOptions");
 		symSetOptions = (t_SymSetOptions)GetProcAddress(hDll, "SymSetOptions");
 		symLoadModule64 = (t_SymLoadModule64)GetProcAddress(hDll, "SymLoadModule64");
-		if (!symGetModuleInfo64 ||
-			!symGetLineFromAddr64 ||
-			!symGetSymFromAddr64 ||
-			!unDecorateSymbolName ||
-			!symInitialize ||
-			!symCleanup ||
-			!symGetOptions ||
-			!symSetOptions ||
-			!symLoadModule64) {
+		if (!symGetModuleInfo64 || !symGetLineFromAddr64 || !symGetSymFromAddr64 || !unDecorateSymbolName ||
+		    !symInitialize || !symCleanup || !symGetOptions || !symSetOptions || !symLoadModule64) {
 			symInitialize = 0;
 			return false;
 		}
 
 		const size_t nSymPathLen = 10 * MAX_PATH;
-		WCHAR szSymPath[nSymPathLen] = { 0 };
+		WCHAR szSymPath[nSymPathLen] = {0};
 
 		wcscat_s(szSymPath, nSymPathLen, L".;..;");
 
-		WCHAR szTemp[MAX_PATH + 1] = { 0 };
-		if (GetCurrentDirectory(MAX_PATH, szTemp) > 0)	{
+		WCHAR szTemp[MAX_PATH + 1] = {0};
+		if (GetCurrentDirectory(MAX_PATH, szTemp) > 0) {
 			wcscat_s(szSymPath, nSymPathLen, szTemp);
 			wcscat_s(szSymPath, nSymPathLen, L";");
 		}
 
 		if (GetModuleFileName(NULL, szTemp, MAX_PATH) > 0) {
 			for (WCHAR *p = (szTemp + wcslen(szTemp) - 1); p >= szTemp; --p) {
-				if ((*p == '\\') || (*p == '/') || (*p == ':'))	{
+				if ((*p == '\\') || (*p == '/') || (*p == ':')) {
 					*p = 0;
 					break;
 				}
 			}
-			if (wcslen(szTemp) > 0)	{
+			if (wcslen(szTemp) > 0) {
 				wcscat_s(szSymPath, nSymPathLen, szTemp);
 				wcscat_s(szSymPath, nSymPathLen, L";");
 			}
@@ -1003,7 +973,7 @@ bool LoadDbgHelp(bool extended = false) {
 		symOptions |= SYMOPT_FAIL_CRITICAL_ERRORS;
 		symOptions = symSetOptions(symOptions);
 
-		const WCHAR *dllname[] = { L"kernel32.dll",  L"tlhelp32.dll" };
+		const WCHAR *dllname[] = {L"kernel32.dll", L"tlhelp32.dll"};
 		HINSTANCE hToolhelp = NULL;
 
 		HANDLE hSnap;
@@ -1016,7 +986,8 @@ bool LoadDbgHelp(bool extended = false) {
 			hToolhelp = LoadLibrary(dllname[i]);
 			if (!hToolhelp) continue;
 
-			createToolhelp32Snapshot = (t_CreateToolhelp32Snapshot)GetProcAddress(hToolhelp, "CreateToolhelp32Snapshot");
+			createToolhelp32Snapshot =
+			    (t_CreateToolhelp32Snapshot)GetProcAddress(hToolhelp, "CreateToolhelp32Snapshot");
 			module32First = (t_Module32First)GetProcAddress(hToolhelp, "Module32First");
 			module32Next = (t_Module32Next)GetProcAddress(hToolhelp, "Module32Next");
 			if (createToolhelp32Snapshot && module32First && module32Next) {
@@ -1031,8 +1002,7 @@ bool LoadDbgHelp(bool extended = false) {
 		}
 
 		hSnap = createToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId);
-		if (hSnap == (HANDLE)-1)
-			return FALSE;
+		if (hSnap == (HANDLE)-1) return FALSE;
 
 		keepGoing = !!module32First(hSnap, &me);
 		int cnt = 0;
@@ -1051,7 +1021,7 @@ bool LoadDbgHelp(bool extended = false) {
 }
 
 struct StackEntry {
-	DWORD64 offset;  // if 0, we have no valid entry
+	DWORD64 offset; // if 0, we have no valid entry
 	CHAR name[StackEntryMaxNameLength];
 	CHAR undName[StackEntryMaxNameLength];
 	CHAR undFullName[StackEntryMaxNameLength];
@@ -1077,7 +1047,7 @@ BOOL _getModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULEW64 *pModu
 	pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULEW64);
 
 	memcpy(GetModuleInfoData, pModuleInfo, sizeof(IMAGEHLP_MODULEW64));
-	if (symGetModuleInfo64(hProcess, baseAddr, (IMAGEHLP_MODULEW64*)GetModuleInfoData) != FALSE) {
+	if (symGetModuleInfo64(hProcess, baseAddr, (IMAGEHLP_MODULEW64 *)GetModuleInfoData) != FALSE) {
 		// only copy as much memory as is reserved...
 		memcpy(pModuleInfo, GetModuleInfoData, sizeof(IMAGEHLP_MODULEW64));
 		pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULEW64);
@@ -1086,8 +1056,7 @@ BOOL _getModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULEW64 *pModu
 	return FALSE;
 }
 
-void psWriteDump() {
-}
+void psWriteDump() {}
 
 char ImageHlpSymbol64[sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength];
 QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
@@ -1103,7 +1072,7 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 	qint32 i = 0, l = lines.size();
 	QString versionstr;
 	quint64 version = 0, betaversion = 0;
-	for (;  i < l; ++i) {
+	for (; i < l; ++i) {
 		result.append(lines.at(i)).append('\n');
 		QString line = lines.at(i).trimmed();
 		if (line.startsWith(qstr("Version: "))) {
@@ -1125,7 +1094,9 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 	QString tolaunch;
 	if ((betaversion && betaversion != cBetaVersion()) || (!betaversion && version && version != AppVersion)) {
 		QString path = cExeDir();
-		QRegularExpressionMatch m = QRegularExpression("deploy/\\d+\\.\\d+/\\d+\\.\\d+\\.\\d+(/|\\.dev/|\\.alpha/|_\\d+/)(Telegram/)?$").match(path);
+		QRegularExpressionMatch m =
+		    QRegularExpression("deploy/\\d+\\.\\d+/\\d+\\.\\d+\\.\\d+(/|\\.dev/|\\.alpha/|_\\d+/)(Telegram/)?$")
+		        .match(path);
 		if (m.hasMatch()) {
 			QString base = path.mid(0, m.capturedStart()) + qstr("deploy/");
 			qint32 major = version / 1000000, minor = (version % 1000000) / 1000, micro = (version % 1000);
@@ -1161,7 +1132,7 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 		IMAGEHLP_MODULEW64 Module;
 		IMAGEHLP_LINEW64 Line;
 
-		pSym = (IMAGEHLP_SYMBOL64*)ImageHlpSymbol64;
+		pSym = (IMAGEHLP_SYMBOL64 *)ImageHlpSymbol64;
 		memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + StackEntryMaxNameLength);
 		pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
 		pSym->MaxNameLength = StackEntryMaxNameLength;
@@ -1236,7 +1207,9 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 				if (csEntry.moduleName[0] == 0) {
 					wcscpy_s(csEntry.moduleName, L"module-name not available");
 				}
-				result.append(csEntry.name).append(qsl(" (%1) 0x%3").arg(QString::fromWCharArray(csEntry.moduleName)).arg(address, 0, 16)).append('\n');
+				result.append(csEntry.name)
+				    .append(qsl(" (%1) 0x%3").arg(QString::fromWCharArray(csEntry.moduleName)).arg(address, 0, 16))
+				    .append('\n');
 			} else {
 				QString file = QString::fromWCharArray(csEntry.lineFileName).toLower();
 				qint32 index = file.indexOf(qstr("tbuild\\tdesktop\\telegram\\"));
@@ -1246,7 +1219,9 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile) {
 						file = file.mid(qstr("sourcefiles\\").size());
 					}
 				}
-				result.append(csEntry.name).append(qsl(" (%1 - %2) 0x%3").arg(file).arg(csEntry.lineNumber).arg(address, 0, 16)).append('\n');
+				result.append(csEntry.name)
+				    .append(qsl(" (%1 - %2) 0x%3").arg(file).arg(csEntry.lineNumber).arg(address, 0, 16))
+				    .append('\n');
 			}
 		}
 	}
@@ -1314,7 +1289,8 @@ void psWriteStackTrace() {
 		// assume that either you are done, or that the stack is so hosed that the next
 		// deeper frame could not be found.
 		// CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386!
-		if (!stackWalk64(imageType, hProcess, hThread, &s, &c, ReadProcessMemoryRoutine64, symFunctionTableAccess64, symGetModuleBase64, NULL)) {
+		if (!stackWalk64(imageType, hProcess, hThread, &s, &c, ReadProcessMemoryRoutine64, symFunctionTableAccess64,
+		                 symGetModuleBase64, NULL)) {
 			SignalHandlers::dump() << "ERROR: Call to StackWalk64() failed!\n";
 			return;
 		}
@@ -1336,5 +1312,6 @@ void psWriteStackTrace() {
 }
 
 bool psLaunchMaps(const LocationCoords &coords) {
-	return QDesktopServices::openUrl(qsl("bingmaps:?lvl=16&collection=point.%1_%2_Point").arg(coords.latAsString()).arg(coords.lonAsString()));
+	return QDesktopServices::openUrl(
+	    qsl("bingmaps:?lvl=16&collection=point.%1_%2_Point").arg(coords.latAsString()).arg(coords.lonAsString()));
 }
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 8f401b0cd..727278c0c 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include <QAbstractNativeEventFilter>
 #include <QString>
 #include <QWidget>
-#include <QAbstractNativeEventFilter>
 #include <windows.h>
 
 #include "core/basic_types.h"
@@ -32,34 +32,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Platform {
 
-inline void SetWatchingMediaKeys(bool watching) {
-}
+inline void SetWatchingMediaKeys(bool watching) {}
 
 inline bool TranslucentWindowsSupported(QPoint globalPosition) {
 	return true;
 }
 
-inline void StartTranslucentPaint(QPainter &p, QPaintEvent *e) {
-}
+inline void StartTranslucentPaint(QPainter &p, QPaintEvent *e) {}
 
-inline void InitOnTopPanel(QWidget *panel) {
-}
+inline void InitOnTopPanel(QWidget *panel) {}
 
-inline void DeInitOnTopPanel(QWidget *panel) {
-}
+inline void DeInitOnTopPanel(QWidget *panel) {}
 
-inline void ReInitOnTopPanel(QWidget *panel) {
-}
+inline void ReInitOnTopPanel(QWidget *panel) {}
 
 QString CurrentExecutablePath(int argc, char *argv[]);
 
 namespace ThirdParty {
 
-inline void start() {
-}
+inline void start() {}
 
-inline void finish() {
-}
+inline void finish() {}
 
 } // namespace ThirdParty
 } // namespace Platform
@@ -67,8 +60,7 @@ inline void finish() {
 inline QString psServerPrefix() {
 	return qsl("Global\\");
 }
-inline void psCheckLocalSocket(const QString &) {
-}
+inline void psCheckLocalSocket(const QString &) {}
 
 void psWriteDump();
 void psWriteStackTrace();
@@ -112,28 +104,24 @@ inline QByteArray psDownloadPathBookmark(const QString &path) {
 inline QByteArray psPathBookmark(const QString &path) {
 	return QByteArray();
 }
-inline void psDownloadPathEnableAccess() {
-}
+inline void psDownloadPathEnableAccess() {}
 
 class PsFileBookmark {
 public:
-	PsFileBookmark(const QByteArray &bookmark) {
-	}
+	PsFileBookmark(const QByteArray &bookmark) {}
 	bool check() const {
 		return true;
 	}
 	bool enable() const {
 		return true;
 	}
-	void disable() const {
-	}
+	void disable() const {}
 	const QString &name(const QString &original) const {
 		return original;
 	}
 	QByteArray bookmark() const {
 		return QByteArray();
 	}
-
 };
 
 bool psLaunchMaps(const LocationCoords &coords);
diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp
index fcbd6f309..de4e0d7d4 100644
--- a/Telegram/SourceFiles/platform/win/window_title_win.cpp
+++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp
@@ -20,20 +20,21 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/win/window_title_win.h"
 
+#include "styles/style_window.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
-#include "styles/style_window.h"
 
 #include <QWindow>
 
 namespace Platform {
 
-TitleWidget::TitleWidget(QWidget *parent) : Window::TitleWidget(parent)
-, _minimize(this, st::titleButtonMinimize)
-, _maximizeRestore(this, st::titleButtonMaximize)
-, _close(this, st::titleButtonClose)
-, _shadow(this, st::titleShadow)
-, _maximizedState(parent->window()->windowState() & Qt::WindowMaximized) {
+TitleWidget::TitleWidget(QWidget *parent)
+    : Window::TitleWidget(parent)
+    , _minimize(this, st::titleButtonMinimize)
+    , _maximizeRestore(this, st::titleButtonMaximize)
+    , _close(this, st::titleButtonClose)
+    , _shadow(this, st::titleShadow)
+    , _maximizedState(parent->window()->windowState() & Qt::WindowMaximized) {
 	_minimize->setClickedCallback([this]() {
 		window()->setWindowState(Qt::WindowMinimized);
 		_minimize->clearState();
@@ -55,7 +56,8 @@ TitleWidget::TitleWidget(QWidget *parent) : Window::TitleWidget(parent)
 }
 
 void TitleWidget::init() {
-	connect(window()->windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this, SLOT(onWindowStateChanged(Qt::WindowState)));
+	connect(window()->windowHandle(), SIGNAL(windowStateChanged(Qt::WindowState)), this,
+	        SLOT(onWindowStateChanged(Qt::WindowState)));
 	_maximizedState = (window()->windowState() & Qt::WindowMaximized);
 	_activeState = isActiveWindow();
 	updateButtonsState();
@@ -72,8 +74,10 @@ void TitleWidget::paintEvent(QPaintEvent *e) {
 
 void TitleWidget::updateControlsPosition() {
 	auto right = 0;
-	_close->moveToRight(right, 0); right += _close->width();
-	_maximizeRestore->moveToRight(right, 0); right += _maximizeRestore->width();
+	_close->moveToRight(right, 0);
+	right += _close->width();
+	_maximizeRestore->moveToRight(right, 0);
+	right += _maximizeRestore->width();
 	_minimize->moveToRight(right, 0);
 }
 
@@ -98,21 +102,23 @@ void TitleWidget::onWindowStateChanged(Qt::WindowState state) {
 }
 
 void TitleWidget::updateButtonsState() {
-	_minimize->setIconOverride(_activeState ? &st::titleButtonMinimizeIconActive : nullptr, _activeState ? &st::titleButtonMinimizeIconActiveOver : nullptr);
+	_minimize->setIconOverride(_activeState ? &st::titleButtonMinimizeIconActive : nullptr,
+	                           _activeState ? &st::titleButtonMinimizeIconActiveOver : nullptr);
 	if (_maximizedState) {
-		_maximizeRestore->setIconOverride(_activeState ? &st::titleButtonRestoreIconActive : &st::titleButtonRestoreIcon, _activeState ? &st::titleButtonRestoreIconActiveOver : &st::titleButtonRestoreIconOver);
+		_maximizeRestore->setIconOverride(
+		    _activeState ? &st::titleButtonRestoreIconActive : &st::titleButtonRestoreIcon,
+		    _activeState ? &st::titleButtonRestoreIconActiveOver : &st::titleButtonRestoreIconOver);
 	} else {
-		_maximizeRestore->setIconOverride(_activeState ? &st::titleButtonMaximizeIconActive : nullptr, _activeState ? &st::titleButtonMaximizeIconActiveOver : nullptr);
+		_maximizeRestore->setIconOverride(_activeState ? &st::titleButtonMaximizeIconActive : nullptr,
+		                                  _activeState ? &st::titleButtonMaximizeIconActiveOver : nullptr);
 	}
-	_close->setIconOverride(_activeState ? &st::titleButtonCloseIconActive : nullptr, _activeState ? &st::titleButtonCloseIconActiveOver : nullptr);
+	_close->setIconOverride(_activeState ? &st::titleButtonCloseIconActive : nullptr,
+	                        _activeState ? &st::titleButtonCloseIconActiveOver : nullptr);
 }
 
 Window::HitTestResult TitleWidget::hitTest(const QPoint &p) const {
-	if (false
-		|| (_minimize->geometry().contains(p))
-		|| (_maximizeRestore->geometry().contains(p))
-		|| (_close->geometry().contains(p))
-	) {
+	if (false || (_minimize->geometry().contains(p)) || (_maximizeRestore->geometry().contains(p)) ||
+	    (_close->geometry().contains(p))) {
 		return Window::HitTestResult::SysButton;
 	} else if (rect().contains(p)) {
 		return Window::HitTestResult::Caption;
diff --git a/Telegram/SourceFiles/platform/win/window_title_win.h b/Telegram/SourceFiles/platform/win/window_title_win.h
index fdcc81571..c1bb4e5d4 100644
--- a/Telegram/SourceFiles/platform/win/window_title_win.h
+++ b/Telegram/SourceFiles/platform/win/window_title_win.h
@@ -67,7 +67,6 @@ private:
 
 	bool _maximizedState = false;
 	bool _activeState = false;
-
 };
 
 inline object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent) {
diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
index dff3d642d..4e90b9ec2 100644
--- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp
@@ -18,17 +18,17 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "settings.h"
 #include "platform/win/windows_app_user_model_id.h"
+#include "settings.h"
 
 #include "platform/win/windows_dlls.h"
-#include <propvarutil.h>
 #include <propkey.h>
+#include <propvarutil.h>
 
 #include <wrl/client.h>
 
-#include <QString>
 #include <QDir>
+#include <QString>
 
 using namespace Microsoft::WRL;
 
@@ -36,8 +36,10 @@ namespace Platform {
 namespace AppUserModelId {
 namespace {
 
-const PROPERTYKEY pkey_AppUserModel_ID = { { 0x9F4C2855, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 5 };
-const PROPERTYKEY pkey_AppUserModel_StartPinOption = { { 0x9F4C2855, 0x9F79, 0x4B39, { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3 } }, 12 };
+const PROPERTYKEY pkey_AppUserModel_ID = {
+    {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 5};
+const PROPERTYKEY pkey_AppUserModel_StartPinOption = {
+    {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 12};
 
 #ifdef OS_WIN_STORE
 const WCHAR AppUserModelIdRelease[] = L"Telegram.TelegramDesktop.Store";
@@ -71,7 +73,7 @@ void checkPinned() {
 
 	WCHAR src[MAX_PATH];
 	GetModuleFileName(GetModuleHandle(0), src, MAX_PATH);
-	BY_HANDLE_FILE_INFORMATION srcinfo = { 0 };
+	BY_HANDLE_FILE_INFORMATION srcinfo = {0};
 	HANDLE srcfile = CreateFile(src, 0x00, 0x00, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (srcfile == INVALID_HANDLE_VALUE) return;
 	BOOL srcres = GetFileInformationByHandle(srcfile, &srcinfo);
@@ -108,14 +110,15 @@ void checkPinned() {
 			hr = shellLink->GetPath(dst, MAX_PATH, 0, 0);
 			if (!SUCCEEDED(hr)) continue;
 
-			BY_HANDLE_FILE_INFORMATION dstinfo = { 0 };
+			BY_HANDLE_FILE_INFORMATION dstinfo = {0};
 			HANDLE dstfile = CreateFile(dst, 0x00, 0x00, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 			if (dstfile == INVALID_HANDLE_VALUE) continue;
 			BOOL dstres = GetFileInformationByHandle(dstfile, &dstinfo);
 			CloseHandle(dstfile);
 			if (!dstres) continue;
 
-			if (srcinfo.dwVolumeSerialNumber == dstinfo.dwVolumeSerialNumber && srcinfo.nFileIndexLow == dstinfo.nFileIndexLow && srcinfo.nFileIndexHigh == dstinfo.nFileIndexHigh) {
+			if (srcinfo.dwVolumeSerialNumber == dstinfo.dwVolumeSerialNumber &&
+			    srcinfo.nFileIndexLow == dstinfo.nFileIndexLow && srcinfo.nFileIndexHigh == dstinfo.nFileIndexHigh) {
 				ComPtr<IPropertyStore> propertyStore;
 				hr = shellLink.As(&propertyStore);
 				if (!SUCCEEDED(hr)) return;
@@ -196,7 +199,7 @@ void cleanupShortcut() {
 
 	WCHAR szGotPath[MAX_PATH];
 	WIN32_FIND_DATA wfd;
-	hr = shellLink->GetPath(szGotPath, MAX_PATH, (WIN32_FIND_DATA*)&wfd, SLGP_SHORTPATH);
+	hr = shellLink->GetPath(szGotPath, MAX_PATH, (WIN32_FIND_DATA *)&wfd, SLGP_SHORTPATH);
 	if (!SUCCEEDED(hr)) return;
 
 	if (QDir::toNativeSeparators(cExeDir() + cExeName()).toStdWString() == szGotPath) {
@@ -287,7 +290,8 @@ bool validateShortcut() {
 	hr = shellLink->SetArguments(L"");
 	if (!SUCCEEDED(hr)) return false;
 
-	hr = shellLink->SetWorkingDirectory(QDir::toNativeSeparators(QDir(cWorkingDir()).absolutePath()).toStdWString().c_str());
+	hr = shellLink->SetWorkingDirectory(
+	    QDir::toNativeSeparators(QDir(cWorkingDir()).absolutePath()).toStdWString().c_str());
 	if (!SUCCEEDED(hr)) return false;
 
 	ComPtr<IPropertyStore> propertyStore;
diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h
index b50908d04..e2feb5f4a 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.h
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.h
@@ -19,10 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
-#include <windows.h>  // all stuff like FAR, BOOL, STDCALL, etc
-#include <ShlObj.h>   // OPENASINFO
+#include <ShlObj.h> // OPENASINFO
 #include <Shobjidl.h> // IEnumAssocHandlers
 #include <hstring.h>
+#include <windows.h> // all stuff like FAR, BOOL, STDCALL, etc
 
 namespace Platform {
 namespace Dlls {
@@ -30,13 +30,12 @@ namespace Dlls {
 void init();
 
 // KERNEL32.DLL
-typedef BOOL (FAR STDAPICALLTYPE *f_SetDllDirectory)(LPCWSTR lpPathName);
+typedef BOOL(FAR STDAPICALLTYPE *f_SetDllDirectory)(LPCWSTR lpPathName);
 extern f_SetDllDirectory SetDllDirectory;
 
 void start();
 
-template <typename Function>
-bool load(HINSTANCE library, LPCSTR name, Function &func) {
+template <typename Function> bool load(HINSTANCE library, LPCSTR name, Function &func) {
 	if (!library) return false;
 
 	func = reinterpret_cast<Function>(GetProcAddress(library, name));
@@ -44,59 +43,66 @@ bool load(HINSTANCE library, LPCSTR name, Function &func) {
 }
 
 // UXTHEME.DLL
-typedef HRESULT (FAR STDAPICALLTYPE *f_SetWindowTheme)(HWND hWnd, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SetWindowTheme)(HWND hWnd, LPCWSTR pszSubAppName, LPCWSTR pszSubIdList);
 extern f_SetWindowTheme SetWindowTheme;
 
 // SHELL32.DLL
-typedef HRESULT (FAR STDAPICALLTYPE *f_SHAssocEnumHandlers)(PCWSTR pszExtra, ASSOC_FILTER afFilter, IEnumAssocHandlers **ppEnumHandler);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SHAssocEnumHandlers)(PCWSTR pszExtra, ASSOC_FILTER afFilter,
+                                                           IEnumAssocHandlers **ppEnumHandler);
 extern f_SHAssocEnumHandlers SHAssocEnumHandlers;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_SHCreateItemFromParsingName)(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SHCreateItemFromParsingName)(PCWSTR pszPath, IBindCtx *pbc, REFIID riid,
+                                                                   void **ppv);
 extern f_SHCreateItemFromParsingName SHCreateItemFromParsingName;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_SHOpenWithDialog)(HWND hwndParent, const OPENASINFO *poainfo);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SHOpenWithDialog)(HWND hwndParent, const OPENASINFO *poainfo);
 extern f_SHOpenWithDialog SHOpenWithDialog;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_OpenAs_RunDLL)(HWND hWnd, HINSTANCE hInstance, LPCWSTR lpszCmdLine, int nCmdShow);
+typedef HRESULT(FAR STDAPICALLTYPE *f_OpenAs_RunDLL)(HWND hWnd, HINSTANCE hInstance, LPCWSTR lpszCmdLine, int nCmdShow);
 extern f_OpenAs_RunDLL OpenAs_RunDLL;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_SHQueryUserNotificationState)(QUERY_USER_NOTIFICATION_STATE *pquns);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SHQueryUserNotificationState)(QUERY_USER_NOTIFICATION_STATE *pquns);
 extern f_SHQueryUserNotificationState SHQueryUserNotificationState;
 
-typedef void (FAR STDAPICALLTYPE *f_SHChangeNotify)(LONG wEventId, UINT uFlags, __in_opt LPCVOID dwItem1, __in_opt LPCVOID dwItem2);
+typedef void(FAR STDAPICALLTYPE *f_SHChangeNotify)(LONG wEventId, UINT uFlags, __in_opt LPCVOID dwItem1,
+                                                   __in_opt LPCVOID dwItem2);
 extern f_SHChangeNotify SHChangeNotify;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_SetCurrentProcessExplicitAppUserModelID)(__in PCWSTR AppID);
+typedef HRESULT(FAR STDAPICALLTYPE *f_SetCurrentProcessExplicitAppUserModelID)(__in PCWSTR AppID);
 extern f_SetCurrentProcessExplicitAppUserModelID SetCurrentProcessExplicitAppUserModelID;
 
 // WTSAPI32.DLL
 
-typedef BOOL (FAR STDAPICALLTYPE *f_WTSRegisterSessionNotification)(HWND hWnd, DWORD dwFlags);
+typedef BOOL(FAR STDAPICALLTYPE *f_WTSRegisterSessionNotification)(HWND hWnd, DWORD dwFlags);
 extern f_WTSRegisterSessionNotification WTSRegisterSessionNotification;
 
-typedef BOOL (FAR STDAPICALLTYPE *f_WTSUnRegisterSessionNotification)(HWND hWnd);
+typedef BOOL(FAR STDAPICALLTYPE *f_WTSUnRegisterSessionNotification)(HWND hWnd);
 extern f_WTSUnRegisterSessionNotification WTSUnRegisterSessionNotification;
 
 // PROPSYS.DLL
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_PropVariantToString)(_In_ REFPROPVARIANT propvar, _Out_writes_(cch) PWSTR psz, _In_ UINT cch);
+typedef HRESULT(FAR STDAPICALLTYPE *f_PropVariantToString)(_In_ REFPROPVARIANT propvar, _Out_writes_(cch) PWSTR psz,
+                                                           _In_ UINT cch);
 extern f_PropVariantToString PropVariantToString;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_PSStringFromPropertyKey)(_In_ REFPROPERTYKEY pkey, _Out_writes_(cch) LPWSTR psz, _In_ UINT cch);
+typedef HRESULT(FAR STDAPICALLTYPE *f_PSStringFromPropertyKey)(_In_ REFPROPERTYKEY pkey, _Out_writes_(cch) LPWSTR psz,
+                                                               _In_ UINT cch);
 extern f_PSStringFromPropertyKey PSStringFromPropertyKey;
 
 // COMBASE.DLL
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_RoGetActivationFactory)(_In_ HSTRING activatableClassId, _In_ REFIID iid, _COM_Outptr_ void ** factory);
+typedef HRESULT(FAR STDAPICALLTYPE *f_RoGetActivationFactory)(_In_ HSTRING activatableClassId, _In_ REFIID iid,
+                                                              _COM_Outptr_ void **factory);
 extern f_RoGetActivationFactory RoGetActivationFactory;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_WindowsCreateStringReference)(_In_reads_opt_(length + 1) PCWSTR sourceString, UINT32 length, _Out_ HSTRING_HEADER * hstringHeader, _Outptr_result_maybenull_ _Result_nullonfailure_ HSTRING * string);
+typedef HRESULT(FAR STDAPICALLTYPE *f_WindowsCreateStringReference)(
+    _In_reads_opt_(length + 1) PCWSTR sourceString, UINT32 length, _Out_ HSTRING_HEADER *hstringHeader,
+    _Outptr_result_maybenull_ _Result_nullonfailure_ HSTRING *string);
 extern f_WindowsCreateStringReference WindowsCreateStringReference;
 
-typedef HRESULT (FAR STDAPICALLTYPE *f_WindowsDeleteString)(_In_opt_ HSTRING string);
+typedef HRESULT(FAR STDAPICALLTYPE *f_WindowsDeleteString)(_In_opt_ HSTRING string);
 extern f_WindowsDeleteString WindowsDeleteString;
 
 
-
 } // namespace Dlls
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
index 5baaae6f9..e0c14b519 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
@@ -22,10 +22,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include <QWindow>
 
-#include "mainwindow.h"
-#include "auth_session.h"
 #include "app.h"
+#include "auth_session.h"
 #include "facades.h"
+#include "mainwindow.h"
 
 namespace Platform {
 namespace {
@@ -55,13 +55,13 @@ bool EventFilter::nativeEventFilter(const QByteArray &eventType, void *message,
 	auto wnd = App::wnd();
 	if (!wnd) return false;
 
-	MSG *msg = (MSG*)message;
+	MSG *msg = (MSG *)message;
 	if (msg->message == WM_ENDSESSION) {
 		App::quit();
 		return false;
 	}
 	if (msg->hwnd == wnd->psHwnd() || msg->hwnd && !wnd->psHwnd()) {
-		return mainWindowEvent(msg->hwnd, msg->message, msg->wParam, msg->lParam, (LRESULT*)result);
+		return mainWindowEvent(msg->hwnd, msg->message, msg->wParam, msg->lParam, (LRESULT *)result);
 	}
 	return false;
 }
@@ -76,12 +76,12 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 	}
 
 	switch (msg) {
-
 	case WM_TIMECHANGE: {
 		if (AuthSession::Exists()) {
 			Auth().checkAutoLockIn(100);
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_WTSSESSION_CHANGE: {
 		if (wParam == WTS_SESSION_LOGOFF || wParam == WTS_SESSION_LOCK) {
@@ -89,11 +89,13 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		} else if (wParam == WTS_SESSION_LOGON || wParam == WTS_SESSION_UNLOCK) {
 			setSessionLoggedOff(false);
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_DESTROY: {
 		App::quit();
-	} return false;
+	}
+		return false;
 
 	case WM_ACTIVATE: {
 		if (LOWORD(wParam) == WA_CLICKACTIVE) {
@@ -107,12 +109,14 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		if (Global::started()) {
 			App::wnd()->update();
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_NCPAINT: {
 		if (QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS8) return false;
 		if (result) *result = 0;
-	} return true;
+	}
+		return true;
 
 	case WM_NCCALCSIZE: {
 		WINDOWPLACEMENT wp;
@@ -120,7 +124,8 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		if (GetWindowPlacement(hWnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED) {
 			LPNCCALCSIZE_PARAMS params = (LPNCCALCSIZE_PARAMS)lParam;
 			LPRECT r = (wParam == TRUE) ? &params->rgrc[0] : (LPRECT)lParam;
-			HMONITOR hMonitor = MonitorFromPoint({ (r->left + r->right) / 2, (r->top + r->bottom) / 2 }, MONITOR_DEFAULTTONEAREST);
+			HMONITOR hMonitor =
+			    MonitorFromPoint({(r->left + r->right) / 2, (r->top + r->bottom) / 2}, MONITOR_DEFAULTTONEAREST);
 			if (hMonitor) {
 				MONITORINFO mi;
 				mi.cbSize = sizeof(mi);
@@ -136,7 +141,8 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 	case WM_NCACTIVATE: {
 		auto res = DefWindowProc(hWnd, msg, wParam, -1);
 		if (result) *result = res;
-	} return true;
+	}
+		return true;
 
 	case WM_WINDOWPOSCHANGING:
 	case WM_WINDOWPOSCHANGED: {
@@ -145,9 +151,10 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		if (GetWindowPlacement(hWnd, &wp) && (wp.showCmd == SW_SHOWMAXIMIZED || wp.showCmd == SW_SHOWMINIMIZED)) {
 			App::wnd()->shadowsUpdate(ShadowsChange::Hidden);
 		} else {
-			App::wnd()->shadowsUpdate(ShadowsChange::Moved | ShadowsChange::Resized, (WINDOWPOS*)lParam);
+			App::wnd()->shadowsUpdate(ShadowsChange::Moved | ShadowsChange::Resized, (WINDOWPOS *)lParam);
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_SIZE: {
 		if (App::wnd()) {
@@ -164,22 +171,29 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 					App::wnd()->positionUpdated();
 				}
 				App::wnd()->psUpdateMargins();
-				MainWindow::ShadowsChanges changes = (wParam == SIZE_MINIMIZED || wParam == SIZE_MAXIMIZED) ? ShadowsChange::Hidden : (ShadowsChange::Resized | ShadowsChange::Shown);
+				MainWindow::ShadowsChanges changes = (wParam == SIZE_MINIMIZED || wParam == SIZE_MAXIMIZED) ?
+				                                         ShadowsChange::Hidden :
+				                                         (ShadowsChange::Resized | ShadowsChange::Shown);
 				App::wnd()->shadowsUpdate(changes);
 			}
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_SHOWWINDOW: {
 		LONG style = GetWindowLong(hWnd, GWL_STYLE);
-		auto changes = ShadowsChange::Resized | ((wParam && !(style & (WS_MAXIMIZE | WS_MINIMIZE))) ? ShadowsChange::Shown : ShadowsChange::Hidden);
+		auto changes =
+		    ShadowsChange::Resized |
+		    ((wParam && !(style & (WS_MAXIMIZE | WS_MINIMIZE))) ? ShadowsChange::Shown : ShadowsChange::Hidden);
 		App::wnd()->shadowsUpdate(changes);
-	} return false;
+	}
+		return false;
 
 	case WM_MOVE: {
 		App::wnd()->shadowsUpdate(ShadowsChange::Moved);
 		App::wnd()->positionUpdated();
-	} return false;
+	}
+		return false;
 
 	case WM_NCHITTEST: {
 		if (!result) return false;
@@ -187,27 +201,30 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		POINTS p = MAKEPOINTS(lParam);
 		RECT r;
 		GetWindowRect(hWnd, &r);
-		auto res = App::wnd()->hitTest(QPoint(p.x - r.left + App::wnd()->deltaLeft(), p.y - r.top + App::wnd()->deltaTop()));
+		auto res =
+		    App::wnd()->hitTest(QPoint(p.x - r.left + App::wnd()->deltaLeft(), p.y - r.top + App::wnd()->deltaTop()));
 		switch (res) {
 		case Window::HitTestResult::Client:
-		case Window::HitTestResult::SysButton:   *result = HTCLIENT; break;
-		case Window::HitTestResult::Caption:     *result = HTCAPTION; break;
-		case Window::HitTestResult::Top:         *result = HTTOP; break;
-		case Window::HitTestResult::TopRight:    *result = HTTOPRIGHT; break;
-		case Window::HitTestResult::Right:       *result = HTRIGHT; break;
+		case Window::HitTestResult::SysButton: *result = HTCLIENT; break;
+		case Window::HitTestResult::Caption: *result = HTCAPTION; break;
+		case Window::HitTestResult::Top: *result = HTTOP; break;
+		case Window::HitTestResult::TopRight: *result = HTTOPRIGHT; break;
+		case Window::HitTestResult::Right: *result = HTRIGHT; break;
 		case Window::HitTestResult::BottomRight: *result = HTBOTTOMRIGHT; break;
-		case Window::HitTestResult::Bottom:      *result = HTBOTTOM; break;
-		case Window::HitTestResult::BottomLeft:  *result = HTBOTTOMLEFT; break;
-		case Window::HitTestResult::Left:        *result = HTLEFT; break;
-		case Window::HitTestResult::TopLeft:     *result = HTTOPLEFT; break;
+		case Window::HitTestResult::Bottom: *result = HTBOTTOM; break;
+		case Window::HitTestResult::BottomLeft: *result = HTBOTTOMLEFT; break;
+		case Window::HitTestResult::Left: *result = HTLEFT; break;
+		case Window::HitTestResult::TopLeft: *result = HTTOPLEFT; break;
 		case Window::HitTestResult::None:
-		default:                                 *result = HTTRANSPARENT; break;
+		default: *result = HTTRANSPARENT; break;
 		};
-	} return true;
+	}
+		return true;
 
 	case WM_NCRBUTTONUP: {
 		SendMessage(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU, lParam);
-	} return true;
+	}
+		return true;
 
 	case WM_SYSCOMMAND: {
 		if (wParam == SC_MOUSEMENU) {
@@ -215,7 +232,8 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 			App::wnd()->updateSystemMenu(App::wnd()->windowHandle()->windowState());
 			TrackPopupMenu(App::wnd()->psMenu(), TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON, p.x, p.y, 0, hWnd, 0);
 		}
-	} return false;
+	}
+		return false;
 
 	case WM_COMMAND: {
 		if (HIWORD(wParam)) return false;
@@ -226,8 +244,8 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		case SC_MAXIMIZE: App::wnd()->setWindowState(Qt::WindowMaximized); return true;
 		case SC_RESTORE: App::wnd()->setWindowState(Qt::WindowNoState); return true;
 		}
-	} return true;
-
+	}
+		return true;
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.h b/Telegram/SourceFiles/platform/win/windows_event_filter.h
index f954fbe45..9a664710f 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.h
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <windows.h>
 #include <QAbstractNativeEventFilter>
+#include <windows.h>
 
 namespace Platform {
 
@@ -42,11 +42,9 @@ public:
 	static void destroy();
 
 private:
-	EventFilter() {
-	}
+	EventFilter() {}
 
 	bool _sessionLoggedOff = false;
-
 };
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/profile/profile_back_button.cpp b/Telegram/SourceFiles/profile/profile_back_button.cpp
index 0bba1da32..aec41efde 100644
--- a/Telegram/SourceFiles/profile/profile_back_button.cpp
+++ b/Telegram/SourceFiles/profile/profile_back_button.cpp
@@ -20,18 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_back_button.h"
 
-#include "window/top_bar_widget.h"
+#include "facades.h"
+#include "styles/style_profile.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
-#include "styles/style_profile.h"
-#include "facades.h"
+#include "window/top_bar_widget.h"
 
 #include <QPaintEvent>
 
 namespace Profile {
 
-BackButton::BackButton(QWidget *parent, const QString &text) : Ui::AbstractButton(parent)
-, _text(text.toUpper()) {
+BackButton::BackButton(QWidget *parent, const QString &text)
+    : Ui::AbstractButton(parent)
+    , _text(text.toUpper()) {
 	setCursor(style::cur_pointer);
 
 	subscribe(Adaptive::Changed(), [this] { updateAdaptiveLayout(); });
@@ -51,11 +52,13 @@ void BackButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	p.fillRect(e->rect(), st::profileBg);
-	st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2, (st::topBarHeight - st::topBarBack.height()) / 2, width());
+	st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2,
+	                     (st::topBarHeight - st::topBarBack.height()) / 2, width());
 
 	p.setFont(st::topBarButton.font);
 	p.setPen(st::topBarButton.textFg);
-	p.drawTextLeft(st::topBarArrowPadding.left(), st::topBarButton.padding.top() + st::topBarButton.textTop, width(), _text);
+	p.drawTextLeft(st::topBarArrowPadding.left(), st::topBarButton.padding.top() + st::topBarButton.textTop, width(),
+	               _text);
 
 	Window::TopBarWidget::paintUnreadCounter(p, width());
 }
diff --git a/Telegram/SourceFiles/profile/profile_back_button.h b/Telegram/SourceFiles/profile/profile_back_button.h
index 3a66f8a67..6bddeb123 100644
--- a/Telegram/SourceFiles/profile/profile_back_button.h
+++ b/Telegram/SourceFiles/profile/profile_back_button.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/abstract_button.h"
 #include "base/observer.h"
+#include "ui/abstract_button.h"
 
 namespace Profile {
 
@@ -42,7 +42,6 @@ private:
 
 	int _unreadCounterSubscription = 0;
 	QString _text;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_actions.cpp b/Telegram/SourceFiles/profile/profile_block_actions.cpp
index 916d6c34d..132edfd00 100644
--- a/Telegram/SourceFiles/profile/profile_block_actions.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_actions.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_actions.h"
 
-#include "styles/style_profile.h"
-#include "styles/style_boxes.h"
-#include "ui/widgets/buttons.h"
-#include "boxes/confirm_box.h"
-#include "boxes/report_box.h"
-#include "mainwidget.h"
-#include "observer_peer.h"
 #include "apiwrap.h"
 #include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "boxes/report_box.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
 #include "profile/profile_channel_controllers.h"
+#include "styles/style_boxes.h"
+#include "styles/style_profile.h"
+#include "ui/widgets/buttons.h"
 
 namespace Profile {
 
@@ -39,14 +39,13 @@ constexpr auto kMaxChannelMembersDeleteAllowed = 1000;
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-ActionsWidget::ActionsWidget(QWidget *parent, PeerData *peer) : BlockWidget(parent, peer, lang(lng_profile_actions_section)) {
-	auto observeEvents = UpdateFlag::ChannelAmIn
-		| UpdateFlag::UserIsBlocked
-		| UpdateFlag::BotCommandsChanged
-		| UpdateFlag::MembersChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+ActionsWidget::ActionsWidget(QWidget *parent, PeerData *peer)
+    : BlockWidget(parent, peer, lang(lng_profile_actions_section)) {
+	auto observeEvents = UpdateFlag::ChannelAmIn | UpdateFlag::UserIsBlocked | UpdateFlag::BotCommandsChanged |
+	                     UpdateFlag::MembersChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	validateBlockStatus();
 	refreshButtons();
@@ -105,7 +104,8 @@ void ActionsWidget::validateBlockStatus() const {
 	}
 }
 
-Ui::LeftOutlineButton *ActionsWidget::addButton(const QString &text, const char *slot, const style::OutlineButton &st, int skipHeight) {
+Ui::LeftOutlineButton *ActionsWidget::addButton(const QString &text, const char *slot, const style::OutlineButton &st,
+                                                int skipHeight) {
 	auto result = new Ui::LeftOutlineButton(this, text, st);
 	connect(result, SIGNAL(clicked()), this, slot);
 	result->show();
@@ -127,9 +127,7 @@ void ActionsWidget::resizeButton(Ui::LeftOutlineButton *button, int newWidth, in
 
 void ActionsWidget::refreshButtons() {
 	auto buttons = base::take(_buttons);
-	for_const (auto &button, buttons) {
-		delete button;
-	}
+	for_const (auto &button, buttons) { delete button; }
 	_blockUser = _leaveChannel = nullptr;
 
 	if (auto user = peer()->asUser()) {
@@ -142,7 +140,8 @@ void ActionsWidget::refreshButtons() {
 		addButton(lang(lng_profile_clear_history), SLOT(onClearHistory()));
 		addButton(lang(lng_profile_delete_conversation), SLOT(onDeleteConversation()));
 		if (user->botInfo) {
-			addButton(lang(lng_profile_report), SLOT(onReport()), st::defaultLeftOutlineButton, st::profileBlockOneLineSkip);
+			addButton(lang(lng_profile_report), SLOT(onReport()), st::defaultLeftOutlineButton,
+			          st::profileBlockOneLineSkip);
 		}
 		refreshBlockUser();
 	} else if (auto chat = peer()->asChat()) {
@@ -228,7 +227,8 @@ void ActionsWidget::refreshBlockUser() {
 				_blockUser->setText(blockText);
 			}
 		} else if (!blockText.isEmpty()) {
-			_blockUser = addButton(blockText, SLOT(onBlockUser()), st::attentionLeftOutlineButton, st::profileBlockOneLineSkip);
+			_blockUser =
+			    addButton(blockText, SLOT(onBlockUser()), st::attentionLeftOutlineButton, st::profileBlockOneLineSkip);
 		}
 	}
 }
@@ -236,7 +236,9 @@ void ActionsWidget::refreshBlockUser() {
 void ActionsWidget::refreshDeleteChannel() {
 	if (auto channel = peer()->asChannel()) {
 		if (channel->canDelete() && !_deleteChannel) {
-			_deleteChannel = addButton(lang(channel->isMegagroup() ? lng_profile_delete_group : lng_profile_delete_channel), SLOT(onDeleteChannel()), st::attentionLeftOutlineButton);
+			_deleteChannel =
+			    addButton(lang(channel->isMegagroup() ? lng_profile_delete_group : lng_profile_delete_channel),
+			              SLOT(onDeleteChannel()), st::attentionLeftOutlineButton);
 		} else if (!channel->canDelete() && _deleteChannel) {
 			_buttons.removeOne(_deleteChannel);
 			delete _deleteChannel;
@@ -249,7 +251,9 @@ void ActionsWidget::refreshLeaveChannel() {
 	if (auto channel = peer()->asChannel()) {
 		if (!channel->amCreator()) {
 			if (channel->amIn() && !_leaveChannel) {
-				_leaveChannel = addButton(lang(channel->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel), SLOT(onLeaveChannel()));
+				_leaveChannel =
+				    addButton(lang(channel->isMegagroup() ? lng_profile_leave_group : lng_profile_leave_channel),
+				              SLOT(onLeaveChannel()));
 			} else if (!channel->amIn() && _leaveChannel) {
 				_buttons.removeOne(_leaveChannel);
 				delete _leaveChannel;
@@ -260,9 +264,7 @@ void ActionsWidget::refreshLeaveChannel() {
 }
 
 int ActionsWidget::resizeGetHeight(int newWidth) {
-	for_const (auto button, _buttons) {
-		resizeButton(button, newWidth, button->y());
-	}
+	for_const (auto button, _buttons) { resizeButton(button, newWidth, button->y()); }
 	return buttonsBottom();
 }
 
@@ -290,11 +292,12 @@ void ActionsWidget::onClearHistory() {
 		confirmation = lng_sure_delete_group_history(lt_group, App::peerName(peer()));
 	}
 	if (!confirmation.isEmpty()) {
-		Ui::show(Box<ConfirmBox>(confirmation, lang(lng_box_delete), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-			Ui::hideLayer();
-			App::main()->clearHistory(peer());
-			Ui::showPeerHistory(peer(), ShowAtUnreadMsgId);
-		})));
+		Ui::show(Box<ConfirmBox>(confirmation, lang(lng_box_delete), st::attentionBoxButton,
+		                         base::lambda_guarded(this, [this] {
+			                         Ui::hideLayer();
+			                         App::main()->clearHistory(peer());
+			                         Ui::showPeerHistory(peer(), ShowAtUnreadMsgId);
+		                         })));
 	}
 }
 
@@ -308,15 +311,16 @@ void ActionsWidget::onDeleteConversation() {
 		confirmButton = lang(lng_box_leave);
 	}
 	if (!confirmation.isEmpty()) {
-		Ui::show(Box<ConfirmBox>(confirmation, confirmButton, st::attentionBoxButton, base::lambda_guarded(this, [this] {
-			Ui::hideLayer();
-			Ui::showChatsList();
-			if (auto user = peer()->asUser()) {
-				App::main()->deleteConversation(peer());
-			} else if (auto chat = peer()->asChat()) {
-				App::main()->deleteAndExit(chat);
-			}
-		})));
+		Ui::show(
+		    Box<ConfirmBox>(confirmation, confirmButton, st::attentionBoxButton, base::lambda_guarded(this, [this] {
+			                    Ui::hideLayer();
+			                    Ui::showChatsList();
+			                    if (auto user = peer()->asUser()) {
+				                    App::main()->deleteConversation(peer());
+			                    } else if (auto chat = peer()->asChat()) {
+				                    App::main()->deleteAndExit(chat);
+			                    }
+		                    })));
 	}
 }
 
@@ -339,22 +343,25 @@ void ActionsWidget::onUpgradeToSupergroup() {
 void ActionsWidget::onDeleteChannel() {
 	if (auto channel = peer()->asChannel()) {
 		if (channel->membersCount() > kMaxChannelMembersDeleteAllowed) {
-			Ui::show(Box<InformBox>((channel->isMegagroup() ? lng_cant_delete_group : lng_cant_delete_channel)(lt_count, kMaxChannelMembersDeleteAllowed)));
+			Ui::show(Box<InformBox>((channel->isMegagroup() ? lng_cant_delete_group : lng_cant_delete_channel)(
+			    lt_count, kMaxChannelMembersDeleteAllowed)));
 			return;
 		}
 	}
 
 	auto text = lang(peer()->isMegagroup() ? lng_sure_delete_group : lng_sure_delete_channel);
 	Ui::show(Box<ConfirmBox>(text, lang(lng_box_delete), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-		Ui::hideLayer();
-		Ui::showChatsList();
-		if (auto chat = peer()->migrateFrom()) {
-			App::main()->deleteAndExit(chat);
-		}
-		if (auto channel = peer()->asChannel()) {
-			MTP::send(MTPchannels_DeleteChannel(channel->inputChannel), App::main()->rpcDone(&MainWidget::sentUpdatesReceived), App::main()->rpcFail(&MainWidget::deleteChannelFailed));
-		}
-	})));
+		                         Ui::hideLayer();
+		                         Ui::showChatsList();
+		                         if (auto chat = peer()->migrateFrom()) {
+			                         App::main()->deleteAndExit(chat);
+		                         }
+		                         if (auto channel = peer()->asChannel()) {
+			                         MTP::send(MTPchannels_DeleteChannel(channel->inputChannel),
+			                                   App::main()->rpcDone(&MainWidget::sentUpdatesReceived),
+			                                   App::main()->rpcFail(&MainWidget::deleteChannelFailed));
+		                         }
+	                         })));
 }
 
 void ActionsWidget::onLeaveChannel() {
@@ -362,9 +369,8 @@ void ActionsWidget::onLeaveChannel() {
 	if (!channel) return;
 
 	auto text = lang(channel->isMegagroup() ? lng_sure_leave_group : lng_sure_leave_channel);
-	Ui::show(Box<ConfirmBox>(text, lang(lng_box_leave), base::lambda_guarded(this, [this] {
-		Auth().api().leaveChannel(peer()->asChannel());
-	})));
+	Ui::show(Box<ConfirmBox>(text, lang(lng_box_leave),
+	                         base::lambda_guarded(this, [this] { Auth().api().leaveChannel(peer()->asChannel()); })));
 }
 
 void ActionsWidget::onSearchMembers() {
diff --git a/Telegram/SourceFiles/profile/profile_block_actions.h b/Telegram/SourceFiles/profile/profile_block_actions.h
index a97aa5102..b8d7c074f 100644
--- a/Telegram/SourceFiles/profile/profile_block_actions.h
+++ b/Telegram/SourceFiles/profile/profile_block_actions.h
@@ -76,15 +76,15 @@ private:
 	void refreshLeaveChannel();
 	void refreshVisibility();
 
-	Ui::LeftOutlineButton *addButton(const QString &text, const char *slot
-		, const style::OutlineButton &st = st::defaultLeftOutlineButton, int skipHeight = 0);
+	Ui::LeftOutlineButton *addButton(const QString &text, const char *slot,
+	                                 const style::OutlineButton &st = st::defaultLeftOutlineButton, int skipHeight = 0);
 	void resizeButton(Ui::LeftOutlineButton *button, int newWidth, int top);
 
 	QString getBlockButtonText() const;
 	bool hasBotCommand(const QString &command) const;
 	void sendBotCommand(const QString &command);
 
-	QList<Ui::LeftOutlineButton*> _buttons;
+	QList<Ui::LeftOutlineButton *> _buttons;
 
 	// Hold some button pointers to update / toggle them.
 	bool _hasBotHelp = false;
@@ -92,7 +92,6 @@ private:
 	Ui::LeftOutlineButton *_blockUser = nullptr;
 	Ui::LeftOutlineButton *_deleteChannel = nullptr;
 	Ui::LeftOutlineButton *_leaveChannel = nullptr;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_channel_members.cpp b/Telegram/SourceFiles/profile/profile_block_channel_members.cpp
index a855f3cd7..658e8ae8c 100644
--- a/Telegram/SourceFiles/profile/profile_block_channel_members.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_channel_members.cpp
@@ -20,25 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_channel_members.h"
 
+#include "history/history_admin_log_section.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
 #include "profile/profile_channel_controllers.h"
 #include "styles/style_profile.h"
 #include "ui/widgets/buttons.h"
-#include "observer_peer.h"
-#include "mainwidget.h"
-#include "history/history_admin_log_section.h"
-#include "lang/lang_keys.h"
 
 namespace Profile {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-ChannelMembersWidget::ChannelMembersWidget(QWidget *parent, PeerData *peer) : BlockWidget(parent, peer, lang(lng_profile_participants_section)) {
-	auto observeEvents = UpdateFlag::ChannelRightsChanged
-		| UpdateFlag::AdminsChanged
-		| UpdateFlag::MembersChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+ChannelMembersWidget::ChannelMembersWidget(QWidget *parent, PeerData *peer)
+    : BlockWidget(parent, peer, lang(lng_profile_participants_section)) {
+	auto observeEvents = UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged | UpdateFlag::MembersChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	refreshButtons();
 }
diff --git a/Telegram/SourceFiles/profile/profile_block_channel_members.h b/Telegram/SourceFiles/profile/profile_block_channel_members.h
index 50d1a273e..4efa12d57 100644
--- a/Telegram/SourceFiles/profile/profile_block_channel_members.h
+++ b/Telegram/SourceFiles/profile/profile_block_channel_members.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "profile/profile_block_widget.h"
 #include "base/object_ptr.h"
+#include "profile/profile_block_widget.h"
 
 namespace Ui {
 class LeftOutlineButton;
@@ -59,10 +59,9 @@ private:
 
 	void addButton(const QString &text, object_ptr<Ui::LeftOutlineButton> *button, const char *slot);
 
-	object_ptr<Ui::LeftOutlineButton> _members = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _admins = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _recentActions = { nullptr };
-
+	object_ptr<Ui::LeftOutlineButton> _members = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _admins = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _recentActions = {nullptr};
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/profile/profile_block_group_members.cpp
index 84c10305b..a9255ec88 100644
--- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_group_members.cpp
@@ -20,54 +20,43 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_group_members.h"
 
-#include "styles/style_profile.h"
-#include "ui/widgets/labels.h"
+#include "apiwrap.h"
+#include "auth_session.h"
 #include "boxes/confirm_box.h"
 #include "boxes/edit_participant_box.h"
-#include "ui/widgets/popup_menu.h"
-#include "mainwidget.h"
-#include "apiwrap.h"
-#include "observer_peer.h"
-#include "auth_session.h"
 #include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
+#include "styles/style_profile.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 
 namespace Profile {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-GroupMembersWidget::GroupMembersWidget(QWidget *parent, PeerData *peer, TitleVisibility titleVisibility, const style::ProfilePeerListItem &st)
-: PeerListWidget(parent
-	, peer
-	, (titleVisibility == TitleVisibility::Visible) ? lang(lng_profile_participants_section) : QString()
-	, st
-	, lang(lng_profile_kick)) {
+GroupMembersWidget::GroupMembersWidget(QWidget *parent, PeerData *peer, TitleVisibility titleVisibility,
+                                       const style::ProfilePeerListItem &st)
+    : PeerListWidget(parent, peer,
+                     (titleVisibility == TitleVisibility::Visible) ? lang(lng_profile_participants_section) : QString(),
+                     st, lang(lng_profile_kick)) {
 	_updateOnlineTimer.setSingleShot(true);
 	connect(&_updateOnlineTimer, SIGNAL(timeout()), this, SLOT(onUpdateOnlineDisplay()));
 
-	auto observeEvents = UpdateFlag::AdminsChanged
-		| UpdateFlag::MembersChanged
-		| UpdateFlag::UserOnlineChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	auto observeEvents = UpdateFlag::AdminsChanged | UpdateFlag::MembersChanged | UpdateFlag::UserOnlineChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
-	setRemovedCallback([this, peer](PeerData *selectedPeer) {
-		removePeer(selectedPeer);
-	});
-	setSelectedCallback([this](PeerData *selectedPeer) {
-		Ui::showPeerProfile(selectedPeer);
-	});
-	setUpdateItemCallback([this](Item *item) {
-		updateItemStatusText(item);
-	});
-	setPreloadMoreCallback([this] {
-		preloadMore();
-	});
+	setRemovedCallback([this, peer](PeerData *selectedPeer) { removePeer(selectedPeer); });
+	setSelectedCallback([this](PeerData *selectedPeer) { Ui::showPeerProfile(selectedPeer); });
+	setUpdateItemCallback([this](Item *item) { updateItemStatusText(item); });
+	setPreloadMoreCallback([this] { preloadMore(); });
 
 	refreshMembers();
 }
 
-void GroupMembersWidget::editAdmin(not_null<UserData*> user) {
+void GroupMembersWidget::editAdmin(not_null<UserData *> user) {
 	auto megagroup = peer()->asMegagroup();
 	if (!megagroup) {
 		return; // not supported
@@ -77,32 +66,36 @@ void GroupMembersWidget::editAdmin(not_null<UserData*> user) {
 	auto currentRights = hasAdminRights ? currentRightsIt->rights : MTP_channelAdminRights(MTP_flags(0));
 	auto weak = QPointer<GroupMembersWidget>(this);
 	auto box = Box<EditAdminBox>(megagroup, user, currentRights);
-	box->setSaveCallback([weak, megagroup, user](const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights) {
-		Ui::hideLayer();
-		MTP::send(MTPchannels_EditAdmin(megagroup->inputChannel, user->inputUser, newRights), rpcDone([weak, megagroup, user, oldRights, newRights](const MTPUpdates &result) {
-			if (App::main()) App::main()->sentUpdatesReceived(result);
-			megagroup->applyEditAdmin(user, oldRights, newRights);
-		}));
-	});
+	box->setSaveCallback(
+	    [weak, megagroup, user](const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights) {
+		    Ui::hideLayer();
+		    MTP::send(MTPchannels_EditAdmin(megagroup->inputChannel, user->inputUser, newRights),
+		              rpcDone([weak, megagroup, user, oldRights, newRights](const MTPUpdates &result) {
+			              if (App::main()) App::main()->sentUpdatesReceived(result);
+			              megagroup->applyEditAdmin(user, oldRights, newRights);
+		              }));
+	    });
 	Ui::show(std::move(box));
 }
 
-void GroupMembersWidget::restrictUser(not_null<UserData*> user) {
+void GroupMembersWidget::restrictUser(not_null<UserData *> user) {
 	auto megagroup = peer()->asMegagroup();
 	if (!megagroup) {
 		return; // not supported
 	}
-	auto defaultRestricted = MegagroupInfo::Restricted { MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) };
+	auto defaultRestricted = MegagroupInfo::Restricted{MTP_channelBannedRights(MTP_flags(0), MTP_int(0))};
 	auto currentRights = megagroup->mgInfo->lastRestricted.value(user, defaultRestricted).rights;
 	auto hasAdminRights = megagroup->mgInfo->lastAdmins.find(user) != megagroup->mgInfo->lastAdmins.cend();
 	auto box = Box<EditRestrictedBox>(megagroup, user, hasAdminRights, currentRights);
-	box->setSaveCallback([megagroup, user](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
-		Ui::hideLayer();
-		MTP::send(MTPchannels_EditBanned(megagroup->inputChannel, user->inputUser, newRights), rpcDone([megagroup, user, oldRights, newRights](const MTPUpdates &result) {
-			if (App::main()) App::main()->sentUpdatesReceived(result);
-			megagroup->applyEditBanned(user, oldRights, newRights);
-		}));
-	});
+	box->setSaveCallback(
+	    [megagroup, user](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+		    Ui::hideLayer();
+		    MTP::send(MTPchannels_EditBanned(megagroup->inputChannel, user->inputUser, newRights),
+		              rpcDone([megagroup, user, oldRights, newRights](const MTPUpdates &result) {
+			              if (App::main()) App::main()->sentUpdatesReceived(result);
+			              megagroup->applyEditBanned(user, oldRights, newRights);
+		              }));
+	    });
 	Ui::show(std::move(box));
 }
 
@@ -142,13 +135,9 @@ void GroupMembersWidget::notifyPeerUpdated(const Notify::PeerUpdate &update) {
 		contentSizeUpdated();
 	} else if (update.flags & UpdateFlag::AdminsChanged) {
 		if (auto chat = peer()->asChat()) {
-			for_const (auto item, items()) {
-				setItemFlags(getMember(item), chat);
-			}
+			for_const (auto item, items()) { setItemFlags(getMember(item), chat); }
 		} else if (auto megagroup = peer()->asMegagroup()) {
-			for_const (auto item, items()) {
-				setItemFlags(getMember(item), megagroup);
-			}
+			for_const (auto item, items()) { setItemFlags(getMember(item), megagroup); }
 		}
 	}
 	this->update();
@@ -173,7 +162,8 @@ void GroupMembersWidget::refreshUserOnline(UserData *user) {
 void GroupMembersWidget::preloadMore() {
 	if (auto megagroup = peer()->asMegagroup()) {
 		auto &megagroupInfo = megagroup->mgInfo;
-		if (!megagroupInfo->lastParticipants.isEmpty() && megagroupInfo->lastParticipants.size() < megagroup->membersCount()) {
+		if (!megagroupInfo->lastParticipants.isEmpty() &&
+		    megagroupInfo->lastParticipants.size() < megagroup->membersCount()) {
 			Auth().api().requestLastParticipants(megagroup, false);
 		}
 	}
@@ -212,9 +202,7 @@ Ui::PopupMenu *GroupMembersWidget::fillPeerMenu(PeerData *selectedPeer) {
 	}
 	auto user = selectedPeer->asUser();
 	auto result = new Ui::PopupMenu(nullptr);
-	result->addAction(lang(lng_context_view_profile), [selectedPeer] {
-		Ui::showPeerProfile(selectedPeer);
-	});
+	result->addAction(lang(lng_context_view_profile), [selectedPeer] { Ui::showPeerProfile(selectedPeer); });
 	auto chat = peer()->asChat();
 	auto channel = peer()->asMegagroup();
 	for_const (auto item, items()) {
@@ -224,7 +212,7 @@ Ui::PopupMenu *GroupMembersWidget::fillPeerMenu(PeerData *selectedPeer) {
 					if (chat) {
 						// Adding of admins from context menu of chat participants
 						// is not supported, so the removing is also disabled.
-						return false;//chat->amCreator();
+						return false; // chat->amCreator();
 					} else if (channel) {
 						return channel->amCreator();
 					}
@@ -233,23 +221,19 @@ Ui::PopupMenu *GroupMembersWidget::fillPeerMenu(PeerData *selectedPeer) {
 			};
 			if (channel) {
 				if (channel->canEditAdmin(user)) {
-					auto label = lang((item->adminState != Item::AdminState::None) ? lng_context_edit_permissions : lng_context_promote_admin);
-					result->addAction(label, base::lambda_guarded(this, [this, user] {
-						editAdmin(user);
-					}));
+					auto label = lang((item->adminState != Item::AdminState::None) ? lng_context_edit_permissions :
+					                                                                 lng_context_promote_admin);
+					result->addAction(label, base::lambda_guarded(this, [this, user] { editAdmin(user); }));
 				}
 				if (channel->canRestrictUser(user)) {
-					result->addAction(lang(lng_context_restrict_user), base::lambda_guarded(this, [this, user] {
-						restrictUser(user);
-					}));
-					result->addAction(lang(lng_context_remove_from_group), base::lambda_guarded(this, [this, selectedPeer] {
-						removePeer(selectedPeer);
-					}));
+					result->addAction(lang(lng_context_restrict_user),
+					                  base::lambda_guarded(this, [this, user] { restrictUser(user); }));
+					result->addAction(lang(lng_context_remove_from_group),
+					                  base::lambda_guarded(this, [this, selectedPeer] { removePeer(selectedPeer); }));
 				}
 			} else if (item->hasRemoveLink) {
-				result->addAction(lang(lng_context_remove_from_group), base::lambda_guarded(this, [this, selectedPeer] {
-					removePeer(selectedPeer);
-				}));
+				result->addAction(lang(lng_context_remove_from_group),
+				                  base::lambda_guarded(this, [this, selectedPeer] { removePeer(selectedPeer); }));
 			}
 		}
 	}
@@ -313,10 +297,16 @@ void GroupMembersWidget::refreshLimitReached() {
 	bool limitReachedShown = (itemsCount() >= Global::ChatSizeMax()) && chat->amCreator() && !emptyTitle();
 	if (limitReachedShown && !_limitReachedInfo) {
 		_limitReachedInfo.create(this, st::profileLimitReachedLabel);
-		QString title = TextUtilities::EscapeForRichParsing(lng_profile_migrate_reached(lt_count, Global::ChatSizeMax()));
+		QString title =
+		    TextUtilities::EscapeForRichParsing(lng_profile_migrate_reached(lt_count, Global::ChatSizeMax()));
 		QString body = TextUtilities::EscapeForRichParsing(lang(lng_profile_migrate_body));
 		QString link = TextUtilities::EscapeForRichParsing(lang(lng_profile_migrate_learn_more));
-		QString text = qsl("%1%2%3\n%4 [a href=\"https://telegram.org/blog/supergroups5k\"]%5[/a]").arg(textcmdStartSemibold()).arg(title).arg(textcmdStopSemibold()).arg(body).arg(link);
+		QString text = qsl("%1%2%3\n%4 [a href=\"https://telegram.org/blog/supergroups5k\"]%5[/a]")
+		                   .arg(textcmdStartSemibold())
+		                   .arg(title)
+		                   .arg(textcmdStopSemibold())
+		                   .arg(body)
+		                   .arg(link);
 		_limitReachedInfo->setRichText(text);
 		_limitReachedInfo->setClickHandlerHook([this](const ClickHandlerPtr &handler, Qt::MouseButton button) {
 			Ui::show(Box<ConvertToSupergroupBox>(peer()->asChat()));
@@ -341,9 +331,7 @@ void GroupMembersWidget::checkSelfAdmin(ChatData *chat) {
 void GroupMembersWidget::sortMembers() {
 	if (!_sortByOnline || !itemsCount()) return;
 
-	sortItems([this](Item *a, Item *b) {
-		return getMember(a)->onlineForSort > getMember(b)->onlineForSort;
-	});
+	sortItems([this](Item *a, Item *b) { return getMember(a)->onlineForSort > getMember(b)->onlineForSort; });
 
 	updateOnlineCount();
 }
@@ -482,7 +470,8 @@ void GroupMembersWidget::setItemFlags(Item *item, ChannelData *megagroup) {
 	auto isAdmin = (adminIt != megagroup->mgInfo->lastAdmins.cend());
 	auto isCreator = megagroup->mgInfo->creator == item->peer;
 	auto adminCanEdit = isAdmin && adminIt->canEdit;
-	auto adminState = (amCreator || isCreator) ? AdminState::Creator : (amAdmin || isAdmin) ? AdminState::Admin : AdminState::None;
+	auto adminState =
+	    (amCreator || isCreator) ? AdminState::Creator : (amAdmin || isAdmin) ? AdminState::Admin : AdminState::None;
 	if (item->adminState != adminState) {
 		item->adminState = adminState;
 		auto user = item->peer->asUser();
@@ -495,7 +484,8 @@ void GroupMembersWidget::setItemFlags(Item *item, ChannelData *megagroup) {
 	}
 	if (item->peer->isSelf()) {
 		item->hasRemoveLink = false;
-	} else if (megagroup->amCreator() || (megagroup->canBanMembers() && ((adminState == AdminState::None) || adminCanEdit))) {
+	} else if (megagroup->amCreator() ||
+	           (megagroup->canBanMembers() && ((adminState == AdminState::None) || adminCanEdit))) {
 		item->hasRemoveLink = true;
 	} else {
 		item->hasRemoveLink = false;
@@ -542,9 +532,7 @@ void GroupMembersWidget::onUpdateOnlineDisplay() {
 
 GroupMembersWidget::~GroupMembersWidget() {
 	auto members = base::take(_membersByUser);
-	for_const (auto member, members) {
-		delete member;
-	}
+	for_const (auto member, members) { delete member; }
 }
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.h b/Telegram/SourceFiles/profile/profile_block_group_members.h
index d5fe39c37..929f381d5 100644
--- a/Telegram/SourceFiles/profile/profile_block_group_members.h
+++ b/Telegram/SourceFiles/profile/profile_block_group_members.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "profile/profile_block_peer_list.h"
-#include "core/click_handler.h"
 #include "QTimer"
+#include "core/click_handler.h"
+#include "profile/profile_block_peer_list.h"
 #include "structs.h"
 
 class UserData;
@@ -48,7 +48,8 @@ public:
 		Visible,
 		Hidden,
 	};
-	GroupMembersWidget(QWidget *parent, PeerData *peer, TitleVisibility titleVisibility = TitleVisibility::Visible, const style::ProfilePeerListItem &st = st::profileMemberItem);
+	GroupMembersWidget(QWidget *parent, PeerData *peer, TitleVisibility titleVisibility = TitleVisibility::Visible,
+	                   const style::ProfilePeerListItem &st = st::profileMemberItem);
 
 	int onlineCount() const {
 		return _onlineCount;
@@ -74,8 +75,8 @@ private:
 	// Observed notifications.
 	void notifyPeerUpdated(const Notify::PeerUpdate &update);
 
-	void editAdmin(not_null<UserData*> user);
-	void restrictUser(not_null<UserData*> user);
+	void editAdmin(not_null<UserData *> user);
+	void restrictUser(not_null<UserData *> user);
 	void removePeer(PeerData *selectedPeer);
 	void refreshMembers();
 	void fillChatMembers(ChatData *chat);
@@ -94,17 +95,17 @@ private:
 	int getListTop() const override;
 
 	struct Member : public Item {
-		explicit Member(UserData *user) : Item(user) {
-		}
+		explicit Member(UserData *user)
+		    : Item(user) {}
 		UserData *user() const {
-			return static_cast<UserData*>(peer);
+			return static_cast<UserData *>(peer);
 		}
 		TimeId onlineTextTill = 0;
 		TimeId onlineTill = 0;
 		TimeId onlineForSort = 0;
 	};
 	Member *getMember(Item *item) {
-		return static_cast<Member*>(item);
+		return static_cast<Member *>(item);
 	}
 
 	void updateItemStatusText(Item *item);
@@ -115,16 +116,15 @@ private:
 	void setItemFlags(Item *item, ChannelData *megagroup);
 	bool addUsersToEnd(ChannelData *megagroup);
 
-	object_ptr<Ui::FlatLabel> _limitReachedInfo = { nullptr };
+	object_ptr<Ui::FlatLabel> _limitReachedInfo = {nullptr};
 
-	QMap<UserData*, Member*> _membersByUser;
+	QMap<UserData *, Member *> _membersByUser;
 	bool _sortByOnline = false;
 	TimeId _now = 0;
 
 	int _onlineCount = 0;
 	TimeId _updateOnlineAt = 0;
 	QTimer _updateOnlineTimer;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_info.cpp b/Telegram/SourceFiles/profile/profile_block_info.cpp
index 596e89f62..509aa14a2 100644
--- a/Telegram/SourceFiles/profile/profile_block_info.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_info.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_info.h"
 
-#include "styles/style_profile.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "core/click_handler_types.h"
-#include "mainwidget.h"
-#include "observer_peer.h"
 #include "apiwrap.h"
+#include "core/click_handler_types.h"
 #include "lang/lang_keys.h"
-#include "ui/toast/toast.h"
+#include "mainwidget.h"
 #include "messenger.h"
+#include "observer_peer.h"
+#include "styles/style_profile.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 
 namespace Profile {
 
@@ -38,14 +38,13 @@ constexpr int kCommonGroupsLimit = 20;
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-InfoWidget::InfoWidget(QWidget *parent, PeerData *peer) : BlockWidget(parent, peer, lang(lng_profile_info_section)) {
-	auto observeEvents = UpdateFlag::AboutChanged
-		| UpdateFlag::UsernameChanged
-		| UpdateFlag::UserPhoneChanged
-		| UpdateFlag::UserCanShareContact;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+InfoWidget::InfoWidget(QWidget *parent, PeerData *peer)
+    : BlockWidget(parent, peer, lang(lng_profile_info_section)) {
+	auto observeEvents = UpdateFlag::AboutChanged | UpdateFlag::UsernameChanged | UpdateFlag::UserPhoneChanged |
+	                     UpdateFlag::UserCanShareContact;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	refreshLabels();
 }
@@ -88,7 +87,8 @@ int InfoWidget::resizeGetHeight(int newWidth) {
 		newHeight += _about->height();
 	}
 
-	auto moveLabeledText = [&newHeight, left, newWidth, marginLeft, marginRight](Ui::FlatLabel *label, Ui::FlatLabel *text, Ui::FlatLabel *shortText) {
+	auto moveLabeledText = [&newHeight, left, newWidth, marginLeft,
+	                        marginRight](Ui::FlatLabel *label, Ui::FlatLabel *text, Ui::FlatLabel *shortText) {
 		if (!label) return;
 
 		label->moveToLeft(left, newHeight);
@@ -111,7 +111,9 @@ int InfoWidget::resizeGetHeight(int newWidth) {
 				text->show();
 			}
 		}
-		newHeight += std::max(label->height(), text->height() - st::profileBlockTextPart.margin.top() - st::profileBlockTextPart.margin.bottom()) + st::profileBlockOneLineSkip;
+		newHeight += std::max(label->height(), text->height() - st::profileBlockTextPart.margin.top() -
+		                                           st::profileBlockTextPart.margin.bottom()) +
+		             st::profileBlockOneLineSkip;
 	};
 	moveLabeledText(_channelLinkLabel, _channelLink, _channelLinkShort);
 	moveLabeledText(_mobileNumberLabel, _mobileNumber, nullptr);
@@ -153,7 +155,7 @@ void InfoWidget::refreshAbout() {
 	_about.destroy();
 	_bioLabel.destroy();
 	_bio.destroy();
-	auto aboutText = TextWithEntities { TextUtilities::Clean(getAboutText()) };
+	auto aboutText = TextWithEntities{TextUtilities::Clean(getAboutText())};
 	auto displayAsBio = false;
 	if (auto user = peer()->asUser()) {
 		if (!user->botInfo) {
@@ -170,7 +172,8 @@ void InfoWidget::refreshAbout() {
 			_about.create(this, st::profileBlockTextPart);
 			_about->show();
 
-			TextUtilities::ParseEntities(aboutText, TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands);
+			TextUtilities::ParseEntities(aboutText,
+			                             TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands);
 			_about->setMarkedText(aboutText);
 			_about->setSelectable(true);
 			_about->setClickHandlerHook([this](const ClickHandlerPtr &handler, Qt::MouseButton button) {
@@ -190,7 +193,8 @@ void InfoWidget::refreshMobileNumber() {
 			phoneText.text = App::phoneFromSharedContact(peerToUser(user->id));
 		}
 	}
-	setSingleLineLabeledText(&_mobileNumberLabel, lang(lng_profile_mobile_number), &_mobileNumber, phoneText, lang(lng_profile_copy_phone));
+	setSingleLineLabeledText(&_mobileNumberLabel, lang(lng_profile_mobile_number), &_mobileNumber, phoneText,
+	                         lang(lng_profile_copy_phone));
 }
 
 void InfoWidget::refreshUsername() {
@@ -200,7 +204,8 @@ void InfoWidget::refreshUsername() {
 			usernameText.text = '@' + user->username;
 		}
 	}
-	setSingleLineLabeledText(&_usernameLabel, lang(lng_profile_username), &_username, usernameText, lang(lng_context_copy_mention));
+	setSingleLineLabeledText(&_usernameLabel, lang(lng_profile_username), &_username, usernameText,
+	                         lang(lng_context_copy_mention));
 }
 
 void InfoWidget::refreshChannelLink() {
@@ -211,11 +216,14 @@ void InfoWidget::refreshChannelLink() {
 			channelLinkText.text = Messenger::Instance().createInternalLinkFull(channel->username);
 			channelLinkText.entities.push_back(EntityInText(EntityInTextUrl, 0, channelLinkText.text.size()));
 			channelLinkTextShort.text = Messenger::Instance().createInternalLink(channel->username);
-			channelLinkTextShort.entities.push_back(EntityInText(EntityInTextCustomUrl, 0, channelLinkTextShort.text.size(), Messenger::Instance().createInternalLinkFull(channel->username)));
+			channelLinkTextShort.entities.push_back(
+			    EntityInText(EntityInTextCustomUrl, 0, channelLinkTextShort.text.size(),
+			                 Messenger::Instance().createInternalLinkFull(channel->username)));
 		}
 	}
 	setSingleLineLabeledText(nullptr, lang(lng_profile_link), &_channelLink, channelLinkText, QString());
-	setSingleLineLabeledText(&_channelLinkLabel, lang(lng_profile_link), &_channelLinkShort, channelLinkTextShort, QString());
+	setSingleLineLabeledText(&_channelLinkLabel, lang(lng_profile_link), &_channelLinkShort, channelLinkTextShort,
+	                         QString());
 	auto copyLinkHandlerHook = [this](const ClickHandlerPtr &handler, Qt::MouseButton button) {
 		if (auto channel = peer()->asChannel()) {
 			auto link = Messenger::Instance().createInternalLinkFull(channel->username);
@@ -235,8 +243,8 @@ void InfoWidget::refreshChannelLink() {
 }
 
 void InfoWidget::setLabeledText(object_ptr<Ui::FlatLabel> *labelWidget, const QString &label,
-	object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities,
-	const style::FlatLabel &st, const QString &copyText) {
+                                object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities,
+                                const style::FlatLabel &st, const QString &copyText) {
 	if (labelWidget) labelWidget->destroy();
 	textWidget->destroy();
 	if (textWithEntities.text.isEmpty()) {
@@ -255,7 +263,8 @@ void InfoWidget::setLabeledText(object_ptr<Ui::FlatLabel> *labelWidget, const QS
 }
 
 void InfoWidget::setSingleLineLabeledText(object_ptr<Ui::FlatLabel> *labelWidget, const QString &label,
-	object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities, const QString &copyText) {
+                                          object_ptr<Ui::FlatLabel> *textWidget,
+                                          const TextWithEntities &textWithEntities, const QString &copyText) {
 	setLabeledText(labelWidget, label, textWidget, textWithEntities, st::profileBlockOneLineTextPart, copyText);
 	if (*textWidget) {
 		(*textWidget)->setDoubleClickSelectsParagraph(true);
diff --git a/Telegram/SourceFiles/profile/profile_block_info.h b/Telegram/SourceFiles/profile/profile_block_info.h
index 77d881038..cee72650a 100644
--- a/Telegram/SourceFiles/profile/profile_block_info.h
+++ b/Telegram/SourceFiles/profile/profile_block_info.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "mtproto/rpc_sender.h"
 #include "profile/profile_block_widget.h"
 #include "ui/text/text_entity.h"
-#include "mtproto/rpc_sender.h"
 
 namespace style {
 struct FlatLabel;
@@ -61,22 +61,22 @@ private:
 
 	// labelWidget may be nullptr.
 	void setLabeledText(object_ptr<Ui::FlatLabel> *labelWidget, const QString &label,
-		object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities,
-		const style::FlatLabel &st, const QString &copyText);
+	                    object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities,
+	                    const style::FlatLabel &st, const QString &copyText);
 	void setSingleLineLabeledText(object_ptr<Ui::FlatLabel> *labelWidget, const QString &label,
-		object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities, const QString &copyText);
-
-	object_ptr<Ui::FlatLabel> _about = { nullptr };
-	object_ptr<Ui::FlatLabel> _channelLinkLabel = { nullptr };
-	object_ptr<Ui::FlatLabel> _channelLink = { nullptr };
-	object_ptr<Ui::FlatLabel> _channelLinkShort = { nullptr };
-	object_ptr<Ui::FlatLabel> _mobileNumberLabel = { nullptr };
-	object_ptr<Ui::FlatLabel> _mobileNumber = { nullptr };
-	object_ptr<Ui::FlatLabel> _bioLabel = { nullptr };
-	object_ptr<Ui::FlatLabel> _bio = { nullptr };
-	object_ptr<Ui::FlatLabel> _usernameLabel = { nullptr };
-	object_ptr<Ui::FlatLabel> _username = { nullptr };
+	                              object_ptr<Ui::FlatLabel> *textWidget, const TextWithEntities &textWithEntities,
+	                              const QString &copyText);
 
+	object_ptr<Ui::FlatLabel> _about = {nullptr};
+	object_ptr<Ui::FlatLabel> _channelLinkLabel = {nullptr};
+	object_ptr<Ui::FlatLabel> _channelLink = {nullptr};
+	object_ptr<Ui::FlatLabel> _channelLinkShort = {nullptr};
+	object_ptr<Ui::FlatLabel> _mobileNumberLabel = {nullptr};
+	object_ptr<Ui::FlatLabel> _mobileNumber = {nullptr};
+	object_ptr<Ui::FlatLabel> _bioLabel = {nullptr};
+	object_ptr<Ui::FlatLabel> _bio = {nullptr};
+	object_ptr<Ui::FlatLabel> _usernameLabel = {nullptr};
+	object_ptr<Ui::FlatLabel> _username = {nullptr};
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
index 3a103b271..09f7e6ea2 100644
--- a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_invite_link.h"
 
-#include "styles/style_profile.h"
-#include "ui/widgets/labels.h"
-#include "ui/toast/toast.h"
 #include "boxes/confirm_box.h"
-#include "observer_peer.h"
-#include "mainwindow.h"
 #include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "observer_peer.h"
+#include "styles/style_profile.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/labels.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -35,11 +35,12 @@ namespace Profile {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-InviteLinkWidget::InviteLinkWidget(QWidget *parent, PeerData *peer) : BlockWidget(parent, peer, lang(lng_profile_invite_link_section)) {
+InviteLinkWidget::InviteLinkWidget(QWidget *parent, PeerData *peer)
+    : BlockWidget(parent, peer, lang(lng_profile_invite_link_section)) {
 	auto observeEvents = UpdateFlag::InviteLinkChanged | UpdateFlag::UsernameChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	refreshLink();
 	refreshVisibility();
@@ -94,7 +95,7 @@ QString InviteLinkWidget::getInviteLink() const {
 
 void InviteLinkWidget::refreshLink() {
 	_link.destroy();
-	TextWithEntities linkData = { getInviteLink(), EntitiesInText() };
+	TextWithEntities linkData = {getInviteLink(), EntitiesInText()};
 	if (linkData.text.isEmpty()) {
 		_link.destroy();
 	} else {
diff --git a/Telegram/SourceFiles/profile/profile_block_invite_link.h b/Telegram/SourceFiles/profile/profile_block_invite_link.h
index 0e0363164..c267e9dbf 100644
--- a/Telegram/SourceFiles/profile/profile_block_invite_link.h
+++ b/Telegram/SourceFiles/profile/profile_block_invite_link.h
@@ -48,8 +48,7 @@ private:
 	void refreshLink();
 	void refreshVisibility();
 
-	object_ptr<Ui::FlatLabel> _link = { nullptr };
-
+	object_ptr<Ui::FlatLabel> _link = {nullptr};
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
index ec5fc65e0..7bac0600a 100644
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
@@ -20,25 +20,26 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_peer_list.h"
 
-#include "ui/effects/ripple_animation.h"
-#include "ui/widgets/popup_menu.h"
+#include "app.h"
+#include "auth_session.h"
 #include "styles/style_profile.h"
 #include "styles/style_widgets.h"
-#include "auth_session.h"
-#include "app.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/popup_menu.h"
 
 namespace Profile {
 
-PeerListWidget::Item::Item(PeerData *peer) : peer(peer) {
-}
+PeerListWidget::Item::Item(PeerData *peer)
+    : peer(peer) {}
 
 PeerListWidget::Item::~Item() = default;
 
-PeerListWidget::PeerListWidget(QWidget *parent, PeerData *peer, const QString &title, const style::ProfilePeerListItem &st, const QString &removeText)
-: BlockWidget(parent, peer, title)
-, _st(st)
-, _removeText(removeText)
-, _removeWidth(st::normalFont->width(_removeText)) {
+PeerListWidget::PeerListWidget(QWidget *parent, PeerData *peer, const QString &title,
+                               const style::ProfilePeerListItem &st, const QString &removeText)
+    : BlockWidget(parent, peer, title)
+    , _st(st)
+    , _removeText(removeText)
+    , _removeWidth(st::normalFont->width(_removeText)) {
 	setMouseTracking(true);
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 }
@@ -72,7 +73,8 @@ void PeerListWidget::paintContents(Painter &p) {
 	auto to = ceilclamp(_visibleBottom - top, st::profileMemberHeight, 0, _items.size());
 	for (auto i = from; i < to; ++i) {
 		auto y = top + i * st::profileMemberHeight;
-		auto selected = (_menuRowIndex >= 0) ? (i == _menuRowIndex) : (_pressed >= 0) ? (i == _pressed) : (i == _selected);
+		auto selected =
+		    (_menuRowIndex >= 0) ? (i == _menuRowIndex) : (_pressed >= 0) ? (i == _pressed) : (i == _selected);
 		auto selectedRemove = selected && _selectedRemove;
 		if (_pressed >= 0 && !_pressedRemove) {
 			selectedRemove = false;
@@ -98,7 +100,8 @@ void PeerListWidget::paintItem(Painter &p, int x, int y, Item *item, bool select
 	}
 	int skip = st::profileMemberPhotoPosition.x();
 
-	item->peer->paintUserpicLeft(p, x + st::profileMemberPhotoPosition.x(), y + st::profileMemberPhotoPosition.y(), width(), st::profileMemberPhotoSize);
+	item->peer->paintUserpicLeft(p, x + st::profileMemberPhotoPosition.x(), y + st::profileMemberPhotoPosition.y(),
+	                             width(), st::profileMemberPhotoSize);
 
 	if (item->name.isEmpty()) {
 		item->name.setText(st::msgNameStyle, App::peerName(item->peer), _textNameOptions);
@@ -115,9 +118,9 @@ void PeerListWidget::paintItem(Painter &p, int x, int y, Item *item, bool select
 	if (item->adminState != Item::AdminState::None) {
 		nameWidth -= st::profileMemberAdminIcon.width();
 		auto iconLeft = nameLeft + std::min(nameWidth, item->name.maxWidth());
-		auto &icon = (item->adminState == Item::AdminState::Creator)
-			? (selected ? st::profileMemberCreatorIconOver : st::profileMemberCreatorIcon)
-			: (selected ? st::profileMemberAdminIconOver : st::profileMemberAdminIcon);
+		auto &icon = (item->adminState == Item::AdminState::Creator) ?
+		                 (selected ? st::profileMemberCreatorIconOver : st::profileMemberCreatorIcon) :
+		                 (selected ? st::profileMemberAdminIconOver : st::profileMemberAdminIcon);
 		icon.paint(p, QPoint(iconLeft, nameTop), width());
 	}
 	p.setPen(st::profileMemberNameFg);
@@ -129,7 +132,8 @@ void PeerListWidget::paintItem(Painter &p, int x, int y, Item *item, bool select
 		p.setPen(selected ? _st.statusFgOver : _st.statusFg);
 	}
 	p.setFont(st::normalFont);
-	p.drawTextLeft(x + st::profileMemberStatusPosition.x(), y + st::profileMemberStatusPosition.y(), width(), item->statusText);
+	p.drawTextLeft(x + st::profileMemberStatusPosition.x(), y + st::profileMemberStatusPosition.y(), width(),
+	               item->statusText);
 }
 
 void PeerListWidget::paintOutlinedRect(Painter &p, int x, int y, int w, int h) const {
@@ -156,10 +160,10 @@ void PeerListWidget::mousePressEvent(QMouseEvent *e) {
 		auto item = _items[_pressed];
 		if (!item->ripple) {
 			auto memberRowWidth = rowWidth();
-			auto mask = Ui::RippleAnimation::rectMask(QSize(memberRowWidth - _st.button.outlineWidth, st::profileMemberHeight));
-			item->ripple = std::make_unique<Ui::RippleAnimation>(_st.button.ripple, std::move(mask), [this, index = _pressed] {
-				repaintRow(index);
-			});
+			auto mask =
+			    Ui::RippleAnimation::rectMask(QSize(memberRowWidth - _st.button.outlineWidth, st::profileMemberHeight));
+			item->ripple = std::make_unique<Ui::RippleAnimation>(_st.button.ripple, std::move(mask),
+			                                                     [this, index = _pressed] { repaintRow(index); });
 		}
 		auto left = getListLeft() + _st.button.outlineWidth;
 		auto top = getListTop() + st::profileMemberHeight * _pressed;
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h
index 1d4e77766..9b6e36328 100644
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.h
+++ b/Telegram/SourceFiles/profile/profile_block_peer_list.h
@@ -37,7 +37,8 @@ namespace Profile {
 
 class PeerListWidget : public BlockWidget {
 public:
-	PeerListWidget(QWidget *parent, PeerData *peer, const QString &title, const style::ProfilePeerListItem &st = st::profileMemberItem, const QString &removeText = QString());
+	PeerListWidget(QWidget *parent, PeerData *peer, const QString &title,
+	               const style::ProfilePeerListItem &st = st::profileMemberItem, const QString &removeText = QString());
 
 	void setVisibleTopBottom(int visibleTop, int visibleBottom) override;
 
@@ -45,7 +46,7 @@ public:
 		explicit Item(PeerData *peer);
 		~Item();
 
-		PeerData * const peer;
+		PeerData *const peer;
 		Text name;
 		QString statusText;
 		bool statusHasOnlineColor = false;
@@ -64,7 +65,7 @@ public:
 
 	int getListLeft() const;
 
-	const QList<Item*> &items() const {
+	const QList<Item *> &items() const {
 		return _items;
 	}
 	int itemsCount() const {
@@ -82,21 +83,20 @@ public:
 	void reserveItemsForSize(int size) {
 		_items.reserve(size);
 	}
-	template <typename Predicate>
-	void sortItems(Predicate predicate) {
+	template <typename Predicate> void sortItems(Predicate predicate) {
 		qSort(_items.begin(), _items.end(), std::move(predicate));
 	}
 
 	void setPreloadMoreCallback(base::lambda<void()> callback) {
 		_preloadMoreCallback = std::move(callback);
 	}
-	void setSelectedCallback(base::lambda<void(PeerData*)> callback) {
+	void setSelectedCallback(base::lambda<void(PeerData *)> callback) {
 		_selectedCallback = std::move(callback);
 	}
-	void setRemovedCallback(base::lambda<void(PeerData*)> callback) {
+	void setRemovedCallback(base::lambda<void(PeerData *)> callback) {
 		_removedCallback = std::move(callback);
 	}
-	void setUpdateItemCallback(base::lambda<void(Item*)> callback) {
+	void setUpdateItemCallback(base::lambda<void(Item *)> callback) {
 		_updateItemCallback = std::move(callback);
 	}
 
@@ -140,11 +140,11 @@ private:
 	const style::ProfilePeerListItem &_st;
 
 	base::lambda<void()> _preloadMoreCallback;
-	base::lambda<void(PeerData*)> _selectedCallback;
-	base::lambda<void(PeerData*)> _removedCallback;
-	base::lambda<void(Item*)> _updateItemCallback;
+	base::lambda<void(PeerData *)> _selectedCallback;
+	base::lambda<void(PeerData *)> _removedCallback;
+	base::lambda<void(Item *)> _updateItemCallback;
 
-	QList<Item*> _items;
+	QList<Item *> _items;
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
@@ -161,7 +161,6 @@ private:
 
 	Ui::PopupMenu *_menu = nullptr;
 	int _menuRowIndex = -1;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_settings.cpp b/Telegram/SourceFiles/profile/profile_block_settings.cpp
index e12956725..31be4e5c5 100644
--- a/Telegram/SourceFiles/profile/profile_block_settings.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_settings.cpp
@@ -20,25 +20,26 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_settings.h"
 
-#include "profile/profile_channel_controllers.h"
+#include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "boxes/peer_list_controllers.h"
 #include "history/history_admin_log_section.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
+#include "profile/profile_channel_controllers.h"
 #include "styles/style_profile.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
-#include "boxes/peer_list_controllers.h"
-#include "boxes/confirm_box.h"
-#include "observer_peer.h"
-#include "auth_session.h"
-#include "mainwidget.h"
-#include "apiwrap.h"
-#include "lang/lang_keys.h"
 
 namespace Profile {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-SettingsWidget::SettingsWidget(QWidget *parent, PeerData *peer) : BlockWidget(parent, peer, lang(lng_profile_settings_section))
-, _enableNotifications(this, lang(lng_profile_enable_notifications), true, st::defaultCheckbox) {
+SettingsWidget::SettingsWidget(QWidget *parent, PeerData *peer)
+    : BlockWidget(parent, peer, lang(lng_profile_settings_section))
+    , _enableNotifications(this, lang(lng_profile_enable_notifications), true, st::defaultCheckbox) {
 	subscribe(_enableNotifications->checkedChanged, [this](bool checked) { onNotificationsChange(); });
 
 	Notify::PeerUpdate::Flags observeEvents = UpdateFlag::NotificationsEnabled;
@@ -47,11 +48,12 @@ SettingsWidget::SettingsWidget(QWidget *parent, PeerData *peer) : BlockWidget(pa
 			observeEvents |= UpdateFlag::ChatCanEdit | UpdateFlag::InviteLinkChanged;
 		}
 	} else if (auto channel = peer->asChannel()) {
-		observeEvents |= UpdateFlag::ChannelRightsChanged | UpdateFlag::BannedUsersChanged | UpdateFlag::UsernameChanged | UpdateFlag::InviteLinkChanged;
+		observeEvents |= UpdateFlag::ChannelRightsChanged | UpdateFlag::BannedUsersChanged |
+		                 UpdateFlag::UsernameChanged | UpdateFlag::InviteLinkChanged;
 	}
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	refreshButtons();
 	_enableNotifications->finishAnimations();
@@ -67,7 +69,8 @@ void SettingsWidget::notifyPeerUpdated(const Notify::PeerUpdate &update) {
 	if (update.flags & UpdateFlag::NotificationsEnabled) {
 		refreshEnableNotifications();
 	}
-	if (update.flags & (UpdateFlag::ChannelRightsChanged | UpdateFlag::ChatCanEdit | UpdateFlag::UsernameChanged | UpdateFlag::InviteLinkChanged)) {
+	if (update.flags & (UpdateFlag::ChannelRightsChanged | UpdateFlag::ChatCanEdit | UpdateFlag::UsernameChanged |
+	                    UpdateFlag::InviteLinkChanged)) {
 		refreshInviteLinkButton();
 	}
 	if (update.flags & (UpdateFlag::ChannelRightsChanged | UpdateFlag::ChatCanEdit)) {
@@ -205,7 +208,8 @@ void SettingsWidget::refreshInviteLinkButton() {
 }
 
 void SettingsWidget::onNotificationsChange() {
-	App::main()->updateNotifySetting(peer(), _enableNotifications->checked() ? NotifySettingSetNotify : NotifySettingSetMuted);
+	App::main()->updateNotifySetting(peer(),
+	                                 _enableNotifications->checked() ? NotifySettingSetNotify : NotifySettingSetMuted);
 }
 
 void SettingsWidget::onManageAdmins() {
@@ -249,9 +253,9 @@ void SettingsWidget::onInviteLink() {
 
 	auto text = lang(link.isEmpty() ? lng_group_invite_about : lng_group_invite_about_new);
 	Ui::show(Box<ConfirmBox>(text, base::lambda_guarded(this, [this] {
-		Ui::hideLayer();
-		Auth().api().exportInviteLink(peer());
-	})));
+		                         Ui::hideLayer();
+		                         Auth().api().exportInviteLink(peer());
+	                         })));
 }
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_settings.h b/Telegram/SourceFiles/profile/profile_block_settings.h
index 35dd86513..49ec4a3ab 100644
--- a/Telegram/SourceFiles/profile/profile_block_settings.h
+++ b/Telegram/SourceFiles/profile/profile_block_settings.h
@@ -62,12 +62,11 @@ private:
 	void refreshInviteLinkButton();
 
 	object_ptr<Ui::Checkbox> _enableNotifications;
-	object_ptr<Ui::LeftOutlineButton> _manageAdmins = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _recentActions = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _manageBannedUsers = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _manageRestrictedUsers = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _inviteLink = { nullptr };
-
+	object_ptr<Ui::LeftOutlineButton> _manageAdmins = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _recentActions = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _manageBannedUsers = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _manageRestrictedUsers = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _inviteLink = {nullptr};
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp
index 15881971c..9744f8061 100644
--- a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_block_shared_media.h"
 
+#include "history/history.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
 #include "profile/profile_common_groups_section.h"
 #include "profile/profile_section_memento.h"
 #include "styles/style_profile.h"
-#include "observer_peer.h"
 #include "ui/widgets/buttons.h"
-#include "mainwidget.h"
-#include "lang/lang_keys.h"
-#include "history/history.h"
 
 namespace Profile {
 namespace {
@@ -44,7 +44,8 @@ QString getButtonText(MediaOverviewType type, int count) {
 	case OverviewFiles: return lng_profile_files(lt_count, count);
 	case OverviewVoiceFiles: return lng_profile_audios(lt_count, count);
 	case OverviewLinks: return lng_profile_shared_links(lt_count, count);
-	case OverviewChatPhotos: case OverviewCount: return QString(); // temp
+	case OverviewChatPhotos:
+	case OverviewCount: return QString(); // temp
 	}
 	return QString();
 }
@@ -52,15 +53,14 @@ QString getButtonText(MediaOverviewType type, int count) {
 } // namespace
 
 SharedMediaWidget::SharedMediaWidget(QWidget *parent, PeerData *peer)
-	: BlockWidget(parent, peer, lang(lng_profile_shared_media))
-	, _history(App::history(peer))
-	, _migrated(_history->migrateFrom())
-{
-	auto observeEvents = Notify::PeerUpdate::Flag::SharedMediaChanged
-		| Notify::PeerUpdate::Flag::UserCommonChatsChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+    : BlockWidget(parent, peer, lang(lng_profile_shared_media))
+    , _history(App::history(peer))
+    , _migrated(_history->migrateFrom()) {
+	auto observeEvents =
+	    Notify::PeerUpdate::Flag::SharedMediaChanged | Notify::PeerUpdate::Flag::UserCommonChatsChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	for (auto i = 0; i != OverviewCount; ++i) {
 		auto type = static_cast<MediaOverviewType>(i);
@@ -173,7 +173,6 @@ void SharedMediaWidget::resizeButtons(int newWidth, int *top) {
 		_commonGroups->moveToLeft(left, *top);
 		*top += _commonGroups->height();
 	}
-
 }
 
 int SharedMediaWidget::getCommonGroupsCount() const {
diff --git a/Telegram/SourceFiles/profile/profile_block_shared_media.h b/Telegram/SourceFiles/profile/profile_block_shared_media.h
index d6fc48e69..2cf85df11 100644
--- a/Telegram/SourceFiles/profile/profile_block_shared_media.h
+++ b/Telegram/SourceFiles/profile/profile_block_shared_media.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "profile/profile_block_widget.h"
 #include "history/history.h"
+#include "profile/profile_block_widget.h"
 
 class History;
 
@@ -63,12 +63,11 @@ private:
 
 	void resizeButtons(int newWidth, int *top);
 
-	Ui::LeftOutlineButton *_mediaButtons[OverviewCount] = { nullptr };
-	object_ptr<Ui::LeftOutlineButton> _commonGroups = { nullptr };
+	Ui::LeftOutlineButton *_mediaButtons[OverviewCount] = {nullptr};
+	object_ptr<Ui::LeftOutlineButton> _commonGroups = {nullptr};
 
 	History *_history;
 	History *_migrated;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_widget.cpp b/Telegram/SourceFiles/profile/profile_block_widget.cpp
index 0eb34df77..281e6ac18 100644
--- a/Telegram/SourceFiles/profile/profile_block_widget.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_widget.cpp
@@ -25,10 +25,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Profile {
 
-BlockWidget::BlockWidget(QWidget *parent, PeerData *peer, const QString &title) : TWidget(parent)
-, _peer(peer)
-, _title(title) {
-}
+BlockWidget::BlockWidget(QWidget *parent, PeerData *peer, const QString &title)
+    : TWidget(parent)
+    , _peer(peer)
+    , _title(title) {}
 
 int BlockWidget::contentTop() const {
 	return emptyTitle() ? 0 : (st::profileBlockMarginTop + st::profileBlockTitleHeight);
diff --git a/Telegram/SourceFiles/profile/profile_block_widget.h b/Telegram/SourceFiles/profile/profile_block_widget.h
index 22795613a..a4897b45b 100644
--- a/Telegram/SourceFiles/profile/profile_block_widget.h
+++ b/Telegram/SourceFiles/profile/profile_block_widget.h
@@ -39,18 +39,14 @@ class BlockWidget : public TWidget, protected base::Subscriber {
 public:
 	BlockWidget(QWidget *parent, PeerData *peer, const QString &title);
 
-	virtual void showFinished() {
-	}
+	virtual void showFinished() {}
 
-	virtual void saveState(gsl::not_null<SectionMemento*> memento) {
-	}
-	virtual void restoreState(gsl::not_null<SectionMemento*> memento) {
-	}
+	virtual void saveState(gsl::not_null<SectionMemento *> memento) {}
+	virtual void restoreState(gsl::not_null<SectionMemento *> memento) {}
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
-	virtual void paintContents(Painter &p) {
-	}
+	virtual void paintContents(Painter &p) {}
 
 	// Where does the block content start (after the title).
 	int contentTop() const;
@@ -77,7 +73,6 @@ private:
 
 	PeerData *_peer;
 	QString _title;
-
 };
 
 int defaultOutlineButtonLeft();
diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
index 12d766aed..466b88054 100644
--- a/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
+++ b/Telegram/SourceFiles/profile/profile_channel_controllers.cpp
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_channel_controllers.h"
 
-#include "boxes/peer_list_controllers.h"
-#include "boxes/edit_participant_box.h"
-#include "boxes/confirm_box.h"
-#include "boxes/add_contact_box.h"
-#include "auth_session.h"
 #include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/edit_participant_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "dialogs/dialogs_indexed_list.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
-#include "dialogs/dialogs_indexed_list.h"
 
 namespace Profile {
 namespace {
@@ -38,15 +38,18 @@ constexpr auto kParticipantsPerPage = 200;
 
 } // namespace
 
-ParticipantsBoxController::ParticipantsBoxController(not_null<ChannelData*> channel, Role role) : PeerListController(CreateSearchController(channel, role, &_additional))
-, _channel(channel)
-, _role(role) {
+ParticipantsBoxController::ParticipantsBoxController(not_null<ChannelData *> channel, Role role)
+    : PeerListController(CreateSearchController(channel, role, &_additional))
+    , _channel(channel)
+    , _role(role) {
 	if (_channel->mgInfo) {
 		_additional.creator = _channel->mgInfo->creator;
 	}
 }
 
-std::unique_ptr<PeerListSearchController> ParticipantsBoxController::CreateSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional) {
+std::unique_ptr<PeerListSearchController>
+ParticipantsBoxController::CreateSearchController(not_null<ChannelData *> channel, Role role,
+                                                  not_null<Additional *> additional) {
 	// In admins box complex search is used for adding new admins.
 	if (role != Role::Admins || channel->canAddAdmins()) {
 		return std::make_unique<ParticipantsBoxSearchController>(channel, role, additional);
@@ -54,13 +57,15 @@ std::unique_ptr<PeerListSearchController> ParticipantsBoxController::CreateSearc
 	return nullptr;
 }
 
-void ParticipantsBoxController::Start(not_null<ChannelData*> channel, Role role) {
+void ParticipantsBoxController::Start(not_null<ChannelData *> channel, Role role) {
 	auto controller = std::make_unique<ParticipantsBoxController>(channel, role);
-	auto initBox = [role, channel, controller = controller.get()](not_null<PeerListBox*> box) {
+	auto initBox = [role, channel, controller = controller.get()](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
 		auto canAddNewItem = [role, channel] {
 			switch (role) {
-			case Role::Members: return !channel->isMegagroup() && channel->canAddMembers() && (channel->membersCount() < Global::ChatSizeMax());
+			case Role::Members:
+				return !channel->isMegagroup() && channel->canAddMembers() &&
+				       (channel->membersCount() < Global::ChatSizeMax());
 			case Role::Admins: return channel->canAddAdmins();
 			case Role::Restricted:
 			case Role::Kicked: return channel->canBanMembers();
@@ -88,37 +93,42 @@ void ParticipantsBoxController::addNewItem() {
 		if (_channel->membersCount() >= Global::ChatSizeMax()) {
 			Ui::show(Box<MaxInviteBox>(_channel), KeepOtherLayers);
 		} else {
-			auto already = std::vector<not_null<UserData*>>();
+			auto already = std::vector<not_null<UserData *>>();
 			already.reserve(delegate()->peerListFullRowsCount());
 			for (auto i = 0, count = delegate()->peerListFullRowsCount(); i != count; ++i) {
 				already.push_back(delegate()->peerListRowAt(i)->peer()->asUser());
 			}
-			AddParticipantsBoxController::Start(_channel, { already.begin(), already.end() });
+			AddParticipantsBoxController::Start(_channel, {already.begin(), already.end()});
 		}
 		return;
 	}
 	auto weak = base::make_weak_unique(this);
-	_addBox = Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantBoxController>(_channel, _role, [weak](not_null<UserData*> user, const MTPChannelAdminRights &rights) {
-		if (weak) {
-			weak->editAdminDone(user, rights);
-		}
-	}, [weak](not_null<UserData*> user, const MTPChannelBannedRights &rights) {
-		if (weak) {
-			weak->editRestrictedDone(user, rights);
-		}
-	}), [](not_null<PeerListBox*> box) {
-		box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
-	}), KeepOtherLayers);
+	_addBox = Ui::show(Box<PeerListBox>(std::make_unique<AddParticipantBoxController>(
+	                                        _channel, _role,
+	                                        [weak](not_null<UserData *> user, const MTPChannelAdminRights &rights) {
+		                                        if (weak) {
+			                                        weak->editAdminDone(user, rights);
+		                                        }
+	                                        },
+	                                        [weak](not_null<UserData *> user, const MTPChannelBannedRights &rights) {
+		                                        if (weak) {
+			                                        weak->editRestrictedDone(user, rights);
+		                                        }
+	                                        }),
+	                                    [](not_null<PeerListBox *> box) {
+		                                    box->addButton(langFactory(lng_cancel), [box] { box->closeBox(); });
+	                                    }),
+	                   KeepOtherLayers);
 }
 
-void ParticipantsBoxController::peerListSearchAddRow(not_null<PeerData*> peer) {
+void ParticipantsBoxController::peerListSearchAddRow(not_null<PeerData *> peer) {
 	PeerListController::peerListSearchAddRow(peer);
 	if (_role == Role::Restricted && delegate()->peerListFullRowsCount() > 0) {
 		setDescriptionText(QString());
 	}
 }
 
-std::unique_ptr<PeerListRow> ParticipantsBoxController::createSearchRow(not_null<PeerData*> peer) {
+std::unique_ptr<PeerListRow> ParticipantsBoxController::createSearchRow(not_null<PeerData *> peer) {
 	if (auto user = peer->asUser()) {
 		return createRow(user);
 	}
@@ -126,7 +136,8 @@ std::unique_ptr<PeerListRow> ParticipantsBoxController::createSearchRow(not_null
 }
 
 template <typename Callback>
-void ParticipantsBoxController::HandleParticipant(const MTPChannelParticipant &participant, Role role, not_null<Additional*> additional, Callback callback) {
+void ParticipantsBoxController::HandleParticipant(const MTPChannelParticipant &participant, Role role,
+                                                  not_null<Additional *> additional, Callback callback) {
 	if ((role == Role::Members || role == Role::Admins) && participant.type() == mtpc_channelParticipantAdmin) {
 		auto &admin = participant.c_channelParticipantAdmin();
 		if (auto user = App::userLoaded(admin.vuser_id.v)) {
@@ -148,13 +159,15 @@ void ParticipantsBoxController::HandleParticipant(const MTPChannelParticipant &p
 			}
 			callback(user);
 		}
-	} else if ((role == Role::Members || role == Role::Admins) && participant.type() == mtpc_channelParticipantCreator) {
+	} else if ((role == Role::Members || role == Role::Admins) &&
+	           participant.type() == mtpc_channelParticipantCreator) {
 		auto &creator = participant.c_channelParticipantCreator();
 		if (auto user = App::userLoaded(creator.vuser_id.v)) {
 			additional->creator = user;
 			callback(user);
 		}
-	} else if ((role == Role::Members || role == Role::Restricted || role == Role::Kicked) && participant.type() == mtpc_channelParticipantBanned) {
+	} else if ((role == Role::Members || role == Role::Restricted || role == Role::Kicked) &&
+	           participant.type() == mtpc_channelParticipantBanned) {
 		auto &banned = participant.c_channelParticipantBanned();
 		if (auto user = App::userLoaded(banned.vuser_id.v)) {
 			additional->restrictedRights[user] = banned.vbanned_rights;
@@ -227,33 +240,34 @@ void ParticipantsBoxController::loadMoreRows() {
 
 	// First query is small and fast, next loads a lot of rows.
 	auto perPage = (_offset > 0) ? kParticipantsPerPage : kParticipantsFirstPageCount;
-	_loadRequestId = request(MTPchannels_GetParticipants(_channel->inputChannel, filter(), MTP_int(_offset), MTP_int(perPage))).done([this](const MTPchannels_ChannelParticipants &result) {
-		Expects(result.type() == mtpc_channels_channelParticipants);
+	_loadRequestId =
+	    request(MTPchannels_GetParticipants(_channel->inputChannel, filter(), MTP_int(_offset), MTP_int(perPage)))
+	        .done([this](const MTPchannels_ChannelParticipants &result) {
+		        Expects(result.type() == mtpc_channels_channelParticipants);
 
-		_loadRequestId = 0;
+		        _loadRequestId = 0;
 
-		if (!_offset) {
-			setDescriptionText((_role == Role::Restricted) ? lang(lng_group_blocked_list_about) : QString());
-		}
-		auto &participants = result.c_channels_channelParticipants();
-		App::feedUsers(participants.vusers);
+		        if (!_offset) {
+			        setDescriptionText((_role == Role::Restricted) ? lang(lng_group_blocked_list_about) : QString());
+		        }
+		        auto &participants = result.c_channels_channelParticipants();
+		        App::feedUsers(participants.vusers);
 
-		auto &list = participants.vparticipants.v;
-		if (list.isEmpty()) {
-			// To be sure - wait for a whole empty result list.
-			_allLoaded = true;
-		} else {
-			for_const (auto &participant, list) {
-				++_offset;
-				HandleParticipant(participant, _role, &_additional, [this](not_null<UserData*> user) {
-					appendRow(user);
-				});
-			}
-		}
-		delegate()->peerListRefreshRows();
-	}).fail([this](const RPCError &error) {
-		_loadRequestId = 0;
-	}).send();
+		        auto &list = participants.vparticipants.v;
+		        if (list.isEmpty()) {
+			        // To be sure - wait for a whole empty result list.
+			        _allLoaded = true;
+		        } else {
+			        for_const (auto &participant, list) {
+				        ++_offset;
+				        HandleParticipant(participant, _role, &_additional,
+				                          [this](not_null<UserData *> user) { appendRow(user); });
+			        }
+		        }
+		        delegate()->peerListRefreshRows();
+	        })
+	        .fail([this](const RPCError &error) { _loadRequestId = 0; })
+	        .send();
 }
 
 bool ParticipantsBoxController::feedMegagroupLastParticipants() {
@@ -301,7 +315,7 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 	return true;
 }
 
-void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
+void ParticipantsBoxController::rowClicked(not_null<PeerListRow *> row) {
 	auto user = row->peer()->asUser();
 	Expects(user != nullptr);
 
@@ -314,7 +328,7 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-void ParticipantsBoxController::rowActionClicked(not_null<PeerListRow*> row) {
+void ParticipantsBoxController::rowActionClicked(not_null<PeerListRow *> row) {
 	auto user = row->peer()->asUser();
 	Expects(user != nullptr);
 
@@ -329,32 +343,34 @@ void ParticipantsBoxController::rowActionClicked(not_null<PeerListRow*> row) {
 	}
 }
 
-void ParticipantsBoxController::showAdmin(not_null<UserData*> user) {
+void ParticipantsBoxController::showAdmin(not_null<UserData *> user) {
 	auto it = _additional.adminRights.find(user);
 	auto isCreator = (user == _additional.creator);
 	auto notAdmin = !isCreator && (it == _additional.adminRights.cend());
-	auto currentRights = isCreator
-		? MTP_channelAdminRights(MTP_flags(~MTPDchannelAdminRights::Flag::f_add_admins | MTPDchannelAdminRights::Flag::f_add_admins))
-		: notAdmin ? MTP_channelAdminRights(MTP_flags(0)) : it->second;
+	auto currentRights = isCreator ? MTP_channelAdminRights(MTP_flags(~MTPDchannelAdminRights::Flag::f_add_admins |
+	                                                                  MTPDchannelAdminRights::Flag::f_add_admins)) :
+	                                 notAdmin ? MTP_channelAdminRights(MTP_flags(0)) : it->second;
 	auto weak = base::make_weak_unique(this);
 	auto box = Box<EditAdminBox>(_channel, user, currentRights);
 	auto canEdit = (_additional.adminCanEdit.find(user) != _additional.adminCanEdit.end());
 	auto canSave = notAdmin ? _channel->canAddAdmins() : canEdit;
 	if (canSave) {
-		box->setSaveCallback([channel = _channel.get(), user, weak](const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights) {
-			MTP::send(MTPchannels_EditAdmin(channel->inputChannel, user->inputUser, newRights), rpcDone([channel, user, weak, oldRights, newRights](const MTPUpdates &result) {
-				Auth().api().applyUpdates(result);
-				channel->applyEditAdmin(user, oldRights, newRights);
-				if (weak) {
-					weak->editAdminDone(user, newRights);
-				}
-			}));
+		box->setSaveCallback([channel = _channel.get(), user, weak](const MTPChannelAdminRights &oldRights,
+		                                                            const MTPChannelAdminRights &newRights) {
+			MTP::send(MTPchannels_EditAdmin(channel->inputChannel, user->inputUser, newRights),
+			          rpcDone([channel, user, weak, oldRights, newRights](const MTPUpdates &result) {
+				          Auth().api().applyUpdates(result);
+				          channel->applyEditAdmin(user, oldRights, newRights);
+				          if (weak) {
+					          weak->editAdminDone(user, newRights);
+				          }
+			          }));
 		});
 	}
 	_editBox = Ui::show(std::move(box), KeepOtherLayers);
 }
 
-void ParticipantsBoxController::editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights) {
+void ParticipantsBoxController::editAdminDone(not_null<UserData *> user, const MTPChannelAdminRights &rights) {
 	if (_editBox) {
 		_editBox->closeBox();
 	}
@@ -386,7 +402,7 @@ void ParticipantsBoxController::editAdminDone(not_null<UserData*> user, const MT
 	delegate()->peerListRefreshRows();
 }
 
-void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
+void ParticipantsBoxController::showRestricted(not_null<UserData *> user) {
 	auto it = _additional.restrictedRights.find(user);
 	if (it == _additional.restrictedRights.cend()) {
 		return;
@@ -395,20 +411,22 @@ void ParticipantsBoxController::showRestricted(not_null<UserData*> user) {
 	auto hasAdminRights = false;
 	auto box = Box<EditRestrictedBox>(_channel, user, hasAdminRights, it->second);
 	if (_channel->canBanMembers()) {
-		box->setSaveCallback([megagroup = _channel.get(), user, weak](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
-			MTP::send(MTPchannels_EditBanned(megagroup->inputChannel, user->inputUser, newRights), rpcDone([megagroup, user, weak, oldRights, newRights](const MTPUpdates &result) {
-				Auth().api().applyUpdates(result);
-				megagroup->applyEditBanned(user, oldRights, newRights);
-				if (weak) {
-					weak->editRestrictedDone(user, newRights);
-				}
-			}));
+		box->setSaveCallback([megagroup = _channel.get(), user, weak](const MTPChannelBannedRights &oldRights,
+		                                                              const MTPChannelBannedRights &newRights) {
+			MTP::send(MTPchannels_EditBanned(megagroup->inputChannel, user->inputUser, newRights),
+			          rpcDone([megagroup, user, weak, oldRights, newRights](const MTPUpdates &result) {
+				          Auth().api().applyUpdates(result);
+				          megagroup->applyEditBanned(user, oldRights, newRights);
+				          if (weak) {
+					          weak->editRestrictedDone(user, newRights);
+				          }
+			          }));
 		});
 	}
 	_editBox = Ui::show(std::move(box), KeepOtherLayers);
 }
 
-void ParticipantsBoxController::editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights) {
+void ParticipantsBoxController::editRestrictedDone(not_null<UserData *> user, const MTPChannelBannedRights &rights) {
 	if (_editBox) {
 		_editBox->closeBox();
 	}
@@ -450,22 +468,27 @@ void ParticipantsBoxController::editRestrictedDone(not_null<UserData*> user, con
 	delegate()->peerListRefreshRows();
 }
 
-void ParticipantsBoxController::kickMember(not_null<UserData*> user) {
-	auto text = (_channel->isMegagroup() ? lng_profile_sure_kick : lng_profile_sure_kick_channel)(lt_user, user->firstName);
+void ParticipantsBoxController::kickMember(not_null<UserData *> user) {
+	auto text =
+	    (_channel->isMegagroup() ? lng_profile_sure_kick : lng_profile_sure_kick_channel)(lt_user, user->firstName);
 	auto weak = base::make_weak_unique(this);
-	_editBox = Ui::show(Box<ConfirmBox>(text, lang(lng_box_remove), [weak, user] {
-		if (weak) {
-			weak->kickMemberSure(user);
-		}
-	}), KeepOtherLayers);
+	_editBox = Ui::show(Box<ConfirmBox>(text, lang(lng_box_remove),
+	                                    [weak, user] {
+		                                    if (weak) {
+			                                    weak->kickMemberSure(user);
+		                                    }
+	                                    }),
+	                    KeepOtherLayers);
 }
 
-void ParticipantsBoxController::kickMemberSure(not_null<UserData*> user) {
+void ParticipantsBoxController::kickMemberSure(not_null<UserData *> user) {
 	if (_editBox) {
 		_editBox->closeBox();
 	}
 	auto alreadyIt = _additional.restrictedRights.find(user);
-	auto currentRights = (alreadyIt == _additional.restrictedRights.cend()) ? MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) : alreadyIt->second;
+	auto currentRights = (alreadyIt == _additional.restrictedRights.cend()) ?
+	                         MTP_channelBannedRights(MTP_flags(0), MTP_int(0)) :
+	                         alreadyIt->second;
 
 	if (auto row = delegate()->peerListFindRow(user->id)) {
 		delegate()->peerListRemoveRow(row);
@@ -474,14 +497,14 @@ void ParticipantsBoxController::kickMemberSure(not_null<UserData*> user) {
 	Auth().api().kickParticipant(_channel, user, currentRights);
 }
 
-void ParticipantsBoxController::removeKicked(not_null<PeerListRow*> row, not_null<UserData*> user) {
+void ParticipantsBoxController::removeKicked(not_null<PeerListRow *> row, not_null<UserData *> user) {
 	delegate()->peerListRemoveRow(row);
 	delegate()->peerListRefreshRows();
 
 	Auth().api().unblockParticipant(_channel, user);
 }
 
-bool ParticipantsBoxController::appendRow(not_null<UserData*> user) {
+bool ParticipantsBoxController::appendRow(not_null<UserData *> user) {
 	if (delegate()->peerListFindRow(user->id)) {
 		return false;
 	}
@@ -492,7 +515,7 @@ bool ParticipantsBoxController::appendRow(not_null<UserData*> user) {
 	return true;
 }
 
-bool ParticipantsBoxController::prependRow(not_null<UserData*> user) {
+bool ParticipantsBoxController::prependRow(not_null<UserData *> user) {
 	if (auto row = delegate()->peerListFindRow(user->id)) {
 		refreshCustomStatus(row);
 		if (_role == Role::Admins) {
@@ -508,7 +531,7 @@ bool ParticipantsBoxController::prependRow(not_null<UserData*> user) {
 	return true;
 }
 
-bool ParticipantsBoxController::removeRow(not_null<UserData*> user) {
+bool ParticipantsBoxController::removeRow(not_null<UserData *> user) {
 	if (auto row = delegate()->peerListFindRow(user->id)) {
 		if (_role == Role::Admins) {
 			// Perhaps we are removing an admin from search results.
@@ -525,24 +548,25 @@ bool ParticipantsBoxController::removeRow(not_null<UserData*> user) {
 	return false;
 }
 
-std::unique_ptr<PeerListRow> ParticipantsBoxController::createRow(not_null<UserData*> user) const {
+std::unique_ptr<PeerListRow> ParticipantsBoxController::createRow(not_null<UserData *> user) const {
 	auto row = std::make_unique<PeerListRowWithLink>(user);
 	refreshCustomStatus(row.get());
-	if (_role == Role::Restricted || (_role == Role::Admins && _additional.adminCanEdit.find(user) != _additional.adminCanEdit.cend())) {
-//		row->setActionLink(lang(lng_profile_edit_permissions));
+	if (_role == Role::Restricted ||
+	    (_role == Role::Admins && _additional.adminCanEdit.find(user) != _additional.adminCanEdit.cend())) {
+		//		row->setActionLink(lang(lng_profile_edit_permissions));
 	} else if (_role == Role::Kicked) {
 		row->setActionLink(lang(lng_blocked_list_unblock));
 	} else if (_role == Role::Members) {
-		if (_channel->canBanMembers() && _additional.creator != user
-			&& (_additional.adminRights.find(user) == _additional.adminRights.cend()
-				|| _additional.adminCanEdit.find(user) != _additional.adminCanEdit.cend())) {
+		if (_channel->canBanMembers() && _additional.creator != user &&
+		    (_additional.adminRights.find(user) == _additional.adminRights.cend() ||
+		     _additional.adminCanEdit.find(user) != _additional.adminCanEdit.cend())) {
 			row->setActionLink(lang(lng_profile_kick));
 		}
 	}
 	return std::move(row);
 }
 
-void ParticipantsBoxController::refreshCustomStatus(not_null<PeerListRow*> row) const {
+void ParticipantsBoxController::refreshCustomStatus(not_null<PeerListRow *> row) const {
 	auto user = row->peer()->asUser();
 	if (_role == Role::Admins) {
 		auto promotedBy = _additional.adminPromotedBy.find(user);
@@ -565,10 +589,11 @@ void ParticipantsBoxController::refreshCustomStatus(not_null<PeerListRow*> row)
 	}
 }
 
-ParticipantsBoxSearchController::ParticipantsBoxSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional)
-: _channel(channel)
-, _role(role)
-, _additional(additional) {
+ParticipantsBoxSearchController::ParticipantsBoxSearchController(not_null<ChannelData *> channel, Role role,
+                                                                 not_null<Additional *> additional)
+    : _channel(channel)
+    , _role(role)
+    , _additional(additional) {
 	_timer.setCallback([this] { searchOnServer(); });
 }
 
@@ -624,15 +649,19 @@ bool ParticipantsBoxSearchController::loadMoreRows() {
 		// (because we've waited for search request by timer already,
 		// so we don't expect it to be fast, but we want to fill cache).
 		auto perPage = kParticipantsPerPage;
-		_requestId = request(MTPchannels_GetParticipants(_channel->inputChannel, filter(), MTP_int(_offset), MTP_int(perPage))).done([this, perPage](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
-			searchDone(requestId, result, perPage);
-		}).fail([this](const RPCError &error, mtpRequestId requestId) {
-			if (_requestId == requestId) {
-				_requestId = 0;
-				_allLoaded = true;
-				delegate()->peerListSearchRefreshRows();
-			}
-		}).send();
+		_requestId =
+		    request(MTPchannels_GetParticipants(_channel->inputChannel, filter(), MTP_int(_offset), MTP_int(perPage)))
+		        .done([this, perPage](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
+			        searchDone(requestId, result, perPage);
+		        })
+		        .fail([this](const RPCError &error, mtpRequestId requestId) {
+			        if (_requestId == requestId) {
+				        _requestId = 0;
+				        _allLoaded = true;
+				        delegate()->peerListSearchRefreshRows();
+			        }
+		        })
+		        .send();
 
 		auto entry = Query();
 		entry.text = _query;
@@ -642,7 +671,8 @@ bool ParticipantsBoxSearchController::loadMoreRows() {
 	return true;
 }
 
-void ParticipantsBoxSearchController::searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount) {
+void ParticipantsBoxSearchController::searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result,
+                                                 int requestedCount) {
 	Expects(result.type() == mtpc_channels_channelParticipants);
 
 	auto &participants = result.c_channels_channelParticipants();
@@ -672,26 +702,29 @@ void ParticipantsBoxSearchController::searchDone(mtpRequestId requestId, const M
 		}
 		auto parseRole = (_role == Role::Admins) ? Role::Members : _role;
 		for_const (auto &participant, list) {
-			ParticipantsBoxController::HandleParticipant(participant, parseRole, _additional, [this](not_null<UserData*> user) {
-				delegate()->peerListSearchAddRow(user);
-			});
+			ParticipantsBoxController::HandleParticipant(
+			    participant, parseRole, _additional,
+			    [this](not_null<UserData *> user) { delegate()->peerListSearchAddRow(user); });
 		}
 		_offset += list.size();
 		delegate()->peerListSearchRefreshRows();
 	}
 }
 
-AddParticipantBoxController::AddParticipantBoxController(not_null<ChannelData*> channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback) : PeerListController(std::make_unique<AddParticipantBoxSearchController>(channel, &_additional))
-, _channel(channel)
-, _role(role)
-, _adminDoneCallback(std::move(adminDoneCallback))
-, _bannedDoneCallback(std::move(bannedDoneCallback)) {
+AddParticipantBoxController::AddParticipantBoxController(not_null<ChannelData *> channel, Role role,
+                                                         AdminDoneCallback adminDoneCallback,
+                                                         BannedDoneCallback bannedDoneCallback)
+    : PeerListController(std::make_unique<AddParticipantBoxSearchController>(channel, &_additional))
+    , _channel(channel)
+    , _role(role)
+    , _adminDoneCallback(std::move(adminDoneCallback))
+    , _bannedDoneCallback(std::move(bannedDoneCallback)) {
 	if (_channel->mgInfo) {
 		_additional.creator = _channel->mgInfo->creator;
 	}
 }
 
-std::unique_ptr<PeerListRow> AddParticipantBoxController::createSearchRow(not_null<PeerData*> peer) {
+std::unique_ptr<PeerListRow> AddParticipantBoxController::createSearchRow(not_null<PeerData *> peer) {
 	if (peer->isSelf()) {
 		return nullptr;
 	}
@@ -729,38 +762,39 @@ void AddParticipantBoxController::loadMoreRows() {
 
 	// First query is small and fast, next loads a lot of rows.
 	auto perPage = (_offset > 0) ? kParticipantsPerPage : kParticipantsFirstPageCount;
-	_loadRequestId = request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsRecent(), MTP_int(_offset), MTP_int(perPage))).done([this](const MTPchannels_ChannelParticipants &result) {
-		Expects(result.type() == mtpc_channels_channelParticipants);
+	_loadRequestId = request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsRecent(),
+	                                                     MTP_int(_offset), MTP_int(perPage)))
+	                     .done([this](const MTPchannels_ChannelParticipants &result) {
+		                     Expects(result.type() == mtpc_channels_channelParticipants);
 
-		_loadRequestId = 0;
+		                     _loadRequestId = 0;
 
-		auto &participants = result.c_channels_channelParticipants();
-		App::feedUsers(participants.vusers);
+		                     auto &participants = result.c_channels_channelParticipants();
+		                     App::feedUsers(participants.vusers);
 
-		auto &list = participants.vparticipants.v;
-		if (list.isEmpty()) {
-			// To be sure - wait for a whole empty result list.
-			_allLoaded = true;
-		} else {
-			for_const (auto &participant, list) {
-				++_offset;
-				HandleParticipant(participant, &_additional, [this](not_null<UserData*> user) {
-					appendRow(user);
-				});
-			}
-		}
-		if (delegate()->peerListFullRowsCount() > 0) {
-			setDescriptionText(QString());
-		} else if (_allLoaded) {
-			setDescriptionText(lang(lng_blocked_list_not_found));
-		}
-		delegate()->peerListRefreshRows();
-	}).fail([this](const RPCError &error) {
-		_loadRequestId = 0;
-	}).send();
+		                     auto &list = participants.vparticipants.v;
+		                     if (list.isEmpty()) {
+			                     // To be sure - wait for a whole empty result list.
+			                     _allLoaded = true;
+		                     } else {
+			                     for_const (auto &participant, list) {
+				                     ++_offset;
+				                     HandleParticipant(participant, &_additional,
+				                                       [this](not_null<UserData *> user) { appendRow(user); });
+			                     }
+		                     }
+		                     if (delegate()->peerListFullRowsCount() > 0) {
+			                     setDescriptionText(QString());
+		                     } else if (_allLoaded) {
+			                     setDescriptionText(lang(lng_blocked_list_not_found));
+		                     }
+		                     delegate()->peerListRefreshRows();
+	                     })
+	                     .fail([this](const RPCError &error) { _loadRequestId = 0; })
+	                     .send();
 }
 
-void AddParticipantBoxController::rowClicked(not_null<PeerListRow*> row) {
+void AddParticipantBoxController::rowClicked(not_null<PeerListRow *> row) {
 	auto user = row->peer()->asUser();
 	switch (_role) {
 	case Role::Admins: return showAdmin(user);
@@ -771,28 +805,31 @@ void AddParticipantBoxController::rowClicked(not_null<PeerListRow*> row) {
 }
 
 template <typename Callback>
-bool AddParticipantBoxController::checkInfoLoaded(not_null<UserData*> user, Callback callback) {
+bool AddParticipantBoxController::checkInfoLoaded(not_null<UserData *> user, Callback callback) {
 	if (_additional.infoNotLoaded.find(user) == _additional.infoNotLoaded.end()) {
 		return true;
 	}
 
 	// We don't know what this user status is in the group.
-	request(MTPchannels_GetParticipant(_channel->inputChannel, user->inputUser)).done([this, user, callback](const MTPchannels_ChannelParticipant &result) {
-		Expects(result.type() == mtpc_channels_channelParticipant);
-		auto &participant = result.c_channels_channelParticipant();
-		App::feedUsers(participant.vusers);
-		HandleParticipant(participant.vparticipant, &_additional, [](not_null<UserData*>) {});
-		_additional.infoNotLoaded.erase(user);
-		callback();
-	}).fail([this, user, callback](const RPCError &error) {
-		_additional.infoNotLoaded.erase(user);
-		_additional.external.emplace(user);
-		callback();
-	}).send();
+	request(MTPchannels_GetParticipant(_channel->inputChannel, user->inputUser))
+	    .done([this, user, callback](const MTPchannels_ChannelParticipant &result) {
+		    Expects(result.type() == mtpc_channels_channelParticipant);
+		    auto &participant = result.c_channels_channelParticipant();
+		    App::feedUsers(participant.vusers);
+		    HandleParticipant(participant.vparticipant, &_additional, [](not_null<UserData *>) {});
+		    _additional.infoNotLoaded.erase(user);
+		    callback();
+	    })
+	    .fail([this, user, callback](const RPCError &error) {
+		    _additional.infoNotLoaded.erase(user);
+		    _additional.external.emplace(user);
+		    callback();
+	    })
+	    .send();
 	return false;
 }
 
-void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure) {
+void AddParticipantBoxController::showAdmin(not_null<UserData *> user, bool sure) {
 	if (!checkInfoLoaded(user, [this, user] { showAdmin(user); })) {
 		return;
 	}
@@ -805,9 +842,10 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 	// Check restrictions.
 	auto weak = base::make_weak_unique(this);
 	auto alreadyIt = _additional.adminRights.find(user);
-	auto currentRights = (_additional.creator == user)
-		? MTP_channelAdminRights(MTP_flags(~MTPDchannelAdminRights::Flag::f_add_admins | MTPDchannelAdminRights::Flag::f_add_admins))
-		: MTP_channelAdminRights(MTP_flags(0));
+	auto currentRights = (_additional.creator == user) ?
+	                         MTP_channelAdminRights(MTP_flags(~MTPDchannelAdminRights::Flag::f_add_admins |
+	                                                          MTPDchannelAdminRights::Flag::f_add_admins)) :
+	                         MTP_channelAdminRights(MTP_flags(0));
 	if (alreadyIt != _additional.adminRights.end()) {
 		// The user is already an admin.
 		currentRights = alreadyIt->second;
@@ -816,11 +854,13 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 		if (_channel->canAddMembers()) {
 			if (_channel->canBanMembers()) {
 				if (!sure) {
-					_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_unban), [weak, user] {
-						if (weak) {
-							weak->showAdmin(user, true);
-						}
-					}), KeepOtherLayers);
+					_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_unban),
+					                                    [weak, user] {
+						                                    if (weak) {
+							                                    weak->showAdmin(user, true);
+						                                    }
+					                                    }),
+					                    KeepOtherLayers);
 					return;
 				}
 			} else {
@@ -835,11 +875,13 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 		// The user is restricted.
 		if (_channel->canBanMembers()) {
 			if (!sure) {
-				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_unban), [weak, user] {
-					if (weak) {
-						weak->showAdmin(user, true);
-					}
-				}), KeepOtherLayers);
+				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_unban),
+				                                    [weak, user] {
+					                                    if (weak) {
+						                                    weak->showAdmin(user, true);
+					                                    }
+				                                    }),
+				                    KeepOtherLayers);
 				return;
 			}
 		} else {
@@ -850,11 +892,13 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 		// The user is not in the group yet.
 		if (_channel->canAddMembers()) {
 			if (!sure) {
-				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_invite), [weak, user] {
-					if (weak) {
-						weak->showAdmin(user, true);
-					}
-				}), KeepOtherLayers);
+				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_add_admin_invite),
+				                                    [weak, user] {
+					                                    if (weak) {
+						                                    weak->showAdmin(user, true);
+					                                    }
+				                                    }),
+				                    KeepOtherLayers);
 				return;
 			}
 		} else {
@@ -864,38 +908,44 @@ void AddParticipantBoxController::showAdmin(not_null<UserData*> user, bool sure)
 	}
 
 	// Finally show the admin.
-	auto canNotEdit = (_additional.creator == user)
-		|| ((alreadyIt != _additional.adminRights.end())
-			&& (_additional.adminCanEdit.find(user) == _additional.adminCanEdit.end()));
+	auto canNotEdit =
+	    (_additional.creator == user) || ((alreadyIt != _additional.adminRights.end()) &&
+	                                      (_additional.adminCanEdit.find(user) == _additional.adminCanEdit.end()));
 	auto box = Box<EditAdminBox>(_channel, user, currentRights);
 	if (!canNotEdit) {
-		box->setSaveCallback([channel = _channel.get(), user, weak](const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights) {
-			MTP::send(MTPchannels_EditAdmin(channel->inputChannel, user->inputUser, newRights), rpcDone([channel, user, weak, oldRights, newRights](const MTPUpdates &result) {
-				Auth().api().applyUpdates(result);
-				channel->applyEditAdmin(user, oldRights, newRights);
-				if (weak) {
-					weak->editAdminDone(user, newRights);
-				}
-			}), rpcFail([channel, weak](const RPCError &error) {
-				if (MTP::isDefaultHandledError(error)) {
-					return false;
-				}
-				if (error.type() == qstr("USER_NOT_MUTUAL_CONTACT")) {
-					Ui::show(Box<InformBox>(PeerFloodErrorText(channel->isMegagroup() ? PeerFloodType::InviteGroup : PeerFloodType::InviteChannel)), KeepOtherLayers);
-				} else if (error.type() == qstr("BOT_GROUPS_BLOCKED")) {
-					Ui::show(Box<InformBox>(lang(lng_error_cant_add_bot)), KeepOtherLayers);
-				}
-				if (weak && weak->_editBox) {
-					weak->_editBox->closeBox();
-				}
-				return true;
-			}));
+		box->setSaveCallback([channel = _channel.get(), user, weak](const MTPChannelAdminRights &oldRights,
+		                                                            const MTPChannelAdminRights &newRights) {
+			MTP::send(MTPchannels_EditAdmin(channel->inputChannel, user->inputUser, newRights),
+			          rpcDone([channel, user, weak, oldRights, newRights](const MTPUpdates &result) {
+				          Auth().api().applyUpdates(result);
+				          channel->applyEditAdmin(user, oldRights, newRights);
+				          if (weak) {
+					          weak->editAdminDone(user, newRights);
+				          }
+			          }),
+			          rpcFail([channel, weak](const RPCError &error) {
+				          if (MTP::isDefaultHandledError(error)) {
+					          return false;
+				          }
+				          if (error.type() == qstr("USER_NOT_MUTUAL_CONTACT")) {
+					          Ui::show(Box<InformBox>(PeerFloodErrorText(channel->isMegagroup() ?
+					                                                         PeerFloodType::InviteGroup :
+					                                                         PeerFloodType::InviteChannel)),
+					                   KeepOtherLayers);
+				          } else if (error.type() == qstr("BOT_GROUPS_BLOCKED")) {
+					          Ui::show(Box<InformBox>(lang(lng_error_cant_add_bot)), KeepOtherLayers);
+				          }
+				          if (weak && weak->_editBox) {
+					          weak->_editBox->closeBox();
+				          }
+				          return true;
+			          }));
 		});
 	}
 	_editBox = Ui::show(std::move(box), KeepOtherLayers);
 }
 
-void AddParticipantBoxController::editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights) {
+void AddParticipantBoxController::editAdminDone(not_null<UserData *> user, const MTPChannelAdminRights &rights) {
 	if (_editBox) _editBox->closeBox();
 	_additional.restrictedRights.erase(user);
 	_additional.restrictedBy.erase(user);
@@ -918,7 +968,7 @@ void AddParticipantBoxController::editAdminDone(not_null<UserData*> user, const
 	}
 }
 
-void AddParticipantBoxController::showRestricted(not_null<UserData*> user, bool sure) {
+void AddParticipantBoxController::showRestricted(not_null<UserData *> user, bool sure) {
 	if (!checkInfoLoaded(user, [this, user] { showRestricted(user); })) {
 		return;
 	}
@@ -941,11 +991,13 @@ void AddParticipantBoxController::showRestricted(not_null<UserData*> user, bool
 		if (_additional.adminCanEdit.find(user) != _additional.adminCanEdit.end()) {
 			hasAdminRights = true;
 			if (!sure) {
-				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_ban_admin), [weak, user] {
-					if (weak) {
-						weak->showRestricted(user, true);
-					}
-				}), KeepOtherLayers);
+				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_ban_admin),
+				                                    [weak, user] {
+					                                    if (weak) {
+						                                    weak->showRestricted(user, true);
+					                                    }
+				                                    }),
+				                    KeepOtherLayers);
 				return;
 			}
 		} else {
@@ -956,26 +1008,29 @@ void AddParticipantBoxController::showRestricted(not_null<UserData*> user, bool
 
 	// Finally edit the restricted.
 	auto box = Box<EditRestrictedBox>(_channel, user, hasAdminRights, currentRights);
-	box->setSaveCallback([user, weak](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
-		if (weak) {
-			weak->restrictUserSure(user, oldRights, newRights);
-		}
-	});
+	box->setSaveCallback(
+	    [user, weak](const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+		    if (weak) {
+			    weak->restrictUserSure(user, oldRights, newRights);
+		    }
+	    });
 	_editBox = Ui::show(std::move(box), KeepOtherLayers);
 }
 
-void AddParticipantBoxController::restrictUserSure(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+void AddParticipantBoxController::restrictUserSure(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+                                                   const MTPChannelBannedRights &newRights) {
 	auto weak = base::make_weak_unique(this);
-	MTP::send(MTPchannels_EditBanned(_channel->inputChannel, user->inputUser, newRights), rpcDone([megagroup = _channel.get(), user, weak, oldRights, newRights](const MTPUpdates &result) {
-		Auth().api().applyUpdates(result);
-		megagroup->applyEditBanned(user, oldRights, newRights);
-		if (weak) {
-			weak->editRestrictedDone(user, newRights);
-		}
-	}));
+	MTP::send(MTPchannels_EditBanned(_channel->inputChannel, user->inputUser, newRights),
+	          rpcDone([megagroup = _channel.get(), user, weak, oldRights, newRights](const MTPUpdates &result) {
+		          Auth().api().applyUpdates(result);
+		          megagroup->applyEditBanned(user, oldRights, newRights);
+		          if (weak) {
+			          weak->editRestrictedDone(user, newRights);
+		          }
+	          }));
 }
 
-void AddParticipantBoxController::editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights) {
+void AddParticipantBoxController::editRestrictedDone(not_null<UserData *> user, const MTPChannelBannedRights &rights) {
 	if (_editBox) _editBox->closeBox();
 	_additional.adminRights.erase(user);
 	_additional.adminCanEdit.erase(user);
@@ -998,7 +1053,7 @@ void AddParticipantBoxController::editRestrictedDone(not_null<UserData*> user, c
 	}
 }
 
-void AddParticipantBoxController::kickUser(not_null<UserData*> user, bool sure) {
+void AddParticipantBoxController::kickUser(not_null<UserData *> user, bool sure) {
 	if (!checkInfoLoaded(user, [this, user] { kickUser(user); })) {
 		return;
 	}
@@ -1009,11 +1064,13 @@ void AddParticipantBoxController::kickUser(not_null<UserData*> user, bool sure)
 		// The user is an admin or creator.
 		if (_additional.adminCanEdit.find(user) != _additional.adminCanEdit.end()) {
 			if (!sure) {
-				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_ban_admin), [weak, user] {
-					if (weak) {
-						weak->kickUser(user, true);
-					}
-				}), KeepOtherLayers);
+				_editBox = Ui::show(Box<ConfirmBox>(lang(lng_sure_ban_admin),
+				                                    [weak, user] {
+					                                    if (weak) {
+						                                    weak->kickUser(user, true);
+					                                    }
+				                                    }),
+				                    KeepOtherLayers);
 				return;
 			}
 		} else {
@@ -1025,11 +1082,13 @@ void AddParticipantBoxController::kickUser(not_null<UserData*> user, bool sure)
 	// Finally kick him.
 	if (!sure) {
 		auto text = lng_sure_ban_user_group(lt_user, App::peerName(user));
-		_editBox = Ui::show(Box<ConfirmBox>(text, [weak, user] {
-			if (weak) {
-				weak->kickUser(user, true);
-			}
-		}), KeepOtherLayers);
+		_editBox = Ui::show(Box<ConfirmBox>(text,
+		                                    [weak, user] {
+			                                    if (weak) {
+				                                    weak->kickUser(user, true);
+			                                    }
+		                                    }),
+		                    KeepOtherLayers);
 		return;
 	}
 	auto currentRights = MTP_channelBannedRights(MTP_flags(0), MTP_int(0));
@@ -1041,7 +1100,7 @@ void AddParticipantBoxController::kickUser(not_null<UserData*> user, bool sure)
 	restrictUserSure(user, currentRights, ChannelData::KickedRestrictedRights());
 }
 
-bool AddParticipantBoxController::appendRow(not_null<UserData*> user) {
+bool AddParticipantBoxController::appendRow(not_null<UserData *> user) {
 	if (delegate()->peerListFindRow(user->id) || user->isSelf()) {
 		return false;
 	}
@@ -1049,7 +1108,7 @@ bool AddParticipantBoxController::appendRow(not_null<UserData*> user) {
 	return true;
 }
 
-bool AddParticipantBoxController::prependRow(not_null<UserData*> user) {
+bool AddParticipantBoxController::prependRow(not_null<UserData *> user) {
 	if (delegate()->peerListFindRow(user->id)) {
 		return false;
 	}
@@ -1057,12 +1116,13 @@ bool AddParticipantBoxController::prependRow(not_null<UserData*> user) {
 	return true;
 }
 
-std::unique_ptr<PeerListRow> AddParticipantBoxController::createRow(not_null<UserData*> user) const {
+std::unique_ptr<PeerListRow> AddParticipantBoxController::createRow(not_null<UserData *> user) const {
 	return std::make_unique<PeerListRow>(user);
 }
 
 template <typename Callback>
-void AddParticipantBoxController::HandleParticipant(const MTPChannelParticipant &participant, not_null<Additional*> additional, Callback callback) {
+void AddParticipantBoxController::HandleParticipant(const MTPChannelParticipant &participant,
+                                                    not_null<Additional *> additional, Callback callback) {
 	switch (participant.type()) {
 	case mtpc_channelParticipantAdmin: {
 		auto &admin = participant.c_channelParticipantAdmin();
@@ -1139,9 +1199,10 @@ void AddParticipantBoxController::HandleParticipant(const MTPChannelParticipant
 	}
 }
 
-AddParticipantBoxSearchController::AddParticipantBoxSearchController(not_null<ChannelData*> channel, not_null<Additional*> additional)
-: _channel(channel)
-, _additional(additional) {
+AddParticipantBoxSearchController::AddParticipantBoxSearchController(not_null<ChannelData *> channel,
+                                                                     not_null<Additional *> additional)
+    : _channel(channel)
+    , _additional(additional) {
 	_timer.setCallback([this] { searchOnServer(); });
 }
 
@@ -1215,23 +1276,30 @@ void AddParticipantBoxSearchController::requestParticipants() {
 	// (because we've waited for search request by timer already,
 	// so we don't expect it to be fast, but we want to fill cache).
 	auto perPage = kParticipantsPerPage;
-	_requestId = request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsSearch(MTP_string(_query)), MTP_int(_offset), MTP_int(perPage))).done([this, perPage](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
-		searchParticipantsDone(requestId, result, perPage);
-	}).fail([this](const RPCError &error, mtpRequestId requestId) {
-		if (_requestId == requestId) {
-			_requestId = 0;
-			_participantsLoaded = true;
-			loadMoreRows();
-			delegate()->peerListSearchRefreshRows();
-		}
-	}).send();
+	_requestId =
+	    request(MTPchannels_GetParticipants(_channel->inputChannel, MTP_channelParticipantsSearch(MTP_string(_query)),
+	                                        MTP_int(_offset), MTP_int(perPage)))
+	        .done([this, perPage](const MTPchannels_ChannelParticipants &result, mtpRequestId requestId) {
+		        searchParticipantsDone(requestId, result, perPage);
+	        })
+	        .fail([this](const RPCError &error, mtpRequestId requestId) {
+		        if (_requestId == requestId) {
+			        _requestId = 0;
+			        _participantsLoaded = true;
+			        loadMoreRows();
+			        delegate()->peerListSearchRefreshRows();
+		        }
+	        })
+	        .send();
 	auto entry = Query();
 	entry.text = _query;
 	entry.offset = _offset;
 	_participantsQueries.emplace(_requestId, entry);
 }
 
-void AddParticipantBoxSearchController::searchParticipantsDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount) {
+void AddParticipantBoxSearchController::searchParticipantsDone(mtpRequestId requestId,
+                                                               const MTPchannels_ChannelParticipants &result,
+                                                               int requestedCount) {
 	Expects(result.type() == mtpc_channels_channelParticipants);
 
 	auto &participants = result.c_channels_channelParticipants();
@@ -1264,7 +1332,7 @@ void AddParticipantBoxSearchController::searchParticipantsDone(mtpRequestId requ
 			}
 		}
 		for_const (auto &participant, list) {
-			AddParticipantBoxController::HandleParticipant(participant, _additional, [this](not_null<UserData*> user) {
+			AddParticipantBoxController::HandleParticipant(participant, _additional, [this](not_null<UserData *> user) {
 				delegate()->peerListSearchAddRow(user);
 			});
 		}
@@ -1280,15 +1348,18 @@ void AddParticipantBoxSearchController::requestGlobal() {
 	}
 
 	auto perPage = SearchPeopleLimit;
-	_requestId = request(MTPcontacts_Search(MTP_string(_query), MTP_int(perPage))).done([this](const MTPcontacts_Found &result, mtpRequestId requestId) {
-		searchGlobalDone(requestId, result);
-	}).fail([this](const RPCError &error, mtpRequestId requestId) {
-		if (_requestId == requestId) {
-			_requestId = 0;
-			_globalLoaded = true;
-			delegate()->peerListSearchRefreshRows();
-		}
-	}).send();
+	_requestId = request(MTPcontacts_Search(MTP_string(_query), MTP_int(perPage)))
+	                 .done([this](const MTPcontacts_Found &result, mtpRequestId requestId) {
+		                 searchGlobalDone(requestId, result);
+	                 })
+	                 .fail([this](const RPCError &error, mtpRequestId requestId) {
+		                 if (_requestId == requestId) {
+			                 _requestId = 0;
+			                 _globalLoaded = true;
+			                 delegate()->peerListSearchRefreshRows();
+		                 }
+	                 })
+	                 .send();
 	_globalQueries.emplace(_requestId, _query);
 }
 
@@ -1315,11 +1386,10 @@ void AddParticipantBoxSearchController::searchGlobalDone(mtpRequestId requestId,
 			auto peerId = peerFromMTP(mtpPeer);
 			if (auto peer = App::peerLoaded(peerId)) {
 				if (auto user = peer->asUser()) {
-					if (_additional->adminRights.find(user) == _additional->adminRights.cend()
-						&& _additional->restrictedRights.find(user) == _additional->restrictedRights.cend()
-						&& _additional->external.find(user) == _additional->external.cend()
-						&& _additional->kicked.find(user) == _additional->kicked.cend()
-						&& _additional->creator != user) {
+					if (_additional->adminRights.find(user) == _additional->adminRights.cend() &&
+					    _additional->restrictedRights.find(user) == _additional->restrictedRights.cend() &&
+					    _additional->external.find(user) == _additional->external.cend() &&
+					    _additional->kicked.find(user) == _additional->kicked.cend() && _additional->creator != user) {
 						_additional->infoNotLoaded.emplace(user);
 					}
 					delegate()->peerListSearchAddRow(user);
@@ -1338,12 +1408,12 @@ void AddParticipantBoxSearchController::addChatsContacts() {
 		return;
 	}
 
-	auto getSmallestIndex = [&wordList](Dialogs::IndexedList *list) -> const Dialogs::List* {
+	auto getSmallestIndex = [&wordList](Dialogs::IndexedList *list) -> const Dialogs::List * {
 		if (list->isEmpty()) {
 			return nullptr;
 		}
 
-		auto result = (const Dialogs::List*)nullptr;
+		auto result = (const Dialogs::List *)nullptr;
 		for_const (auto &word, wordList) {
 			auto found = list->filtered(word[0]);
 			if (found->isEmpty()) {
diff --git a/Telegram/SourceFiles/profile/profile_channel_controllers.h b/Telegram/SourceFiles/profile/profile_channel_controllers.h
index 968b7f513..b20bda1cb 100644
--- a/Telegram/SourceFiles/profile/profile_channel_controllers.h
+++ b/Telegram/SourceFiles/profile/profile_channel_controllers.h
@@ -20,14 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/weak_unique_ptr.h"
 #include "boxes/peer_list_box.h"
 #include "mtproto/sender.h"
-#include "base/weak_unique_ptr.h"
 
 namespace Profile {
 
 // Viewing admins, banned or restricted users list with search.
-class ParticipantsBoxController : public PeerListController, private base::Subscriber, private MTP::Sender, public base::enable_weak_from_this {
+class ParticipantsBoxController : public PeerListController,
+                                  private base::Subscriber,
+                                  private MTP::Sender,
+                                  public base::enable_weak_from_this {
 public:
 	enum class Role {
 		Members,
@@ -35,56 +38,58 @@ public:
 		Restricted,
 		Kicked,
 	};
-	static void Start(not_null<ChannelData*> channel, Role role);
+	static void Start(not_null<ChannelData *> channel, Role role);
 
 	struct Additional {
-		std::map<not_null<UserData*>, MTPChannelAdminRights> adminRights;
-		std::set<not_null<UserData*>> adminCanEdit;
-		std::map<not_null<UserData*>, not_null<UserData*>> adminPromotedBy;
-		std::map<not_null<UserData*>, MTPChannelBannedRights> restrictedRights;
-		std::set<not_null<UserData*>> kicked;
-		std::map<not_null<UserData*>, not_null<UserData*>> restrictedBy;
-		std::set<not_null<UserData*>> external;
-		std::set<not_null<UserData*>> infoNotLoaded;
+		std::map<not_null<UserData *>, MTPChannelAdminRights> adminRights;
+		std::set<not_null<UserData *>> adminCanEdit;
+		std::map<not_null<UserData *>, not_null<UserData *>> adminPromotedBy;
+		std::map<not_null<UserData *>, MTPChannelBannedRights> restrictedRights;
+		std::set<not_null<UserData *>> kicked;
+		std::map<not_null<UserData *>, not_null<UserData *>> restrictedBy;
+		std::set<not_null<UserData *>> external;
+		std::set<not_null<UserData *>> infoNotLoaded;
 		UserData *creator = nullptr;
 	};
 
-	ParticipantsBoxController(not_null<ChannelData*> channel, Role role);
+	ParticipantsBoxController(not_null<ChannelData *> channel, Role role);
 
 	void addNewItem();
 
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowActionClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
+	void rowActionClicked(not_null<PeerListRow *> row) override;
 	void loadMoreRows() override;
 
-	void peerListSearchAddRow(not_null<PeerData*> peer) override;
-	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override;
+	void peerListSearchAddRow(not_null<PeerData *> peer) override;
+	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData *> peer) override;
 
 	// Callback(not_null<UserData*>)
 	template <typename Callback>
-	static void HandleParticipant(const MTPChannelParticipant &participant, Role role, not_null<Additional*> additional, Callback callback);
+	static void HandleParticipant(const MTPChannelParticipant &participant, Role role,
+	                              not_null<Additional *> additional, Callback callback);
 
 protected:
-	virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
+	virtual std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user) const;
 
 private:
-	static std::unique_ptr<PeerListSearchController> CreateSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional);
+	static std::unique_ptr<PeerListSearchController> CreateSearchController(not_null<ChannelData *> channel, Role role,
+	                                                                        not_null<Additional *> additional);
 
-	void showAdmin(not_null<UserData*> user);
-	void editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights);
-	void showRestricted(not_null<UserData*> user);
-	void editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights);
-	void removeKicked(not_null<PeerListRow*> row, not_null<UserData*> user);
-	void kickMember(not_null<UserData*> user);
-	void kickMemberSure(not_null<UserData*> user);
-	bool appendRow(not_null<UserData*> user);
-	bool prependRow(not_null<UserData*> user);
-	bool removeRow(not_null<UserData*> user);
-	void refreshCustomStatus(not_null<PeerListRow*> row) const;
+	void showAdmin(not_null<UserData *> user);
+	void editAdminDone(not_null<UserData *> user, const MTPChannelAdminRights &rights);
+	void showRestricted(not_null<UserData *> user);
+	void editRestrictedDone(not_null<UserData *> user, const MTPChannelBannedRights &rights);
+	void removeKicked(not_null<PeerListRow *> row, not_null<UserData *> user);
+	void kickMember(not_null<UserData *> user);
+	void kickMemberSure(not_null<UserData *> user);
+	bool appendRow(not_null<UserData *> user);
+	bool prependRow(not_null<UserData *> user);
+	bool removeRow(not_null<UserData *> user);
+	void refreshCustomStatus(not_null<PeerListRow *> row) const;
 	bool feedMegagroupLastParticipants();
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 	Role _role = Role::Admins;
 	int _offset = 0;
 	mtpRequestId _loadRequestId = 0;
@@ -92,7 +97,6 @@ private:
 	Additional _additional;
 	QPointer<BoxContent> _editBox;
 	QPointer<PeerListBox> _addBox;
-
 };
 
 // Members, banned and restricted users server side search.
@@ -101,7 +105,7 @@ public:
 	using Role = ParticipantsBoxController::Role;
 	using Additional = ParticipantsBoxController::Additional;
 
-	ParticipantsBoxSearchController(not_null<ChannelData*> channel, Role role, not_null<Additional*> additional);
+	ParticipantsBoxSearchController(not_null<ChannelData *> channel, Role role, not_null<Additional *> additional);
 
 	void searchQuery(const QString &query) override;
 	bool isLoading() override;
@@ -121,9 +125,9 @@ private:
 	bool searchInCache();
 	void searchDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount);
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 	Role _role = Role::Restricted;
-	not_null<Additional*> _additional;
+	not_null<Additional *> _additional;
 
 	base::Timer _timer;
 	QString _query;
@@ -132,44 +136,49 @@ private:
 	bool _allLoaded = false;
 	std::map<QString, CacheEntry> _cache;
 	std::map<mtpRequestId, Query> _queries;
-
 };
 
 // Adding an admin, banned or restricted user from channel members with search + contacts search + global search.
-class AddParticipantBoxController : public PeerListController, private base::Subscriber, private MTP::Sender, public base::enable_weak_from_this {
+class AddParticipantBoxController : public PeerListController,
+                                    private base::Subscriber,
+                                    private MTP::Sender,
+                                    public base::enable_weak_from_this {
 public:
 	using Role = ParticipantsBoxController::Role;
 	using Additional = ParticipantsBoxController::Additional;
 
-	using AdminDoneCallback = base::lambda<void(not_null<UserData*> user, const MTPChannelAdminRights &adminRights)>;
-	using BannedDoneCallback = base::lambda<void(not_null<UserData*> user, const MTPChannelBannedRights &bannedRights)>;
-	AddParticipantBoxController(not_null<ChannelData*> channel, Role role, AdminDoneCallback adminDoneCallback, BannedDoneCallback bannedDoneCallback);
+	using AdminDoneCallback = base::lambda<void(not_null<UserData *> user, const MTPChannelAdminRights &adminRights)>;
+	using BannedDoneCallback =
+	    base::lambda<void(not_null<UserData *> user, const MTPChannelBannedRights &bannedRights)>;
+	AddParticipantBoxController(not_null<ChannelData *> channel, Role role, AdminDoneCallback adminDoneCallback,
+	                            BannedDoneCallback bannedDoneCallback);
 
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 	void loadMoreRows() override;
 
-	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override;
+	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData *> peer) override;
 
 	// Callback(not_null<UserData*>)
 	template <typename Callback>
-	static void HandleParticipant(const MTPChannelParticipant &participant, not_null<Additional*> additional, Callback callback);
+	static void HandleParticipant(const MTPChannelParticipant &participant, not_null<Additional *> additional,
+	                              Callback callback);
 
 private:
-	template <typename Callback>
-	bool checkInfoLoaded(not_null<UserData*> user, Callback callback);
+	template <typename Callback> bool checkInfoLoaded(not_null<UserData *> user, Callback callback);
 
-	void showAdmin(not_null<UserData*> user, bool sure = false);
-	void editAdminDone(not_null<UserData*> user, const MTPChannelAdminRights &rights);
-	void showRestricted(not_null<UserData*> user, bool sure = false);
-	void editRestrictedDone(not_null<UserData*> user, const MTPChannelBannedRights &rights);
-	void kickUser(not_null<UserData*> user, bool sure = false);
-	void restrictUserSure(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights);
-	bool appendRow(not_null<UserData*> user);
-	bool prependRow(not_null<UserData*> user);
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
+	void showAdmin(not_null<UserData *> user, bool sure = false);
+	void editAdminDone(not_null<UserData *> user, const MTPChannelAdminRights &rights);
+	void showRestricted(not_null<UserData *> user, bool sure = false);
+	void editRestrictedDone(not_null<UserData *> user, const MTPChannelBannedRights &rights);
+	void kickUser(not_null<UserData *> user, bool sure = false);
+	void restrictUserSure(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+	                      const MTPChannelBannedRights &newRights);
+	bool appendRow(not_null<UserData *> user);
+	bool prependRow(not_null<UserData *> user);
+	std::unique_ptr<PeerListRow> createRow(not_null<UserData *> user) const;
 
-	not_null<ChannelData*> _channel;
+	not_null<ChannelData *> _channel;
 	Role _role = Role::Admins;
 	int _offset = 0;
 	mtpRequestId _loadRequestId = 0;
@@ -178,7 +187,6 @@ private:
 	QPointer<BoxContent> _editBox;
 	AdminDoneCallback _adminDoneCallback;
 	BannedDoneCallback _bannedDoneCallback;
-
 };
 
 // Finds channel members, then contacts, then global search results.
@@ -187,7 +195,7 @@ public:
 	using Role = ParticipantsBoxController::Role;
 	using Additional = ParticipantsBoxController::Additional;
 
-	AddParticipantBoxSearchController(not_null<ChannelData*> channel, not_null<Additional*> additional);
+	AddParticipantBoxSearchController(not_null<ChannelData *> channel, not_null<Additional *> additional);
 
 	void searchQuery(const QString &query) override;
 	bool isLoading() override;
@@ -205,15 +213,16 @@ private:
 
 	void searchOnServer();
 	bool searchParticipantsInCache();
-	void searchParticipantsDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result, int requestedCount);
+	void searchParticipantsDone(mtpRequestId requestId, const MTPchannels_ChannelParticipants &result,
+	                            int requestedCount);
 	bool searchGlobalInCache();
 	void searchGlobalDone(mtpRequestId requestId, const MTPcontacts_Found &result);
 	void requestParticipants();
 	void addChatsContacts();
 	void requestGlobal();
 
-	not_null<ChannelData*> _channel;
-	not_null<Additional*> _additional;
+	not_null<ChannelData *> _channel;
+	not_null<Additional *> _additional;
 
 	base::Timer _timer;
 	QString _query;
@@ -226,7 +235,6 @@ private:
 	std::map<mtpRequestId, Query> _participantsQueries;
 	std::map<QString, MTPcontacts_Found> _globalCache;
 	std::map<mtpRequestId, QString> _globalQueries;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_common_groups_section.cpp b/Telegram/SourceFiles/profile/profile_common_groups_section.cpp
index dbc9c4cf8..62c2adee7 100644
--- a/Telegram/SourceFiles/profile/profile_common_groups_section.cpp
+++ b/Telegram/SourceFiles/profile/profile_common_groups_section.cpp
@@ -20,19 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_common_groups_section.h"
 
-#include "profile/profile_section_memento.h"
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
 #include "profile/profile_back_button.h"
-#include "styles/style_widgets.h"
+#include "profile/profile_section_memento.h"
 #include "styles/style_profile.h"
-#include "styles/style_window.h"
 #include "styles/style_settings.h"
+#include "styles/style_widgets.h"
+#include "styles/style_window.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
-#include "mainwidget.h"
-#include "observer_peer.h"
-#include "apiwrap.h"
-#include "lang/lang_keys.h"
 
 namespace Profile {
 namespace CommonGroups {
@@ -42,14 +42,16 @@ constexpr int kCommonGroupsPerPage = 40;
 
 } // namespace
 
-object_ptr<Window::SectionWidget> SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller*> controller, const QRect &geometry) {
+object_ptr<Window::SectionWidget>
+SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller *> controller, const QRect &geometry) {
 	auto result = object_ptr<Widget>(parent, controller, _user);
 	result->setInternalState(geometry, this);
 	return std::move(result);
 }
 
-FixedBar::FixedBar(QWidget *parent) : TWidget(parent)
-, _backButton(this, lang(lng_profile_common_groups_section)) {
+FixedBar::FixedBar(QWidget *parent)
+    : TWidget(parent)
+    , _backButton(this, lang(lng_profile_common_groups_section)) {
 	_backButton->moveToLeft(0, 0);
 	connect(_backButton, SIGNAL(clicked()), this, SLOT(onBack()));
 }
@@ -92,16 +94,18 @@ void FixedBar::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
-InnerWidget::Item::Item(PeerData *peer) : peer(peer) {
-}
+InnerWidget::Item::Item(PeerData *peer)
+    : peer(peer) {}
 
 InnerWidget::Item::~Item() = default;
 
-InnerWidget::InnerWidget(QWidget *parent, not_null<UserData*> user) : TWidget(parent)
-, _user(user) {
+InnerWidget::InnerWidget(QWidget *parent, not_null<UserData *> user)
+    : TWidget(parent)
+    , _user(user) {
 	setMouseTracking(true);
 	setAttribute(Qt::WA_OpaquePaintEvent);
-	_rowHeight = st::profileCommonGroupsPadding.top() + st::profileCommonGroupsPhotoSize + st::profileCommonGroupsPadding.bottom();
+	_rowHeight = st::profileCommonGroupsPadding.top() + st::profileCommonGroupsPhotoSize +
+	             st::profileCommonGroupsPadding.bottom();
 	_contentTop = st::profileCommonGroupsSkip;
 }
 
@@ -118,18 +122,16 @@ void InnerWidget::checkPreloadMore() {
 	}
 }
 
-void InnerWidget::saveState(not_null<SectionMemento*> memento) {
+void InnerWidget::saveState(not_null<SectionMemento *> memento) {
 	if (auto count = _items.size()) {
-		QList<not_null<PeerData*>> groups;
+		QList<not_null<PeerData *>> groups;
 		groups.reserve(count);
-		for_const (auto item, _items) {
-			groups.push_back(item->peer);
-		}
+		for_const (auto item, _items) { groups.push_back(item->peer); }
 		memento->setCommonGroups(groups);
 	}
 }
 
-void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
+void InnerWidget::restoreState(not_null<SectionMemento *> memento) {
 	auto list = memento->getCommonGroups();
 	_allLoaded = false;
 	if (!list.empty()) {
@@ -137,7 +139,7 @@ void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
 	}
 }
 
-void InnerWidget::showInitial(const QList<not_null<PeerData*>> &list) {
+void InnerWidget::showInitial(const QList<not_null<PeerData *>> &list) {
 	for_const (auto group, list) {
 		if (auto item = computeItem(group)) {
 			_items.push_back(item);
@@ -151,37 +153,39 @@ void InnerWidget::preloadMore() {
 	if (_preloadRequestId || _allLoaded) {
 		return;
 	}
-	auto request = MTPmessages_GetCommonChats(user()->inputUser, MTP_int(_preloadGroupId), MTP_int(kCommonGroupsPerPage));
-	_preloadRequestId = MTP::send(request, ::rpcDone(base::lambda_guarded(this, [this](const MTPmessages_Chats &result) {
-		_preloadRequestId = 0;
-		_preloadGroupId = 0;
-		_allLoaded = true;
-		if (auto chats = Api::getChatsFromMessagesChats(result)) {
-			auto &list = chats->v;
-			if (!list.empty()) {
-				_items.reserve(_items.size() + list.size());
-				for_const (auto &chatData, list) {
-					if (auto chat = App::feedChat(chatData)) {
-						auto found = false;
-						for_const (auto item, _items) {
-							if (item->peer == chat) {
-								found = true;
-								break;
-							}
-						}
-						if (!found) {
-							if (auto item = computeItem(chat)) {
-								_items.push_back(item);
-							}
-						}
-						_preloadGroupId = chat->bareId();
-						_allLoaded = false;
-					}
-				}
-				updateSize();
-			}
-		}
-	})));
+	auto request =
+	    MTPmessages_GetCommonChats(user()->inputUser, MTP_int(_preloadGroupId), MTP_int(kCommonGroupsPerPage));
+	_preloadRequestId =
+	    MTP::send(request, ::rpcDone(base::lambda_guarded(this, [this](const MTPmessages_Chats &result) {
+		              _preloadRequestId = 0;
+		              _preloadGroupId = 0;
+		              _allLoaded = true;
+		              if (auto chats = Api::getChatsFromMessagesChats(result)) {
+			              auto &list = chats->v;
+			              if (!list.empty()) {
+				              _items.reserve(_items.size() + list.size());
+				              for_const (auto &chatData, list) {
+					              if (auto chat = App::feedChat(chatData)) {
+						              auto found = false;
+						              for_const (auto item, _items) {
+							              if (item->peer == chat) {
+								              found = true;
+								              break;
+							              }
+						              }
+						              if (!found) {
+							              if (auto item = computeItem(chat)) {
+								              _items.push_back(item);
+							              }
+						              }
+						              _preloadGroupId = chat->bareId();
+						              _allLoaded = false;
+					              }
+				              }
+				              updateSize();
+			              }
+		              }
+	              })));
 }
 
 void InnerWidget::updateSize() {
@@ -196,7 +200,8 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 	auto contentLeftMax = st::profileCommonGroupsLeftMax;
 	auto widthWithMin = st::windowMinWidth;
 	auto widthWithMax = st::profileCommonGroupsWidthMax + 2 * contentLeftMax;
-	_contentLeft = anim::interpolate(contentLeftMax, contentLeftMin, std::max(widthWithMax - newWidth, 0) / double(widthWithMax - widthWithMin));
+	_contentLeft = anim::interpolate(contentLeftMax, contentLeftMin,
+	                                 std::max(widthWithMax - newWidth, 0) / double(widthWithMax - widthWithMin));
 	_contentWidth = std::min(newWidth - 2 * _contentLeft, st::profileCommonGroupsWidthMax);
 
 	auto newHeight = _contentTop;
@@ -237,7 +242,8 @@ void InnerWidget::paintRow(Painter &p, int index, TimeMs ms) {
 
 	x += st::profileCommonGroupsPadding.left();
 	y += st::profileCommonGroupsPadding.top();
-	item->peer->paintUserpic(p, rtl() ? (width() - x - st::profileCommonGroupsPhotoSize) : x, y, st::profileCommonGroupsPhotoSize);
+	item->peer->paintUserpic(p, rtl() ? (width() - x - st::profileCommonGroupsPhotoSize) : x, y,
+	                         st::profileCommonGroupsPhotoSize);
 
 	p.setPen(st::profileMemberNameFg);
 	x += st::profileCommonGroupsPhotoSize + st::profileCommonGroupsNameLeft;
@@ -287,9 +293,8 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		auto item = _items[_pressed];
 		if (!item->ripple) {
 			auto mask = Ui::RippleAnimation::rectMask(QSize(_contentWidth, _rowHeight));
-			item->ripple = std::make_unique<Ui::RippleAnimation>(st::profileCommonGroupsRipple, std::move(mask), [this, index = _pressed] {
-				updateRow(index);
-			});
+			item->ripple = std::make_unique<Ui::RippleAnimation>(st::profileCommonGroupsRipple, std::move(mask),
+			                                                     [this, index = _pressed] { updateRow(index); });
 		}
 		auto left = _contentLeft;
 		auto top = _contentTop + _rowHeight * _pressed;
@@ -335,10 +340,11 @@ InnerWidget::~InnerWidget() {
 	}
 }
 
-Widget::Widget(QWidget *parent, not_null<Window::Controller*> controller, not_null<UserData*> user) : Window::SectionWidget(parent, controller)
-, _scroll(this, st::settingsScroll)
-, _fixedBar(this)
-, _fixedBarShadow(this, st::shadowFg) {
+Widget::Widget(QWidget *parent, not_null<Window::Controller *> controller, not_null<UserData *> user)
+    : Window::SectionWidget(parent, controller)
+    , _scroll(this, st::settingsScroll)
+    , _fixedBar(this)
+    , _fixedBarShadow(this, st::shadowFg) {
 	_fixedBar->move(0, 0);
 	_fixedBar->resizeToWidth(width());
 	_fixedBar->show();
@@ -359,7 +365,7 @@ void Widget::updateAdaptiveLayout() {
 	_fixedBarShadow->moveToLeft(Adaptive::OneColumn() ? 0 : st::lineWidth, _fixedBar->height());
 }
 
-not_null<UserData*> Widget::user() const {
+not_null<UserData *> Widget::user() const {
 	return _inner->user();
 }
 
@@ -374,8 +380,8 @@ void Widget::doSetInnerFocus() {
 	_inner->setFocus();
 }
 
-bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
-	if (auto profileMemento = dynamic_cast<SectionMemento*>(memento.get())) {
+bool Widget::showInternal(not_null<Window::SectionMemento *> memento) {
+	if (auto profileMemento = dynamic_cast<SectionMemento *>(memento.get())) {
 		if (profileMemento->getUser() == user()) {
 			restoreState(profileMemento);
 			return true;
@@ -384,7 +390,7 @@ bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
 	return false;
 }
 
-void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento*> memento) {
+void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento *> memento) {
 	setGeometry(geometry);
 	myEnsureResized(this);
 	restoreState(memento);
@@ -396,12 +402,12 @@ std::unique_ptr<Window::SectionMemento> Widget::createMemento() {
 	return std::move(result);
 }
 
-void Widget::saveState(not_null<SectionMemento*> memento) {
+void Widget::saveState(not_null<SectionMemento *> memento) {
 	memento->setScrollTop(_scroll->scrollTop());
 	_inner->saveState(memento);
 }
 
-void Widget::restoreState(not_null<SectionMemento*> memento) {
+void Widget::restoreState(not_null<SectionMemento *> memento) {
 	_inner->restoreState(memento);
 	auto scrollTop = memento->getScrollTop();
 	_scroll->scrollToY(scrollTop);
diff --git a/Telegram/SourceFiles/profile/profile_common_groups_section.h b/Telegram/SourceFiles/profile/profile_common_groups_section.h
index 09ed58f66..aaeb5f5af 100644
--- a/Telegram/SourceFiles/profile/profile_common_groups_section.h
+++ b/Telegram/SourceFiles/profile/profile_common_groups_section.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/section_widget.h"
-#include "window/section_memento.h"
+#include "structs.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text.h"
-#include "structs.h"
+#include "window/section_memento.h"
+#include "window/section_widget.h"
 
 namespace Notify {
 struct PeerUpdate;
@@ -43,12 +43,13 @@ namespace CommonGroups {
 
 class SectionMemento : public Window::SectionMemento {
 public:
-	SectionMemento(not_null<UserData*> user) : _user(user) {
-	}
+	SectionMemento(not_null<UserData *> user)
+	    : _user(user) {}
 
-	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, not_null<Window::Controller*> controller, const QRect &geometry) override;
+	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, not_null<Window::Controller *> controller,
+	                                               const QRect &geometry) override;
 
-	not_null<UserData*> getUser() const {
+	not_null<UserData *> getUser() const {
 		return _user;
 	}
 	void setScrollTop(int scrollTop) {
@@ -57,18 +58,17 @@ public:
 	int getScrollTop() const {
 		return _scrollTop;
 	}
-	void setCommonGroups(const QList<not_null<PeerData*>> &groups) {
+	void setCommonGroups(const QList<not_null<PeerData *>> &groups) {
 		_commonGroups = groups;
 	}
-	const QList<not_null<PeerData*>> &getCommonGroups() const {
+	const QList<not_null<PeerData *>> &getCommonGroups() const {
 		return _commonGroups;
 	}
 
 private:
-	not_null<UserData*> _user;
+	not_null<UserData *> _user;
 	int _scrollTop = 0;
-	QList<not_null<PeerData*>> _commonGroups;
-
+	QList<not_null<PeerData *>> _commonGroups;
 };
 
 class FixedBar final : public TWidget, private base::Subscriber {
@@ -92,16 +92,15 @@ private:
 	object_ptr<BackButton> _backButton;
 
 	bool _animatingMode = false;
-
 };
 
 class InnerWidget final : public TWidget {
 	Q_OBJECT
 
 public:
-	InnerWidget(QWidget *parent, not_null<UserData*> user);
+	InnerWidget(QWidget *parent, not_null<UserData *> user);
 
-	not_null<UserData*> user() const {
+	not_null<UserData *> user() const {
 		return _user;
 	}
 
@@ -113,8 +112,8 @@ public:
 		return TWidget::resizeToWidth(newWidth);
 	}
 
-	void saveState(not_null<SectionMemento*> memento);
-	void restoreState(not_null<SectionMemento*> memento);
+	void saveState(not_null<SectionMemento *> memento);
+	void restoreState(not_null<SectionMemento *> memento);
 
 	~InnerWidget();
 
@@ -134,13 +133,13 @@ protected:
 private:
 	void updateSelected(QPoint localPos);
 	void updateRow(int index);
-	void showInitial(const QList<not_null<PeerData*>> &list);
+	void showInitial(const QList<not_null<PeerData *>> &list);
 	void checkPreloadMore();
 	void preloadMore();
 	void updateSize();
 	void paintRow(Painter &p, int index, TimeMs ms);
 
-	not_null<UserData*> _user;
+	not_null<UserData *> _user;
 
 	int _minHeight = 0;
 	int _rowHeight = 0;
@@ -154,29 +153,28 @@ private:
 		explicit Item(PeerData *peer);
 		~Item();
 
-		PeerData * const peer;
+		PeerData *const peer;
 		Text name;
 		std::unique_ptr<Ui::RippleAnimation> ripple;
 	};
 	Item *computeItem(PeerData *group);
-	QMap<PeerData*, Item*> _dataMap;
-	QList<Item*> _items;
+	QMap<PeerData *, Item *> _dataMap;
+	QList<Item *> _items;
 	int _selected = -1;
 	int _pressed = -1;
 
 	qint32 _preloadGroupId = 0;
 	mtpRequestId _preloadRequestId = 0;
 	bool _allLoaded = true;
-
 };
 
 class Widget final : public Window::SectionWidget {
 	Q_OBJECT
 
 public:
-	Widget(QWidget *parent, not_null<Window::Controller*> controller, not_null<UserData*> user);
+	Widget(QWidget *parent, not_null<Window::Controller *> controller, not_null<UserData *> user);
 
-	not_null<UserData*> user() const;
+	not_null<UserData *> user() const;
 	PeerData *peerForDialogs() const override {
 		return user();
 	}
@@ -187,10 +185,10 @@ public:
 
 	QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
 
-	bool showInternal(not_null<Window::SectionMemento*> memento) override;
+	bool showInternal(not_null<Window::SectionMemento *> memento) override;
 	std::unique_ptr<Window::SectionMemento> createMemento() override;
 
-	void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);
+	void setInternalState(const QRect &geometry, not_null<SectionMemento *> memento);
 
 	// Float player interface.
 	bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) override;
@@ -208,14 +206,13 @@ private slots:
 
 private:
 	void updateAdaptiveLayout();
-	void saveState(not_null<SectionMemento*> memento);
-	void restoreState(not_null<SectionMemento*> memento);
+	void saveState(not_null<SectionMemento *> memento);
+	void restoreState(not_null<SectionMemento *> memento);
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<InnerWidget> _inner;
 	object_ptr<FixedBar> _fixedBar;
 	object_ptr<Ui::PlainShadow> _fixedBarShadow;
-
 };
 
 } // namespace CommonGroups
diff --git a/Telegram/SourceFiles/profile/profile_cover.cpp b/Telegram/SourceFiles/profile/profile_cover.cpp
index c03295583..b7ce34196 100644
--- a/Telegram/SourceFiles/profile/profile_cover.cpp
+++ b/Telegram/SourceFiles/profile/profile_cover.cpp
@@ -20,25 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_cover.h"
 
-#include "styles/style_profile.h"
-#include "styles/style_window.h"
-#include "profile/profile_cover_drop_area.h"
-#include "profile/profile_userpic_button.h"
-#include "ui/widgets/buttons.h"
-#include "core/file_utilities.h"
-#include "ui/widgets/labels.h"
-#include "observer_peer.h"
-#include "boxes/confirm_box.h"
-#include "boxes/photo_crop_box.h"
-#include "boxes/peer_list_controllers.h"
-#include "lang/lang_keys.h"
 #include "apiwrap.h"
 #include "auth_session.h"
+#include "boxes/confirm_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "boxes/photo_crop_box.h"
+#include "core/file_utilities.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "messenger.h"
+#include "observer_peer.h"
 #include "platform/platform_file_utilities.h"
+#include "profile/profile_cover_drop_area.h"
+#include "profile/profile_userpic_button.h"
+#include "styles/style_profile.h"
 #include "styles/style_widgets.h"
+#include "styles/style_window.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 
 #include <QWidget>
 
@@ -46,22 +46,20 @@ namespace Profile {
 namespace {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
-const auto ButtonsUpdateFlags = UpdateFlag::UserCanShareContact
-	| UpdateFlag::BotCanAddToGroups
-	| UpdateFlag::ChatCanEdit
-	| UpdateFlag::ChannelRightsChanged
-	| UpdateFlag::ChannelAmIn;
+const auto ButtonsUpdateFlags = UpdateFlag::UserCanShareContact | UpdateFlag::BotCanAddToGroups |
+                                UpdateFlag::ChatCanEdit | UpdateFlag::ChannelRightsChanged | UpdateFlag::ChannelAmIn;
 
 } // namespace
 
-CoverWidget::CoverWidget(QWidget *parent, PeerData *peer) : TWidget(parent)
-, _peer(peer)
-, _peerUser(peer->asUser())
-, _peerChat(peer->asChat())
-, _peerChannel(peer->asChannel())
-, _peerMegagroup(peer->isMegagroup() ? _peerChannel : nullptr)
-, _userpicButton(this, peer)
-, _name(this, st::profileNameLabel) {
+CoverWidget::CoverWidget(QWidget *parent, PeerData *peer)
+    : TWidget(parent)
+    , _peer(peer)
+    , _peerUser(peer->asUser())
+    , _peerChat(peer->asChat())
+    , _peerChannel(peer->asChannel())
+    , _peerMegagroup(peer->isMegagroup() ? _peerChannel : nullptr)
+    , _userpicButton(this, peer)
+    , _name(this, st::profileNameLabel) {
 	_peer->updateFull();
 
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
@@ -72,14 +70,11 @@ CoverWidget::CoverWidget(QWidget *parent, PeerData *peer) : TWidget(parent)
 	_name->setSelectable(true);
 	_name->setContextCopyText(lang(lng_profile_copy_fullname));
 
-	auto observeEvents = ButtonsUpdateFlags
-		| UpdateFlag::NameChanged
-		| UpdateFlag::UserOnlineChanged
-		| UpdateFlag::MembersChanged
-		| UpdateFlag::PhotoChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	auto observeEvents = ButtonsUpdateFlags | UpdateFlag::NameChanged | UpdateFlag::UserOnlineChanged |
+	                     UpdateFlag::MembersChanged | UpdateFlag::PhotoChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	connect(&Messenger::Instance(), SIGNAL(peerPhotoDone(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId)));
 	connect(&Messenger::Instance(), SIGNAL(peerPhotoFail(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId)));
@@ -137,7 +132,9 @@ int CoverWidget::resizeGetHeight(int newWidth) {
 	int infoLeft = _userpicButton->x() + _userpicButton->width();
 	_statusPosition = QPoint(infoLeft + st::profileStatusLeft, _userpicButton->y() + st::profileStatusTop);
 	if (_cancelPhotoUpload) {
-		_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) + st::profileStatusFont->spacew, _statusPosition.y());
+		_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) +
+		                                   st::profileStatusFont->spacew,
+		                               _statusPosition.y());
 	}
 
 	moveAndToggleButtons(newWidth);
@@ -216,7 +213,8 @@ void CoverWidget::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(_statusPosition.x(), _statusPosition.y(), width(), _statusText);
 
 	if (_peer->isVerified()) {
-		st::profileVerifiedCheck.paint(p, _name->x() + _name->width() + st::profileVerifiedCheckShift, _name->y(), width());
+		st::profileVerifiedCheck.paint(p, _name->x() + _name->width() + st::profileVerifiedCheckShift, _name->y(),
+		                               width());
 	}
 
 	paintDivider(p);
@@ -334,9 +332,11 @@ void CoverWidget::paintDivider(Painter &p) {
 		st::profileDividerLeft.paint(p, QPoint(dividerLeft, _dividerTop), width());
 	}
 	auto dividerFillLeft = Adaptive::OneColumn() ? 0 : (st::lineWidth + st::profileDividerLeft.width());
-	auto dividerFillTop = rtlrect(dividerFillLeft, _dividerTop, width() - dividerFillLeft, st::profileDividerTop.height(), width());
+	auto dividerFillTop =
+	    rtlrect(dividerFillLeft, _dividerTop, width() - dividerFillLeft, st::profileDividerTop.height(), width());
 	st::profileDividerTop.fill(p, dividerFillTop);
-	auto dividerFillBottom = rtlrect(dividerFillLeft, _dividerTop + dividerHeight - st::profileDividerBottom.height(), width() - dividerFillLeft, st::profileDividerBottom.height(), width());
+	auto dividerFillBottom = rtlrect(dividerFillLeft, _dividerTop + dividerHeight - st::profileDividerBottom.height(),
+	                                 width() - dividerFillLeft, st::profileDividerBottom.height(), width());
 	st::profileDividerBottom.fill(p, dividerFillBottom);
 }
 
@@ -371,7 +371,9 @@ void CoverWidget::refreshStatusText() {
 			_cancelPhotoUpload.create(this, lang(lng_cancel), st::defaultLinkButton);
 			connect(_cancelPhotoUpload, SIGNAL(clicked()), this, SLOT(onCancelPhotoUpload()));
 			_cancelPhotoUpload->show();
-			_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) + st::profileStatusFont->spacew, _statusPosition.y());
+			_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) +
+			                                   st::profileStatusFont->spacew,
+			                               _statusPosition.y());
 		}
 		update();
 		return;
@@ -471,19 +473,21 @@ void CoverWidget::clearButtons() {
 	}
 }
 
-void CoverWidget::addButton(base::lambda<QString()> textFactory, const char *slot, const style::RoundButton *replacementStyle) {
+void CoverWidget::addButton(base::lambda<QString()> textFactory, const char *slot,
+                            const style::RoundButton *replacementStyle) {
 	auto &buttonStyle = _buttons.isEmpty() ? st::profilePrimaryButton : st::profileSecondaryButton;
 	auto button = new Ui::RoundButton(this, std::move(textFactory), buttonStyle);
 	connect(button, SIGNAL(clicked()), this, slot);
 	button->show();
 
-	auto replacement = replacementStyle ? new Ui::RoundButton(this, base::lambda<QString()>(), *replacementStyle) : nullptr;
+	auto replacement =
+	    replacementStyle ? new Ui::RoundButton(this, base::lambda<QString()>(), *replacementStyle) : nullptr;
 	if (replacement) {
 		connect(replacement, SIGNAL(clicked()), this, slot);
 		replacement->hide();
 	}
 
-	_buttons.push_back({ button, replacement });
+	_buttons.push_back({button, replacement});
 }
 
 void CoverWidget::onOnlineCountUpdated(int onlineCount) {
@@ -503,20 +507,21 @@ void CoverWidget::onSetPhoto() {
 	App::CallDelayed(st::profilePrimaryButton.ripple.hideDuration, this, [this] {
 		auto imgExtensions = cImgExtensions();
 		auto filter = qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + FileDialog::AllFilesFilter();
-		FileDialog::GetOpenPath(lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-			if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
-				return;
-			}
+		FileDialog::GetOpenPath(lang(lng_choose_image), filter,
+		                        base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+			                        if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+				                        return;
+			                        }
 
-			QImage img;
-			if (!result.remoteContent.isEmpty()) {
-				img = App::readImage(result.remoteContent);
-			} else {
-				img = App::readImage(result.paths.front());
-			}
+			                        QImage img;
+			                        if (!result.remoteContent.isEmpty()) {
+				                        img = App::readImage(result.remoteContent);
+			                        } else {
+				                        img = App::readImage(result.paths.front());
+			                        }
 
-			showSetPhotoBox(img);
-		}));
+			                        showSetPhotoBox(img);
+		                        }));
 	});
 }
 
@@ -545,7 +550,7 @@ void CoverWidget::onAddMember() {
 		}
 	} else if (_peerChannel && _peerChannel->mgInfo) {
 		auto &participants = _peerChannel->mgInfo->lastParticipants;
-		AddParticipantsBoxController::Start(_peerChannel, { participants.cbegin(), participants.cend() });
+		AddParticipantsBoxController::Start(_peerChannel, {participants.cbegin(), participants.cend()});
 	}
 }
 
diff --git a/Telegram/SourceFiles/profile/profile_cover.h b/Telegram/SourceFiles/profile/profile_cover.h
index a8d2da40e..e898290a5 100644
--- a/Telegram/SourceFiles/profile/profile_cover.h
+++ b/Telegram/SourceFiles/profile/profile_cover.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/observer.h"
 #include "base/object_ptr.h"
-#include "ui/twidget.h"
+#include "base/observer.h"
 #include "structs.h"
+#include "ui/twidget.h"
 
 class PhotoData;
 class PeerData;
@@ -120,7 +120,8 @@ private:
 	void setChannelButtons();
 
 	void clearButtons();
-	void addButton(base::lambda<QString()> textFactory, const char *slot, const style::RoundButton *replacementStyle = nullptr);
+	void addButton(base::lambda<QString()> textFactory, const char *slot,
+	               const style::RoundButton *replacementStyle = nullptr);
 
 	void paintDivider(Painter &p);
 
@@ -137,10 +138,10 @@ private:
 	ChannelData *_peerMegagroup;
 
 	object_ptr<UserpicButton> _userpicButton;
-	object_ptr<CoverDropArea> _dropArea = { nullptr };
+	object_ptr<CoverDropArea> _dropArea = {nullptr};
 
 	object_ptr<Ui::FlatLabel> _name;
-	object_ptr<Ui::LinkButton> _cancelPhotoUpload = { nullptr };
+	object_ptr<Ui::LinkButton> _cancelPhotoUpload = {nullptr};
 
 	QPoint _statusPosition;
 	QString _statusText;
@@ -156,7 +157,6 @@ private:
 	int _dividerTop = 0;
 
 	int _onlineCount = 0;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
index a61ef024a..847de8461 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
@@ -21,17 +21,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "profile/profile_cover_drop_area.h"
 
 #include "styles/style_profile.h"
-#include <QWidget>
 #include <QPaintEvent>
+#include <QWidget>
 
 namespace Profile {
 
-CoverDropArea::CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle) : TWidget(parent)
-, _title(title)
-, _subtitle(subtitle)
-, _titleWidth(st::profileDropAreaTitleFont->width(_title))
-, _subtitleWidth(st::profileDropAreaSubtitleFont->width(_subtitle)) {
-}
+CoverDropArea::CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle)
+    : TWidget(parent)
+    , _title(title)
+    , _subtitle(subtitle)
+    , _titleWidth(st::profileDropAreaTitleFont->width(_title))
+    , _subtitleWidth(st::profileDropAreaSubtitleFont->width(_subtitle)) {}
 
 void CoverDropArea::showAnimated() {
 	show();
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.h b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
index d9c1133c9..ede9d4a70 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.h
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
@@ -33,7 +33,7 @@ public:
 
 	void showAnimated();
 
-	using HideFinishCallback = base::lambda<void(CoverDropArea*)>;
+	using HideFinishCallback = base::lambda<void(CoverDropArea *)>;
 	void hideAnimated(HideFinishCallback &&callback);
 
 	bool hiding() const {
@@ -53,7 +53,6 @@ private:
 	Animation _a_appearance;
 	bool _hiding = false;
 	HideFinishCallback _hideFinishCallback;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp
index 59d2efe2c..59652b071 100644
--- a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp
+++ b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp
@@ -20,16 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_fixed_bar.h"
 
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
+#include "profile/profile_back_button.h"
+#include "styles/style_boxes.h"
 #include "styles/style_profile.h"
 #include "styles/style_window.h"
 #include "ui/widgets/buttons.h"
-#include "lang/lang_keys.h"
-#include "mainwidget.h"
-#include "boxes/add_contact_box.h"
-#include "boxes/confirm_box.h"
-#include "observer_peer.h"
-#include "styles/style_boxes.h"
-#include "profile/profile_back_button.h"
 
 #include <QWidget>
 
@@ -37,30 +37,28 @@ namespace Profile {
 namespace {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
-const auto ButtonsUpdateFlags = UpdateFlag::UserCanShareContact
-	| UpdateFlag::UserIsContact
-	| UpdateFlag::ChatCanEdit
-	| UpdateFlag::ChannelRightsChanged;
+const auto ButtonsUpdateFlags = UpdateFlag::UserCanShareContact | UpdateFlag::UserIsContact | UpdateFlag::ChatCanEdit |
+                                UpdateFlag::ChannelRightsChanged;
 
 } // namespace
 
-FixedBar::FixedBar(QWidget *parent, PeerData *peer) : TWidget(parent)
-, _peer(peer)
-, _peerUser(peer->asUser())
-, _peerChat(peer->asChat())
-, _peerChannel(peer->asChannel())
-, _peerMegagroup(peer->isMegagroup() ? _peerChannel : nullptr)
-, _backButton(this, lang(lng_menu_back)) {
+FixedBar::FixedBar(QWidget *parent, PeerData *peer)
+    : TWidget(parent)
+    , _peer(peer)
+    , _peerUser(peer->asUser())
+    , _peerChat(peer->asChat())
+    , _peerChannel(peer->asChannel())
+    , _peerMegagroup(peer->isMegagroup() ? _peerChannel : nullptr)
+    , _backButton(this, lang(lng_menu_back)) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	_backButton->moveToLeft(0, 0);
 	connect(_backButton, SIGNAL(clicked()), this, SLOT(onBack()));
 
-	auto observeEvents = ButtonsUpdateFlags
-		| UpdateFlag::MigrationChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdate(update);
-	}));
+	auto observeEvents = ButtonsUpdateFlags | UpdateFlag::MigrationChanged;
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdate(update); }));
 
 	refreshRightActions();
 }
@@ -101,11 +99,13 @@ void FixedBar::refreshRightActions() {
 
 void FixedBar::setUserActions() {
 	if (_peerUser->canShareThisContact()) {
-		addRightAction(RightActionType::ShareContact, langFactory(lng_profile_top_bar_share_contact), SLOT(onShareContact()));
+		addRightAction(RightActionType::ShareContact, langFactory(lng_profile_top_bar_share_contact),
+		               SLOT(onShareContact()));
 	}
 	if (_peerUser->isContact()) {
 		addRightAction(RightActionType::EditContact, langFactory(lng_profile_edit_contact), SLOT(onEditContact()));
-		addRightAction(RightActionType::DeleteContact, langFactory(lng_profile_delete_contact), SLOT(onDeleteContact()));
+		addRightAction(RightActionType::DeleteContact, langFactory(lng_profile_delete_contact),
+		               SLOT(onDeleteContact()));
 	} else if (_peerUser->canAddContact()) {
 		addRightAction(RightActionType::AddContact, langFactory(lng_profile_add_contact), SLOT(onAddContact()));
 	}
@@ -179,19 +179,20 @@ void FixedBar::onShareContact() {
 void FixedBar::onDeleteContact() {
 	auto text = lng_sure_delete_contact(lt_contact, App::peerName(_peerUser));
 	Ui::show(Box<ConfirmBox>(text, lang(lng_box_delete), base::lambda_guarded(this, [this] {
-		Ui::showChatsList();
-		Ui::hideLayer();
-		MTP::send(MTPcontacts_DeleteContact(_peerUser->inputUser), App::main()->rpcDone(&MainWidget::deletedContact, _peerUser));
-	})));
+		                         Ui::showChatsList();
+		                         Ui::hideLayer();
+		                         MTP::send(MTPcontacts_DeleteContact(_peerUser->inputUser),
+		                                   App::main()->rpcDone(&MainWidget::deletedContact, _peerUser));
+	                         })));
 }
 
 void FixedBar::onLeaveGroup() {
 	auto text = lng_sure_delete_and_exit(lt_group, App::peerName(_peerChat));
 	Ui::show(Box<ConfirmBox>(text, lang(lng_box_leave), st::attentionBoxButton, base::lambda_guarded(this, [this] {
-		Ui::showChatsList();
-		Ui::hideLayer();
-		App::main()->deleteAndExit(_peerChat);
-	})));
+		                         Ui::showChatsList();
+		                         Ui::hideLayer();
+		                         App::main()->deleteAndExit(_peerChat);
+	                         })));
 }
 
 int FixedBar::resizeGetHeight(int newWidth) {
diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.h b/Telegram/SourceFiles/profile/profile_fixed_bar.h
index a2c2872f2..a049cc51c 100644
--- a/Telegram/SourceFiles/profile/profile_fixed_bar.h
+++ b/Telegram/SourceFiles/profile/profile_fixed_bar.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/observer.h"
 #include "base/object_ptr.h"
+#include "base/observer.h"
 #include "ui/twidget.h"
 
 class PeerData;
@@ -114,7 +114,6 @@ private:
 
 	bool _animatingMode = false;
 	bool _hideShareContactButton = false;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_inner_widget.cpp b/Telegram/SourceFiles/profile/profile_inner_widget.cpp
index 8e0aecd4c..c8e28dff1 100644
--- a/Telegram/SourceFiles/profile/profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/profile/profile_inner_widget.cpp
@@ -20,23 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_inner_widget.h"
 
-#include "styles/style_profile.h"
-#include "styles/style_window.h"
-#include "profile/profile_cover.h"
-#include "profile/profile_block_info.h"
-#include "profile/profile_block_settings.h"
-#include "profile/profile_block_invite_link.h"
-#include "profile/profile_block_shared_media.h"
+#include "apiwrap.h"
 #include "profile/profile_block_actions.h"
 #include "profile/profile_block_channel_members.h"
 #include "profile/profile_block_group_members.h"
-#include "apiwrap.h"
+#include "profile/profile_block_info.h"
+#include "profile/profile_block_invite_link.h"
+#include "profile/profile_block_settings.h"
+#include "profile/profile_block_shared_media.h"
+#include "profile/profile_cover.h"
+#include "styles/style_profile.h"
+#include "styles/style_window.h"
 
 namespace Profile {
 
-InnerWidget::InnerWidget(QWidget *parent, PeerData *peer) : TWidget(parent)
-, _peer(peer)
-, _cover(this, peer) {
+InnerWidget::InnerWidget(QWidget *parent, PeerData *peer)
+    : TWidget(parent)
+    , _peer(peer)
+    , _cover(this, peer) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	createBlocks();
@@ -48,22 +49,22 @@ void InnerWidget::createBlocks() {
 	auto channel = _peer->asChannel();
 	auto megagroup = _peer->isMegagroup() ? channel : nullptr;
 	if (user || channel || megagroup) {
-		_blocks.push_back({ new InfoWidget(this, _peer), RectPart::Right });
+		_blocks.push_back({new InfoWidget(this, _peer), RectPart::Right});
 	}
-	_blocks.push_back({ new SettingsWidget(this, _peer), RectPart::Right });
+	_blocks.push_back({new SettingsWidget(this, _peer), RectPart::Right});
 	if (chat || channel || megagroup) {
-		_blocks.push_back({ new InviteLinkWidget(this, _peer), RectPart::Right });
+		_blocks.push_back({new InviteLinkWidget(this, _peer), RectPart::Right});
 	}
-	_blocks.push_back({ new SharedMediaWidget(this, _peer), RectPart::Right });
+	_blocks.push_back({new SharedMediaWidget(this, _peer), RectPart::Right});
 	if (channel && !megagroup) {
-		_blocks.push_back({ new ChannelMembersWidget(this, _peer), RectPart::Right });
+		_blocks.push_back({new ChannelMembersWidget(this, _peer), RectPart::Right});
 	}
-	_blocks.push_back({ new ActionsWidget(this, _peer), RectPart::Right });
+	_blocks.push_back({new ActionsWidget(this, _peer), RectPart::Right});
 	if (chat || megagroup) {
 		auto membersWidget = new GroupMembersWidget(this, _peer);
 		connect(membersWidget, SIGNAL(onlineCountUpdated(int)), _cover, SLOT(onOnlineCountUpdated(int)));
 		_cover->onOnlineCountUpdated(membersWidget->onlineCount());
-		_blocks.push_back({ membersWidget, RectPart::Left });
+		_blocks.push_back({membersWidget, RectPart::Left});
 	}
 	for_const (auto &blockData, _blocks) {
 		connect(blockData.block, SIGNAL(heightUpdated()), this, SLOT(onBlockHeightUpdated()));
@@ -89,23 +90,17 @@ bool InnerWidget::shareContactButtonShown() const {
 	return _cover->shareContactButtonShown();
 }
 
-void InnerWidget::saveState(not_null<SectionMemento*> memento) {
-	for_const (auto &blockData, _blocks) {
-		blockData.block->saveState(memento);
-	}
+void InnerWidget::saveState(not_null<SectionMemento *> memento) {
+	for_const (auto &blockData, _blocks) { blockData.block->saveState(memento); }
 }
 
-void InnerWidget::restoreState(not_null<SectionMemento*> memento) {
-	for_const (auto &blockData, _blocks) {
-		blockData.block->restoreState(memento);
-	}
+void InnerWidget::restoreState(not_null<SectionMemento *> memento) {
+	for_const (auto &blockData, _blocks) { blockData.block->restoreState(memento); }
 }
 
 void InnerWidget::showFinished() {
 	_cover->showFinished();
-	for_const (auto &blockData, _blocks) {
-		blockData.block->showFinished();
-	}
+	for_const (auto &blockData, _blocks) { blockData.block->showFinished(); }
 }
 
 void InnerWidget::decreaseAdditionalHeight(int removeHeight) {
@@ -120,11 +115,12 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	if (_mode == Mode::TwoColumn) {
 		int leftHeight = countBlocksHeight(RectPart::Left);
 		int rightHeight = countBlocksHeight(RectPart::Right);
-		int shadowHeight = rightHeight;// std::min(leftHeight, rightHeight);
+		int shadowHeight = rightHeight; // std::min(leftHeight, rightHeight);
 
 		int shadowLeft = _blocksLeft + _leftColumnWidth + _columnDivider;
 		int shadowTop = _blocksTop + st::profileBlockMarginTop;
-		p.fillRect(rtlrect(shadowLeft, shadowTop, st::lineWidth, shadowHeight - st::profileBlockMarginTop, width()), st::shadowFg);
+		p.fillRect(rtlrect(shadowLeft, shadowTop, st::lineWidth, shadowHeight - st::profileBlockMarginTop, width()),
+		           st::shadowFg);
 	}
 }
 
diff --git a/Telegram/SourceFiles/profile/profile_inner_widget.h b/Telegram/SourceFiles/profile/profile_inner_widget.h
index 66b0bfbc1..ff3ae4a6d 100644
--- a/Telegram/SourceFiles/profile/profile_inner_widget.h
+++ b/Telegram/SourceFiles/profile/profile_inner_widget.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <gsl/gsl>
 #include "ui/twidget.h"
+#include <gsl/gsl>
 
 class PeerData;
 
@@ -58,8 +58,8 @@ public:
 	// It should show it only if it is hidden in the cover.
 	bool shareContactButtonShown() const;
 
-	void saveState(gsl::not_null<SectionMemento*> memento);
-	void restoreState(gsl::not_null<SectionMemento*> memento);
+	void saveState(gsl::not_null<SectionMemento *> memento);
+	void restoreState(gsl::not_null<SectionMemento *> memento);
 
 	void showFinished();
 
@@ -120,7 +120,6 @@ private:
 	QList<Block> _blocks;
 
 	Mode _mode = Mode::OneColumn;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_section_memento.cpp b/Telegram/SourceFiles/profile/profile_section_memento.cpp
index d6d53e558..4783ff839 100644
--- a/Telegram/SourceFiles/profile/profile_section_memento.cpp
+++ b/Telegram/SourceFiles/profile/profile_section_memento.cpp
@@ -24,7 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Profile {
 
-object_ptr<Window::SectionWidget> SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller*> controller, const QRect &geometry) {
+object_ptr<Window::SectionWidget>
+SectionMemento::createWidget(QWidget *parent, not_null<Window::Controller *> controller, const QRect &geometry) {
 	auto result = object_ptr<Widget>(parent, controller, _peer);
 	result->setInternalState(geometry, this);
 	return std::move(result);
diff --git a/Telegram/SourceFiles/profile/profile_section_memento.h b/Telegram/SourceFiles/profile/profile_section_memento.h
index 4fda46cf0..7dd165966 100644
--- a/Telegram/SourceFiles/profile/profile_section_memento.h
+++ b/Telegram/SourceFiles/profile/profile_section_memento.h
@@ -30,10 +30,11 @@ class Widget;
 
 class SectionMemento : public Window::SectionMemento {
 public:
-	SectionMemento(PeerData *peer) : _peer(peer) {
-	}
+	SectionMemento(PeerData *peer)
+	    : _peer(peer) {}
 
-	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, gsl::not_null<Window::Controller*> controller, const QRect &geometry) override;
+	object_ptr<Window::SectionWidget> createWidget(QWidget *parent, gsl::not_null<Window::Controller *> controller,
+	                                               const QRect &geometry) override;
 
 	PeerData *getPeer() const {
 		return _peer;
@@ -48,7 +49,6 @@ public:
 private:
 	PeerData *_peer;
 	int _scrollTop = 0;
-
 };
 
-} // namespace Window
+} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.cpp b/Telegram/SourceFiles/profile/profile_userpic_button.cpp
index 3820e17c6..91e338195 100644
--- a/Telegram/SourceFiles/profile/profile_userpic_button.cpp
+++ b/Telegram/SourceFiles/profile/profile_userpic_button.cpp
@@ -20,16 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_userpic_button.h"
 
-#include "styles/style_profile.h"
-#include "observer_peer.h"
-#include "auth_session.h"
 #include "app.h"
+#include "auth_session.h"
+#include "observer_peer.h"
+#include "styles/style_profile.h"
 
 namespace Profile {
 
-UserpicButton::UserpicButton(QWidget *parent, PeerData *peer, int size) : AbstractButton(parent)
-, _size(size ? size : st::profilePhotoSize)
-, _peer(peer) {
+UserpicButton::UserpicButton(QWidget *parent, PeerData *peer, int size)
+    : AbstractButton(parent)
+    , _size(size ? size : st::profilePhotoSize)
+    , _peer(peer) {
 	resize(_size, _size);
 
 	processPeerPhoto();
@@ -39,9 +40,9 @@ UserpicButton::UserpicButton(QWidget *parent, PeerData *peer, int size) : Abstra
 	}
 
 	auto observeEvents = Notify::PeerUpdate::Flag::PhotoChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 	subscribe(Auth().downloaderTaskFinished(), [this] {
 		if (_waiting && _peer->userpicLoaded()) {
 			_waiting = false;
diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.h b/Telegram/SourceFiles/profile/profile_userpic_button.h
index de9791afb..bf7aa6d74 100644
--- a/Telegram/SourceFiles/profile/profile_userpic_button.h
+++ b/Telegram/SourceFiles/profile/profile_userpic_button.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/abstract_button.h"
 #include "base/observer.h"
+#include "ui/abstract_button.h"
 #include "ui/animation.h"
 
 namespace Notify {
@@ -56,7 +56,6 @@ private:
 	bool _waiting = false;
 	QPixmap _userpic, _oldUserpic;
 	Animation _a_appearance;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_widget.cpp b/Telegram/SourceFiles/profile/profile_widget.cpp
index 23c574b02..b271ddb44 100644
--- a/Telegram/SourceFiles/profile/profile_widget.cpp
+++ b/Telegram/SourceFiles/profile/profile_widget.cpp
@@ -20,23 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "profile/profile_widget.h"
 
-#include "styles/style_settings.h"
+#include "application.h"
+#include "facades.h"
+#include "mainwindow.h"
 #include "profile/profile_fixed_bar.h"
 #include "profile/profile_inner_widget.h"
 #include "profile/profile_section_memento.h"
-#include "mainwindow.h"
-#include "application.h"
+#include "styles/style_settings.h"
 #include "ui/effects/widget_fade_wrap.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
-#include "facades.h"
 
 namespace Profile {
 
-Widget::Widget(QWidget *parent, not_null<Window::Controller*> controller, PeerData *peer) : Window::SectionWidget(parent, controller)
-, _scroll(this, st::settingsScroll)
-, _fixedBar(this, peer)
-, _fixedBarShadow(this, object_ptr<Ui::PlainShadow>(this, st::shadowFg)) {
+Widget::Widget(QWidget *parent, not_null<Window::Controller *> controller, PeerData *peer)
+    : Window::SectionWidget(parent, controller)
+    , _scroll(this, st::settingsScroll)
+    , _fixedBar(this, peer)
+    , _fixedBarShadow(this, object_ptr<Ui::PlainShadow>(this, st::shadowFg)) {
 	_fixedBar->move(0, 0);
 	_fixedBar->resizeToWidth(width());
 	_fixedBar->show();
@@ -77,8 +78,8 @@ void Widget::doSetInnerFocus() {
 	_inner->setFocus();
 }
 
-bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
-	if (auto profileMemento = dynamic_cast<SectionMemento*>(memento.get())) {
+bool Widget::showInternal(not_null<Window::SectionMemento *> memento) {
+	if (auto profileMemento = dynamic_cast<SectionMemento *>(memento.get())) {
 		if (profileMemento->getPeer() == peer()) {
 			restoreState(profileMemento);
 			return true;
@@ -87,7 +88,7 @@ bool Widget::showInternal(not_null<Window::SectionMemento*> memento) {
 	return false;
 }
 
-void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento*> memento) {
+void Widget::setInternalState(const QRect &geometry, not_null<SectionMemento *> memento) {
 	setGeometry(geometry);
 	myEnsureResized(this);
 	restoreState(memento);
@@ -99,12 +100,12 @@ std::unique_ptr<Window::SectionMemento> Widget::createMemento() {
 	return std::move(result);
 }
 
-void Widget::saveState(not_null<SectionMemento*> memento) {
+void Widget::saveState(not_null<SectionMemento *> memento) {
 	memento->setScrollTop(_scroll->scrollTop());
 	_inner->saveState(memento);
 }
 
-void Widget::restoreState(not_null<SectionMemento*> memento) {
+void Widget::restoreState(not_null<SectionMemento *> memento) {
 	_inner->restoreState(memento);
 	auto scrollTop = memento->getScrollTop();
 	_scroll->scrollToY(scrollTop);
diff --git a/Telegram/SourceFiles/profile/profile_widget.h b/Telegram/SourceFiles/profile/profile_widget.h
index 6ce454a4b..14dd9dda4 100644
--- a/Telegram/SourceFiles/profile/profile_widget.h
+++ b/Telegram/SourceFiles/profile/profile_widget.h
@@ -25,8 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Ui {
 class ScrollArea;
 class PlainShadow;
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 } // namespace Ui
 
 namespace Profile {
@@ -38,7 +37,7 @@ class Widget final : public Window::SectionWidget {
 	Q_OBJECT
 
 public:
-	Widget(QWidget *parent, not_null<Window::Controller*> controller, PeerData *peer);
+	Widget(QWidget *parent, not_null<Window::Controller *> controller, PeerData *peer);
 
 	PeerData *peer() const;
 	PeerData *peerForDialogs() const override {
@@ -49,10 +48,10 @@ public:
 
 	QPixmap grabForShowAnimation(const Window::SectionSlideParams &params) override;
 
-	bool showInternal(not_null<Window::SectionMemento*> memento) override;
+	bool showInternal(not_null<Window::SectionMemento *> memento) override;
 	std::unique_ptr<Window::SectionMemento> createMemento() override;
 
-	void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);
+	void setInternalState(const QRect &geometry, not_null<SectionMemento *> memento);
 
 	// Float player interface.
 	bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) override;
@@ -71,14 +70,13 @@ private slots:
 private:
 	void updateScrollState();
 	void updateAdaptiveLayout();
-	void saveState(not_null<SectionMemento*> memento);
-	void restoreState(not_null<SectionMemento*> memento);
+	void saveState(not_null<SectionMemento *> memento);
+	void restoreState(not_null<SectionMemento *> memento);
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<InnerWidget> _inner;
 	object_ptr<FixedBar> _fixedBar;
 	object_ptr<Ui::WidgetFadeWrap<Ui::PlainShadow>> _fixedBarShadow;
-
 };
 
 } // namespace Profile
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
index e9875037c..481ecfc84 100644
--- a/Telegram/SourceFiles/qt_functions.cpp
+++ b/Telegram/SourceFiles/qt_functions.cpp
@@ -40,57 +40,56 @@
     Makes a list of filters from ;;-separated text.
     Used by the mac and windows implementations
 */
-QStringList qt_make_filter_list(const QString &filter)
-{
-    QString f(filter);
+QStringList qt_make_filter_list(const QString &filter) {
+	QString f(filter);
 
-    if (f.isEmpty())
-        return QStringList();
+	if (f.isEmpty()) return QStringList();
 
-    QString sep(QLatin1String(";;"));
-    int i = f.indexOf(sep, 0);
-    if (i == -1) {
-        if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
-            sep = QLatin1Char('\n');
-            i = f.indexOf(sep, 0);
-        }
-    }
+	QString sep(QLatin1String(";;"));
+	int i = f.indexOf(sep, 0);
+	if (i == -1) {
+		if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
+			sep = QLatin1Char('\n');
+			i = f.indexOf(sep, 0);
+		}
+	}
 
-    return f.split(sep);
+	return f.split(sep);
 }
 
 /* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */
-QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format)
-    : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format),
-      num_chars(numChars), chars(chars_), logClusters(0), f(font),  glyphs(g), fontEngine(fe)
-{
-}
+QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe,
+                           const QTextCharFormat &format)
+    : flags(0)
+    , justified(false)
+    , underlineStyle(QTextCharFormat::NoUnderline)
+    , charFormat(format)
+    , num_chars(numChars)
+    , chars(chars_)
+    , logClusters(0)
+    , f(font)
+    , glyphs(g)
+    , fontEngine(fe) {}
 
 /* Debian maintainer: this method is also taken from qtextengine.cpp */
 // Fix up flags and underlineStyle with given info
-void QTextItemInt::initWithScriptItem(const QScriptItem &si)
-{
-    // explicitly initialize flags so that initFontAttributes can be called
-    // multiple times on the same TextItem
-    flags = 0;
-    if (si.analysis.bidiLevel %2)
-        flags |= QTextItem::RightToLeft;
-    ascent = si.ascent;
-    descent = si.descent;
+void QTextItemInt::initWithScriptItem(const QScriptItem &si) {
+	// explicitly initialize flags so that initFontAttributes can be called
+	// multiple times on the same TextItem
+	flags = 0;
+	if (si.analysis.bidiLevel % 2) flags |= QTextItem::RightToLeft;
+	ascent = si.ascent;
+	descent = si.descent;
 
-    if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
-        underlineStyle = charFormat.underlineStyle();
-    } else if (charFormat.boolProperty(QTextFormat::FontUnderline)
-               || f->d->underline) {
-        underlineStyle = QTextCharFormat::SingleUnderline;
-    }
+	if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
+		underlineStyle = charFormat.underlineStyle();
+	} else if (charFormat.boolProperty(QTextFormat::FontUnderline) || f->d->underline) {
+		underlineStyle = QTextCharFormat::SingleUnderline;
+	}
 
-    // compat
-    if (underlineStyle == QTextCharFormat::SingleUnderline)
-        flags |= QTextItem::Underline;
+	// compat
+	if (underlineStyle == QTextCharFormat::SingleUnderline) flags |= QTextItem::Underline;
 
-    if (f->d->overline || charFormat.fontOverline())
-        flags |= QTextItem::Overline;
-    if (f->d->strikeOut || charFormat.fontStrikeOut())
-        flags |= QTextItem::StrikeOut;
+	if (f->d->overline || charFormat.fontOverline()) flags |= QTextItem::Overline;
+	if (f->d->strikeOut || charFormat.fontStrikeOut()) flags |= QTextItem::StrikeOut;
 }
diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp
index 84b6b57eb..2c020bf1b 100644
--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "settings.h"
 #include "structs.h"
 
-#include "platform/platform_specific.h"
 #include "app.h"
+#include "platform/platform_specific.h"
 
 bool gRtl = false;
 Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight;
@@ -128,20 +128,20 @@ void ParseCommandLineArguments(const QStringList &arguments) {
 		OneValue,
 		AllLeftValues,
 	};
-	auto parseMap = std::map<QByteArray, KeyFormat> {
-		{ "-testmode"   , KeyFormat::NoValues },
-		{ "-debug"      , KeyFormat::NoValues },
-		{ "-many"       , KeyFormat::NoValues },
-		{ "-key"        , KeyFormat::OneValue },
-		{ "-autostart"  , KeyFormat::NoValues },
-		{ "-fixprevious", KeyFormat::NoValues },
-		{ "-cleanup"    , KeyFormat::NoValues },
-		{ "-noupdate"   , KeyFormat::NoValues },
-		{ "-tosettings" , KeyFormat::NoValues },
-		{ "-startintray", KeyFormat::NoValues },
-		{ "-sendpath"   , KeyFormat::AllLeftValues },
-		{ "-workdir"    , KeyFormat::OneValue },
-		{ "--"          , KeyFormat::OneValue },
+	auto parseMap = std::map<QByteArray, KeyFormat>{
+	    {"-testmode", KeyFormat::NoValues},
+	    {"-debug", KeyFormat::NoValues},
+	    {"-many", KeyFormat::NoValues},
+	    {"-key", KeyFormat::OneValue},
+	    {"-autostart", KeyFormat::NoValues},
+	    {"-fixprevious", KeyFormat::NoValues},
+	    {"-cleanup", KeyFormat::NoValues},
+	    {"-noupdate", KeyFormat::NoValues},
+	    {"-tosettings", KeyFormat::NoValues},
+	    {"-startintray", KeyFormat::NoValues},
+	    {"-sendpath", KeyFormat::AllLeftValues},
+	    {"-workdir", KeyFormat::OneValue},
+	    {"--", KeyFormat::OneValue},
 	};
 	auto parseResult = QMap<QByteArray, QStringList>();
 	auto parsingKey = QByteArray();
@@ -170,9 +170,11 @@ void ParseCommandLineArguments(const QStringList &arguments) {
 	gDebug = parseResult.contains("-debug");
 	gManyInstance = parseResult.contains("-many");
 	gKeyFile = parseResult.value("-key", QStringList()).join(QString());
-	gLaunchMode = parseResult.contains("-autostart") ? LaunchModeAutoStart
-		: parseResult.contains("-fixprevious") ? LaunchModeFixPrevious
-		: parseResult.contains("-cleanup") ? LaunchModeCleanup : LaunchModeNormal;
+	gLaunchMode = parseResult.contains("-autostart") ?
+	                  LaunchModeAutoStart :
+	                  parseResult.contains("-fixprevious") ?
+	                  LaunchModeFixPrevious :
+	                  parseResult.contains("-cleanup") ? LaunchModeCleanup : LaunchModeNormal;
 	gNoStartUpdate = parseResult.contains("-noupdate");
 	gStartToSettings = parseResult.contains("-tosettings");
 	gStartInTray = parseResult.contains("-startintray");
@@ -205,34 +207,32 @@ void InitFromCommandLine(int argc, char *argv[]) {
 #endif // Q_OS_MAC
 
 	switch (cPlatform()) {
-	case dbipWindows:
-		gUpdateURL = QUrl(qsl("http://tdesktop.com/win/tupdates/current"));
+	case dbipWindows: gUpdateURL = QUrl(qsl("http://tdesktop.com/win/tupdates/current"));
 #ifndef OS_WIN_STORE
 		gPlatformString = qsl("Windows");
 #else // OS_WIN_STORE
 		gPlatformString = qsl("WinStore");
 #endif // OS_WIN_STORE
-	break;
-	case dbipMac:
-		gUpdateURL = QUrl(qsl("http://tdesktop.com/mac/tupdates/current"));
+		break;
+	case dbipMac: gUpdateURL = QUrl(qsl("http://tdesktop.com/mac/tupdates/current"));
 #ifndef OS_MAC_STORE
 		gPlatformString = qsl("MacOS");
 #else // OS_MAC_STORE
 		gPlatformString = qsl("MacAppStore");
 #endif // OS_MAC_STORE
-	break;
+		break;
 	case dbipMacOld:
 		gUpdateURL = QUrl(qsl("http://tdesktop.com/mac32/tupdates/current"));
 		gPlatformString = qsl("MacOSold");
-	break;
+		break;
 	case dbipLinux64:
 		gUpdateURL = QUrl(qsl("http://tdesktop.com/linux/tupdates/current"));
 		gPlatformString = qsl("Linux64bit");
-	break;
+		break;
 	case dbipLinux32:
 		gUpdateURL = QUrl(qsl("http://tdesktop.com/linux32/tupdates/current"));
 		gPlatformString = qsl("Linux32bit");
-	break;
+		break;
 	}
 
 	auto path = Platform::CurrentExecutablePath(argc, argv);
diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h
index 2258d17e5..d869859ca 100644
--- a/Telegram/SourceFiles/settings.h
+++ b/Telegram/SourceFiles/settings.h
@@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <cassert>
 #include <cstdint>
 
-#include <QDir>
 #include "core/utils.h"
+#include <QDir>
 void InitFromCommandLine(int argc, char *argv[]);
 
 extern bool gDebug;
@@ -39,20 +39,21 @@ inline void cSetDebug(bool debug) {
 	gDebug = debug;
 }
 
-#define DeclareReadSetting(Type, Name) extern Type g##Name; \
-inline const Type &c##Name() { \
-	return g##Name; \
-}
+#define DeclareReadSetting(Type, Name)                                                                                 \
+	extern Type g##Name;                                                                                               \
+	inline const Type &c##Name() {                                                                                     \
+		return g##Name;                                                                                                \
+	}
 
-#define DeclareSetting(Type, Name) DeclareReadSetting(Type, Name) \
-inline void cSet##Name(const Type &Name) { \
-	g##Name = Name; \
-}
+#define DeclareSetting(Type, Name)                                                                                     \
+	DeclareReadSetting(Type, Name) inline void cSet##Name(const Type &Name) {                                          \
+		g##Name = Name;                                                                                                \
+	}
 
-#define DeclareRefSetting(Type, Name) DeclareSetting(Type, Name) \
-inline Type &cRef##Name() { \
-	return g##Name; \
-}
+#define DeclareRefSetting(Type, Name)                                                                                  \
+	DeclareSetting(Type, Name) inline Type &cRef##Name() {                                                             \
+		return g##Name;                                                                                                \
+	}
 
 DeclareSetting(bool, Rtl);
 DeclareSetting(Qt::LayoutDirection, LangDir);
@@ -86,10 +87,8 @@ inline void cForceWorkingDir(const QString &newDir) {
 	cSetWorkingDir(newDir);
 	if (!gWorkingDir.isEmpty()) {
 		QDir().mkpath(gWorkingDir);
-		QFile::setPermissions(gWorkingDir,
-			QFileDevice::ReadUser | QFileDevice::WriteUser | QFileDevice::ExeUser);
+		QFile::setPermissions(gWorkingDir, QFileDevice::ReadUser | QFileDevice::WriteUser | QFileDevice::ExeUser);
 	}
-
 }
 DeclareReadSetting(QString, ExeName);
 DeclareReadSetting(QString, ExeDir);
@@ -144,14 +143,14 @@ inline DBIScale cScale() {
 	return cEvalScale(cRealScale());
 }
 
-template <typename T>
-T convertScale(T v) {
+template <typename T> T convertScale(T v) {
 	switch (cScale()) {
-		case dbisOneAndQuarter: return qRound(double(v) * 1.25 - 0.01);
-		case dbisOneAndHalf: return qRound(double(v) * 1.5 - 0.01);
-		case dbisTwo: return v * 2;
-		case dbisAuto: case dbisOne: return v;
-		case dbisScaleCount: assert(false); // temp
+	case dbisOneAndQuarter: return qRound(double(v) * 1.25 - 0.01);
+	case dbisOneAndHalf: return qRound(double(v) * 1.5 - 0.01);
+	case dbisTwo: return v * 2;
+	case dbisAuto:
+	case dbisOne: return v;
+	case dbisScaleCount: assert(false); // temp
 	}
 	return v;
 }
@@ -162,7 +161,7 @@ class One;
 } // namespace Emoji
 } // namespace Ui
 
-using EmojiPtr = const Ui::Emoji::One*;
+using EmojiPtr = const Ui::Emoji::One *;
 
 using EmojiPack = QVector<EmojiPtr>;
 using RecentEmojiPreloadOldOld = QVector<QPair<quint32, quint16>>;
@@ -176,11 +175,11 @@ DeclareSetting(RecentEmojiPreload, RecentEmojiPreload);
 DeclareRefSetting(EmojiColorVariants, EmojiVariants);
 
 class DocumentData;
-typedef QVector<DocumentData*> StickerPack;
+typedef QVector<DocumentData *> StickerPack;
 
-typedef QList<QPair<DocumentData*, qint16> > RecentStickerPackOld;
-typedef QVector<QPair<quint64, quint16> > RecentStickerPreload;
-typedef QVector<QPair<DocumentData*, quint16> > RecentStickerPack;
+typedef QList<QPair<DocumentData *, qint16>> RecentStickerPackOld;
+typedef QVector<QPair<quint64, quint16>> RecentStickerPreload;
+typedef QVector<QPair<DocumentData *, quint16>> RecentStickerPack;
 DeclareSetting(RecentStickerPreload, RecentStickersPreload);
 DeclareRefSetting(RecentStickerPack, RecentStickers);
 
@@ -188,16 +187,16 @@ RecentStickerPack &cGetRecentStickers();
 
 typedef QMap<EmojiPtr, StickerPack> StickersByEmojiMap;
 
-typedef QVector<DocumentData*> SavedGifs;
+typedef QVector<DocumentData *> SavedGifs;
 DeclareRefSetting(SavedGifs, SavedGifs);
 DeclareSetting(TimeMs, LastSavedGifsUpdate);
 
-typedef QList<QPair<QString, quint16> > RecentHashtagPack;
+typedef QList<QPair<QString, quint16>> RecentHashtagPack;
 DeclareRefSetting(RecentHashtagPack, RecentWriteHashtags);
 DeclareSetting(RecentHashtagPack, RecentSearchHashtags);
 
 class UserData;
-typedef QVector<UserData*> RecentInlineBots;
+typedef QVector<UserData *> RecentInlineBots;
 DeclareRefSetting(RecentInlineBots, RecentInlineBots);
 
 DeclareSetting(bool, PasswordRecovered);
@@ -223,15 +222,15 @@ inline void incrementRecentHashtag(RecentHashtagPack &recent, const QString &tag
 	for (; i != e; ++i) {
 		if (i->first == tag) {
 			++i->second;
-		if (qAbs(i->second) > 0x4000) {
-			for (RecentHashtagPack::iterator j = recent.begin(); j != e; ++j) {
-				if (j->second > 1) {
-					j->second /= 2;
-				} else if (j->second > 0) {
-					j->second = 1;
+			if (qAbs(i->second) > 0x4000) {
+				for (RecentHashtagPack::iterator j = recent.begin(); j != e; ++j) {
+					if (j->second > 1) {
+						j->second /= 2;
+					} else if (j->second > 0) {
+						j->second = 1;
+					}
 				}
 			}
-		}
 			for (; i != recent.begin(); --i) {
 				if (qAbs((i - 1)->second) > qAbs(i->second)) {
 					break;
@@ -268,8 +267,8 @@ DeclareReadSetting(QUrl, UpdateURL);
 DeclareSetting(int, OtherOnline);
 
 class PeerData;
-typedef QMap<PeerData*, QDateTime> SavedPeers;
-typedef QMultiMap<QDateTime, PeerData*> SavedPeersByTime;
+typedef QMap<PeerData *, QDateTime> SavedPeers;
+typedef QMultiMap<QDateTime, PeerData *> SavedPeersByTime;
 DeclareRefSetting(SavedPeers, SavedPeers);
 DeclareRefSetting(SavedPeersByTime, SavedPeersByTime);
 
@@ -278,7 +277,7 @@ DeclareRefSetting(ReportSpamStatuses, ReportSpamStatuses);
 
 enum DBIAutoDownloadFlags {
 	dbiadNoPrivate = 0x01,
-	dbiadNoGroups  = 0x02,
+	dbiadNoGroups = 0x02,
 };
 
 DeclareSetting(qint32, AutoDownloadPhoto);
diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
index e8a8a8074..585343397 100644
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
@@ -20,31 +20,30 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_advanced_widget.h"
 
-#include "styles/style_settings.h"
-#include "lang/lang_keys.h"
-#include "boxes/connection_box.h"
-#include "boxes/confirm_box.h"
-#include "boxes/about_box.h"
-#include "boxes/local_storage_box.h"
-#include "mainwindow.h"
-#include "ui/widgets/buttons.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "storage/localstorage.h"
-#include "window/themes/window_theme.h"
-#include "scheme.h"
-#include "facades.h"
 #include "app.h"
+#include "boxes/about_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/connection_box.h"
+#include "boxes/local_storage_box.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "scheme.h"
+#include "storage/localstorage.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "window/themes/window_theme.h"
 
 #include <QDesktopServices>
 
 namespace Settings {
 
-AdvancedWidget::AdvancedWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_advanced_settings)) {
+AdvancedWidget::AdvancedWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_advanced_settings)) {
 	createControls();
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-	subscribe(Global::RefConnectionTypeChanged(), [this]() {
-		connectionTypeUpdated();
-	});
+	subscribe(Global::RefConnectionTypeChanged(), [this]() { connectionTypeUpdated(); });
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
 	if (!self) {
 		subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
@@ -67,11 +66,13 @@ void AdvancedWidget::createControls() {
 #endif // TDESKTOP_DISABLE_NETWORK_PROXY
 	})();
 	if (self()) {
-		addChildRow(_manageLocalStorage, marginLocalStorage, lang(lng_settings_manage_local_storage), SLOT(onManageLocalStorage()));
+		addChildRow(_manageLocalStorage, marginLocalStorage, lang(lng_settings_manage_local_storage),
+		            SLOT(onManageLocalStorage()));
 	}
 
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-	addChildRow(_connectionType, marginLarge, lang(lng_connection_type), lang(lng_connection_auto_connecting), LabeledLink::Type::Primary, SLOT(onConnectionType()));
+	addChildRow(_connectionType, marginLarge, lang(lng_connection_type), lang(lng_connection_auto_connecting),
+	            LabeledLink::Type::Primary, SLOT(onConnectionType()));
 	connectionTypeUpdated();
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
 
@@ -79,11 +80,13 @@ void AdvancedWidget::createControls() {
 		addChildRow(_askQuestion, marginSmall, lang(lng_settings_ask_question), SLOT(onAskQuestion()));
 	} else {
 		style::margins slidedPadding(0, marginLarge.bottom() / 2, 0, marginLarge.bottom() - (marginLarge.bottom() / 2));
-		addChildRow(_useDefaultTheme, marginLarge, slidedPadding, lang(lng_settings_bg_use_default), SLOT(onUseDefaultTheme()));
+		addChildRow(_useDefaultTheme, marginLarge, slidedPadding, lang(lng_settings_bg_use_default),
+		            SLOT(onUseDefaultTheme()));
 		if (!Window::Theme::IsNonDefaultUsed()) {
 			_useDefaultTheme->hideFast();
 		}
-		addChildRow(_toggleNightTheme, marginLarge, slidedPadding, getNightThemeToggleText(), SLOT(onToggleNightTheme()));
+		addChildRow(_toggleNightTheme, marginLarge, slidedPadding, getNightThemeToggleText(),
+		            SLOT(onToggleNightTheme()));
 		if (Window::Theme::IsNonDefaultUsed()) {
 			_toggleNightTheme->hideFast();
 		}
@@ -113,12 +116,14 @@ void AdvancedWidget::connectionTypeUpdated() {
 		case dbictHttpProxy:
 		case dbictTcpProxy: {
 			auto transport = MTP::dctransport();
-			return transport.isEmpty() ? lang(lng_connection_proxy_connecting) : lng_connection_proxy(lt_transport, transport);
+			return transport.isEmpty() ? lang(lng_connection_proxy_connecting) :
+			                             lng_connection_proxy(lt_transport, transport);
 		} break;
 		case dbictAuto:
 		default: {
 			auto transport = MTP::dctransport();
-			return transport.isEmpty() ? lang(lng_connection_auto_connecting) : lng_connection_auto(lt_transport, transport);
+			return transport.isEmpty() ? lang(lng_connection_auto_connecting) :
+			                             lng_connection_auto(lt_transport, transport);
 		} break;
 		}
 	};
@@ -140,11 +145,9 @@ void AdvancedWidget::onToggleNightTheme() {
 }
 
 void AdvancedWidget::onAskQuestion() {
-	auto box = Box<ConfirmBox>(lang(lng_settings_ask_sure), lang(lng_settings_ask_ok), lang(lng_settings_faq_button), base::lambda_guarded(this, [this] {
-		onAskQuestionSure();
-	}), base::lambda_guarded(this, [this] {
-		onTelegramFAQ();
-	}));
+	auto box = Box<ConfirmBox>(lang(lng_settings_ask_sure), lang(lng_settings_ask_ok), lang(lng_settings_faq_button),
+	                           base::lambda_guarded(this, [this] { onAskQuestionSure(); }),
+	                           base::lambda_guarded(this, [this] { onTelegramFAQ(); }));
 	box->setStrictCancel(true);
 	Ui::show(std::move(box));
 }
diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.h b/Telegram/SourceFiles/settings/settings_advanced_widget.h
index 38f32b48c..4acb1cde6 100644
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.h
+++ b/Telegram/SourceFiles/settings/settings_advanced_widget.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "mtproto/core_types.h"
+#include "mtproto/rpc_sender.h"
+#include "scheme.h"
 #include "settings/settings_block_widget.h"
 #include "settings/settings_chat_settings_widget.h"
-#include "mtproto/rpc_sender.h"
-#include "mtproto/core_types.h"
-#include "scheme.h"
 
 namespace Settings {
 
@@ -55,18 +55,17 @@ private:
 	void supportGot(const MTPhelp_Support &support);
 	QString getNightThemeToggleText() const;
 
-	object_ptr<Ui::LinkButton> _manageLocalStorage = { nullptr };
+	object_ptr<Ui::LinkButton> _manageLocalStorage = {nullptr};
 #ifndef TDESKTOP_DISABLE_NETWORK_PROXY
-	object_ptr<LabeledLink> _connectionType = { nullptr };
+	object_ptr<LabeledLink> _connectionType = {nullptr};
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
-	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _useDefaultTheme = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _toggleNightTheme = { nullptr };
-	object_ptr<Ui::LinkButton> _askQuestion = { nullptr };
-	object_ptr<Ui::LinkButton> _telegramFAQ = { nullptr };
-	object_ptr<Ui::LinkButton> _logOut = { nullptr };
+	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _useDefaultTheme = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _toggleNightTheme = {nullptr};
+	object_ptr<Ui::LinkButton> _askQuestion = {nullptr};
+	object_ptr<Ui::LinkButton> _telegramFAQ = {nullptr};
+	object_ptr<Ui::LinkButton> _logOut = {nullptr};
 
 	mtpRequestId _supportGetRequest = 0;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_background_widget.cpp b/Telegram/SourceFiles/settings/settings_background_widget.cpp
index fbb051fd6..eec86f253 100644
--- a/Telegram/SourceFiles/settings/settings_background_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_background_widget.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_background_widget.h"
 
-#include "styles/style_settings.h"
+#include "boxes/background_box.h"
+#include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
-#include "boxes/background_box.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "storage/localstorage.h"
 #include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_editor.h"
-#include "core/file_utilities.h"
 
 namespace Settings {
 
-BackgroundRow::BackgroundRow(QWidget *parent) : TWidget(parent)
-, _chooseFromGallery(this, lang(lng_settings_bg_from_gallery), st::boxLinkButton)
-, _chooseFromFile(this, lang(lng_settings_bg_from_file), st::boxLinkButton)
-, _editTheme(this, lang(lng_settings_bg_edit_theme), st::boxLinkButton)
-, _radial(animation(this, &BackgroundRow::step_radial)) {
+BackgroundRow::BackgroundRow(QWidget *parent)
+    : TWidget(parent)
+    , _chooseFromGallery(this, lang(lng_settings_bg_from_gallery), st::boxLinkButton)
+    , _chooseFromFile(this, lang(lng_settings_bg_from_file), st::boxLinkButton)
+    , _editTheme(this, lang(lng_settings_bg_edit_theme), st::boxLinkButton)
+    , _radial(animation(this, &BackgroundRow::step_radial)) {
 	updateImage();
 
 	connect(_chooseFromGallery, SIGNAL(clicked()), this, SIGNAL(chooseFromGallery()));
@@ -83,11 +84,16 @@ void BackgroundRow::paintEvent(QPaintEvent *e) {
 			p.drawPixmap(0, 0, _background);
 		} else {
 			const QPixmap &pix = App::main()->newBackgroundThumb()->pixBlurred(st::settingsBackgroundSize);
-			p.drawPixmap(0, 0, st::settingsBackgroundSize, st::settingsBackgroundSize, pix, 0, (pix.height() - st::settingsBackgroundSize * cIntRetinaFactor()) / 2, st::settingsBackgroundSize * cIntRetinaFactor(), st::settingsBackgroundSize * cIntRetinaFactor());
+			p.drawPixmap(0, 0, st::settingsBackgroundSize, st::settingsBackgroundSize, pix, 0,
+			             (pix.height() - st::settingsBackgroundSize * cIntRetinaFactor()) / 2,
+			             st::settingsBackgroundSize * cIntRetinaFactor(),
+			             st::settingsBackgroundSize * cIntRetinaFactor());
 		}
 
 		auto outer = radialRect();
-		QRect inner(QPoint(outer.x() + (outer.width() - st::radialSize.width()) / 2, outer.y() + (outer.height() - st::radialSize.height()) / 2), st::radialSize);
+		QRect inner(QPoint(outer.x() + (outer.width() - st::radialSize.width()) / 2,
+		                   outer.y() + (outer.height() - st::radialSize.height()) / 2),
+		            st::radialSize);
 		p.setPen(Qt::NoPen);
 		p.setOpacity(radialOpacity);
 		p.setBrush(st::radialBg);
@@ -140,7 +146,7 @@ bool BackgroundRow::radialLoading() const {
 			if (m->chatBackgroundLoading()) {
 				return true;
 			} else {
-				const_cast<BackgroundRow*>(this)->updateImage();
+				const_cast<BackgroundRow *>(this)->updateImage();
 			}
 		}
 	}
@@ -196,7 +202,8 @@ void BackgroundRow::updateImage() {
 	}
 }
 
-BackgroundWidget::BackgroundWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_background)) {
+BackgroundWidget::BackgroundWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_background)) {
 	createControls();
 
 	using Update = Window::Theme::BackgroundUpdate;
@@ -207,9 +214,8 @@ BackgroundWidget::BackgroundWidget(QWidget *parent, UserData *self) : BlockWidge
 			needBackgroundUpdate(update.tiled);
 		}
 	});
-	subscribe(Adaptive::Changed(), [this]() {
-		_adaptive->toggleAnimated(Global::AdaptiveChatLayout() == Adaptive::ChatLayout::Wide);
-	});
+	subscribe(Adaptive::Changed(),
+	          [this]() { _adaptive->toggleAnimated(Global::AdaptiveChatLayout() == Adaptive::ChatLayout::Wide); });
 }
 
 void BackgroundWidget::createControls() {
@@ -222,8 +228,10 @@ void BackgroundWidget::createControls() {
 	connect(_background, SIGNAL(editTheme()), this, SLOT(onEditTheme()));
 	connect(_background, SIGNAL(useDefault()), this, SLOT(onUseDefaultTheme()));
 
-	addChildRow(_tile, margin, lang(lng_settings_bg_tile), [this](bool) { onTile(); }, Window::Theme::Background()->tile());
-	addChildRow(_adaptive, margin, slidedPadding, lang(lng_settings_adaptive_wide), [this](bool) { onAdaptive(); }, Global::AdaptiveForWide());
+	addChildRow(_tile, margin, lang(lng_settings_bg_tile), [this](bool) { onTile(); },
+	            Window::Theme::Background()->tile());
+	addChildRow(_adaptive, margin, slidedPadding, lang(lng_settings_adaptive_wide), [this](bool) { onAdaptive(); },
+	            Global::AdaptiveForWide());
 	if (Global::AdaptiveChatLayout() != Adaptive::ChatLayout::Wide) {
 		_adaptive->hideFast();
 	}
@@ -240,41 +248,44 @@ void BackgroundWidget::needBackgroundUpdate(bool tile) {
 
 void BackgroundWidget::onChooseFromFile() {
 	auto imgExtensions = cImgExtensions();
-	auto filters = QStringList(qsl("Theme files (*.tdesktop-theme *.tdesktop-palette *") + imgExtensions.join(qsl(" *")) + qsl(")"));
+	auto filters = QStringList(qsl("Theme files (*.tdesktop-theme *.tdesktop-palette *") +
+	                           imgExtensions.join(qsl(" *")) + qsl(")"));
 	filters.push_back(FileDialog::AllFilesFilter());
-	FileDialog::GetOpenPath(lang(lng_choose_image), filters.join(qsl(";;")), base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
-			return;
-		}
+	FileDialog::GetOpenPath(
+	    lang(lng_choose_image), filters.join(qsl(";;")),
+	    base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+		    if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			    return;
+		    }
 
-		if (!result.paths.isEmpty()) {
-			auto filePath = result.paths.front();
-			if (filePath.endsWith(qstr(".tdesktop-theme"), Qt::CaseInsensitive)
-				|| filePath.endsWith(qstr(".tdesktop-palette"), Qt::CaseInsensitive)) {
-				Window::Theme::Apply(filePath);
-				return;
-			}
-		}
+		    if (!result.paths.isEmpty()) {
+			    auto filePath = result.paths.front();
+			    if (filePath.endsWith(qstr(".tdesktop-theme"), Qt::CaseInsensitive) ||
+			        filePath.endsWith(qstr(".tdesktop-palette"), Qt::CaseInsensitive)) {
+				    Window::Theme::Apply(filePath);
+				    return;
+			    }
+		    }
 
-		QImage img;
-		if (!result.remoteContent.isEmpty()) {
-			img = App::readImage(result.remoteContent);
-		} else {
-			img = App::readImage(result.paths.front());
-		}
+		    QImage img;
+		    if (!result.remoteContent.isEmpty()) {
+			    img = App::readImage(result.remoteContent);
+		    } else {
+			    img = App::readImage(result.paths.front());
+		    }
 
-		if (img.isNull() || img.width() <= 0 || img.height() <= 0) return;
+		    if (img.isNull() || img.width() <= 0 || img.height() <= 0) return;
 
-		if (img.width() > 4096 * img.height()) {
-			img = img.copy((img.width() - 4096 * img.height()) / 2, 0, 4096 * img.height(), img.height());
-		} else if (img.height() > 4096 * img.width()) {
-			img = img.copy(0, (img.height() - 4096 * img.width()) / 2, img.width(), 4096 * img.width());
-		}
+		    if (img.width() > 4096 * img.height()) {
+			    img = img.copy((img.width() - 4096 * img.height()) / 2, 0, 4096 * img.height(), img.height());
+		    } else if (img.height() > 4096 * img.width()) {
+			    img = img.copy(0, (img.height() - 4096 * img.width()) / 2, img.width(), 4096 * img.width());
+		    }
 
-		Window::Theme::Background()->setImage(Window::Theme::kCustomBackground, std::move(img));
-		_tile->setChecked(false);
-		_background->updateImage();
-	}));
+		    Window::Theme::Background()->setImage(Window::Theme::kCustomBackground, std::move(img));
+		    _tile->setChecked(false);
+		    _background->updateImage();
+	    }));
 }
 
 void BackgroundWidget::onEditTheme() {
diff --git a/Telegram/SourceFiles/settings/settings_background_widget.h b/Telegram/SourceFiles/settings/settings_background_widget.h
index 240eea491..2e9784e58 100644
--- a/Telegram/SourceFiles/settings/settings_background_widget.h
+++ b/Telegram/SourceFiles/settings/settings_background_widget.h
@@ -55,13 +55,12 @@ private:
 	void step_radial(TimeMs ms, bool timer);
 
 	QPixmap _background;
-	object_ptr<Ui::LinkButton> _useDefaultTheme = { nullptr };
+	object_ptr<Ui::LinkButton> _useDefaultTheme = {nullptr};
 	object_ptr<Ui::LinkButton> _chooseFromGallery;
 	object_ptr<Ui::LinkButton> _chooseFromFile;
 	object_ptr<Ui::LinkButton> _editTheme;
 
 	Ui::RadialAnimation _radial;
-
 };
 
 class BackgroundWidget : public BlockWidget {
@@ -82,10 +81,9 @@ private:
 	void createControls();
 	void needBackgroundUpdate(bool tile);
 
-	object_ptr<BackgroundRow> _background = { nullptr };
-	object_ptr<Ui::Checkbox> _tile = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _adaptive = { nullptr };
-
+	object_ptr<BackgroundRow> _background = {nullptr};
+	object_ptr<Ui::Checkbox> _tile = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _adaptive = {nullptr};
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_block_widget.cpp b/Telegram/SourceFiles/settings/settings_block_widget.cpp
index e608bf362..514472bf2 100644
--- a/Telegram/SourceFiles/settings/settings_block_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_block_widget.cpp
@@ -21,15 +21,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "settings/settings_block_widget.h"
 
 #include "styles/style_settings.h"
-#include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 
 namespace Settings {
 
-BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title) : TWidget(parent)
-, _self(self)
-, _title(title) {
-}
+BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title)
+    : TWidget(parent)
+    , _self(self)
+    , _title(title) {}
 
 void BlockWidget::setContentLeft(int contentLeft) {
 	_contentLeft = contentLeft;
@@ -74,7 +74,7 @@ void BlockWidget::paintTitle(Painter &p) {
 }
 
 void BlockWidget::addCreatedRow(TWidget *child, const style::margins &margin) {
-	_rows.push_back({ child, margin });
+	_rows.push_back({child, margin});
 }
 
 void BlockWidget::rowHeightUpdated() {
@@ -85,12 +85,14 @@ void BlockWidget::rowHeightUpdated() {
 	}
 }
 
-void BlockWidget::createChildRow(object_ptr<Ui::Checkbox> &child, style::margins &margin, const QString &text, base::lambda<void(bool checked)> callback, bool checked) {
+void BlockWidget::createChildRow(object_ptr<Ui::Checkbox> &child, style::margins &margin, const QString &text,
+                                 base::lambda<void(bool checked)> callback, bool checked) {
 	child.create(this, text, checked, st::defaultBoxCheckbox);
 	subscribe(child->checkedChanged, std::move(callback));
 }
 
-void BlockWidget::createChildRow(object_ptr<Ui::LinkButton> &child, style::margins &margin, const QString &text, const char *slot, const style::LinkButton &st) {
+void BlockWidget::createChildRow(object_ptr<Ui::LinkButton> &child, style::margins &margin, const QString &text,
+                                 const char *slot, const style::LinkButton &st) {
 	child.create(this, text, st);
 	connect(child, SIGNAL(clicked()), this, slot);
 }
diff --git a/Telegram/SourceFiles/settings/settings_block_widget.h b/Telegram/SourceFiles/settings/settings_block_widget.h
index bc487e8c8..5199eee02 100644
--- a/Telegram/SourceFiles/settings/settings_block_widget.h
+++ b/Telegram/SourceFiles/settings/settings_block_widget.h
@@ -32,12 +32,9 @@ class Checkbox;
 class RadiobuttonGroup;
 class Radiobutton;
 class LinkButton;
-template <typename Enum>
-class RadioenumGroup;
-template <typename Enum>
-class Radioenum;
-template <typename Widget>
-class WidgetSlideWrap;
+template <typename Enum> class RadioenumGroup;
+template <typename Enum> class Radioenum;
+template <typename Widget> class WidgetSlideWrap;
 } // namespace Ui
 
 namespace Settings {
@@ -52,8 +49,7 @@ public:
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
-	virtual void paintContents(Painter &p) {
-	}
+	virtual void paintContents(Painter &p) {}
 
 	// Where does the block content start (after the title).
 	int contentLeft() const {
@@ -77,17 +73,18 @@ protected:
 		return _title.isEmpty();
 	}
 
-	template <typename Widget, typename ...Args>
-	Widget *addChildRow(object_ptr<Widget> &child, style::margins margin, Args&&... args) {
+	template <typename Widget, typename... Args>
+	Widget *addChildRow(object_ptr<Widget> &child, style::margins margin, Args &&... args) {
 		createChildRow(child, margin, std::forward<Args>(args)...);
 		addCreatedRow(child, margin);
 		return child;
 	}
 
 private:
-	template <typename Widget, typename ...Args>
-	void createChildRow(object_ptr<Ui::WidgetSlideWrap<Widget>> &child, style::margins &margin, const style::margins &padding, Args&&... args) {
-		object_ptr<Widget> entity = { nullptr };
+	template <typename Widget, typename... Args>
+	void createChildRow(object_ptr<Ui::WidgetSlideWrap<Widget>> &child, style::margins &margin,
+	                    const style::margins &padding, Args &&... args) {
+		object_ptr<Widget> entity = {nullptr};
 		createChildRow(entity, margin, std::forward<Args>(args)...);
 		child.create(this, std::move(entity), padding, [this] { rowHeightUpdated(); });
 		margin.setLeft(margin.left() - padding.left());
@@ -95,39 +92,32 @@ private:
 		margin.setRight(margin.right() - padding.right());
 		margin.setBottom(margin.bottom() - padding.bottom());
 	}
-	void createChildRow(object_ptr<Ui::Checkbox> &child, style::margins &margin, const QString &text, base::lambda<void(bool checked)> callback, bool checked);
-	void createChildRow(object_ptr<Ui::LinkButton> &child, style::margins &margin, const QString &text, const char *slot, const style::LinkButton &st = st::boxLinkButton);
+	void createChildRow(object_ptr<Ui::Checkbox> &child, style::margins &margin, const QString &text,
+	                    base::lambda<void(bool checked)> callback, bool checked);
+	void createChildRow(object_ptr<Ui::LinkButton> &child, style::margins &margin, const QString &text,
+	                    const char *slot, const style::LinkButton &st = st::boxLinkButton);
 
 	template <typename Enum>
-	void createChildRow(object_ptr<Ui::Radioenum<Enum>> &child, style::margins &margin, const std::shared_ptr<Ui::RadioenumGroup<Enum>> &group, Enum value, const QString &text) {
+	void createChildRow(object_ptr<Ui::Radioenum<Enum>> &child, style::margins &margin,
+	                    const std::shared_ptr<Ui::RadioenumGroup<Enum>> &group, Enum value, const QString &text) {
 		child.create(this, group, value, text, st::defaultBoxCheckbox);
 	}
 
 	void addCreatedRow(TWidget *child, const style::margins &margin);
 	void rowHeightUpdated();
 
-	template <typename Widget>
-	struct IsWidgetSlideWrap : std::false_type {
-	};
-	template <typename Widget>
-	struct IsWidgetSlideWrap<Ui::WidgetSlideWrap<Widget>> : std::true_type {
-	};
-	template <typename Widget>
-	struct IsRadioenum : std::false_type {
-	};
-	template <typename Enum>
-	struct IsRadioenum<Ui::Radioenum<Enum>> : std::true_type {
-	};
+	template <typename Widget> struct IsWidgetSlideWrap : std::false_type {};
+	template <typename Widget> struct IsWidgetSlideWrap<Ui::WidgetSlideWrap<Widget>> : std::true_type {};
+	template <typename Widget> struct IsRadioenum : std::false_type {};
+	template <typename Enum> struct IsRadioenum<Ui::Radioenum<Enum>> : std::true_type {};
 
 	template <typename Widget>
-	using NotImplementedYet = std::enable_if_t<
-		!IsWidgetSlideWrap<Widget>::value &&
-		!IsRadioenum<Widget>::value &&
-		!std::is_same<Ui::Checkbox, Widget>::value &&
-		!std::is_same<Ui::LinkButton, Widget>::value>;
+	using NotImplementedYet =
+	    std::enable_if_t<!IsWidgetSlideWrap<Widget>::value && !IsRadioenum<Widget>::value &&
+	                     !std::is_same<Ui::Checkbox, Widget>::value && !std::is_same<Ui::LinkButton, Widget>::value>;
 
 	template <typename Widget, typename... Args, typename = NotImplementedYet<Widget>>
-	void createChildRow(object_ptr<Widget> &child, style::margins &margin, Args&&... args) {
+	void createChildRow(object_ptr<Widget> &child, style::margins &margin, Args &&... args) {
 		child.create(this, std::forward<Args>(args)...);
 	}
 
@@ -142,7 +132,6 @@ private:
 	int _contentLeft = 0;
 	UserData *_self;
 	QString _title;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
index 41027cd02..389772e22 100644
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
@@ -20,25 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_chat_settings_widget.h"
 
-#include "styles/style_settings.h"
+#include "boxes/confirm_box.h"
+#include "boxes/connection_box.h"
+#include "boxes/download_path_box.h"
+#include "boxes/stickers_box.h"
 #include "lang/lang_keys.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "boxes/stickers_box.h"
-#include "boxes/download_path_box.h"
-#include "boxes/connection_box.h"
-#include "boxes/confirm_box.h"
+#include "storage/localstorage.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/labels.h"
 
 namespace Settings {
 
-LabeledLink::LabeledLink(QWidget *parent, const QString &label, const QString &text, Type type, const char *slot) : TWidget(parent)
-, _label(this, label, Ui::FlatLabel::InitType::Simple, (type == Type::Primary) ? st::settingsPrimaryLabel : st::defaultFlatLabel)
-, _link(this, text, (type == Type::Primary) ? st::boxLinkButton : st::defaultLinkButton) {
+LabeledLink::LabeledLink(QWidget *parent, const QString &label, const QString &text, Type type, const char *slot)
+    : TWidget(parent)
+    , _label(this, label, Ui::FlatLabel::InitType::Simple,
+             (type == Type::Primary) ? st::settingsPrimaryLabel : st::defaultFlatLabel)
+    , _link(this, text, (type == Type::Primary) ? st::boxLinkButton : st::defaultLinkButton) {
 	connect(_link, SIGNAL(clicked()), parent, slot);
 }
 
@@ -58,9 +60,11 @@ int LabeledLink::resizeGetHeight(int newWidth) {
 }
 
 #ifndef OS_WIN_STORE
-DownloadPathState::DownloadPathState(QWidget *parent) : TWidget(parent)
-, _path(this, lang(lng_download_path_label), downloadPathText(), LabeledLink::Type::Secondary, SLOT(onDownloadPath()))
-, _clear(this, lang(lng_download_path_clear)) {
+DownloadPathState::DownloadPathState(QWidget *parent)
+    : TWidget(parent)
+    , _path(this, lang(lng_download_path_label), downloadPathText(), LabeledLink::Type::Secondary,
+            SLOT(onDownloadPath()))
+    , _clear(this, lang(lng_download_path_clear)) {
 	connect(_clear, SIGNAL(clicked()), this, SLOT(onClear()));
 	connect(App::wnd(), SIGNAL(tempDirCleared(int)), this, SLOT(onTempDirCleared(int)));
 	connect(App::wnd(), SIGNAL(tempDirClearFailed(int)), this, SLOT(onTempDirClearFailed(int)));
@@ -121,11 +125,11 @@ void DownloadPathState::onDownloadPath() {
 
 void DownloadPathState::onClear() {
 	Ui::show(Box<ConfirmBox>(lang(lng_sure_clear_downloads), base::lambda_guarded(this, [this] {
-		Ui::hideLayer();
-		App::wnd()->tempDirDelete(Local::ClearManagerDownloads);
-		_state = State::Clearing;
-		updateControls();
-	})));
+		                         Ui::hideLayer();
+		                         App::wnd()->tempDirDelete(Local::ClearManagerDownloads);
+		                         _state = State::Clearing;
+		                         updateControls();
+	                         })));
 }
 
 void DownloadPathState::onTempDirCleared(int task) {
@@ -143,7 +147,8 @@ void DownloadPathState::onTempDirClearFailed(int task) {
 }
 #endif // OS_WIN_STORE
 
-ChatSettingsWidget::ChatSettingsWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_chat_settings)) {
+ChatSettingsWidget::ChatSettingsWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_chat_settings)) {
 	createControls();
 }
 
@@ -153,32 +158,38 @@ void ChatSettingsWidget::createControls() {
 	style::margins marginSub(0, 0, 0, st::settingsSubSkip);
 	style::margins slidedPadding(0, marginSub.bottom() / 2, 0, marginSub.bottom() - (marginSub.bottom() / 2));
 
-	addChildRow(_replaceEmoji, marginSkip, lang(lng_settings_replace_emojis), [this](bool) { onReplaceEmoji(); }, cReplaceEmojis());
-	addChildRow(_messageFormat, marginSkip, lang(lng_settings_message_formatting), [this](bool) { toggleMessageFormat(); }, cMessageFormatting());
+	addChildRow(_replaceEmoji, marginSkip, lang(lng_settings_replace_emojis), [this](bool) { onReplaceEmoji(); },
+	            cReplaceEmojis());
+	addChildRow(_messageFormat, marginSkip, lang(lng_settings_message_formatting),
+	            [this](bool) { toggleMessageFormat(); }, cMessageFormatting());
 
 #ifndef OS_WIN_STORE
 	auto pathMargin = marginSub;
 #else // OS_WIN_STORE
 	auto pathMargin = marginSkip;
 #endif // OS_WIN_STORE
-	addChildRow(_dontAskDownloadPath, pathMargin, lang(lng_download_path_dont_ask), [this](bool) { onDontAskDownloadPath(); }, !Global::AskDownloadPath());
+	addChildRow(_dontAskDownloadPath, pathMargin, lang(lng_download_path_dont_ask),
+	            [this](bool) { onDontAskDownloadPath(); }, !Global::AskDownloadPath());
 
 #ifndef OS_WIN_STORE
-	style::margins marginPath(st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x(), 0, 0, st::settingsSkip);
+	style::margins marginPath(st::defaultCheck.diameter + st::defaultBoxCheckbox.textPosition.x(), 0, 0,
+	                          st::settingsSkip);
 	addChildRow(_downloadPath, marginPath, slidedPadding);
 	if (Global::AskDownloadPath()) {
 		_downloadPath->hideFast();
 	}
 #endif // OS_WIN_STORE
 
-	auto group = std::make_shared<Ui::RadioenumGroup<SendByType>>(cCtrlEnter() ? SendByType::CtrlEnter : SendByType::Enter);
+	auto group =
+	    std::make_shared<Ui::RadioenumGroup<SendByType>>(cCtrlEnter() ? SendByType::CtrlEnter : SendByType::Enter);
 	addChildRow(_sendByEnter, marginSmall, group, SendByType::Enter, lang(lng_settings_send_enter));
-	addChildRow(_sendByCtrlEnter, marginSkip, group, SendByType::CtrlEnter, lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_settings_send_cmdenter : lng_settings_send_ctrlenter));
-	group->setChangedCallback([this](SendByType value) {
-		sendByChanged(value);
-	});
+	addChildRow(_sendByCtrlEnter, marginSkip, group, SendByType::CtrlEnter,
+	            lang((cPlatform() == dbipMac || cPlatform() == dbipMacOld) ? lng_settings_send_cmdenter :
+	                                                                         lng_settings_send_ctrlenter));
+	group->setChangedCallback([this](SendByType value) { sendByChanged(value); });
 
-	addChildRow(_automaticMediaDownloadSettings, marginSmall, lang(lng_media_auto_settings), SLOT(onAutomaticMediaDownloadSettings()));
+	addChildRow(_automaticMediaDownloadSettings, marginSmall, lang(lng_media_auto_settings),
+	            SLOT(onAutomaticMediaDownloadSettings()));
 	addChildRow(_manageStickerSets, marginSmall, lang(lng_stickers_you_have), SLOT(onManageStickerSets()));
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h
index 432c7b91a..98b86b70c 100644
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h
+++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/observer.h"
 #include "settings/settings_block_widget.h"
 #include "ui/twidget.h"
-#include "base/observer.h"
 
 class QPaintEvent;
 
@@ -50,7 +50,6 @@ protected:
 private:
 	object_ptr<Ui::FlatLabel> _label;
 	object_ptr<Ui::LinkButton> _link;
-
 };
 
 #ifndef OS_WIN_STORE
@@ -86,7 +85,6 @@ private:
 
 	object_ptr<LabeledLink> _path;
 	object_ptr<Ui::LinkButton> _clear;
-
 };
 #endif // OS_WIN_STORE
 
@@ -110,20 +108,19 @@ private:
 	void sendByChanged(SendByType value);
 	void createControls();
 
-	object_ptr<Ui::Checkbox> _replaceEmoji = { nullptr };
-	object_ptr<Ui::Checkbox> _messageFormat = { nullptr };
-	object_ptr<Ui::Checkbox> _dontAskDownloadPath = { nullptr };
+	object_ptr<Ui::Checkbox> _replaceEmoji = {nullptr};
+	object_ptr<Ui::Checkbox> _messageFormat = {nullptr};
+	object_ptr<Ui::Checkbox> _dontAskDownloadPath = {nullptr};
 	void toggleMessageFormat();
 
 #ifndef OS_WIN_STORE
-	object_ptr<Ui::WidgetSlideWrap<DownloadPathState>> _downloadPath = { nullptr };
+	object_ptr<Ui::WidgetSlideWrap<DownloadPathState>> _downloadPath = {nullptr};
 #endif // OS_WIN_STORE
 
-	object_ptr<Ui::Radioenum<SendByType>> _sendByEnter = { nullptr };
-	object_ptr<Ui::Radioenum<SendByType>> _sendByCtrlEnter = { nullptr };
-	object_ptr<Ui::LinkButton> _automaticMediaDownloadSettings = { nullptr };
-	object_ptr<Ui::LinkButton> _manageStickerSets = { nullptr };
-
+	object_ptr<Ui::Radioenum<SendByType>> _sendByEnter = {nullptr};
+	object_ptr<Ui::Radioenum<SendByType>> _sendByCtrlEnter = {nullptr};
+	object_ptr<Ui::LinkButton> _automaticMediaDownloadSettings = {nullptr};
+	object_ptr<Ui::LinkButton> _manageStickerSets = {nullptr};
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_cover.cpp b/Telegram/SourceFiles/settings/settings_cover.cpp
index 37e5881b6..1945bb8b2 100644
--- a/Telegram/SourceFiles/settings/settings_cover.cpp
+++ b/Telegram/SourceFiles/settings/settings_cover.cpp
@@ -20,36 +20,37 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_cover.h"
 
-#include "ui/widgets/labels.h"
-#include "ui/widgets/buttons.h"
-#include "observer_peer.h"
-#include "lang/lang_keys.h"
-#include "messenger.h"
-#include "mainwindow.h"
 #include "apiwrap.h"
+#include "app.h"
 #include "auth_session.h"
-#include "profile/profile_userpic_button.h"
-#include "profile/profile_cover_drop_area.h"
+#include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
 #include "boxes/photo_crop_box.h"
-#include "boxes/add_contact_box.h"
-#include "styles/style_settings.h"
-#include "styles/style_profile.h" // for divider
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "observer_peer.h"
 #include "platform/platform_file_utilities.h"
-#include "app.h"
+#include "profile/profile_cover_drop_area.h"
+#include "profile/profile_userpic_button.h"
+#include "styles/style_profile.h" // for divider
+#include "styles/style_settings.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
 
 #include <QString>
 #include <QWidget>
 
 namespace Settings {
 
-CoverWidget::CoverWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, QString())
-, _self(App::self())
-, _userpicButton(this, _self)
-, _name(this, st::settingsNameLabel)
-, _editNameInline(this, st::settingsEditButton)
-, _setPhoto(this, langFactory(lng_settings_upload), st::settingsPrimaryButton)
-, _editName(this, langFactory(lng_settings_edit), st::settingsSecondaryButton) {
+CoverWidget::CoverWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, QString())
+    , _self(App::self())
+    , _userpicButton(this, _self)
+    , _name(this, st::settingsNameLabel)
+    , _editNameInline(this, st::settingsEditButton)
+    , _setPhoto(this, langFactory(lng_settings_upload), st::settingsPrimaryButton)
+    , _editName(this, langFactory(lng_settings_edit), st::settingsSecondaryButton) {
 	if (_self) {
 		_self->updateFull();
 	}
@@ -58,14 +59,15 @@ CoverWidget::CoverWidget(QWidget *parent, UserData *self) : BlockWidget(parent,
 	_name->setSelectable(true);
 	_name->setContextCopyText(lang(lng_profile_copy_fullname));
 
-	_setPhoto->setClickedCallback(App::LambdaDelayed(st::settingsPrimaryButton.ripple.hideDuration, this, [this] { onSetPhoto(); }));
+	_setPhoto->setClickedCallback(
+	    App::LambdaDelayed(st::settingsPrimaryButton.ripple.hideDuration, this, [this] { onSetPhoto(); }));
 	connect(_editName, SIGNAL(clicked()), this, SLOT(onEditName()));
 	connect(_editNameInline, SIGNAL(clicked()), this, SLOT(onEditName()));
 
 	auto observeEvents = Notify::PeerUpdate::Flag::NameChanged | Notify::PeerUpdate::Flag::PhotoChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	connect(&Messenger::Instance(), SIGNAL(peerPhotoDone(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId)));
 	connect(&Messenger::Instance(), SIGNAL(peerPhotoFail(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId)));
@@ -110,7 +112,9 @@ int CoverWidget::resizeGetHeight(int newWidth) {
 	int infoLeft = _userpicButton->x() + _userpicButton->width();
 	_statusPosition = QPoint(infoLeft + st::settingsStatusLeft, _userpicButton->y() + st::settingsStatusTop);
 	if (_cancelPhotoUpload) {
-		_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::settingsStatusFont->width(_statusText) + st::settingsStatusFont->spacew, _statusPosition.y(), newWidth);
+		_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::settingsStatusFont->width(_statusText) +
+		                                   st::settingsStatusFont->spacew,
+		                               _statusPosition.y(), newWidth);
 	}
 
 	refreshButtonsGeometry(newWidth);
@@ -261,7 +265,8 @@ void CoverWidget::paintDivider(Painter &p) {
 	p.fillRect(divider, st::profileDividerBg);
 	auto dividerFillTop = rtlrect(0, _dividerTop, width(), st::profileDividerTop.height(), width());
 	st::profileDividerTop.fill(p, dividerFillTop);
-	auto dividerFillBottom = rtlrect(0, _dividerTop + dividerHeight - st::profileDividerBottom.height(), width(), st::profileDividerBottom.height(), width());
+	auto dividerFillBottom = rtlrect(0, _dividerTop + dividerHeight - st::profileDividerBottom.height(), width(),
+	                                 st::profileDividerBottom.height(), width());
 	st::profileDividerBottom.fill(p, dividerFillBottom);
 }
 
@@ -290,7 +295,9 @@ void CoverWidget::refreshStatusText() {
 			_cancelPhotoUpload.create(this, lang(lng_cancel), st::defaultLinkButton);
 			connect(_cancelPhotoUpload, SIGNAL(clicked()), this, SLOT(onCancelPhotoUpload()));
 			_cancelPhotoUpload->show();
-			_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::settingsStatusFont->width(_statusText) + st::settingsStatusFont->spacew, _statusPosition.y());
+			_cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::settingsStatusFont->width(_statusText) +
+			                                   st::settingsStatusFont->spacew,
+			                               _statusPosition.y());
 		}
 		update();
 		return;
@@ -311,20 +318,21 @@ void CoverWidget::refreshStatusText() {
 void CoverWidget::onSetPhoto() {
 	auto imageExtensions = cImgExtensions();
 	auto filter = qsl("Image files (*") + imageExtensions.join(qsl(" *")) + qsl(");;") + FileDialog::AllFilesFilter();
-	FileDialog::GetOpenPath(lang(lng_choose_image), filter, base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
-			return;
-		}
+	FileDialog::GetOpenPath(lang(lng_choose_image), filter,
+	                        base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+		                        if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
+			                        return;
+		                        }
 
-		QImage img;
-		if (!result.remoteContent.isEmpty()) {
-			img = App::readImage(result.remoteContent);
-		} else {
-			img = App::readImage(result.paths.front());
-		}
+		                        QImage img;
+		                        if (!result.remoteContent.isEmpty()) {
+			                        img = App::readImage(result.remoteContent);
+		                        } else {
+			                        img = App::readImage(result.paths.front());
+		                        }
 
-		showSetPhotoBox(img);
-	}));
+		                        showSetPhotoBox(img);
+	                        }));
 }
 
 void CoverWidget::onEditName() {
diff --git a/Telegram/SourceFiles/settings/settings_cover.h b/Telegram/SourceFiles/settings/settings_cover.h
index 0e3893487..89c744442 100644
--- a/Telegram/SourceFiles/settings/settings_cover.h
+++ b/Telegram/SourceFiles/settings/settings_cover.h
@@ -92,11 +92,11 @@ private:
 	UserData *_self;
 
 	object_ptr<Profile::UserpicButton> _userpicButton;
-	object_ptr<Profile::CoverDropArea> _dropArea = { nullptr };
+	object_ptr<Profile::CoverDropArea> _dropArea = {nullptr};
 
 	object_ptr<Ui::FlatLabel> _name;
 	object_ptr<Ui::IconButton> _editNameInline;
-	object_ptr<Ui::LinkButton> _cancelPhotoUpload = { nullptr };
+	object_ptr<Ui::LinkButton> _cancelPhotoUpload = {nullptr};
 
 	QPoint _statusPosition;
 	QString _statusText;
@@ -107,7 +107,6 @@ private:
 	bool _editNameVisible = true;
 
 	int _dividerTop = 0;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_fixed_bar.cpp b/Telegram/SourceFiles/settings/settings_fixed_bar.cpp
index 5cc10ed16..26aa6018b 100644
--- a/Telegram/SourceFiles/settings/settings_fixed_bar.cpp
+++ b/Telegram/SourceFiles/settings/settings_fixed_bar.cpp
@@ -20,13 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_fixed_bar.h"
 
-#include "styles/style_settings.h"
-#include "styles/style_boxes.h"
 #include "mainwindow.h"
+#include "styles/style_boxes.h"
+#include "styles/style_settings.h"
 
 namespace Settings {
 
-FixedBar::FixedBar(QWidget *parent) : TWidget(parent) {
+FixedBar::FixedBar(QWidget *parent)
+    : TWidget(parent) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 }
 
@@ -46,7 +47,8 @@ void FixedBar::paintEvent(QPaintEvent *e) {
 
 	p.setFont(st::settingsFixedBarFont);
 	p.setPen(st::windowFg);
-	p.drawTextLeft(st::settingsFixedBarTextPosition.x(), st::settingsFixedBarTextPosition.y() - st::boxRadius, width(), _text);
+	p.drawTextLeft(st::settingsFixedBarTextPosition.x(), st::settingsFixedBarTextPosition.y() - st::boxRadius, width(),
+	               _text);
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_fixed_bar.h b/Telegram/SourceFiles/settings/settings_fixed_bar.h
index 5a92154ee..bec2c1e2e 100644
--- a/Telegram/SourceFiles/settings/settings_fixed_bar.h
+++ b/Telegram/SourceFiles/settings/settings_fixed_bar.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
 #include "ui/twidget.h"
+#include <QString>
 
 class QWidget;
 class QPaintEvent;
@@ -45,7 +45,6 @@ protected:
 
 private:
 	QString _text;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp
index b0fe2ec5d..8afc140d2 100644
--- a/Telegram/SourceFiles/settings/settings_general_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp
@@ -20,34 +20,38 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_general_widget.h"
 
-#include "styles/style_settings.h"
-#include "lang/lang_keys.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "storage/localstorage.h"
-#include "platform/platform_specific.h"
-#include "mainwindow.h"
-#include "application.h"
-#include "boxes/language_box.h"
-#include "boxes/confirm_box.h"
-#include "boxes/about_box.h"
-#include "core/file_utilities.h"
-#include "lang/lang_file_parser.h"
-#include "lang/lang_cloud_manager.h"
-#include "messenger.h"
 #include "app.h"
+#include "application.h"
+#include "boxes/about_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/language_box.h"
+#include "core/file_utilities.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_file_parser.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
 
 namespace Settings {
 
-GeneralWidget::GeneralWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_general))
-, _changeLanguage(this, lang(lng_settings_change_lang), st::boxLinkButton) {
+GeneralWidget::GeneralWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_general))
+    , _changeLanguage(this, lang(lng_settings_change_lang), st::boxLinkButton) {
 	connect(_changeLanguage, SIGNAL(clicked()), this, SLOT(onChangeLanguage()));
 	refreshControls();
 }
 
 int GeneralWidget::resizeGetHeight(int newWidth) {
-	_changeLanguage->moveToRight(contentLeft(), st::settingsBlockMarginTop + st::settingsBlockTitleTop + st::settingsBlockTitleFont->ascent - st::defaultLinkButton.font->ascent, newWidth);
+	_changeLanguage->moveToRight(contentLeft(),
+	                             st::settingsBlockMarginTop + st::settingsBlockTitleTop +
+	                                 st::settingsBlockTitleFont->ascent - st::defaultLinkButton.font->ascent,
+	                             newWidth);
 	return BlockWidget::resizeGetHeight(newWidth);
 }
 
@@ -59,27 +63,34 @@ void GeneralWidget::refreshControls() {
 
 	if (cPlatform() == dbipWindows || cSupportTray()) {
 		auto workMode = Global::WorkMode().value();
-		addChildRow(_enableTrayIcon, marginSmall, lang(lng_settings_workmode_tray), [this](bool) { onEnableTrayIcon(); }, (workMode == dbiwmTrayOnly || workMode == dbiwmWindowAndTray));
+		addChildRow(_enableTrayIcon, marginSmall, lang(lng_settings_workmode_tray),
+		            [this](bool) { onEnableTrayIcon(); },
+		            (workMode == dbiwmTrayOnly || workMode == dbiwmWindowAndTray));
 		if (cPlatform() == dbipWindows) {
-			addChildRow(_enableTaskbarIcon, marginLarge, lang(lng_settings_workmode_window), [this](bool) { onEnableTaskbarIcon(); }, (workMode == dbiwmWindowOnly || workMode == dbiwmWindowAndTray));
+			addChildRow(_enableTaskbarIcon, marginLarge, lang(lng_settings_workmode_window),
+			            [this](bool) { onEnableTaskbarIcon(); },
+			            (workMode == dbiwmWindowOnly || workMode == dbiwmWindowAndTray));
 
 #ifndef OS_WIN_STORE
-			addChildRow(_autoStart, marginSmall, lang(lng_settings_auto_start), [this](bool) { onAutoStart(); }, cAutoStart());
-			addChildRow(_startMinimized, marginLarge, slidedPadding, lang(lng_settings_start_min), [this](bool) { onStartMinimized(); }, (cStartMinimized() && !Global::LocalPasscode()));
-			subscribe(Global::RefLocalPasscodeChanged(), [this] {
-				_startMinimized->entity()->setChecked(cStartMinimized() && !Global::LocalPasscode());
-			});
+			addChildRow(_autoStart, marginSmall, lang(lng_settings_auto_start), [this](bool) { onAutoStart(); },
+			            cAutoStart());
+			addChildRow(_startMinimized, marginLarge, slidedPadding, lang(lng_settings_start_min),
+			            [this](bool) { onStartMinimized(); }, (cStartMinimized() && !Global::LocalPasscode()));
+			subscribe(Global::RefLocalPasscodeChanged(),
+			          [this] { _startMinimized->entity()->setChecked(cStartMinimized() && !Global::LocalPasscode()); });
 			if (!cAutoStart()) {
 				_startMinimized->hideFast();
 			}
-			addChildRow(_addInSendTo, marginSmall, lang(lng_settings_add_sendto), [this](bool) { onAddInSendTo(); }, cSendToMenu());
+			addChildRow(_addInSendTo, marginSmall, lang(lng_settings_add_sendto), [this](bool) { onAddInSendTo(); },
+			            cSendToMenu());
 #endif // OS_WIN_STORE
 		}
 	}
 }
 
 void GeneralWidget::onChangeLanguage() {
-	if ((_changeLanguage->clickModifiers() & Qt::ShiftModifier) && (_changeLanguage->clickModifiers() & Qt::AltModifier)) {
+	if ((_changeLanguage->clickModifiers() & Qt::ShiftModifier) &&
+	    (_changeLanguage->clickModifiers() & Qt::AltModifier)) {
 		Lang::CurrentCloudManager().switchToLanguage(qsl("custom"));
 		return;
 	}
@@ -101,7 +112,8 @@ void GeneralWidget::onRestart() {
 }
 
 void GeneralWidget::onEnableTrayIcon() {
-	if ((!_enableTrayIcon->checked() || cPlatform() != dbipWindows) && _enableTaskbarIcon && !_enableTaskbarIcon->checked()) {
+	if ((!_enableTrayIcon->checked() || cPlatform() != dbipWindows) && _enableTaskbarIcon &&
+	    !_enableTaskbarIcon->checked()) {
 		_enableTaskbarIcon->setChecked(true);
 	} else {
 		updateWorkmode();
@@ -117,7 +129,9 @@ void GeneralWidget::onEnableTaskbarIcon() {
 }
 
 void GeneralWidget::updateWorkmode() {
-	auto newMode = (_enableTrayIcon->checked() && (!_enableTaskbarIcon || _enableTaskbarIcon->checked())) ? dbiwmWindowAndTray : (_enableTrayIcon->checked() ? dbiwmTrayOnly : dbiwmWindowOnly);
+	auto newMode = (_enableTrayIcon->checked() && (!_enableTaskbarIcon || _enableTaskbarIcon->checked())) ?
+	                   dbiwmWindowAndTray :
+	                   (_enableTrayIcon->checked() ? dbiwmTrayOnly : dbiwmWindowOnly);
 	if (Global::WorkMode().value() != newMode && (newMode == dbiwmWindowAndTray || newMode == dbiwmTrayOnly)) {
 		cSetSeenTrayTooltip(false);
 	}
diff --git a/Telegram/SourceFiles/settings/settings_general_widget.h b/Telegram/SourceFiles/settings/settings_general_widget.h
index 852e77c75..2a231e12f 100644
--- a/Telegram/SourceFiles/settings/settings_general_widget.h
+++ b/Telegram/SourceFiles/settings/settings_general_widget.h
@@ -52,14 +52,13 @@ private:
 	void updateWorkmode();
 
 	object_ptr<Ui::LinkButton> _changeLanguage;
-	object_ptr<Ui::Checkbox> _enableTrayIcon = { nullptr };
-	object_ptr<Ui::Checkbox> _enableTaskbarIcon = { nullptr };
-	object_ptr<Ui::Checkbox> _autoStart = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _startMinimized = { nullptr };
-	object_ptr<Ui::Checkbox> _addInSendTo = { nullptr };
+	object_ptr<Ui::Checkbox> _enableTrayIcon = {nullptr};
+	object_ptr<Ui::Checkbox> _enableTaskbarIcon = {nullptr};
+	object_ptr<Ui::Checkbox> _autoStart = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _startMinimized = {nullptr};
+	object_ptr<Ui::Checkbox> _addInSendTo = {nullptr};
 
 	int _languagesLoadedSubscription = 0;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/settings/settings_info_widget.cpp
index 09b1a8cc9..869f19ec3 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_info_widget.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_info_widget.h"
 
-#include "styles/style_settings.h"
-#include "lang/lang_keys.h"
-#include "ui/widgets/labels.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "boxes/username_box.h"
+#include "app.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/change_phone_box.h"
-#include "observer_peer.h"
+#include "boxes/username_box.h"
+#include "lang/lang_keys.h"
 #include "messenger.h"
-#include "app.h"
+#include "observer_peer.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/labels.h"
 
 namespace Settings {
 
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
-InfoWidget::InfoWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_info)) {
+InfoWidget::InfoWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_info)) {
 	auto observeEvents = UpdateFlag::UsernameChanged | UpdateFlag::UserPhoneChanged | UpdateFlag::AboutChanged;
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(observeEvents, [this](const Notify::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}));
+	subscribe(Notify::PeerUpdated(),
+	          Notify::PeerUpdatedHandler(observeEvents,
+	                                     [this](const Notify::PeerUpdate &update) { notifyPeerUpdated(update); }));
 
 	createControls();
 }
@@ -68,12 +69,11 @@ void InfoWidget::refreshMobileNumber() {
 			phoneText.text = App::phoneFromSharedContact(peerToUser(user->id));
 		}
 	}
-	setLabeledText(_mobileNumber, lang(lng_profile_mobile_number), phoneText, TextWithEntities(), lang(lng_profile_copy_phone));
+	setLabeledText(_mobileNumber, lang(lng_profile_mobile_number), phoneText, TextWithEntities(),
+	               lang(lng_profile_copy_phone));
 	if (auto text = _mobileNumber->entity()->textLabel()) {
 		text->setRichText(textcmdLink(1, phoneText.text));
-		text->setLink(1, MakeShared<LambdaClickHandler>([] {
-			Ui::show(Box<ChangePhoneBox>());
-		}));
+		text->setLink(1, MakeShared<LambdaClickHandler>([] { Ui::show(Box<ChangePhoneBox>()); }));
 	}
 }
 
@@ -86,7 +86,8 @@ void InfoWidget::refreshUsername() {
 		usernameText.text = '@' + self()->username;
 		copyText = lang(lng_context_copy_mention);
 	}
-	usernameText.entities.push_back(EntityInText(EntityInTextCustomUrl, 0, usernameText.text.size(), Messenger::Instance().createInternalLinkFull(self()->username)));
+	usernameText.entities.push_back(EntityInText(EntityInTextCustomUrl, 0, usernameText.text.size(),
+	                                             Messenger::Instance().createInternalLinkFull(self()->username)));
 	setLabeledText(_username, lang(lng_profile_username), usernameText, TextWithEntities(), copyText);
 	if (auto text = _username->entity()->textLabel()) {
 		text->setClickHandlerHook([](const ClickHandlerPtr &handler, Qt::MouseButton button) {
@@ -114,7 +115,9 @@ void InfoWidget::refreshBio() {
 	}
 }
 
-void InfoWidget::setLabeledText(object_ptr<LabeledWrap> &row, const QString &label, const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities, const QString &copyText) {
+void InfoWidget::setLabeledText(object_ptr<LabeledWrap> &row, const QString &label,
+                                const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities,
+                                const QString &copyText) {
 	auto nonEmptyText = !textWithEntities.text.isEmpty();
 	if (nonEmptyText) {
 		row->entity()->setLabeledText(label, textWithEntities, shortTextWithEntities, copyText);
@@ -122,11 +125,12 @@ void InfoWidget::setLabeledText(object_ptr<LabeledWrap> &row, const QString &lab
 	row->toggleAnimated(nonEmptyText);
 }
 
-InfoWidget::LabeledWidget::LabeledWidget(QWidget *parent, const style::FlatLabel &valueSt) : TWidget(parent)
-, _valueSt(valueSt) {
-}
+InfoWidget::LabeledWidget::LabeledWidget(QWidget *parent, const style::FlatLabel &valueSt)
+    : TWidget(parent)
+    , _valueSt(valueSt) {}
 
-void InfoWidget::LabeledWidget::setLabeledText(const QString &label, const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities, const QString &copyText) {
+void InfoWidget::LabeledWidget::setLabeledText(const QString &label, const TextWithEntities &textWithEntities,
+                                               const TextWithEntities &shortTextWithEntities, const QString &copyText) {
 	_label.destroy();
 	_text.destroy();
 	_shortText.destroy();
@@ -147,7 +151,8 @@ Ui::FlatLabel *InfoWidget::LabeledWidget::shortTextLabel() const {
 	return _shortText;
 }
 
-void InfoWidget::LabeledWidget::setLabelText(object_ptr<Ui::FlatLabel> &text, const TextWithEntities &textWithEntities, const QString &copyText) {
+void InfoWidget::LabeledWidget::setLabelText(object_ptr<Ui::FlatLabel> &text, const TextWithEntities &textWithEntities,
+                                             const QString &copyText) {
 	text.destroy();
 	if (textWithEntities.text.isEmpty()) return;
 
@@ -216,7 +221,10 @@ int InfoWidget::LabeledWidget::resizeGetHeight(int newWidth) {
 			_text->show();
 		}
 	}
-	return st::settingsBlockOneLineTextPart.margin.top() + std::max(_label->height(), _text->height() - st::settingsBlockOneLineTextPart.margin.top() - st::settingsBlockOneLineTextPart.margin.bottom()) + st::settingsBlockOneLineTextPart.margin.bottom();
+	return st::settingsBlockOneLineTextPart.margin.top() +
+	       std::max(_label->height(), _text->height() - st::settingsBlockOneLineTextPart.margin.top() -
+	                                      st::settingsBlockOneLineTextPart.margin.bottom()) +
+	       st::settingsBlockOneLineTextPart.margin.bottom();
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.h b/Telegram/SourceFiles/settings/settings_info_widget.h
index d244c1cc6..95e3344ea 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.h
+++ b/Telegram/SourceFiles/settings/settings_info_widget.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "settings/settings_block_widget.h"
 #include "base/object_ptr.h"
+#include "settings/settings_block_widget.h"
 #include "ui/twidget.h"
 
 struct TextWithEntities;
@@ -54,7 +54,8 @@ private:
 	public:
 		LabeledWidget(QWidget *parent, const style::FlatLabel &valueSt);
 
-		void setLabeledText(const QString &label, const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities, const QString &copyText);
+		void setLabeledText(const QString &label, const TextWithEntities &textWithEntities,
+		                    const TextWithEntities &shortTextWithEntities, const QString &copyText);
 
 		Ui::FlatLabel *textLabel() const;
 		Ui::FlatLabel *shortTextLabel() const;
@@ -65,22 +66,22 @@ private:
 		int resizeGetHeight(int newWidth) override;
 
 	private:
-		void setLabelText(object_ptr<Ui::FlatLabel> &text, const TextWithEntities &textWithEntities, const QString &copyText);
+		void setLabelText(object_ptr<Ui::FlatLabel> &text, const TextWithEntities &textWithEntities,
+		                  const QString &copyText);
 
 		const style::FlatLabel &_valueSt;
-		object_ptr<Ui::FlatLabel> _label = { nullptr };
-		object_ptr<Ui::FlatLabel> _text = { nullptr };
-		object_ptr<Ui::FlatLabel> _shortText = { nullptr };
-
+		object_ptr<Ui::FlatLabel> _label = {nullptr};
+		object_ptr<Ui::FlatLabel> _text = {nullptr};
+		object_ptr<Ui::FlatLabel> _shortText = {nullptr};
 	};
 
 	using LabeledWrap = Ui::WidgetSlideWrap<LabeledWidget>;
-	void setLabeledText(object_ptr<LabeledWrap> &row, const QString &label, const TextWithEntities &textWithEntities, const TextWithEntities &shortTextWithEntities, const QString &copyText);
-
-	object_ptr<LabeledWrap> _mobileNumber = { nullptr };
-	object_ptr<LabeledWrap> _username = { nullptr };
-	object_ptr<LabeledWrap> _bio = { nullptr };
+	void setLabeledText(object_ptr<LabeledWrap> &row, const QString &label, const TextWithEntities &textWithEntities,
+	                    const TextWithEntities &shortTextWithEntities, const QString &copyText);
 
+	object_ptr<LabeledWrap> _mobileNumber = {nullptr};
+	object_ptr<LabeledWrap> _username = {nullptr};
+	object_ptr<LabeledWrap> _bio = {nullptr};
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.cpp b/Telegram/SourceFiles/settings/settings_inner_widget.cpp
index e37b1fab2..96e6a9d3c 100644
--- a/Telegram/SourceFiles/settings/settings_inner_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_inner_widget.cpp
@@ -20,25 +20,26 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_inner_widget.h"
 
-#include "lang/lang_instance.h"
-#include "styles/style_settings.h"
-#include "settings/settings_cover.h"
-#include "settings/settings_block_widget.h"
-#include "settings/settings_info_widget.h"
-#include "settings/settings_notifications_widget.h"
-#include "settings/settings_general_widget.h"
-#include "settings/settings_chat_settings_widget.h"
-#include "settings/settings_scale_widget.h"
-#include "settings/settings_background_widget.h"
-#include "settings/settings_privacy_widget.h"
-#include "settings/settings_advanced_widget.h"
 #include "app.h"
 #include "facades.h"
+#include "lang/lang_instance.h"
+#include "settings/settings_advanced_widget.h"
+#include "settings/settings_background_widget.h"
+#include "settings/settings_block_widget.h"
+#include "settings/settings_chat_settings_widget.h"
+#include "settings/settings_cover.h"
+#include "settings/settings_general_widget.h"
+#include "settings/settings_info_widget.h"
+#include "settings/settings_notifications_widget.h"
+#include "settings/settings_privacy_widget.h"
+#include "settings/settings_scale_widget.h"
+#include "styles/style_settings.h"
 
 namespace Settings {
 
-InnerWidget::InnerWidget(QWidget *parent) : LayerInner(parent)
-, _self(App::self()) {
+InnerWidget::InnerWidget(QWidget *parent)
+    : LayerInner(parent)
+    , _self(App::self()) {
 	refreshBlocks();
 	subscribe(Global::RefSelfChanged(), [this] { fullRebuild(); });
 	subscribe(Lang::Current().updated(), [this] { fullRebuild(); });
diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.h b/Telegram/SourceFiles/settings/settings_inner_widget.h
index e61dd1258..e56c42790 100644
--- a/Telegram/SourceFiles/settings/settings_inner_widget.h
+++ b/Telegram/SourceFiles/settings/settings_inner_widget.h
@@ -58,8 +58,8 @@ private:
 	// Returns the new height value.
 	int refreshBlocksPositions(int newWidth);
 
-	object_ptr<CoverWidget> _cover = { nullptr };
-	QList<BlockWidget*> _blocks;
+	object_ptr<CoverWidget> _cover = {nullptr};
+	QList<BlockWidget *> _blocks;
 
 	UserData *_self = nullptr;
 
@@ -68,7 +68,6 @@ private:
 
 	int _visibleTop = 0;
 	int _visibleBottom = 0;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_layer.cpp b/Telegram/SourceFiles/settings/settings_layer.cpp
index 46b2b4635..88ba36f83 100644
--- a/Telegram/SourceFiles/settings/settings_layer.cpp
+++ b/Telegram/SourceFiles/settings/settings_layer.cpp
@@ -20,29 +20,29 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_layer.h"
 
-#include "settings/settings_inner_widget.h"
+#include "application.h"
+#include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
 #include "settings/settings_fixed_bar.h"
+#include "settings/settings_inner_widget.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "styles/style_window.h"
-#include "styles/style_boxes.h"
 #include "ui/effects/widget_fade_wrap.h"
-#include "ui/widgets/scroll_area.h"
 #include "ui/widgets/buttons.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "storage/localstorage.h"
-#include "boxes/confirm_box.h"
-#include "application.h"
-#include "core/file_utilities.h"
+#include "ui/widgets/scroll_area.h"
 #include "window/themes/window_theme.h"
 
 namespace Settings {
 
 Layer::Layer()
-: _scroll(this, st::settingsScroll)
-, _fixedBar(this)
-, _fixedBarClose(this, st::settingsFixedBarClose)
-, _fixedBarShadow(this, object_ptr<BoxLayerTitleShadow>(this)) {
+    : _scroll(this, st::settingsScroll)
+    , _fixedBar(this)
+    , _fixedBarClose(this, st::settingsFixedBarClose)
+    , _fixedBarShadow(this, object_ptr<BoxLayerTitleShadow>(this)) {
 	_fixedBar->moveToLeft(0, st::boxRadius);
 	_fixedBarClose->moveToRight(0, 0);
 	_fixedBarShadow->entity()->resize(width(), st::lineWidth);
diff --git a/Telegram/SourceFiles/settings/settings_layer.h b/Telegram/SourceFiles/settings/settings_layer.h
index 7a36a1406..d6afe7585 100644
--- a/Telegram/SourceFiles/settings/settings_layer.h
+++ b/Telegram/SourceFiles/settings/settings_layer.h
@@ -27,8 +27,7 @@ class BoxLayerTitleShadow;
 namespace Ui {
 class ScrollArea;
 class IconButton;
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 } // namespace Ui
 
 namespace Settings {
@@ -36,13 +35,12 @@ namespace Settings {
 class FixedBar;
 class LayerInner : public TWidget {
 public:
-	LayerInner(QWidget *parent) : TWidget(parent) {
-	}
+	LayerInner(QWidget *parent)
+	    : TWidget(parent) {}
 
 	virtual void resizeToWidth(int newWidth, int contentLeft) {
 		TWidget::resizeToWidth(newWidth);
 	}
-
 };
 
 class Layer : public LayerWidget {
@@ -58,8 +56,7 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
-	template <typename Widget>
-	QPointer<Widget> setInnerWidget(object_ptr<Widget> widget) {
+	template <typename Widget> QPointer<Widget> setInnerWidget(object_ptr<Widget> widget) {
 		auto result = QPointer<Widget>(widget);
 		doSetInnerWidget(std::move(widget));
 		return result;
@@ -88,7 +85,6 @@ private:
 	object_ptr<Ui::WidgetFadeWrap<BoxLayerTitleShadow>> _fixedBarShadow;
 
 	bool _roundedCorners = false;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
index 3c25df36e..c4a0366d1 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_notifications_widget.h"
 
-#include "styles/style_settings.h"
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "ui/effects/widget_slide_wrap.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/buttons.h"
-#include "mainwindow.h"
-#include "window/notifications_manager.h"
-#include "boxes/notifications_box.h"
-#include "platform/platform_notifications_manager.h"
 #include "auth_session.h"
+#include "boxes/notifications_box.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "platform/platform_notifications_manager.h"
+#include "storage/localstorage.h"
+#include "styles/style_settings.h"
+#include "ui/effects/widget_slide_wrap.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "window/notifications_manager.h"
 
 namespace Settings {
 namespace {
@@ -39,7 +39,8 @@ using ChangeType = Window::Notifications::ChangeType;
 
 } // namespace
 
-NotificationsWidget::NotificationsWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_notify)) {
+NotificationsWidget::NotificationsWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_notify)) {
 	createControls();
 
 	subscribe(Auth().notifications().settingsChanged(), [this](ChangeType type) {
@@ -56,9 +57,12 @@ NotificationsWidget::NotificationsWidget(QWidget *parent, UserData *self) : Bloc
 void NotificationsWidget::createControls() {
 	style::margins margin(0, 0, 0, st::settingsSkip);
 	style::margins slidedPadding(0, margin.bottom() / 2, 0, margin.bottom() - (margin.bottom() / 2));
-	addChildRow(_desktopNotifications, margin, lang(lng_settings_desktop_notify), [this](bool) { onDesktopNotifications(); }, Global::DesktopNotify());
-	addChildRow(_showSenderName, margin, slidedPadding, lang(lng_settings_show_name), [this](bool) { onShowSenderName(); }, Global::NotifyView() <= dbinvShowName);
-	addChildRow(_showMessagePreview, margin, slidedPadding, lang(lng_settings_show_preview), [this](bool) { onShowMessagePreview(); }, Global::NotifyView() <= dbinvShowPreview);
+	addChildRow(_desktopNotifications, margin, lang(lng_settings_desktop_notify),
+	            [this](bool) { onDesktopNotifications(); }, Global::DesktopNotify());
+	addChildRow(_showSenderName, margin, slidedPadding, lang(lng_settings_show_name),
+	            [this](bool) { onShowSenderName(); }, Global::NotifyView() <= dbinvShowName);
+	addChildRow(_showMessagePreview, margin, slidedPadding, lang(lng_settings_show_preview),
+	            [this](bool) { onShowMessagePreview(); }, Global::NotifyView() <= dbinvShowPreview);
 	if (!_showSenderName->entity()->checked()) {
 		_showMessagePreview->hideFast();
 	}
@@ -66,8 +70,10 @@ void NotificationsWidget::createControls() {
 		_showSenderName->hideFast();
 		_showMessagePreview->hideFast();
 	}
-	addChildRow(_playSound, margin, lang(lng_settings_sound_notify), [this](bool) { onPlaySound(); }, Global::SoundNotify());
-	addChildRow(_includeMuted, margin, lang(lng_settings_include_muted), [this](bool) { onIncludeMuted(); }, Global::IncludeMuted());
+	addChildRow(_playSound, margin, lang(lng_settings_sound_notify), [this](bool) { onPlaySound(); },
+	            Global::SoundNotify());
+	addChildRow(_includeMuted, margin, lang(lng_settings_include_muted), [this](bool) { onIncludeMuted(); },
+	            Global::IncludeMuted());
 
 	if (cPlatform() != dbipMac) {
 		createNotificationsControls();
@@ -87,7 +93,8 @@ void NotificationsWidget::createNotificationsControls() {
 #endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32
 	}
 	if (!nativeNotificationsLabel.isEmpty()) {
-		addChildRow(_nativeNotifications, margin, nativeNotificationsLabel, [this](bool) { onNativeNotifications(); }, Global::NativeNotifications());
+		addChildRow(_nativeNotifications, margin, nativeNotificationsLabel, [this](bool) { onNativeNotifications(); },
+		            Global::NativeNotifications());
 	}
 	addChildRow(_advanced, margin, slidedPadding, lang(lng_settings_advanced_notifications), SLOT(onAdvanced()));
 	if (!nativeNotificationsLabel.isEmpty() && Global::NativeNotifications()) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.h b/Telegram/SourceFiles/settings/settings_notifications_widget.h
index 70e01f4b6..be4e28936 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.h
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.h
@@ -45,14 +45,13 @@ private:
 	void desktopEnabledUpdated();
 	void viewParamUpdated();
 
-	object_ptr<Ui::Checkbox> _desktopNotifications = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _showSenderName = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _showMessagePreview = { nullptr };
-	object_ptr<Ui::Checkbox> _nativeNotifications = { nullptr };
-	object_ptr<Ui::Checkbox> _playSound = { nullptr };
-	object_ptr<Ui::Checkbox> _includeMuted = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _advanced = { nullptr };
-
+	object_ptr<Ui::Checkbox> _desktopNotifications = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _showSenderName = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::Checkbox>> _showMessagePreview = {nullptr};
+	object_ptr<Ui::Checkbox> _nativeNotifications = {nullptr};
+	object_ptr<Ui::Checkbox> _playSound = {nullptr};
+	object_ptr<Ui::Checkbox> _includeMuted = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<Ui::LinkButton>> _advanced = {nullptr};
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index e421a540c..47a718708 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_privacy_controllers.h"
 
-#include "lang/lang_keys.h"
 #include "apiwrap.h"
-#include "observer_peer.h"
-#include "mainwidget.h"
 #include "auth_session.h"
-#include "storage/localstorage.h"
-#include "boxes/peer_list_controllers.h"
 #include "boxes/confirm_box.h"
+#include "boxes/peer_list_controllers.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "observer_peer.h"
+#include "storage/localstorage.h"
 
 namespace Settings {
 namespace {
@@ -36,40 +36,41 @@ constexpr auto kBlockedPerPage = 40;
 
 class BlockUserBoxController : public ChatsListBoxController {
 public:
-	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
 
-	void setBlockUserCallback(base::lambda<void(not_null<UserData*> user)> callback) {
+	void setBlockUserCallback(base::lambda<void(not_null<UserData *> user)> callback) {
 		_blockUserCallback = std::move(callback);
 	}
 
 protected:
 	void prepareViewHook() override;
-	std::unique_ptr<Row> createRow(not_null<History*> history) override;
-	void updateRowHook(not_null<Row*> row) override {
+	std::unique_ptr<Row> createRow(not_null<History *> history) override;
+	void updateRowHook(not_null<Row *> row) override {
 		updateIsBlocked(row, row->peer()->asUser());
 		delegate()->peerListUpdateRow(row);
 	}
 
 private:
-	void updateIsBlocked(not_null<PeerListRow*> row, UserData *user) const;
-
-	base::lambda<void(not_null<UserData*> user)> _blockUserCallback;
+	void updateIsBlocked(not_null<PeerListRow *> row, UserData *user) const;
 
+	base::lambda<void(not_null<UserData *> user)> _blockUserCallback;
 };
 
 void BlockUserBoxController::prepareViewHook() {
 	delegate()->peerListSetTitle(langFactory(lng_blocked_list_add_title));
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserIsBlocked, [this](const Notify::PeerUpdate &update) {
-		if (auto user = update.peer->asUser()) {
-			if (auto row = delegate()->peerListFindRow(user->id)) {
-				updateIsBlocked(row, user);
-				delegate()->peerListUpdateRow(row);
-			}
-		}
-	}));
+	subscribe(
+	    Notify::PeerUpdated(),
+	    Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserIsBlocked, [this](const Notify::PeerUpdate &update) {
+		    if (auto user = update.peer->asUser()) {
+			    if (auto row = delegate()->peerListFindRow(user->id)) {
+				    updateIsBlocked(row, user);
+				    delegate()->peerListUpdateRow(row);
+			    }
+		    }
+	    }));
 }
 
-void BlockUserBoxController::updateIsBlocked(not_null<PeerListRow*> row, UserData *user) const {
+void BlockUserBoxController::updateIsBlocked(not_null<PeerListRow *> row, UserData *user) const {
 	auto blocked = user->isBlocked();
 	row->setDisabledState(blocked ? PeerListRow::State::DisabledChecked : PeerListRow::State::Active);
 	if (blocked) {
@@ -79,11 +80,11 @@ void BlockUserBoxController::updateIsBlocked(not_null<PeerListRow*> row, UserDat
 	}
 }
 
-void BlockUserBoxController::rowClicked(not_null<PeerListRow*> row) {
+void BlockUserBoxController::rowClicked(not_null<PeerListRow *> row) {
 	_blockUserCallback(row->peer()->asUser());
 }
 
-std::unique_ptr<BlockUserBoxController::Row> BlockUserBoxController::createRow(not_null<History*> history) {
+std::unique_ptr<BlockUserBoxController::Row> BlockUserBoxController::createRow(not_null<History *> history) {
 	if (history->peer->isSelf()) {
 		return nullptr;
 	}
@@ -102,11 +103,12 @@ void BlockedBoxController::prepare() {
 	setDescriptionText(lang(lng_contacts_loading));
 	delegate()->peerListRefreshRows();
 
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserIsBlocked, [this](const Notify::PeerUpdate &update) {
-		if (auto user = update.peer->asUser()) {
-			handleBlockedEvent(user);
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserIsBlocked,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (auto user = update.peer->asUser()) {
+			                                                            handleBlockedEvent(user);
+		                                                            }
+	                                                            }));
 
 	loadMoreRows();
 }
@@ -116,37 +118,38 @@ void BlockedBoxController::loadMoreRows() {
 		return;
 	}
 
-	_loadRequestId = request(MTPcontacts_GetBlocked(MTP_int(_offset), MTP_int(kBlockedPerPage))).done([this](const MTPcontacts_Blocked &result) {
-		_loadRequestId = 0;
+	_loadRequestId = request(MTPcontacts_GetBlocked(MTP_int(_offset), MTP_int(kBlockedPerPage)))
+	                     .done([this](const MTPcontacts_Blocked &result) {
+		                     _loadRequestId = 0;
 
-		if (!_offset) {
-			setDescriptionText(lang(lng_blocked_list_about));
-		}
+		                     if (!_offset) {
+			                     setDescriptionText(lang(lng_blocked_list_about));
+		                     }
 
-		auto handleContactsBlocked = [](auto &list) {
-			App::feedUsers(list.vusers);
-			return list.vblocked.v;
-		};
-		switch (result.type()) {
-		case mtpc_contacts_blockedSlice: {
-			receivedUsers(handleContactsBlocked(result.c_contacts_blockedSlice()));
-		} break;
-		case mtpc_contacts_blocked: {
-			_allLoaded = true;
-			receivedUsers(handleContactsBlocked(result.c_contacts_blocked()));
-		} break;
-		default: Unexpected("Bad type() in MTPcontacts_GetBlocked() result.");
-		}
-	}).fail([this](const RPCError &error) {
-		_loadRequestId = 0;
-	}).send();
+		                     auto handleContactsBlocked = [](auto &list) {
+			                     App::feedUsers(list.vusers);
+			                     return list.vblocked.v;
+		                     };
+		                     switch (result.type()) {
+		                     case mtpc_contacts_blockedSlice: {
+			                     receivedUsers(handleContactsBlocked(result.c_contacts_blockedSlice()));
+		                     } break;
+		                     case mtpc_contacts_blocked: {
+			                     _allLoaded = true;
+			                     receivedUsers(handleContactsBlocked(result.c_contacts_blocked()));
+		                     } break;
+		                     default: Unexpected("Bad type() in MTPcontacts_GetBlocked() result.");
+		                     }
+	                     })
+	                     .fail([this](const RPCError &error) { _loadRequestId = 0; })
+	                     .send();
 }
 
-void BlockedBoxController::rowClicked(not_null<PeerListRow*> row) {
+void BlockedBoxController::rowClicked(not_null<PeerListRow *> row) {
 	Ui::showPeerHistoryAsync(row->peer()->id, ShowAtUnreadMsgId);
 }
 
-void BlockedBoxController::rowActionClicked(not_null<PeerListRow*> row) {
+void BlockedBoxController::rowActionClicked(not_null<PeerListRow *> row) {
 	auto user = row->peer()->asUser();
 	Expects(user != nullptr);
 
@@ -187,8 +190,8 @@ void BlockedBoxController::handleBlockedEvent(UserData *user) {
 
 void BlockedBoxController::BlockNewUser() {
 	auto controller = std::make_unique<BlockUserBoxController>();
-	auto initBox = [controller = controller.get()](not_null<PeerListBox*> box) {
-		controller->setBlockUserCallback([box](not_null<UserData*> user) {
+	auto initBox = [controller = controller.get()](not_null<PeerListBox *> box) {
+		controller->setBlockUserCallback([box](not_null<UserData *> user) {
 			Auth().api().blockUser(user);
 			box->closeBox();
 		});
@@ -246,8 +249,12 @@ QString LastSeenPrivacyController::warning() {
 
 QString LastSeenPrivacyController::exceptionLinkText(Exception exception, int count) {
 	switch (exception) {
-	case Exception::Always: return (count > 0) ? lng_edit_privacy_lastseen_always(lt_count, count) : lang(lng_edit_privacy_lastseen_always_empty);
-	case Exception::Never: return (count > 0) ? lng_edit_privacy_lastseen_never(lt_count, count) : lang(lng_edit_privacy_lastseen_never_empty);
+	case Exception::Always:
+		return (count > 0) ? lng_edit_privacy_lastseen_always(lt_count, count) :
+		                     lang(lng_edit_privacy_lastseen_always_empty);
+	case Exception::Never:
+		return (count > 0) ? lng_edit_privacy_lastseen_never(lt_count, count) :
+		                     lang(lng_edit_privacy_lastseen_never_empty);
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -275,7 +282,8 @@ void LastSeenPrivacyController::confirmSave(bool someAreDisallowed, base::lambda
 			Auth().data().setLastSeenWarningSeen(true);
 			Local::writeUserSettings();
 		};
-		auto box = Box<ConfirmBox>(lang(lng_edit_privacy_lastseen_warning), lang(lng_continue), lang(lng_cancel), std::move(callback));
+		auto box = Box<ConfirmBox>(lang(lng_edit_privacy_lastseen_warning), lang(lng_continue), lang(lng_cancel),
+		                           std::move(callback));
 		*weakBox = Ui::show(std::move(box), KeepOtherLayers);
 	} else {
 		saveCallback();
@@ -300,8 +308,11 @@ QString GroupsInvitePrivacyController::description() {
 
 QString GroupsInvitePrivacyController::exceptionLinkText(Exception exception, int count) {
 	switch (exception) {
-	case Exception::Always: return (count > 0) ? lng_edit_privacy_groups_always(lt_count, count) : lang(lng_edit_privacy_groups_always_empty);
-	case Exception::Never: return (count > 0) ? lng_edit_privacy_groups_never(lt_count, count) : lang(lng_edit_privacy_groups_never_empty);
+	case Exception::Always:
+		return (count > 0) ? lng_edit_privacy_groups_always(lt_count, count) :
+		                     lang(lng_edit_privacy_groups_always_empty);
+	case Exception::Never:
+		return (count > 0) ? lng_edit_privacy_groups_never(lt_count, count) : lang(lng_edit_privacy_groups_never_empty);
 	}
 	Unexpected("Invalid exception value.");
 }
@@ -332,8 +343,10 @@ QString CallsPrivacyController::description() {
 
 QString CallsPrivacyController::exceptionLinkText(Exception exception, int count) {
 	switch (exception) {
-	case Exception::Always: return (count > 0) ? lng_edit_privacy_calls_always(lt_count, count) : lang(lng_edit_privacy_calls_always_empty);
-	case Exception::Never: return (count > 0) ? lng_edit_privacy_calls_never(lt_count, count) : lang(lng_edit_privacy_calls_never_empty);
+	case Exception::Always:
+		return (count > 0) ? lng_edit_privacy_calls_always(lt_count, count) : lang(lng_edit_privacy_calls_always_empty);
+	case Exception::Never:
+		return (count > 0) ? lng_edit_privacy_calls_never(lt_count, count) : lang(lng_edit_privacy_calls_never_empty);
 	}
 	Unexpected("Invalid exception value.");
 }
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.h b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
index 872c0f987..312e0e7d2 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "boxes/peer_list_box.h"
 #include "boxes/edit_privacy_box.h"
+#include "boxes/peer_list_box.h"
 #include "mtproto/sender.h"
 
 namespace Settings {
@@ -29,8 +29,8 @@ namespace Settings {
 class BlockedBoxController : public PeerListController, private base::Subscriber, private MTP::Sender {
 public:
 	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowActionClicked(not_null<PeerListRow*> row) override;
+	void rowClicked(not_null<PeerListRow *> row) override;
+	void rowActionClicked(not_null<PeerListRow *> row) override;
 	void loadMoreRows() override;
 
 	static void BlockNewUser();
@@ -46,7 +46,6 @@ private:
 	int _offset = 0;
 	mtpRequestId _loadRequestId = 0;
 	bool _allLoaded = false;
-
 };
 
 class LastSeenPrivacyController : public EditPrivacyBox::Controller, private base::Subscriber {
@@ -64,7 +63,6 @@ public:
 	QString exceptionsDescription() override;
 
 	void confirmSave(bool someAreDisallowed, base::lambda_once<void()> saveCallback) override;
-
 };
 
 class GroupsInvitePrivacyController : public EditPrivacyBox::Controller, private base::Subscriber {
@@ -80,7 +78,6 @@ public:
 	QString exceptionLinkText(Exception exception, int count) override;
 	QString exceptionBoxTitle(Exception exception) override;
 	QString exceptionsDescription() override;
-
 };
 
 class CallsPrivacyController : public EditPrivacyBox::Controller, private base::Subscriber {
@@ -95,7 +92,6 @@ public:
 	QString exceptionLinkText(Exception exception, int count) override;
 	QString exceptionBoxTitle(Exception exception) override;
 	QString exceptionsDescription() override;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
index a622dd72a..a65aa70e7 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
@@ -20,26 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_privacy_widget.h"
 
+#include "application.h"
+#include "boxes/autolock_box.h"
+#include "boxes/edit_privacy_box.h"
+#include "boxes/passcode_box.h"
+#include "boxes/peer_list_box.h"
+#include "boxes/self_destruction_box.h"
+#include "boxes/sessions_box.h"
+#include "lang/lang_keys.h"
+#include "platform/platform_specific.h"
+#include "scheme.h"
+#include "settings/settings_privacy_controllers.h"
+#include "styles/style_settings.h"
 #include "ui/effects/widget_slide_wrap.h"
 #include "ui/widgets/buttons.h"
-#include "styles/style_settings.h"
-#include "lang/lang_keys.h"
-#include "application.h"
-#include "platform/platform_specific.h"
-#include "boxes/sessions_box.h"
-#include "boxes/passcode_box.h"
-#include "boxes/autolock_box.h"
-#include "boxes/peer_list_box.h"
-#include "boxes/edit_privacy_box.h"
-#include "boxes/self_destruction_box.h"
-#include "settings/settings_privacy_controllers.h"
-#include "scheme.h"
 
 namespace Settings {
 
-LocalPasscodeState::LocalPasscodeState(QWidget *parent) : TWidget(parent)
-, _edit(this, GetEditPasscodeText(), st::boxLinkButton)
-, _turnOff(this, lang(lng_passcode_turn_off), st::boxLinkButton) {
+LocalPasscodeState::LocalPasscodeState(QWidget *parent)
+    : TWidget(parent)
+    , _edit(this, GetEditPasscodeText(), st::boxLinkButton)
+    , _turnOff(this, lang(lng_passcode_turn_off), st::boxLinkButton) {
 	updateControls();
 	connect(_edit, SIGNAL(clicked()), this, SLOT(onEdit()));
 	connect(_turnOff, SIGNAL(clicked()), this, SLOT(onTurnOff()));
@@ -70,13 +71,15 @@ QString LocalPasscodeState::GetEditPasscodeText() {
 	return lang(Global::LocalPasscode() ? lng_passcode_change : lng_passcode_turn_on);
 }
 
-CloudPasswordState::CloudPasswordState(QWidget *parent) : TWidget(parent)
-, _edit(this, lang(lng_cloud_password_set), st::boxLinkButton)
-, _turnOff(this, lang(lng_passcode_turn_off), st::boxLinkButton) {
+CloudPasswordState::CloudPasswordState(QWidget *parent)
+    : TWidget(parent)
+    , _edit(this, lang(lng_cloud_password_set), st::boxLinkButton)
+    , _turnOff(this, lang(lng_passcode_turn_off), st::boxLinkButton) {
 	_turnOff->hide();
 	connect(_edit, SIGNAL(clicked()), this, SLOT(onEdit()));
 	connect(_turnOff, SIGNAL(clicked()), this, SLOT(onTurnOff()));
-	Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onReloadPassword(Qt::ApplicationState)));
+	Sandbox::connect(SIGNAL(applicationStateChanged(Qt::ApplicationState)), this,
+	                 SLOT(onReloadPassword(Qt::ApplicationState)));
 	onReloadPassword();
 }
 
@@ -96,10 +99,14 @@ void CloudPasswordState::onTurnOff() {
 		_turnOff->hide();
 
 		auto flags = MTPDaccount_passwordInputSettings::Flag::f_email;
-		MTPaccount_PasswordInputSettings settings(MTP_account_passwordInputSettings(MTP_flags(flags), MTP_bytes(QByteArray()), MTP_bytes(QByteArray()), MTP_string(QString()), MTP_string(QString())));
-		MTP::send(MTPaccount_UpdatePasswordSettings(MTP_bytes(QByteArray()), settings), rpcDone(&CloudPasswordState::offPasswordDone), rpcFail(&CloudPasswordState::offPasswordFail));
+		MTPaccount_PasswordInputSettings settings(
+		    MTP_account_passwordInputSettings(MTP_flags(flags), MTP_bytes(QByteArray()), MTP_bytes(QByteArray()),
+		                                      MTP_string(QString()), MTP_string(QString())));
+		MTP::send(MTPaccount_UpdatePasswordSettings(MTP_bytes(QByteArray()), settings),
+		          rpcDone(&CloudPasswordState::offPasswordDone), rpcFail(&CloudPasswordState::offPasswordFail));
 	} else {
-		auto box = Ui::show(Box<PasscodeBox>(_newPasswordSalt, _curPasswordSalt, _hasPasswordRecovery, _curPasswordHint, true));
+		auto box = Ui::show(
+		    Box<PasscodeBox>(_newPasswordSalt, _curPasswordSalt, _hasPasswordRecovery, _curPasswordHint, true));
 		connect(box, SIGNAL(reloadPassword()), this, SLOT(onReloadPassword()));
 	}
 }
@@ -169,13 +176,15 @@ bool CloudPasswordState::offPasswordFail(const RPCError &error) {
 	return true;
 }
 
-PrivacyWidget::PrivacyWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_privacy)) {
+PrivacyWidget::PrivacyWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_privacy)) {
 	createControls();
 	subscribe(Global::RefLocalPasscodeChanged(), [this]() { autoLockUpdated(); });
 }
 
 QString PrivacyWidget::GetAutoLockText() {
-	return (Global::AutoLock() % 3600) ? lng_passcode_autolock_minutes(lt_count, Global::AutoLock() / 60) : lng_passcode_autolock_hours(lt_count, Global::AutoLock() / 3600);
+	return (Global::AutoLock() % 3600) ? lng_passcode_autolock_minutes(lt_count, Global::AutoLock() / 60) :
+	                                     lng_passcode_autolock_hours(lt_count, Global::AutoLock() / 3600);
 }
 
 void PrivacyWidget::createControls() {
@@ -186,7 +195,8 @@ void PrivacyWidget::createControls() {
 	addChildRow(_blockedUsers, marginSmall, lang(lng_settings_blocked_users), SLOT(onBlockedUsers()));
 	addChildRow(_lastSeenPrivacy, marginSmall, lang(lng_settings_last_seen_privacy), SLOT(onLastSeenPrivacy()));
 	addChildRow(_callsPrivacy, marginSmall, lang(lng_settings_calls_privacy), SLOT(onCallsPrivacy()));
-	addChildRow(_groupsInvitePrivacy, marginSmall, lang(lng_settings_groups_invite_privacy), SLOT(onGroupsInvitePrivacy()));
+	addChildRow(_groupsInvitePrivacy, marginSmall, lang(lng_settings_groups_invite_privacy),
+	            SLOT(onGroupsInvitePrivacy()));
 	addChildRow(_localPasscodeState, marginSmall);
 	auto label = lang(psIdleSupported() ? lng_passcode_autolock_away : lng_passcode_autolock_inactive);
 	auto value = GetAutoLockText();
@@ -209,7 +219,7 @@ void PrivacyWidget::autoLockUpdated() {
 }
 
 void PrivacyWidget::onBlockedUsers() {
-	Ui::show(Box<PeerListBox>(std::make_unique<BlockedBoxController>(), [](not_null<PeerListBox*> box) {
+	Ui::show(Box<PeerListBox>(std::make_unique<BlockedBoxController>(), [](not_null<PeerListBox *> box) {
 		box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
 		box->addLeftButton(langFactory(lng_blocked_list_add), [box] { BlockedBoxController::BlockNewUser(); });
 	}));
diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.h b/Telegram/SourceFiles/settings/settings_privacy_widget.h
index e0b2d5871..8b7950081 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.h
+++ b/Telegram/SourceFiles/settings/settings_privacy_widget.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "base/object_ptr.h"
+#include "mtproto/rpc_sender.h"
+#include "scheme.h"
 #include "settings/settings_block_widget.h"
 #include "settings/settings_chat_settings_widget.h"
-#include "mtproto/rpc_sender.h"
-#include "base/object_ptr.h"
-#include "scheme.h"
 
 namespace Settings {
 
@@ -48,7 +48,6 @@ private:
 
 	object_ptr<Ui::LinkButton> _edit;
 	object_ptr<Ui::LinkButton> _turnOff;
-
 };
 
 class CloudPasswordState : public TWidget, private base::Subscriber, public RPCSender {
@@ -80,7 +79,6 @@ private:
 	bool _hasPasswordRecovery = false;
 	QString _curPasswordHint;
 	QByteArray _newPasswordSalt;
-
 };
 
 class PrivacyWidget : public BlockWidget {
@@ -104,16 +102,15 @@ private:
 	void createControls();
 	void autoLockUpdated();
 
-	object_ptr<Ui::LinkButton> _blockedUsers = { nullptr };
-	object_ptr<Ui::LinkButton> _lastSeenPrivacy = { nullptr };
-	object_ptr<Ui::LinkButton> _callsPrivacy = { nullptr };
-	object_ptr<Ui::LinkButton> _groupsInvitePrivacy = { nullptr };
-	object_ptr<LocalPasscodeState> _localPasscodeState = { nullptr };
-	object_ptr<Ui::WidgetSlideWrap<LabeledLink>> _autoLock = { nullptr };
-	object_ptr<CloudPasswordState> _cloudPasswordState = { nullptr };
-	object_ptr<Ui::LinkButton> _showAllSessions = { nullptr };
-	object_ptr<Ui::LinkButton> _selfDestruction = { nullptr };
-
+	object_ptr<Ui::LinkButton> _blockedUsers = {nullptr};
+	object_ptr<Ui::LinkButton> _lastSeenPrivacy = {nullptr};
+	object_ptr<Ui::LinkButton> _callsPrivacy = {nullptr};
+	object_ptr<Ui::LinkButton> _groupsInvitePrivacy = {nullptr};
+	object_ptr<LocalPasscodeState> _localPasscodeState = {nullptr};
+	object_ptr<Ui::WidgetSlideWrap<LabeledLink>> _autoLock = {nullptr};
+	object_ptr<CloudPasswordState> _cloudPasswordState = {nullptr};
+	object_ptr<Ui::LinkButton> _showAllSessions = {nullptr};
+	object_ptr<Ui::LinkButton> _selfDestruction = {nullptr};
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp
index 43ec486d0..95479f78c 100644
--- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp
@@ -20,17 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_scale_widget.h"
 
+#include "app.h"
+#include "application.h"
+#include "boxes/confirm_box.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "ui/widgets/checkbox.h"
-#include "lang/lang_keys.h"
-#include "storage/localstorage.h"
-#include "mainwindow.h"
-#include "boxes/confirm_box.h"
-#include "application.h"
 #include "ui/widgets/discrete_sliders.h"
-#include "facades.h"
-#include "app.h"
 
 namespace Settings {
 namespace {
@@ -41,21 +41,24 @@ QString scaleLabel(DBIScale scale) {
 	case dbisOneAndQuarter: return qsl("125%");
 	case dbisOneAndHalf: return qsl("150%");
 	case dbisTwo: return qsl("200%");
-	case dbisAuto: case dbisScaleCount: assert(false); // temp
+	case dbisAuto:
+	case dbisScaleCount: assert(false); // temp
 	}
 	return QString();
 }
 
 } // namespace
 
-ScaleWidget::ScaleWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_scale)) {
+ScaleWidget::ScaleWidget(QWidget *parent, UserData *self)
+    : BlockWidget(parent, self, lang(lng_settings_section_scale)) {
 	createControls();
 }
 
 void ScaleWidget::createControls() {
 	style::margins margin(0, 0, 0, st::settingsSmallSkip);
 
-	addChildRow(_auto, margin, lng_settings_scale_auto(lt_cur, scaleLabel(cScreenScale())), [this](bool) { onAutoChanged(); }, (cConfigScale() == dbisAuto));
+	addChildRow(_auto, margin, lng_settings_scale_auto(lt_cur, scaleLabel(cScreenScale())),
+	            [this](bool) { onAutoChanged(); }, (cConfigScale() == dbisAuto));
 	addChildRow(_scale, style::margins(0, 0, 0, 0));
 
 	_scale->addSection(scaleLabel(dbisOne));
@@ -77,7 +80,8 @@ void ScaleWidget::onAutoChanged() {
 			case dbisOneAndQuarter: newScale = dbisOne; break;
 			case dbisOneAndHalf: newScale = dbisOneAndQuarter; break;
 			case dbisTwo: newScale = dbisOneAndHalf; break;
-			case dbisAuto: case dbisScaleCount: assert(false); // temp
+			case dbisAuto:
+			case dbisScaleCount: assert(false); // temp
 			}
 		}
 	}
@@ -102,15 +106,16 @@ void ScaleWidget::setScale(DBIScale newScale) {
 	}
 
 	if (cEvalScale(newScale) != cEvalScale(cRealScale())) {
-		Ui::show(Box<ConfirmBox>(lang(lng_settings_need_restart), lang(lng_settings_restart_now), base::lambda_guarded(this, [this] {
-			cSetConfigScale(_newScale);
-			Local::writeSettings();
-			App::restart();
-		}), base::lambda_guarded(this, [this] {
-			App::CallDelayed(st::boxDuration, this, [this] {
-				setScale(cRealScale());
-			});
-		})));
+		Ui::show(Box<ConfirmBox>(lang(lng_settings_need_restart), lang(lng_settings_restart_now),
+		                         base::lambda_guarded(this,
+		                                              [this] {
+			                                              cSetConfigScale(_newScale);
+			                                              Local::writeSettings();
+			                                              App::restart();
+		                                              }),
+		                         base::lambda_guarded(this, [this] {
+			                         App::CallDelayed(st::boxDuration, this, [this] { setScale(cRealScale()); });
+		                         })));
 	} else {
 		cSetConfigScale(newScale);
 		Local::writeSettings();
diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.h b/Telegram/SourceFiles/settings/settings_scale_widget.h
index 7281ebbd3..4b8065ab4 100644
--- a/Telegram/SourceFiles/settings/settings_scale_widget.h
+++ b/Telegram/SourceFiles/settings/settings_scale_widget.h
@@ -43,12 +43,11 @@ private:
 	void createControls();
 	void setScale(DBIScale newScale);
 
-	object_ptr<Ui::Checkbox> _auto = { nullptr };
-	object_ptr<Ui::SettingsSlider> _scale = { nullptr };
+	object_ptr<Ui::Checkbox> _auto = {nullptr};
+	object_ptr<Ui::SettingsSlider> _scale = {nullptr};
 
 	DBIScale _newScale = dbisAuto;
 	bool _inSetScale = false;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_widget.cpp b/Telegram/SourceFiles/settings/settings_widget.cpp
index c39e22c6d..1f0c912a3 100644
--- a/Telegram/SourceFiles/settings/settings_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_widget.cpp
@@ -20,27 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings/settings_widget.h"
 
-#include "settings/settings_inner_widget.h"
+#include "boxes/confirm_box.h"
+#include "core/file_utilities.h"
+#include "lang/lang_cloud_manager.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_audio_track.h"
+#include "messenger.h"
+#include "mtproto/dc_options.h"
+#include "mtproto/mtp_instance.h"
 #include "settings/settings_fixed_bar.h"
+#include "settings/settings_inner_widget.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 #include "styles/style_window.h"
-#include "styles/style_boxes.h"
 #include "ui/effects/widget_fade_wrap.h"
-#include "ui/widgets/scroll_area.h"
 #include "ui/widgets/buttons.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "storage/localstorage.h"
-#include "boxes/confirm_box.h"
-#include "lang/lang_keys.h"
-#include "lang/lang_cloud_manager.h"
-#include "messenger.h"
-#include "mtproto/mtp_instance.h"
-#include "mtproto/dc_options.h"
-#include "core/file_utilities.h"
+#include "ui/widgets/scroll_area.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_editor.h"
-#include "media/media_audio_track.h"
 
 namespace Settings {
 namespace {
@@ -50,20 +50,16 @@ QMap<QString, base::lambda<void()>> Codes;
 
 void fillCodes() {
 	Codes.insert(qsl("debugmode"), [] {
-		QString text = cDebug() ? qsl("Do you want to disable DEBUG logs?") : qsl("Do you want to enable DEBUG logs?\n\nAll network events will be logged.");
-		Ui::show(Box<ConfirmBox>(text, [] {
-			Messenger::Instance().onSwitchDebugMode();
-		}));
+		QString text = cDebug() ? qsl("Do you want to disable DEBUG logs?") :
+		                          qsl("Do you want to enable DEBUG logs?\n\nAll network events will be logged.");
+		Ui::show(Box<ConfirmBox>(text, [] { Messenger::Instance().onSwitchDebugMode(); }));
 	});
 	Codes.insert(qsl("testmode"), [] {
-		auto text = cTestMode() ? qsl("Do you want to disable TEST mode?") : qsl("Do you want to enable TEST mode?\n\nYou will be switched to test cloud.");
-		Ui::show(Box<ConfirmBox>(text, [] {
-			Messenger::Instance().onSwitchTestMode();
-		}));
-	});
-	Codes.insert(qsl("loadlang"), [] {
-		Lang::CurrentCloudManager().switchToLanguage(qsl("custom"));
+		auto text = cTestMode() ? qsl("Do you want to disable TEST mode?") :
+		                          qsl("Do you want to enable TEST mode?\n\nYou will be switched to test cloud.");
+		Ui::show(Box<ConfirmBox>(text, [] { Messenger::Instance().onSwitchTestMode(); }));
 	});
+	Codes.insert(qsl("loadlang"), [] { Lang::CurrentCloudManager().switchToLanguage(qsl("custom")); });
 	Codes.insert(qsl("debugfiles"), [] {
 		if (!cDebug()) return;
 		if (DebugLogging::FileLoader()) {
@@ -71,16 +67,13 @@ void fillCodes() {
 		} else {
 			Global::RefDebugLoggingFlags() |= DebugLogging::FileLoaderFlag;
 		}
-		Ui::show(Box<InformBox>(DebugLogging::FileLoader() ? qsl("Enabled file download logging") : qsl("Disabled file download logging")));
-	});
-	Codes.insert(qsl("crashplease"), [] {
-		Unexpected("Crashed in Settings!");
+		Ui::show(Box<InformBox>(DebugLogging::FileLoader() ? qsl("Enabled file download logging") :
+		                                                     qsl("Disabled file download logging")));
 	});
+	Codes.insert(qsl("crashplease"), [] { Unexpected("Crashed in Settings!"); });
 	Codes.insert(qsl("workmode"), [] {
 		auto text = Global::DialogsModeEnabled() ? qsl("Disable work mode?") : qsl("Enable work mode?");
-		Ui::show(Box<ConfirmBox>(text, [] {
-			Messenger::Instance().onSwitchWorkMode();
-		}));
+		Ui::show(Box<ConfirmBox>(text, [] { Messenger::Instance().onSwitchWorkMode(); }));
 	});
 	Codes.insert(qsl("moderate"), [] {
 		auto text = Global::ModerateModeEnabled() ? qsl("Disable moderate mode?") : qsl("Enable moderate mode?");
@@ -96,15 +89,14 @@ void fillCodes() {
 		}
 	});
 	Codes.insert(qsl("loadcolors"), [] {
-		FileDialog::GetOpenPath("Open palette file", "Palette (*.tdesktop-palette)", [](const FileDialog::OpenResult &result) {
-			if (!result.paths.isEmpty()) {
-				Window::Theme::Apply(result.paths.front());
-			}
-		});
-	});
-	Codes.insert(qsl("edittheme"), [] {
-		Window::Theme::Editor::Start();
+		FileDialog::GetOpenPath("Open palette file", "Palette (*.tdesktop-palette)",
+		                        [](const FileDialog::OpenResult &result) {
+			                        if (!result.paths.isEmpty()) {
+				                        Window::Theme::Apply(result.paths.front());
+			                        }
+		                        });
 	});
+	Codes.insert(qsl("edittheme"), [] { Window::Theme::Editor::Start(); });
 	Codes.insert(qsl("videoplayer"), [] {
 		auto text = cUseExternalVideoPlayer() ? qsl("Use internal video player?") : qsl("Use external video player?");
 		Ui::show(Box<ConfirmBox>(text, [] {
@@ -114,23 +106,20 @@ void fillCodes() {
 		}));
 	});
 	Codes.insert(qsl("endpoints"), [] {
-		FileDialog::GetOpenPath("Open DC endpoints", "DC Endpoints (*.tdesktop-endpoints)", [](const FileDialog::OpenResult &result) {
-			if (!result.paths.isEmpty()) {
-				if (!Messenger::Instance().mtp()->dcOptions()->loadFromFile(result.paths.front())) {
-					Ui::show(Box<InformBox>("Could not load endpoints :( Errors in 'log.txt'."));
-				}
-			}
-		});
+		FileDialog::GetOpenPath(
+		    "Open DC endpoints", "DC Endpoints (*.tdesktop-endpoints)", [](const FileDialog::OpenResult &result) {
+			    if (!result.paths.isEmpty()) {
+				    if (!Messenger::Instance().mtp()->dcOptions()->loadFromFile(result.paths.front())) {
+					    Ui::show(Box<InformBox>("Could not load endpoints :( Errors in 'log.txt'."));
+				    }
+			    }
+		    });
 	});
 
 	auto audioFilters = qsl("Audio files (*.wav *.mp3);;") + FileDialog::AllFilesFilter();
 	auto audioKeys = {
-		qsl("msg_incoming"),
-		qsl("call_incoming"),
-		qsl("call_outgoing"),
-		qsl("call_busy"),
-		qsl("call_connect"),
-		qsl("call_end"),
+	    qsl("msg_incoming"), qsl("call_incoming"), qsl("call_outgoing"),
+	    qsl("call_busy"),    qsl("call_connect"),  qsl("call_end"),
 	};
 	for (auto &key : audioKeys) {
 		Codes.insert(key, [audioFilters, key] {
@@ -199,9 +188,7 @@ Widget::Widget(QWidget *parent) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	_inner = setInnerWidget(object_ptr<InnerWidget>(this));
-	setCloseClickHandler([]() {
-		Ui::hideSettingsAndLayer();
-	});
+	setCloseClickHandler([]() { Ui::hideSettingsAndLayer(); });
 }
 
 void Widget::refreshLang() {
@@ -230,7 +217,8 @@ void Widget::parentResized() {
 		if (windowWidth > st::windowMinWidth) {
 			// Width changes from st::windowMinWidth to st::settingsMaxWidth.
 			// Padding changes from st::settingsMinPadding to st::settingsMaxPadding.
-			newContentLeft += ((newWidth - st::windowMinWidth) * (st::settingsMaxPadding - st::settingsMinPadding)) / (st::settingsMaxWidth - st::windowMinWidth);
+			newContentLeft += ((newWidth - st::windowMinWidth) * (st::settingsMaxPadding - st::settingsMinPadding)) /
+			                  (st::settingsMaxWidth - st::windowMinWidth);
 		}
 	} else if (windowWidth < st::settingsMaxWidth + 2 * st::settingsMargin) {
 		newWidth = windowWidth - 2 * st::settingsMargin;
@@ -238,7 +226,8 @@ void Widget::parentResized() {
 		if (windowWidth > st::windowMinWidth) {
 			// Width changes from st::windowMinWidth to st::settingsMaxWidth.
 			// Padding changes from st::settingsMinPadding to st::settingsMaxPadding.
-			newContentLeft += ((newWidth - st::windowMinWidth) * (st::settingsMaxPadding - st::settingsMinPadding)) / (st::settingsMaxWidth - st::windowMinWidth);
+			newContentLeft += ((newWidth - st::windowMinWidth) * (st::settingsMaxPadding - st::settingsMinPadding)) /
+			                  (st::settingsMaxWidth - st::windowMinWidth);
 		}
 	}
 	resizeToWidth(newWidth, newContentLeft);
diff --git a/Telegram/SourceFiles/settings/settings_widget.h b/Telegram/SourceFiles/settings/settings_widget.h
index b10b2caf5..d7ffe7ff2 100644
--- a/Telegram/SourceFiles/settings/settings_widget.h
+++ b/Telegram/SourceFiles/settings/settings_widget.h
@@ -30,7 +30,7 @@ class Widget : public Layer, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	Widget(QWidget*);
+	Widget(QWidget *);
 
 	void refreshLang();
 
@@ -46,7 +46,6 @@ private:
 	QPointer<InnerWidget> _inner;
 
 	int _contentLeft = 0;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp
index 1ea510f97..33a4c1500 100644
--- a/Telegram/SourceFiles/shortcuts.cpp
+++ b/Telegram/SourceFiles/shortcuts.cpp
@@ -20,23 +20,23 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "shortcuts.h"
 
-#include "mainwindow.h"
-#include "passcodewidget.h"
-#include "mainwidget.h"
-#include "messenger.h"
-#include "media/player/media_player_instance.h"
-#include "platform/platform_specific.h"
 #include "base/parse_helper.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/player/media_player_instance.h"
+#include "messenger.h"
+#include "passcodewidget.h"
+#include "platform/platform_specific.h"
 
-#include <QJsonObject>
-#include <QJsonDocument>
 #include <QDirIterator>
-#include <QShortcut>
 #include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QShortcut>
 
 namespace ShortcutCommands {
 
-using Handler = bool(*)();
+using Handler = bool (*)();
 
 bool lock_telegram() {
 	if (!App::passcoded() && Global::LocalPasscode()) {
@@ -59,11 +59,11 @@ bool quit_telegram() {
 	return true;
 }
 
-//void start_stop_recording() {
+// void start_stop_recording() {
 
 //}
 
-//void cancel_recording() {
+// void cancel_recording() {
 
 //}
 
@@ -161,7 +161,9 @@ struct DataStruct {
 		}
 
 #define DeclareAlias(keys, command) setShortcut(qsl(keys), qsl(#command))
-#define DeclareCommand(keys, command) createCommand(qsl(#command), ShortcutCommands::command); DeclareAlias(keys, command)
+#define DeclareCommand(keys, command)                                                                                  \
+	createCommand(qsl(#command), ShortcutCommands::command);                                                           \
+	DeclareAlias(keys, command)
 
 		DeclareCommand("ctrl+w", close_telegram);
 		DeclareAlias("ctrl+f4", close_telegram);
@@ -169,9 +171,9 @@ struct DataStruct {
 		DeclareCommand("ctrl+m", minimize_telegram);
 		DeclareCommand("ctrl+q", quit_telegram);
 
-		//DeclareCommand("ctrl+r", start_stop_recording);
-		//DeclareCommand("ctrl+shift+r", cancel_recording);
-		//DeclareCommand("media record", start_stop_recording);
+		// DeclareCommand("ctrl+r", start_stop_recording);
+		// DeclareCommand("ctrl+shift+r", cancel_recording);
+		// DeclareCommand("media record", start_stop_recording);
 
 		DeclareCommand("media play", media_play);
 		DeclareCommand("media pause", media_pause);
@@ -208,13 +210,12 @@ struct DataStruct {
 	QMap<QString, ShortcutCommands::Handler> commands;
 	QMap<ShortcutCommands::Handler, QString> commandnames;
 
-	QMap<QKeySequence, QShortcut*> sequences;
+	QMap<QKeySequence, QShortcut *> sequences;
 	QMap<int, ShortcutCommands::Handler> handlers;
 
-	QSet<QShortcut*> mediaShortcuts;
+	QSet<QShortcut *> mediaShortcuts;
 	QSet<QString> autoRepeatCommands;
 	QSet<QString> mediaCommands;
-
 };
 
 namespace {
@@ -240,7 +241,8 @@ QKeySequence setShortcut(const QString &keys, const QString &command) {
 		if (it == DataPtr->commands.cend()) {
 			LOG(("Warning: could not find shortcut command handler '%1'").arg(command));
 		} else {
-			auto shortcut = std::make_unique<QShortcut>(seq, Messenger::Instance().getActiveWindow(), nullptr, nullptr, Qt::ApplicationShortcut);
+			auto shortcut = std::make_unique<QShortcut>(seq, Messenger::Instance().getActiveWindow(), nullptr, nullptr,
+			                                            Qt::ApplicationShortcut);
 			if (!DataPtr->autoRepeatCommands.contains(command)) {
 				shortcut->setAutoRepeat(false);
 			}
@@ -307,7 +309,7 @@ void start() {
 	bool defaultValid = false;
 	QFile defaultFile(cWorkingDir() + qsl("tdata/shortcuts-default.json"));
 	if (defaultFile.open(QIODevice::ReadOnly)) {
-		QJsonParseError error = { 0, QJsonParseError::NoError };
+		QJsonParseError error = {0, QJsonParseError::NoError};
 		QJsonDocument doc = QJsonDocument::fromJson(base::parse::stripComments(defaultFile.readAll()), &error);
 		defaultFile.close();
 
@@ -316,14 +318,16 @@ void start() {
 			if (!shortcuts.isEmpty() && (*shortcuts.constBegin()).isObject()) {
 				QJsonObject versionObject((*shortcuts.constBegin()).toObject());
 				QJsonObject::const_iterator version = versionObject.constFind(qsl("version"));
-				if (version != versionObject.constEnd() && (*version).isString() && (*version).toString() == QString::number(AppVersion)) {
+				if (version != versionObject.constEnd() && (*version).isString() &&
+				    (*version).toString() == QString::number(AppVersion)) {
 					defaultValid = true;
 				}
 			}
 		}
 	}
 	if (!defaultValid && defaultFile.open(QIODevice::WriteOnly)) {
-		const char *defaultHeader = "\
+		const char *defaultHeader =
+		    "\
 // This is a list of default shortcuts for Kepka\n\
 // Please don't modify it, its content is not used in any way\n\
 // You can place your own shortcuts in the 'shortcuts-custom.json' file\n\n";
@@ -358,7 +362,7 @@ void start() {
 	QFile customFile(cWorkingDir() + qsl("tdata/shortcuts-custom.json"));
 	if (customFile.exists()) {
 		if (customFile.open(QIODevice::ReadOnly)) {
-			QJsonParseError error = { 0, QJsonParseError::NoError };
+			QJsonParseError error = {0, QJsonParseError::NoError};
 			QJsonDocument doc = QJsonDocument::fromJson(base::parse::stripComments(customFile.readAll()), &error);
 			customFile.close();
 
@@ -375,9 +379,12 @@ void start() {
 					} else {
 						QKeySequence seq;
 						QJsonObject entry((*i).toObject());
-						QJsonObject::const_iterator keys = entry.constFind(qsl("keys")), command = entry.constFind(qsl("command"));
-						if (keys == entry.constEnd() || command == entry.constEnd() || !(*keys).isString() || (!(*command).isString() && !(*command).isNull())) {
-							DataPtr->errors.push_back(qsl("Bad entry! {\"keys\": \"...\", \"command\": [ \"...\" | null ]} expected"));
+						QJsonObject::const_iterator keys = entry.constFind(qsl("keys")),
+						                            command = entry.constFind(qsl("command"));
+						if (keys == entry.constEnd() || command == entry.constEnd() || !(*keys).isString() ||
+						    (!(*command).isString() && !(*command).isNull())) {
+							DataPtr->errors.push_back(
+							    qsl("Bad entry! {\"keys\": \"...\", \"command\": [ \"...\" | null ]} expected"));
 						} else if ((*command).isNull()) {
 							seq = removeShortcut((*keys).toString());
 						} else {
@@ -397,7 +404,8 @@ void start() {
 			DataPtr->errors.push_front(qsl("While reading file '%1'...").arg(customFile.fileName()));
 		}
 	} else if (customFile.open(QIODevice::WriteOnly)) {
-		const char *customContent = "\
+		const char *customContent =
+		    "\
 // This is a list of your own shortcuts for Kepka\n\
 // You can see full list of commands in the 'shortcuts-default.json' file\n\
 // Place a null value instead of a command string to switch the shortcut off\n\n\
@@ -443,17 +451,13 @@ bool launch(const QString &command) {
 
 void enableMediaShortcuts() {
 	if (!DataPtr) return;
-	for_const (auto shortcut, DataPtr->mediaShortcuts) {
-		shortcut->setEnabled(true);
-	}
+	for_const (auto shortcut, DataPtr->mediaShortcuts) { shortcut->setEnabled(true); }
 	Platform::SetWatchingMediaKeys(true);
 }
 
 void disableMediaShortcuts() {
 	if (!DataPtr) return;
-	for_const (auto shortcut, DataPtr->mediaShortcuts) {
-		shortcut->setEnabled(false);
-	}
+	for_const (auto shortcut, DataPtr->mediaShortcuts) { shortcut->setEnabled(false); }
 	Platform::SetWatchingMediaKeys(false);
 }
 
diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp
index 075b42f12..81a3b5a18 100644
--- a/Telegram/SourceFiles/storage/file_download.cpp
+++ b/Telegram/SourceFiles/storage/file_download.cpp
@@ -20,18 +20,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "storage/file_download.h"
 
+#include "auth_session.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "messenger.h"
-#include "storage/localstorage.h"
 #include "platform/platform_file_utilities.h"
-#include "auth_session.h"
+#include "storage/localstorage.h"
 
 namespace Storage {
 
 Downloader::Downloader()
-: _delayedLoadersDestroyer([this] { _delayedDestroyedLoaders.clear(); }) {
-}
+    : _delayedLoadersDestroyer([this] { _delayedDestroyedLoaders.clear(); }) {}
 
 void Downloader::delayedDestroyLoader(std::unique_ptr<FileLoader> loader) {
 	_delayedDestroyedLoaders.push_back(std::move(loader));
@@ -46,7 +45,7 @@ void Downloader::requestedAmountIncrement(MTP::DcId dcId, int index, int amount)
 	Expects(index >= 0 && index < MTP::kDownloadSessionsCount);
 	auto it = _requestedBytesAmount.find(dcId);
 	if (it == _requestedBytesAmount.cend()) {
-		it = _requestedBytesAmount.emplace(dcId, RequestedInDc { { 0 } }).first;
+		it = _requestedBytesAmount.emplace(dcId, RequestedInDc{{0}}).first;
 	}
 	it->second[index] += amount;
 	if (it->second[index]) {
@@ -89,8 +88,8 @@ constexpr auto kDownloadCdnPartSize = 128 * 1024; // 128kb for cdn requests
 } // namespace
 
 struct FileLoaderQueue {
-	FileLoaderQueue(int queriesLimit) : queriesLimit(queriesLimit) {
-	}
+	FileLoaderQueue(int queriesLimit)
+	    : queriesLimit(queriesLimit) {}
 	int queriesCount = 0;
 	int queriesLimit = 0;
 	FileLoader *start = nullptr;
@@ -113,15 +112,16 @@ WebLoadMainManager *_webLoadMainManager = nullptr;
 
 } // namespace
 
-FileLoader::FileLoader(const QString &toFile, qint32 size, LocationType locationType, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading)
-: _downloader(&Auth().downloader())
-, _autoLoading(autoLoading)
-, _filename(toFile)
-, _file(_filename)
-, _toCache(toCache)
-, _fromCloud(fromCloud)
-, _size(size)
-, _locationType(locationType) {
+FileLoader::FileLoader(const QString &toFile, qint32 size, LocationType locationType, LoadToCacheSetting toCache,
+                       LoadFromCloudSetting fromCloud, bool autoLoading)
+    : _downloader(&Auth().downloader())
+    , _autoLoading(autoLoading)
+    , _filename(toFile)
+    , _file(_filename)
+    , _toCache(toCache)
+    , _fromCloud(fromCloud)
+    , _size(size)
+    , _locationType(locationType) {
 	Expects(!_filename.isEmpty() || (_size <= Storage::kMaxFileInMemory));
 }
 
@@ -144,7 +144,8 @@ void FileLoader::readImage(const QSize &shrinkBox) const {
 	auto image = App::readImage(_data, &format, false);
 	if (!image.isNull()) {
 		if (!shrinkBox.isEmpty() && (image.width() > shrinkBox.width() || image.height() > shrinkBox.height())) {
-			_imagePixmap = App::pixmapFromImageInPlace(image.scaled(shrinkBox, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+			_imagePixmap =
+			    App::pixmapFromImageInPlace(image.scaled(shrinkBox, Qt::KeepAspectRatio, Qt::SmoothTransformation));
 		} else {
 			_imagePixmap = App::pixmapFromImageInPlace(std::move(image));
 		}
@@ -220,7 +221,8 @@ FileLoader::~FileLoader() {
 	removeFromQueue();
 }
 
-void FileLoader::localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat, const QPixmap &imagePixmap) {
+void FileLoader::localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat,
+                             const QPixmap &imagePixmap) {
 	_localTaskId = 0;
 	if (result.data.isEmpty()) {
 		_localStatus = LocalFailed;
@@ -400,10 +402,11 @@ void FileLoader::startLoading(bool loadFirst, bool prior) {
 	loadPart();
 }
 
-mtpFileLoader::mtpFileLoader(const StorageImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud, bool autoLoading)
-: FileLoader(QString(), size, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
-, _dcId(location->dc())
-, _location(location) {
+mtpFileLoader::mtpFileLoader(const StorageImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud,
+                             bool autoLoading)
+    : FileLoader(QString(), size, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
+    , _dcId(location->dc())
+    , _location(location) {
 	auto shiftedDcId = MTP::downloadDcId(_dcId, 0);
 	auto i = queues.find(shiftedDcId);
 	if (i == queues.cend()) {
@@ -412,12 +415,14 @@ mtpFileLoader::mtpFileLoader(const StorageImageLocation *location, qint32 size,
 	_queue = &i.value();
 }
 
-mtpFileLoader::mtpFileLoader(qint32 dc, quint64 id, quint64 accessHash, qint32 version, LocationType type, const QString &to, qint32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading)
-: FileLoader(to, size, type, toCache, fromCloud, autoLoading)
-, _dcId(dc)
-, _id(id)
-, _accessHash(accessHash)
-, _version(version) {
+mtpFileLoader::mtpFileLoader(qint32 dc, quint64 id, quint64 accessHash, qint32 version, LocationType type,
+                             const QString &to, qint32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud,
+                             bool autoLoading)
+    : FileLoader(to, size, type, toCache, fromCloud, autoLoading)
+    , _dcId(dc)
+    , _id(id)
+    , _accessHash(accessHash)
+    , _version(version) {
 	auto shiftedDcId = MTP::downloadDcId(_dcId, 0);
 	auto i = queues.find(shiftedDcId);
 	if (i == queues.cend()) {
@@ -426,10 +431,11 @@ mtpFileLoader::mtpFileLoader(qint32 dc, quint64 id, quint64 accessHash, qint32 v
 	_queue = &i.value();
 }
 
-mtpFileLoader::mtpFileLoader(const WebFileImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud, bool autoLoading)
-: FileLoader(QString(), size, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
-, _dcId(location->dc())
-, _urlLocation(location) {
+mtpFileLoader::mtpFileLoader(const WebFileImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud,
+                             bool autoLoading)
+    : FileLoader(QString(), size, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
+    , _dcId(location->dc())
+    , _urlLocation(location) {
 	auto shiftedDcId = MTP::downloadDcId(_dcId, 0);
 	auto i = queues.find(shiftedDcId);
 	if (i == queues.cend()) {
@@ -462,12 +468,12 @@ int mtpFileLoader::partSize() const {
 	// and then we get a cdn-redirect where we support only
 	// fixed part size download for hash checking.
 	//
-	//if (_cdnDcId) {
+	// if (_cdnDcId) {
 	//	return kDownloadCdnPartSize;
 	//} else if (_locationType == UnknownFileLocation) {
 	//	return kDownloadPhotoPartSize;
 	//}
-	//return kDownloadDocumentPartSize;
+	// return kDownloadDocumentPartSize;
 }
 
 mtpFileLoader::RequestData mtpFileLoader::prepareRequest(int offset) const {
@@ -486,19 +492,28 @@ void mtpFileLoader::makeRequest(int offset) {
 		auto shiftedDcId = MTP::downloadDcId(requestData.dcId, requestData.dcIndex);
 		if (_cdnDcId) {
 			Assert(requestData.dcId == _cdnDcId);
-			return MTP::send(MTPupload_GetCdnFile(MTP_bytes(_cdnToken), MTP_int(offset), MTP_int(limit)), rpcDone(&mtpFileLoader::cdnPartLoaded), rpcFail(&mtpFileLoader::cdnPartFailed), shiftedDcId, 50);
+			return MTP::send(MTPupload_GetCdnFile(MTP_bytes(_cdnToken), MTP_int(offset), MTP_int(limit)),
+			                 rpcDone(&mtpFileLoader::cdnPartLoaded), rpcFail(&mtpFileLoader::cdnPartFailed),
+			                 shiftedDcId, 50);
 		} else if (_urlLocation) {
 			Assert(requestData.dcId == _dcId);
-			return MTP::send(MTPupload_GetWebFile(MTP_inputWebFileLocation(MTP_bytes(_urlLocation->url()), MTP_long(_urlLocation->accessHash())), MTP_int(offset), MTP_int(limit)), rpcDone(&mtpFileLoader::webPartLoaded), rpcFail(&mtpFileLoader::partFailed), shiftedDcId, 50);
+			return MTP::send(MTPupload_GetWebFile(MTP_inputWebFileLocation(MTP_bytes(_urlLocation->url()),
+			                                                               MTP_long(_urlLocation->accessHash())),
+			                                      MTP_int(offset), MTP_int(limit)),
+			                 rpcDone(&mtpFileLoader::webPartLoaded), rpcFail(&mtpFileLoader::partFailed), shiftedDcId,
+			                 50);
 		} else {
 			Assert(requestData.dcId == _dcId);
 			auto location = [this] {
 				if (_location) {
-					return MTP_inputFileLocation(MTP_long(_location->volume()), MTP_int(_location->local()), MTP_long(_location->secret()));
+					return MTP_inputFileLocation(MTP_long(_location->volume()), MTP_int(_location->local()),
+					                             MTP_long(_location->secret()));
 				}
 				return MTP_inputDocumentFileLocation(MTP_long(_id), MTP_long(_accessHash), MTP_int(_version));
 			};
-			return MTP::send(MTPupload_GetFile(location(), MTP_int(offset), MTP_int(limit)), rpcDone(&mtpFileLoader::normalPartLoaded), rpcFail(&mtpFileLoader::partFailed), shiftedDcId, 50);
+			return MTP::send(MTPupload_GetFile(location(), MTP_int(offset), MTP_int(limit)),
+			                 rpcDone(&mtpFileLoader::normalPartLoaded), rpcFail(&mtpFileLoader::partFailed),
+			                 shiftedDcId, 50);
 		}
 	};
 	placeSentRequest(send(), requestData);
@@ -515,7 +530,9 @@ void mtpFileLoader::requestMoreCdnFileHashes() {
 	requestData.dcIndex = 0;
 	requestData.offset = offset;
 	auto shiftedDcId = MTP::downloadDcId(requestData.dcId, requestData.dcIndex);
-	auto requestId = _cdnHashesRequestId = MTP::send(MTPupload_GetCdnFileHashes(MTP_bytes(_cdnToken), MTP_int(offset)), rpcDone(&mtpFileLoader::getCdnFileHashesDone), rpcFail(&mtpFileLoader::cdnPartFailed), shiftedDcId);
+	auto requestId = _cdnHashesRequestId =
+	    MTP::send(MTPupload_GetCdnFileHashes(MTP_bytes(_cdnToken), MTP_int(offset)),
+	              rpcDone(&mtpFileLoader::getCdnFileHashesDone), rpcFail(&mtpFileLoader::cdnPartFailed), shiftedDcId);
 	placeSentRequest(requestId, requestData);
 }
 
@@ -553,7 +570,9 @@ void mtpFileLoader::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequestId
 		requestData.dcIndex = 0;
 		requestData.offset = offset;
 		auto shiftedDcId = MTP::downloadDcId(requestData.dcId, requestData.dcIndex);
-		auto requestId = MTP::send(MTPupload_ReuploadCdnFile(MTP_bytes(_cdnToken), result.c_upload_cdnFileReuploadNeeded().vrequest_token), rpcDone(&mtpFileLoader::reuploadDone), rpcFail(&mtpFileLoader::cdnPartFailed), shiftedDcId);
+		auto requestId = MTP::send(
+		    MTPupload_ReuploadCdnFile(MTP_bytes(_cdnToken), result.c_upload_cdnFileReuploadNeeded().vrequest_token),
+		    rpcDone(&mtpFileLoader::reuploadDone), rpcFail(&mtpFileLoader::cdnPartFailed), shiftedDcId);
 		placeSentRequest(requestId, requestData);
 		return;
 	}
@@ -582,16 +601,19 @@ void mtpFileLoader::cdnPartLoaded(const MTPupload_CdnFile &result, mtpRequestId
 	case CheckCdnHashResult::NoHash: {
 		_cdnUncheckedParts.emplace(offset, decryptInPlace);
 		requestMoreCdnFileHashes();
-	} return;
+	}
+		return;
 
 	case CheckCdnHashResult::Invalid: {
 		LOG(("API Error: Wrong cdnFileHash for offset %1.").arg(offset));
 		cancel(true);
-	} return;
+	}
+		return;
 
 	case CheckCdnHashResult::Good: {
 		partLoaded(offset, bytes);
-	} return;
+	}
+		return;
 	}
 	Unexpected("Result of checkCdnFileHash()");
 }
@@ -602,7 +624,8 @@ mtpFileLoader::CheckCdnHashResult mtpFileLoader::checkCdnFileHash(int offset, ba
 		return CheckCdnHashResult::NoHash;
 	}
 	auto realHash = hashSha256(bytes.data(), bytes.size());
-	if (base::compare_bytes(gsl::as_bytes(gsl::make_span(realHash)), gsl::as_bytes(gsl::make_span(cdnFileHashIt->second.hash)))) {
+	if (base::compare_bytes(gsl::as_bytes(gsl::make_span(realHash)),
+	                        gsl::as_bytes(gsl::make_span(cdnFileHashIt->second.hash)))) {
 		return CheckCdnHashResult::Invalid;
 	}
 	return CheckCdnHashResult::Good;
@@ -689,14 +712,28 @@ void mtpFileLoader::partLoaded(int offset, base::const_byte_span bytes) {
 				_skippedBytes += offset - fsize;
 			}
 			_file.seek(offset);
-			if (_file.write(reinterpret_cast<const char*>(bytes.data()), bytes.size()) != qint64(bytes.size())) {
+			if (_file.write(reinterpret_cast<const char *>(bytes.data()), bytes.size()) != qint64(bytes.size())) {
 				return cancel(true);
 			}
 		} else {
 			if (offset > 100 * 1024 * 1024) {
 				// Debugging weird out of memory crashes.
-				auto info = QString("offset: %1, size: %2, cancelled: %3, finished: %4, filename: '%5', tocache: %6, fromcloud: %7, data: %8, fullsize: %9").arg(offset).arg(bytes.size()).arg(Logs::b(_cancelled)).arg(Logs::b(_finished)).arg(_filename).arg(int(_toCache)).arg(int(_fromCloud)).arg(_data.size()).arg(_size);
-				info += QString(", locationtype: %1, inqueue: %2, localstatus: %3").arg(int(_locationType)).arg(Logs::b(_inQueue)).arg(int(_localStatus));
+				auto info = QString(
+				                "offset: %1, size: %2, cancelled: %3, finished: %4, filename: '%5', tocache: %6, "
+				                "fromcloud: %7, data: %8, fullsize: %9")
+				                .arg(offset)
+				                .arg(bytes.size())
+				                .arg(Logs::b(_cancelled))
+				                .arg(Logs::b(_finished))
+				                .arg(_filename)
+				                .arg(int(_toCache))
+				                .arg(int(_fromCloud))
+				                .arg(_data.size())
+				                .arg(_size);
+				info += QString(", locationtype: %1, inqueue: %2, localstatus: %3")
+				            .arg(int(_locationType))
+				            .arg(Logs::b(_inQueue))
+				            .arg(int(_localStatus));
 				SignalHandlers::setCrashAnnotation("DebugInfo", info);
 			}
 			_data.reserve(offset + bytes.size());
@@ -709,7 +746,7 @@ void mtpFileLoader::partLoaded(int offset, base::const_byte_span bytes) {
 				_data.resize(offset);
 			}
 			if (offset == _data.size()) {
-				_data.append(reinterpret_cast<const char*>(bytes.data()), bytes.size());
+				_data.append(reinterpret_cast<const char *>(bytes.data()), bytes.size());
 			} else {
 				_skippedBytes -= bytes.size();
 				if (qint64(offset + bytes.size()) > _data.size()) {
@@ -724,7 +761,8 @@ void mtpFileLoader::partLoaded(int offset, base::const_byte_span bytes) {
 	if (!bytes.size() || (bytes.size() % 1024)) { // bad next offset
 		_lastComplete = true;
 	}
-	if (_sentRequests.empty() && _cdnUncheckedParts.empty() && (_lastComplete || (_size && _nextRequestOffset >= _size))) {
+	if (_sentRequests.empty() && _cdnUncheckedParts.empty() &&
+	    (_lastComplete || (_size && _nextRequestOffset >= _size))) {
 		if (!_filename.isEmpty() && (_toCache == LoadToCacheAsWell)) {
 			if (!_fileIsOpen) _fileIsOpen = _file.open(QIODevice::WriteOnly);
 			if (!_fileIsOpen) {
@@ -801,28 +839,32 @@ void mtpFileLoader::cancelRequests() {
 }
 
 void mtpFileLoader::switchToCDN(int offset, const MTPDupload_fileCdnRedirect &redirect) {
-	changeCDNParams(offset, redirect.vdc_id.v, redirect.vfile_token.v, redirect.vencryption_key.v, redirect.vencryption_iv.v, redirect.vcdn_file_hashes.v);
+	changeCDNParams(offset, redirect.vdc_id.v, redirect.vfile_token.v, redirect.vencryption_key.v,
+	                redirect.vencryption_iv.v, redirect.vcdn_file_hashes.v);
 }
 
 void mtpFileLoader::addCdnHashes(const QVector<MTPCdnFileHash> &hashes) {
 	for_const (auto &hash, hashes) {
 		Assert(hash.type() == mtpc_cdnFileHash);
 		auto &data = hash.c_cdnFileHash();
-		_cdnFileHashes.emplace(data.voffset.v, CdnFileHash { data.vlimit.v, data.vhash.v });
+		_cdnFileHashes.emplace(data.voffset.v, CdnFileHash{data.vlimit.v, data.vhash.v});
 	}
 }
 
-void mtpFileLoader::changeCDNParams(int offset, MTP::DcId dcId, const QByteArray &token, const QByteArray &encryptionKey, const QByteArray &encryptionIV, const QVector<MTPCdnFileHash> &hashes) {
-	if (dcId != 0 && (encryptionKey.size() != MTP::CTRState::KeySize || encryptionIV.size() != MTP::CTRState::IvecSize)) {
-		LOG(("Message Error: Wrong key (%1) / iv (%2) size in CDN params").arg(encryptionKey.size()).arg(encryptionIV.size()));
+void mtpFileLoader::changeCDNParams(int offset, MTP::DcId dcId, const QByteArray &token,
+                                    const QByteArray &encryptionKey, const QByteArray &encryptionIV,
+                                    const QVector<MTPCdnFileHash> &hashes) {
+	if (dcId != 0 &&
+	    (encryptionKey.size() != MTP::CTRState::KeySize || encryptionIV.size() != MTP::CTRState::IvecSize)) {
+		LOG(("Message Error: Wrong key (%1) / iv (%2) size in CDN params")
+		        .arg(encryptionKey.size())
+		        .arg(encryptionIV.size()));
 		cancel(true);
 		return;
 	}
 
-	auto resendAllRequests = (_cdnDcId != dcId
-		|| _cdnToken != token
-		|| _cdnEncryptionKey != encryptionKey
-		|| _cdnEncryptionIV != encryptionIV);
+	auto resendAllRequests = (_cdnDcId != dcId || _cdnToken != token || _cdnEncryptionKey != encryptionKey ||
+	                          _cdnEncryptionIV != encryptionIV);
 	_cdnDcId = dcId;
 	_cdnToken = token;
 	_cdnEncryptionKey = encryptionKey;
@@ -885,10 +927,10 @@ mtpFileLoader::~mtpFileLoader() {
 }
 
 webFileLoader::webFileLoader(const QString &url, const QString &to, LoadFromCloudSetting fromCloud, bool autoLoading)
-: FileLoader(QString(), 0, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
-, _url(url)
-, _requestSent(false)
-, _already(0) {
+    : FileLoader(QString(), 0, UnknownFileLocation, LoadToCacheAsWell, fromCloud, autoLoading)
+    , _url(url)
+    , _requestSent(false)
+    , _already(0) {
 	_queue = &_webQueue;
 }
 
@@ -982,16 +1024,14 @@ void webFileLoader::cancelRequests() {
 	webLoadManager()->stop(this);
 }
 
-webFileLoader::~webFileLoader() {
-}
+webFileLoader::~webFileLoader() {}
 
 class webFileLoaderPrivate {
 public:
 	webFileLoaderPrivate(webFileLoader *loader, const QString &url)
-		: _interface(loader)
-		, _url(url)
-		, _redirectsLeft(kMaxHttpRedirects) {
-	}
+	    : _interface(loader)
+	    , _url(url)
+	    , _redirectsLeft(kMaxHttpRedirects) {}
 
 	QNetworkReply *reply() {
 		return _reply;
@@ -1088,13 +1128,17 @@ WebLoadManager::WebLoadManager(QThread *thread) {
 	connect(this, SIGNAL(processDelayed()), this, SLOT(process()), Qt::QueuedConnection);
 	connect(this, SIGNAL(proxyApplyDelayed()), this, SLOT(proxyApply()), Qt::QueuedConnection);
 
-	connect(this, SIGNAL(progress(webFileLoader*,qint64,qint64)), _webLoadMainManager, SLOT(progress(webFileLoader*,qint64,qint64)));
-	connect(this, SIGNAL(finished(webFileLoader*,QByteArray)), _webLoadMainManager, SLOT(finished(webFileLoader*,QByteArray)));
-	connect(this, SIGNAL(error(webFileLoader*)), _webLoadMainManager, SLOT(error(webFileLoader*)));
+	connect(this, SIGNAL(progress(webFileLoader *, qint64, qint64)), _webLoadMainManager,
+	        SLOT(progress(webFileLoader *, qint64, qint64)));
+	connect(this, SIGNAL(finished(webFileLoader *, QByteArray)), _webLoadMainManager,
+	        SLOT(finished(webFileLoader *, QByteArray)));
+	connect(this, SIGNAL(error(webFileLoader *)), _webLoadMainManager, SLOT(error(webFileLoader *)));
 
-	connect(&_manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), this, SLOT(onFailed(QNetworkReply*)));
+	connect(&_manager, SIGNAL(authenticationRequired(QNetworkReply *, QAuthenticator *)), this,
+	        SLOT(onFailed(QNetworkReply *)));
 #ifndef OS_MAC_OLD
-	connect(&_manager, SIGNAL(sslErrors(QNetworkReply*,const QList<QSslError>&)), this, SLOT(onFailed(QNetworkReply*)));
+	connect(&_manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)), this,
+	        SLOT(onFailed(QNetworkReply *)));
 #endif // OS_MAC_OLD
 }
 
@@ -1148,7 +1192,7 @@ bool WebLoadManager::handleReplyResult(webFileLoaderPrivate *loader, WebReplyPro
 }
 
 void WebLoadManager::onFailed(QNetworkReply::NetworkError error) {
-	onFailed(qobject_cast<QNetworkReply*>(QObject::sender()));
+	onFailed(qobject_cast<QNetworkReply *>(QObject::sender()));
 }
 
 void WebLoadManager::onFailed(QNetworkReply *reply) {
@@ -1162,7 +1206,10 @@ void WebLoadManager::onFailed(QNetworkReply *reply) {
 	webFileLoaderPrivate *loader = j.value();
 	_replies.erase(j);
 
-	LOG(("Network Error: Failed to request '%1', error %2 (%3)").arg(QString::fromLatin1(loader->_url.toEncoded())).arg(int(reply->error())).arg(reply->errorString()));
+	LOG(("Network Error: Failed to request '%1', error %2 (%3)")
+	        .arg(QString::fromLatin1(loader->_url.toEncoded()))
+	        .arg(int(reply->error()))
+	        .arg(reply->errorString()));
 
 	if (!handleReplyResult(loader, WebReplyProcessError)) {
 		_loaders.remove(loader);
@@ -1171,7 +1218,7 @@ void WebLoadManager::onFailed(QNetworkReply *reply) {
 }
 
 void WebLoadManager::onProgress(qint64 already, qint64 size) {
-	QNetworkReply *reply = qobject_cast<QNetworkReply*>(QObject::sender());
+	QNetworkReply *reply = qobject_cast<QNetworkReply *>(QObject::sender());
 	if (!reply) return;
 
 	Replies::iterator j = _replies.find(reply);
@@ -1196,7 +1243,8 @@ void WebLoadManager::onProgress(qint64 already, qint64 size) {
 				}
 			}
 		} else {
-			LOG(("Network Error: Bad HTTP status received in WebLoadManager::onProgress(): %1").arg(statusCode.toInt()));
+			LOG(("Network Error: Bad HTTP status received in WebLoadManager::onProgress(): %1")
+			        .arg(statusCode.toInt()));
 			result = WebReplyProcessError;
 		}
 	} else {
@@ -1206,7 +1254,10 @@ void WebLoadManager::onProgress(qint64 already, qint64 size) {
 			loader->addData(r);
 		}
 		if (size == 0) {
-			LOG(("Network Error: Zero size received for HTTP download progress in WebLoadManager::onProgress(): %1 / %2").arg(already).arg(size));
+			LOG(("Network Error: Zero size received for HTTP download progress in WebLoadManager::onProgress(): %1 / "
+			     "%2")
+			        .arg(already)
+			        .arg(size));
 			result = WebReplyProcessError;
 		}
 	}
@@ -1221,7 +1272,7 @@ void WebLoadManager::onProgress(qint64 already, qint64 size) {
 }
 
 void WebLoadManager::onMeta() {
-	QNetworkReply *reply = qobject_cast<QNetworkReply*>(QObject::sender());
+	QNetworkReply *reply = qobject_cast<QNetworkReply *>(QObject::sender());
 	if (!reply) return;
 
 	Replies::iterator j = _replies.find(reply);
@@ -1234,9 +1285,11 @@ void WebLoadManager::onMeta() {
 	Pairs pairs = reply->rawHeaderPairs();
 	for (Pairs::iterator i = pairs.begin(), e = pairs.end(); i != e; ++i) {
 		if (QString::fromUtf8(i->first).toLower() == "content-range") {
-			QRegularExpressionMatch m = QRegularExpression(qsl("/(\\d+)([^\\d]|$)")).match(QString::fromUtf8(i->second));
+			QRegularExpressionMatch m =
+			    QRegularExpression(qsl("/(\\d+)([^\\d]|$)")).match(QString::fromUtf8(i->second));
 			if (m.hasMatch()) {
-				loader->setProgress(std::max(qint64(loader->data().size()), loader->already()), m.captured(1).toLongLong());
+				loader->setProgress(std::max(qint64(loader->data().size()), loader->already()),
+				                    m.captured(1).toLongLong());
 				if (!handleReplyResult(loader, WebReplyProcessProgress)) {
 					_replies.erase(j);
 					_loaders.remove(loader);
@@ -1326,9 +1379,7 @@ void WebLoadManager::clear() {
 	}
 	_loaderPointers.clear();
 
-	for_const (webFileLoaderPrivate *loader, _loaders) {
-		delete loader;
-	}
+	for_const (webFileLoaderPrivate *loader, _loaders) { delete loader; }
 	_loaders.clear();
 
 	for (Replies::iterator i = _replies.begin(), e = _replies.end(); i != e; ++i) {
diff --git a/Telegram/SourceFiles/storage/file_download.h b/Telegram/SourceFiles/storage/file_download.h
index e00f1da5a..226cbf897 100644
--- a/Telegram/SourceFiles/storage/file_download.h
+++ b/Telegram/SourceFiles/storage/file_download.h
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QNetworkReply>
 #include <QNetworkProxy>
+#include <QNetworkReply>
 
 #include "base/observer.h"
-#include "storage/localimageloader.h" // for TaskId
 #include "mtproto/facade.h"
+#include "storage/localimageloader.h" // for TaskId
 
 namespace Storage {
 
@@ -63,18 +63,16 @@ private:
 
 	using RequestedInDc = std::array<qint64, MTP::kDownloadSessionsCount>;
 	std::map<MTP::DcId, RequestedInDc> _requestedBytesAmount;
-
 };
 
 } // namespace Storage
 
 struct StorageImageSaved {
 	StorageImageSaved() = default;
-	explicit StorageImageSaved(const QByteArray &data) : data(data) {
-	}
+	explicit StorageImageSaved(const QByteArray &data)
+	    : data(data) {}
 
 	QByteArray data;
-
 };
 
 enum LocalLoadStatus {
@@ -93,7 +91,8 @@ class FileLoader : public QObject {
 	Q_OBJECT
 
 public:
-	FileLoader(const QString &toFile, qint32 size, LocationType locationType, LoadToCacheSetting, LoadFromCloudSetting fromCloud, bool autoLoading);
+	FileLoader(const QString &toFile, qint32 size, LocationType locationType, LoadToCacheSetting,
+	           LoadFromCloudSetting fromCloud, bool autoLoading);
 	bool finished() const {
 		return _finished;
 	}
@@ -138,11 +137,11 @@ public:
 		return _autoLoading;
 	}
 
-	virtual void stop() {
-	}
+	virtual void stop() {}
 	virtual ~FileLoader();
 
-	void localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat = QByteArray(), const QPixmap &imagePixmap = QPixmap());
+	void localLoaded(const StorageImageSaved &result, const QByteArray &imageFormat = QByteArray(),
+	                 const QPixmap &imagePixmap = QPixmap());
 
 signals:
 	void progress(FileLoader *loader);
@@ -151,7 +150,7 @@ signals:
 protected:
 	void readImage(const QSize &shrinkBox) const;
 
-	not_null<Storage::Downloader*> _downloader;
+	not_null<Storage::Downloader *> _downloader;
 	FileLoader *_prev = nullptr;
 	FileLoader *_next = nullptr;
 	int _priority = 0;
@@ -189,7 +188,6 @@ protected:
 	TaskId _localTaskId = 0;
 	mutable QByteArray _imageFormat;
 	mutable QPixmap _imagePixmap;
-
 };
 
 class StorageImageLocation;
@@ -199,7 +197,8 @@ class mtpFileLoader : public FileLoader, public RPCSender {
 
 public:
 	mtpFileLoader(const StorageImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud, bool autoLoading);
-	mtpFileLoader(qint32 dc, quint64 id, quint64 accessHash, qint32 version, LocationType type, const QString &toFile, qint32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading);
+	mtpFileLoader(qint32 dc, quint64 id, quint64 accessHash, qint32 version, LocationType type, const QString &toFile,
+	              qint32 size, LoadToCacheSetting toCache, LoadFromCloudSetting fromCloud, bool autoLoading);
 	mtpFileLoader(const WebFileImageLocation *location, qint32 size, LoadFromCloudSetting fromCloud, bool autoLoading);
 
 	qint32 currentOffset(bool includeSkipped = false) const override;
@@ -221,8 +220,9 @@ private:
 		int offset = 0;
 	};
 	struct CdnFileHash {
-		CdnFileHash(int limit, QByteArray hash) : limit(limit), hash(hash) {
-		}
+		CdnFileHash(int limit, QByteArray hash)
+		    : limit(limit)
+		    , hash(hash) {}
 		int limit = 0;
 		QByteArray hash;
 	};
@@ -250,7 +250,8 @@ private:
 	int finishSentRequestGetOffset(mtpRequestId requestId);
 	void switchToCDN(int offset, const MTPDupload_fileCdnRedirect &redirect);
 	void addCdnHashes(const QVector<MTPCdnFileHash> &hashes);
-	void changeCDNParams(int offset, MTP::DcId dcId, const QByteArray &token, const QByteArray &encryptionKey, const QByteArray &encryptionIV, const QVector<MTPCdnFileHash> &hashes);
+	void changeCDNParams(int offset, MTP::DcId dcId, const QByteArray &token, const QByteArray &encryptionKey,
+	                     const QByteArray &encryptionIV, const QVector<MTPCdnFileHash> &hashes);
 
 	enum class CheckCdnHashResult {
 		NoHash,
@@ -281,7 +282,6 @@ private:
 	std::map<int, CdnFileHash> _cdnFileHashes;
 	std::map<int, QByteArray> _cdnUncheckedParts;
 	mtpRequestId _cdnHashesRequestId = 0;
-
 };
 
 class webFileLoaderPrivate;
@@ -290,7 +290,6 @@ class webFileLoader : public FileLoader {
 	Q_OBJECT
 
 public:
-
 	webFileLoader(const QString &url, const QString &to, LoadFromCloudSetting fromCloud, bool autoLoading);
 
 	virtual qint32 currentOffset(bool includeSkipped = false) const;
@@ -312,7 +311,6 @@ public:
 	~webFileLoader();
 
 protected:
-
 	virtual void cancelRequests();
 	virtual bool tryLoadLocal();
 	virtual bool loadPart();
@@ -324,7 +322,6 @@ protected:
 
 	friend class WebLoadManager;
 	webFileLoaderPrivate *_private;
-
 };
 
 enum WebReplyProcessResult {
@@ -376,35 +373,32 @@ private:
 	QNetworkProxy _proxySettings;
 #endif // !TDESKTOP_DISABLE_NETWORK_PROXY
 	QNetworkAccessManager _manager;
-	typedef QMap<webFileLoader*, webFileLoaderPrivate*> LoaderPointers;
+	typedef QMap<webFileLoader *, webFileLoaderPrivate *> LoaderPointers;
 	LoaderPointers _loaderPointers;
 	mutable QMutex _loaderPointersMutex;
 
-	typedef OrderedSet<webFileLoaderPrivate*> Loaders;
+	typedef OrderedSet<webFileLoaderPrivate *> Loaders;
 	Loaders _loaders;
 
-	typedef QMap<QNetworkReply*, webFileLoaderPrivate*> Replies;
+	typedef QMap<QNetworkReply *, webFileLoaderPrivate *> Replies;
 	Replies _replies;
-
 };
 
 class WebLoadMainManager : public QObject {
 	Q_OBJECT
 
 public:
-
 public slots:
 
 	void progress(webFileLoader *loader, qint64 already, qint64 size);
 	void finished(webFileLoader *loader, QByteArray data);
 	void error(webFileLoader *loader);
-
 };
 
-static FileLoader * const CancelledFileLoader = SharedMemoryLocation<FileLoader, 0>();
-static mtpFileLoader * const CancelledMtpFileLoader = static_cast<mtpFileLoader*>(CancelledFileLoader);
-static webFileLoader * const CancelledWebFileLoader = static_cast<webFileLoader*>(CancelledFileLoader);
-static WebLoadManager * const FinishedWebLoadManager = SharedMemoryLocation<WebLoadManager, 0>();
+static FileLoader *const CancelledFileLoader = SharedMemoryLocation<FileLoader, 0>();
+static mtpFileLoader *const CancelledMtpFileLoader = static_cast<mtpFileLoader *>(CancelledFileLoader);
+static webFileLoader *const CancelledWebFileLoader = static_cast<webFileLoader *>(CancelledFileLoader);
+static WebLoadManager *const FinishedWebLoadManager = SharedMemoryLocation<WebLoadManager, 0>();
 
 void reinitWebLoadManager();
 void stopWebLoadManager();
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 2c3234c4e..07f1c0ef8 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -24,7 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Storage {
 namespace {
 
-constexpr auto kMaxUploadFileParallelSize = MTP::kUploadSessionsCount * 512 * 1024; // max 512kb uploaded at the same time in each session
+constexpr auto kMaxUploadFileParallelSize =
+    MTP::kUploadSessionsCount * 512 * 1024; // max 512kb uploaded at the same time in each session
 
 } // namespace
 
@@ -62,7 +63,8 @@ void Uploader::upload(const FullMsgId &msgId, const FileLoadResultPtr &file) {
 		auto photo = App::feedPhoto(file->photo, file->photoThumbs);
 		photo->uploadingData = std::make_unique<PhotoData::UploadingData>(file->partssize);
 	} else if (file->type == SendMediaType::File || file->type == SendMediaType::Audio) {
-		auto document = file->thumb.isNull() ? App::feedDocument(file->document) : App::feedDocument(file->document, file->thumb);
+		auto document =
+		    file->thumb.isNull() ? App::feedDocument(file->document) : App::feedDocument(file->document, file->thumb);
 		document->status = FileUploading;
 		if (!file->content.isEmpty()) {
 			document->setData(file->content);
@@ -136,8 +138,10 @@ void Uploader::sendNext() {
 		}
 	}
 
-	UploadFileParts &parts(i->file ? (i->type() == SendMediaType::Photo ? i->file->fileparts : i->file->thumbparts) : i->media.parts);
-	quint64 partsOfId(i->file ? (i->type() == SendMediaType::Photo ? i->file->id : i->file->thumbId) : i->media.thumbId);
+	UploadFileParts &parts(i->file ? (i->type() == SendMediaType::Photo ? i->file->fileparts : i->file->thumbparts) :
+	                                 i->media.parts);
+	quint64 partsOfId(i->file ? (i->type() == SendMediaType::Photo ? i->file->id : i->file->thumbId) :
+	                            i->media.thumbId);
 	if (parts.isEmpty()) {
 		if (i->docSentParts >= i->docPartsCount) {
 			if (requestsSent.isEmpty() && docRequestsSent.isEmpty()) {
@@ -150,14 +154,25 @@ void Uploader::sendNext() {
 						// because the filename from inputFile is not used anywhere.
 						photoFilename += qstr(".jpg");
 					}
-					emit photoReady(uploading, silent, MTP_inputFile(MTP_long(i->id()), MTP_int(i->partsCount), MTP_string(photoFilename), MTP_bytes(i->file ? i->file->filemd5 : i->media.jpeg_md5)));
+					emit photoReady(uploading, silent,
+					                MTP_inputFile(MTP_long(i->id()), MTP_int(i->partsCount), MTP_string(photoFilename),
+					                              MTP_bytes(i->file ? i->file->filemd5 : i->media.jpeg_md5)));
 				} else if (i->type() == SendMediaType::File || i->type() == SendMediaType::Audio) {
 					QByteArray docMd5(32, Qt::Uninitialized);
 					hashMd5Hex(i->md5Hash.result(), docMd5.data());
 
-					MTPInputFile doc = (i->docSize > UseBigFilesFrom) ? MTP_inputFileBig(MTP_long(i->id()), MTP_int(i->docPartsCount), MTP_string(i->filename())) : MTP_inputFile(MTP_long(i->id()), MTP_int(i->docPartsCount), MTP_string(i->filename()), MTP_bytes(docMd5));
+					MTPInputFile doc =
+					    (i->docSize > UseBigFilesFrom) ?
+					        MTP_inputFileBig(MTP_long(i->id()), MTP_int(i->docPartsCount), MTP_string(i->filename())) :
+					        MTP_inputFile(MTP_long(i->id()), MTP_int(i->docPartsCount), MTP_string(i->filename()),
+					                      MTP_bytes(docMd5));
 					if (i->partsCount) {
-						emit thumbDocumentReady(uploading, silent, doc, MTP_inputFile(MTP_long(i->thumbId()), MTP_int(i->partsCount), MTP_string(i->file ? i->file->thumbname : (qsl("thumb.") + i->media.thumbExt)), MTP_bytes(i->file ? i->file->thumbmd5 : i->media.jpeg_md5)));
+						emit thumbDocumentReady(
+						    uploading, silent, doc,
+						    MTP_inputFile(
+						        MTP_long(i->thumbId()), MTP_int(i->partsCount),
+						        MTP_string(i->file ? i->file->thumbname : (qsl("thumb.") + i->media.thumbExt)),
+						        MTP_bytes(i->file ? i->file->thumbmd5 : i->media.jpeg_md5)));
 					} else {
 						emit documentReady(uploading, silent, doc);
 					}
@@ -185,19 +200,26 @@ void Uploader::sendNext() {
 			}
 		} else {
 			toSend = content.mid(i->docSentParts * i->docPartSize, i->docPartSize);
-			if ((i->type() == SendMediaType::File || i->type() == SendMediaType::Audio) && i->docSentParts <= UseBigFilesFrom) {
+			if ((i->type() == SendMediaType::File || i->type() == SendMediaType::Audio) &&
+			    i->docSentParts <= UseBigFilesFrom) {
 				i->md5Hash.feed(toSend.constData(), toSend.size());
 			}
 		}
-		if (toSend.size() > i->docPartSize || (toSend.size() < i->docPartSize && i->docSentParts + 1 != i->docPartsCount)) {
+		if (toSend.size() > i->docPartSize ||
+		    (toSend.size() < i->docPartSize && i->docSentParts + 1 != i->docPartsCount)) {
 			currentFailed();
 			return;
 		}
 		mtpRequestId requestId;
 		if (i->docSize > UseBigFilesFrom) {
-			requestId = MTP::send(MTPupload_SaveBigFilePart(MTP_long(i->id()), MTP_int(i->docSentParts), MTP_int(i->docPartsCount), MTP_bytes(toSend)), rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
+			requestId =
+			    MTP::send(MTPupload_SaveBigFilePart(MTP_long(i->id()), MTP_int(i->docSentParts),
+			                                        MTP_int(i->docPartsCount), MTP_bytes(toSend)),
+			              rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
 		} else {
-			requestId = MTP::send(MTPupload_SaveFilePart(MTP_long(i->id()), MTP_int(i->docSentParts), MTP_bytes(toSend)), rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
+			requestId =
+			    MTP::send(MTPupload_SaveFilePart(MTP_long(i->id()), MTP_int(i->docSentParts), MTP_bytes(toSend)),
+			              rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
 		}
 		docRequestsSent.insert(requestId, i->docSentParts);
 		dcMap.insert(requestId, todc);
@@ -208,7 +230,9 @@ void Uploader::sendNext() {
 	} else {
 		UploadFileParts::iterator part = parts.begin();
 
-		mtpRequestId requestId = MTP::send(MTPupload_SaveFilePart(MTP_long(partsOfId), MTP_int(part.key()), MTP_bytes(part.value())), rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
+		mtpRequestId requestId =
+		    MTP::send(MTPupload_SaveFilePart(MTP_long(partsOfId), MTP_int(part.key()), MTP_bytes(part.value())),
+		              rpcDone(&Uploader::partLoaded), rpcFail(&Uploader::partFailed), MTP::uploadDcId(todc));
 		requestsSent.insert(requestId, part.value());
 		dcMap.insert(requestId, todc);
 		sentSize += part.value().size();
@@ -237,17 +261,18 @@ void Uploader::unpause() {
 	sendNext();
 }
 
-void Uploader::confirm(const FullMsgId &msgId) {
-}
+void Uploader::confirm(const FullMsgId &msgId) {}
 
 void Uploader::clear() {
 	uploaded.clear();
 	queue.clear();
-	for (QMap<mtpRequestId, QByteArray>::const_iterator i = requestsSent.cbegin(), e = requestsSent.cend(); i != e; ++i) {
+	for (QMap<mtpRequestId, QByteArray>::const_iterator i = requestsSent.cbegin(), e = requestsSent.cend(); i != e;
+	     ++i) {
 		MTP::cancel(i.key());
 	}
 	requestsSent.clear();
-	for (QMap<mtpRequestId, qint32>::const_iterator i = docRequestsSent.cbegin(), e = docRequestsSent.cend(); i != e; ++i) {
+	for (QMap<mtpRequestId, qint32>::const_iterator i = docRequestsSent.cbegin(), e = docRequestsSent.cend(); i != e;
+	     ++i) {
 		MTP::cancel(i.key());
 	}
 	docRequestsSent.clear();
@@ -317,7 +342,8 @@ void Uploader::partLoaded(const MTPBool &result, mtpRequestId requestId) {
 bool Uploader::partFailed(const RPCError &error, mtpRequestId requestId) {
 	if (MTP::isDefaultHandledError(error)) return false;
 
-	if (requestsSent.constFind(requestId) != requestsSent.cend() || docRequestsSent.constFind(requestId) != docRequestsSent.cend()) { // failed to upload current file
+	if (requestsSent.constFind(requestId) != requestsSent.cend() ||
+	    docRequestsSent.constFind(requestId) != docRequestsSent.cend()) { // failed to upload current file
 		currentFailed();
 	}
 	sendNext();
diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h
index bd9909132..5f72b3dd6 100644
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "storage/localimageloader.h"
-#include "mtproto/rpc_sender.h"
 #include "mtproto/facade.h"
+#include "mtproto/rpc_sender.h"
+#include "storage/localimageloader.h"
 
 class RPCError;
 
@@ -65,7 +65,9 @@ signals:
 
 private:
 	struct File {
-		File(const SendMediaReady &media) : media(media), docSentParts(0) {
+		File(const SendMediaReady &media)
+		    : media(media)
+		    , docSentParts(0) {
 			partsCount = media.parts.size();
 			if (type() == SendMediaType::File || type() == SendMediaType::Audio) {
 				setDocSize(media.file.isEmpty() ? media.data.size() : media.filesize);
@@ -73,7 +75,9 @@ private:
 				docSize = docPartSize = docPartsCount = 0;
 			}
 		}
-		File(const FileLoadResultPtr &file) : file(file), docSentParts(0) {
+		File(const FileLoadResultPtr &file)
+		    : file(file)
+		    , docSentParts(0) {
 			partsCount = (type() == SendMediaType::Photo) ? file->fileparts.size() : file->thumbparts.size();
 			if (type() == SendMediaType::File || type() == SendMediaType::Audio) {
 				setDocSize(file->filesize);
@@ -138,13 +142,12 @@ private:
 	QMap<mtpRequestId, qint32> docRequestsSent;
 	QMap<mtpRequestId, qint32> dcMap;
 	quint32 sentSize = 0;
-	quint32 sentSizes[MTP::kUploadSessionsCount] = { 0 };
+	quint32 sentSizes[MTP::kUploadSessionsCount] = {0};
 
 	FullMsgId uploading, _paused;
 	Queue queue;
 	Queue uploaded;
 	QTimer nextTimer, killSessionsTimer;
-
 };
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 486180667..9e9110c86 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "storage/localimageloader.h"
 
-#include "core/file_utilities.h"
-#include "media/media_audio.h"
+#include "boxes/confirm_box.h"
 #include "boxes/send_files_box.h"
-#include "media/media_clip_reader.h"
+#include "core/file_utilities.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "lang/lang_keys.h"
-#include "boxes/confirm_box.h"
+#include "media/media_audio.h"
+#include "media/media_clip_reader.h"
 #include "storage/file_download.h"
 
 #include <QBuffer>
@@ -40,7 +40,11 @@ bool ValidateThumbDimensions(int width, int height) {
 
 } // namespace
 
-TaskQueue::TaskQueue(QObject *parent, qint32 stopTimeoutMs) : QObject(parent), _thread(0), _worker(0), _stopTimer(0) {
+TaskQueue::TaskQueue(QObject *parent, qint32 stopTimeoutMs)
+    : QObject(parent)
+    , _thread(0)
+    , _worker(0)
+    , _stopTimer(0) {
 	if (stopTimeoutMs > 0) {
 		_stopTimer = new QTimer(this);
 		connect(_stopTimer, SIGNAL(timeout()), this, SLOT(stop()));
@@ -182,32 +186,36 @@ void TaskQueueWorker::onTaskAdded() {
 	_inTaskAdded = false;
 }
 
-FileLoadTask::FileLoadTask(const QString &filepath, std::unique_ptr<MediaInformation> information, SendMediaType type, const FileLoadTo &to, const QString &caption) : _id(rand_value<quint64>())
-, _to(to)
-, _filepath(filepath)
-, _information(std::move(information))
-, _type(type)
-, _caption(caption) {
-}
+FileLoadTask::FileLoadTask(const QString &filepath, std::unique_ptr<MediaInformation> information, SendMediaType type,
+                           const FileLoadTo &to, const QString &caption)
+    : _id(rand_value<quint64>())
+    , _to(to)
+    , _filepath(filepath)
+    , _information(std::move(information))
+    , _type(type)
+    , _caption(caption) {}
 
-FileLoadTask::FileLoadTask(const QByteArray &content, const QImage &image, SendMediaType type, const FileLoadTo &to, const QString &caption) : _id(rand_value<quint64>())
-, _to(to)
-, _content(content)
-, _image(image)
-, _type(type)
-, _caption(caption) {
-}
+FileLoadTask::FileLoadTask(const QByteArray &content, const QImage &image, SendMediaType type, const FileLoadTo &to,
+                           const QString &caption)
+    : _id(rand_value<quint64>())
+    , _to(to)
+    , _content(content)
+    , _image(image)
+    , _type(type)
+    , _caption(caption) {}
 
-FileLoadTask::FileLoadTask(const QByteArray &voice, qint32 duration, const VoiceWaveform &waveform, const FileLoadTo &to, const QString &caption) : _id(rand_value<quint64>())
-, _to(to)
-, _content(voice)
-, _duration(duration)
-, _waveform(waveform)
-, _type(SendMediaType::Audio)
-, _caption(caption) {
-}
+FileLoadTask::FileLoadTask(const QByteArray &voice, qint32 duration, const VoiceWaveform &waveform,
+                           const FileLoadTo &to, const QString &caption)
+    : _id(rand_value<quint64>())
+    , _to(to)
+    , _content(voice)
+    , _duration(duration)
+    , _waveform(waveform)
+    , _type(SendMediaType::Audio)
+    , _caption(caption) {}
 
-std::unique_ptr<FileLoadTask::MediaInformation> FileLoadTask::ReadMediaInformation(const QString &filepath, const QByteArray &content, const QString &filemime) {
+std::unique_ptr<FileLoadTask::MediaInformation>
+FileLoadTask::ReadMediaInformation(const QString &filepath, const QByteArray &content, const QString &filemime) {
 	auto result = std::make_unique<MediaInformation>();
 	result->filemime = filemime;
 
@@ -222,32 +230,26 @@ std::unique_ptr<FileLoadTask::MediaInformation> FileLoadTask::ReadMediaInformati
 }
 
 template <typename Mimes, typename Extensions>
-bool FileLoadTask::CheckMimeOrExtensions(const QString &filepath, const QString &filemime, Mimes &mimes, Extensions &extensions) {
+bool FileLoadTask::CheckMimeOrExtensions(const QString &filepath, const QString &filemime, Mimes &mimes,
+                                         Extensions &extensions) {
 	if (std::find(std::begin(mimes), std::end(mimes), filemime) != std::end(mimes)) {
 		return true;
 	}
 	if (std::find_if(std::begin(extensions), std::end(extensions), [&filepath](auto &extension) {
-		return filepath.endsWith(extension, Qt::CaseInsensitive);
-	}) != std::end(extensions)) {
+		    return filepath.endsWith(extension, Qt::CaseInsensitive);
+	    }) != std::end(extensions)) {
 		return true;
 	}
 	return false;
 }
 
-bool FileLoadTask::CheckForSong(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result) {
+bool FileLoadTask::CheckForSong(const QString &filepath, const QByteArray &content,
+                                std::unique_ptr<MediaInformation> &result) {
 	static const auto mimes = {
-		qstr("audio/mp3"),
-		qstr("audio/m4a"),
-		qstr("audio/aac"),
-		qstr("audio/ogg"),
-		qstr("audio/flac"),
+	    qstr("audio/mp3"), qstr("audio/m4a"), qstr("audio/aac"), qstr("audio/ogg"), qstr("audio/flac"),
 	};
 	static const auto extensions = {
-		qstr(".mp3"),
-		qstr(".m4a"),
-		qstr(".aac"),
-		qstr(".ogg"),
-		qstr(".flac"),
+	    qstr(".mp3"), qstr(".m4a"), qstr(".aac"), qstr(".ogg"), qstr(".flac"),
 	};
 	if (!CheckMimeOrExtensions(filepath, result->filemime, mimes, extensions)) {
 		return false;
@@ -264,14 +266,15 @@ bool FileLoadTask::CheckForSong(const QString &filepath, const QByteArray &conte
 	return true;
 }
 
-bool FileLoadTask::CheckForVideo(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result) {
+bool FileLoadTask::CheckForVideo(const QString &filepath, const QByteArray &content,
+                                 std::unique_ptr<MediaInformation> &result) {
 	static const auto mimes = {
-		qstr("video/mp4"),
-		qstr("video/quicktime"),
+	    qstr("video/mp4"),
+	    qstr("video/quicktime"),
 	};
 	static const auto extensions = {
-		qstr(".mp4"),
-		qstr(".mov"),
+	    qstr(".mp4"),
+	    qstr(".mov"),
 	};
 	if (!CheckMimeOrExtensions(filepath, result->filemime, mimes, extensions)) {
 		return false;
@@ -295,7 +298,8 @@ bool FileLoadTask::CheckForVideo(const QString &filepath, const QByteArray &cont
 	return true;
 }
 
-bool FileLoadTask::CheckForImage(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result) {
+bool FileLoadTask::CheckForImage(const QString &filepath, const QByteArray &content,
+                                 std::unique_ptr<MediaInformation> &result) {
 	auto animated = false;
 	auto image = ([&filepath, &content, &animated] {
 		if (!content.isEmpty()) {
@@ -436,11 +440,16 @@ void FileLoadTask::process() {
 		if (auto song = base::get_if<Song>(&_information->media)) {
 			isSong = true;
 			auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
-			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(song->duration), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
+			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(song->duration),
+			                                                MTP_string(song->title), MTP_string(song->performer),
+			                                                MTPstring()));
 			if (!song->cover.isNull()) { // cover to thumb
 				auto coverWidth = song->cover.width();
 				auto coverHeight = song->cover.height();
-				auto full = (coverWidth > 90 || coverHeight > 90) ? App::pixmapFromImageInPlace(song->cover.scaled(90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation)) : App::pixmapFromImageInPlace(std::move(song->cover));
+				auto full = (coverWidth > 90 || coverHeight > 90) ?
+				                App::pixmapFromImageInPlace(
+				                    song->cover.scaled(90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation)) :
+				                App::pixmapFromImageInPlace(std::move(song->cover));
 				{
 					auto thumbFormat = QByteArray("JPG");
 					auto thumbQuality = 87;
@@ -450,7 +459,9 @@ void FileLoadTask::process() {
 				}
 
 				thumb = full;
-				thumbSize = MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(full.width()), MTP_int(full.height()), MTP_int(0));
+				thumbSize =
+				    MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+				                  MTP_int(full.width()), MTP_int(full.height()), MTP_int(0));
 
 				thumbId = rand_value<quint64>();
 			}
@@ -462,11 +473,12 @@ void FileLoadTask::process() {
 				attributes.push_back(MTP_documentAttributeAnimated());
 			}
 			auto flags = MTPDdocumentAttributeVideo::Flags(0);
-			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(video->duration), MTP_int(coverWidth), MTP_int(coverHeight)));
+			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(video->duration),
+			                                                MTP_int(coverWidth), MTP_int(coverHeight)));
 
-			auto cover = (coverWidth > 90 || coverHeight > 90)
-				? video->thumbnail.scaled(90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation)
-				: std::move(video->thumbnail);
+			auto cover = (coverWidth > 90 || coverHeight > 90) ?
+			                 video->thumbnail.scaled(90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation) :
+			                 std::move(video->thumbnail);
 			{
 				auto thumbFormat = QByteArray("JPG");
 				auto thumbQuality = 87;
@@ -476,7 +488,8 @@ void FileLoadTask::process() {
 			}
 
 			thumb = App::pixmapFromImageInPlace(std::move(cover));
-			thumbSize = MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0));
+			thumbSize = MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+			                          MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0));
 
 			thumbId = rand_value<quint64>();
 		}
@@ -490,24 +503,37 @@ void FileLoadTask::process() {
 			if (isAnimation) {
 				attributes.push_back(MTP_documentAttributeAnimated());
 			} else if (_type != SendMediaType::File) {
-				auto thumb = (w > 100 || h > 100) ? App::pixmapFromImageInPlace(fullimage.scaled(100, 100, Qt::KeepAspectRatio, Qt::SmoothTransformation)) : QPixmap::fromImage(fullimage);
+				auto thumb = (w > 100 || h > 100) ? App::pixmapFromImageInPlace(fullimage.scaled(
+				                                        100, 100, Qt::KeepAspectRatio, Qt::SmoothTransformation)) :
+				                                    QPixmap::fromImage(fullimage);
 				photoThumbs.insert('s', thumb);
-				photoSizes.push_back(MTP_photoSize(MTP_string("s"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0)));
+				photoSizes.push_back(MTP_photoSize(MTP_string("s"),
+				                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+				                                   MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0)));
 
-				auto medium = (w > 320 || h > 320) ? App::pixmapFromImageInPlace(fullimage.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation)) : QPixmap::fromImage(fullimage);
+				auto medium = (w > 320 || h > 320) ? App::pixmapFromImageInPlace(fullimage.scaled(
+				                                         320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation)) :
+				                                     QPixmap::fromImage(fullimage);
 				photoThumbs.insert('m', medium);
-				photoSizes.push_back(MTP_photoSize(MTP_string("m"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(medium.width()), MTP_int(medium.height()), MTP_int(0)));
+				photoSizes.push_back(MTP_photoSize(MTP_string("m"),
+				                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+				                                   MTP_int(medium.width()), MTP_int(medium.height()), MTP_int(0)));
 
-				auto full = (w > 1280 || h > 1280) ? App::pixmapFromImageInPlace(fullimage.scaled(1280, 1280, Qt::KeepAspectRatio, Qt::SmoothTransformation)) : QPixmap::fromImage(fullimage);
+				auto full = (w > 1280 || h > 1280) ? App::pixmapFromImageInPlace(fullimage.scaled(
+				                                         1280, 1280, Qt::KeepAspectRatio, Qt::SmoothTransformation)) :
+				                                     QPixmap::fromImage(fullimage);
 				photoThumbs.insert('y', full);
-				photoSizes.push_back(MTP_photoSize(MTP_string("y"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(full.width()), MTP_int(full.height()), MTP_int(0)));
+				photoSizes.push_back(MTP_photoSize(MTP_string("y"),
+				                                   MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+				                                   MTP_int(full.width()), MTP_int(full.height()), MTP_int(0)));
 
 				{
 					QBuffer buffer(&filedata);
 					full.save(&buffer, "JPG", 87);
 				}
 
-				photo = MTP_photo(MTP_flags(0), MTP_long(_id), MTP_long(0), MTP_int(unixtime()), MTP_vector<MTPPhotoSize>(photoSizes));
+				photo = MTP_photo(MTP_flags(0), MTP_long(_id), MTP_long(0), MTP_int(unixtime()),
+				                  MTP_vector<MTPPhotoSize>(photoSizes));
 
 				if (filesize < 0) {
 					filesize = _result->filesize = filedata.size();
@@ -516,19 +542,17 @@ void FileLoadTask::process() {
 
 			QByteArray thumbFormat = "JPG";
 			auto thumbQuality = 87;
-			if (!isAnimation
-				&& filemime == stickerMime
-				&& w > 0
-				&& h > 0
-				&& w <= StickerMaxSize
-				&& h <= StickerMaxSize
-				&& filesize < Storage::kMaxStickerInMemory) {
-				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(""), MTP_inputStickerSetEmpty(), MTPMaskCoords()));
+			if (!isAnimation && filemime == stickerMime && w > 0 && h > 0 && w <= StickerMaxSize &&
+			    h <= StickerMaxSize && filesize < Storage::kMaxStickerInMemory) {
+				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(""),
+				                                                  MTP_inputStickerSetEmpty(), MTPMaskCoords()));
 				thumbFormat = "webp";
 				thumbname = qsl("thumb.webp");
 			}
 
-			QPixmap full = (w > 90 || h > 90) ? App::pixmapFromImageInPlace(fullimage.scaled(90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation)) : QPixmap::fromImage(fullimage, Qt::ColorOnly);
+			QPixmap full = (w > 90 || h > 90) ? App::pixmapFromImageInPlace(fullimage.scaled(
+			                                        90, 90, Qt::KeepAspectRatio, Qt::SmoothTransformation)) :
+			                                    QPixmap::fromImage(fullimage, Qt::ColorOnly);
 
 			{
 				QBuffer buffer(&thumbdata);
@@ -536,7 +560,8 @@ void FileLoadTask::process() {
 			}
 
 			thumb = full;
-			thumbSize = MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(full.width()), MTP_int(full.height()), MTP_int(0));
+			thumbSize = MTP_photoSize(MTP_string(""), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)),
+			                          MTP_int(full.width()), MTP_int(full.height()), MTP_int(0));
 
 			thumbId = rand_value<quint64>();
 		}
@@ -548,11 +573,16 @@ void FileLoadTask::process() {
 
 	if (isVoice) {
 		auto flags = MTPDdocumentAttributeAudio::Flag::f_voice | MTPDdocumentAttributeAudio::Flag::f_waveform;
-		attributes[0] = MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(_duration), MTPstring(), MTPstring(), MTP_bytes(documentWaveformEncode5bit(_waveform)));
+		attributes[0] = MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(_duration), MTPstring(), MTPstring(),
+		                                           MTP_bytes(documentWaveformEncode5bit(_waveform)));
 		attributes.resize(1);
-		document = MTP_document(MTP_long(_id), MTP_long(0), MTP_int(unixtime()), MTP_string(filemime), MTP_int(filesize), thumbSize, MTP_int(MTP::maindc()), MTP_int(0), MTP_vector<MTPDocumentAttribute>(attributes));
+		document =
+		    MTP_document(MTP_long(_id), MTP_long(0), MTP_int(unixtime()), MTP_string(filemime), MTP_int(filesize),
+		                 thumbSize, MTP_int(MTP::maindc()), MTP_int(0), MTP_vector<MTPDocumentAttribute>(attributes));
 	} else if (_type != SendMediaType::Photo) {
-		document = MTP_document(MTP_long(_id), MTP_long(0), MTP_int(unixtime()), MTP_string(filemime), MTP_int(filesize), thumbSize, MTP_int(MTP::maindc()), MTP_int(0), MTP_vector<MTPDocumentAttribute>(attributes));
+		document =
+		    MTP_document(MTP_long(_id), MTP_long(0), MTP_int(unixtime()), MTP_string(filemime), MTP_int(filesize),
+		                 thumbSize, MTP_int(MTP::maindc()), MTP_int(0), MTP_vector<MTPDocumentAttribute>(attributes));
 		_type = SendMediaType::File;
 	}
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index 625681908..f123834f3 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
-#include <QByteArray>
-#include <QMap>
-#include <QList>
-#include <QImage>
-#include <QMutex>
 #include "base/variant.h"
 #include "structs.h"
+#include <QByteArray>
+#include <QImage>
+#include <QList>
+#include <QMap>
+#include <QMutex>
+#include <QString>
 
 enum class CompressConfirm {
 	Auto,
@@ -43,14 +43,31 @@ enum class SendMediaType {
 };
 
 struct SendMediaPrepare {
-	SendMediaPrepare(const QString &file, const PeerId &peer, SendMediaType type, MsgId replyTo) : id(rand_value<PhotoId>()), file(file), peer(peer), type(type), replyTo(replyTo) {
-	}
-	SendMediaPrepare(const QImage &img, const PeerId &peer, SendMediaType type, MsgId replyTo) : id(rand_value<PhotoId>()), img(img), peer(peer), type(type), replyTo(replyTo) {
-	}
-	SendMediaPrepare(const QByteArray &data, const PeerId &peer, SendMediaType type, MsgId replyTo) : id(rand_value<PhotoId>()), data(data), peer(peer), type(type), replyTo(replyTo) {
-	}
-	SendMediaPrepare(const QByteArray &data, int duration, const PeerId &peer, SendMediaType type, MsgId replyTo) : id(rand_value<PhotoId>()), data(data), peer(peer), type(type), duration(duration), replyTo(replyTo) {
-	}
+	SendMediaPrepare(const QString &file, const PeerId &peer, SendMediaType type, MsgId replyTo)
+	    : id(rand_value<PhotoId>())
+	    , file(file)
+	    , peer(peer)
+	    , type(type)
+	    , replyTo(replyTo) {}
+	SendMediaPrepare(const QImage &img, const PeerId &peer, SendMediaType type, MsgId replyTo)
+	    : id(rand_value<PhotoId>())
+	    , img(img)
+	    , peer(peer)
+	    , type(type)
+	    , replyTo(replyTo) {}
+	SendMediaPrepare(const QByteArray &data, const PeerId &peer, SendMediaType type, MsgId replyTo)
+	    : id(rand_value<PhotoId>())
+	    , data(data)
+	    , peer(peer)
+	    , type(type)
+	    , replyTo(replyTo) {}
+	SendMediaPrepare(const QByteArray &data, int duration, const PeerId &peer, SendMediaType type, MsgId replyTo)
+	    : id(rand_value<PhotoId>())
+	    , data(data)
+	    , peer(peer)
+	    , type(type)
+	    , duration(duration)
+	    , replyTo(replyTo) {}
 	PhotoId id;
 	QString file;
 	QImage img;
@@ -59,27 +76,29 @@ struct SendMediaPrepare {
 	SendMediaType type;
 	int duration = 0;
 	MsgId replyTo;
-
 };
 using SendMediaPrepareList = QList<SendMediaPrepare>;
 
-using UploadFileParts =  QMap<int, QByteArray>;
+using UploadFileParts = QMap<int, QByteArray>;
 struct SendMediaReady {
 	SendMediaReady() = default; // temp
-	SendMediaReady(SendMediaType type, const QString &file, const QString &filename, qint32 filesize, const QByteArray &data, const quint64 &id, const quint64 &thumbId, const QString &thumbExt, const PeerId &peer, const MTPPhoto &photo, const PreparedPhotoThumbs &photoThumbs, const MTPDocument &document, const QByteArray &jpeg, MsgId replyTo)
-		: replyTo(replyTo)
-		, type(type)
-		, file(file)
-		, filename(filename)
-		, filesize(filesize)
-		, data(data)
-		, thumbExt(thumbExt)
-		, id(id)
-		, thumbId(thumbId)
-		, peer(peer)
-		, photo(photo)
-		, document(document)
-		, photoThumbs(photoThumbs) {
+	SendMediaReady(SendMediaType type, const QString &file, const QString &filename, qint32 filesize,
+	               const QByteArray &data, const quint64 &id, const quint64 &thumbId, const QString &thumbExt,
+	               const PeerId &peer, const MTPPhoto &photo, const PreparedPhotoThumbs &photoThumbs,
+	               const MTPDocument &document, const QByteArray &jpeg, MsgId replyTo)
+	    : replyTo(replyTo)
+	    , type(type)
+	    , file(file)
+	    , filename(filename)
+	    , filesize(filesize)
+	    , data(data)
+	    , thumbExt(thumbExt)
+	    , id(id)
+	    , thumbId(thumbId)
+	    , peer(peer)
+	    , photo(photo)
+	    , document(document)
+	    , photoThumbs(photoThumbs) {
 		if (!jpeg.isEmpty()) {
 			qint32 size = jpeg.size();
 			for (qint32 i = 0, part = 0; i < size; i += UploadPartSize, ++part) {
@@ -105,10 +124,9 @@ struct SendMediaReady {
 	QByteArray jpeg_md5;
 
 	QString caption;
-
 };
 
-using TaskId = void*; // no interface, just id
+using TaskId = void *; // no interface, just id
 
 class Task {
 public:
@@ -117,9 +135,8 @@ public:
 	virtual ~Task() = default;
 
 	TaskId id() const {
-		return static_cast<TaskId>(const_cast<Task*>(this));
+		return static_cast<TaskId>(const_cast<Task *>(this));
 	}
-
 };
 using TaskPtr = QSharedPointer<Task>;
 using TasksList = QList<TaskPtr>;
@@ -154,15 +171,14 @@ private:
 	QThread *_thread;
 	TaskQueueWorker *_worker;
 	QTimer *_stopTimer;
-
 };
 
 class TaskQueueWorker : public QObject {
 	Q_OBJECT
 
 public:
-	TaskQueueWorker(TaskQueue *queue) : _queue(queue) {
-	}
+	TaskQueueWorker(TaskQueue *queue)
+	    : _queue(queue) {}
 
 signals:
 	void taskProcessed();
@@ -173,15 +189,13 @@ public slots:
 private:
 	TaskQueue *_queue;
 	bool _inTaskAdded = false;
-
 };
 
 struct FileLoadTo {
 	FileLoadTo(const PeerId &peer, bool silent, MsgId replyTo)
-		: peer(peer)
-		, silent(silent)
-		, replyTo(replyTo) {
-	}
+	    : peer(peer)
+	    , silent(silent)
+	    , replyTo(replyTo) {}
 	PeerId peer;
 	bool silent;
 	MsgId replyTo;
@@ -189,10 +203,9 @@ struct FileLoadTo {
 
 struct FileLoadResult {
 	FileLoadResult(const quint64 &id, const FileLoadTo &to, const QString &caption)
-		: id(id)
-		, to(to)
-		, caption(caption) {
-	}
+	    : id(id)
+	    , to(to)
+	    , caption(caption) {}
 
 	quint64 id;
 	FileLoadTo to;
@@ -265,11 +278,15 @@ public:
 		QString filemime;
 		base::variant<Image, Song, Video> media;
 	};
-	static std::unique_ptr<MediaInformation> ReadMediaInformation(const QString &filepath, const QByteArray &content, const QString &filemime);
+	static std::unique_ptr<MediaInformation> ReadMediaInformation(const QString &filepath, const QByteArray &content,
+	                                                              const QString &filemime);
 
-	FileLoadTask(const QString &filepath, std::unique_ptr<MediaInformation> information, SendMediaType type, const FileLoadTo &to, const QString &caption);
-	FileLoadTask(const QByteArray &content, const QImage &image, SendMediaType type, const FileLoadTo &to, const QString &caption);
-	FileLoadTask(const QByteArray &voice, qint32 duration, const VoiceWaveform &waveform, const FileLoadTo &to, const QString &caption);
+	FileLoadTask(const QString &filepath, std::unique_ptr<MediaInformation> information, SendMediaType type,
+	             const FileLoadTo &to, const QString &caption);
+	FileLoadTask(const QByteArray &content, const QImage &image, SendMediaType type, const FileLoadTo &to,
+	             const QString &caption);
+	FileLoadTask(const QByteArray &voice, qint32 duration, const VoiceWaveform &waveform, const FileLoadTo &to,
+	             const QString &caption);
 
 	quint64 fileid() const {
 		return _id;
@@ -279,12 +296,16 @@ public:
 	void finish();
 
 private:
-	static bool CheckForSong(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result);
-	static bool CheckForVideo(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result);
-	static bool CheckForImage(const QString &filepath, const QByteArray &content, std::unique_ptr<MediaInformation> &result);
+	static bool CheckForSong(const QString &filepath, const QByteArray &content,
+	                         std::unique_ptr<MediaInformation> &result);
+	static bool CheckForVideo(const QString &filepath, const QByteArray &content,
+	                          std::unique_ptr<MediaInformation> &result);
+	static bool CheckForImage(const QString &filepath, const QByteArray &content,
+	                          std::unique_ptr<MediaInformation> &result);
 
 	template <typename Mimes, typename Extensions>
-	static bool CheckMimeOrExtensions(const QString &filepath, const QString &filemime, Mimes &mimes, Extensions &extensions);
+	static bool CheckMimeOrExtensions(const QString &filepath, const QString &filemime, Mimes &mimes,
+	                                  Extensions &extensions);
 
 	std::unique_ptr<MediaInformation> readMediaInformation(const QString &filemime) const {
 		return ReadMediaInformation(_filepath, _content, filemime);
@@ -302,5 +323,4 @@ private:
 	QString _caption;
 
 	FileLoadResultPtr _result;
-
 };
diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 5cd664331..e37d5a708 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -20,29 +20,29 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "storage/localstorage.h"
 
-#include "storage/serialize_document.h"
-#include "storage/serialize_common.h"
+#include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
+#include "base/flags.h"
 #include "data/data_drafts.h"
-#include "window/themes/window_theme.h"
-#include "observer_peer.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "lang/lang_keys.h"
 #include "media/media_audio.h"
-#include "ui/widgets/input_fields.h"
-#include "mtproto/dc_options.h"
 #include "messenger.h"
-#include "application.h"
-#include "apiwrap.h"
-#include "auth_session.h"
+#include "mtproto/dc_options.h"
+#include "observer_peer.h"
+#include "storage/serialize_common.h"
+#include "storage/serialize_document.h"
+#include "ui/widgets/input_fields.h"
+#include "window/themes/window_theme.h"
 #include "window/window_controller.h"
-#include "base/flags.h"
 
 #include <openssl/evp.h>
 
 #include <QBuffer>
-#include <QImageReader>
 #include <QDirIterator>
+#include <QImageReader>
 #include <qendian.h>
 
 namespace Local {
@@ -52,7 +52,7 @@ constexpr int kThemeFileSizeLimit = 5 * 1024 * 1024;
 
 using FileKey = quint64;
 
-constexpr char tdfMagic[] = { 'T', 'D', 'F', '$' };
+constexpr char tdfMagic[] = {'T', 'D', 'F', '$'};
 constexpr int tdfMagicLen = sizeof(tdfMagic);
 
 QString toFilePart(FileKey val) {
@@ -85,7 +85,9 @@ enum class FileOption {
 	Safe = (1 << 1),
 };
 using FileOptions = base::flags<FileOption>;
-inline constexpr auto is_flag_type(FileOption) { return true; };
+inline constexpr auto is_flag_type(FileOption) {
+	return true;
+};
 
 bool keyAlreadyUsed(QString &name, FileOptions options = FileOption::User | FileOption::Safe) {
 	name += '0';
@@ -152,7 +154,7 @@ auto PassKey = MTP::AuthKeyPtr();
 auto LocalKey = MTP::AuthKeyPtr();
 
 void createLocalKey(const QByteArray &pass, QByteArray *salt, MTP::AuthKeyPtr *result) {
-	auto key = MTP::AuthKey::Data { { gsl::byte{} } };
+	auto key = MTP::AuthKey::Data{{gsl::byte{}}};
 	auto iterCount = pass.size() ? LocalEncryptIterCount : LocalEncryptNoPwdIterCount; // dont slow down for no password
 	auto newSalt = QByteArray();
 	if (!salt) {
@@ -163,14 +165,15 @@ void createLocalKey(const QByteArray &pass, QByteArray *salt, MTP::AuthKeyPtr *r
 		cSetLocalSalt(newSalt);
 	}
 
-	PKCS5_PBKDF2_HMAC_SHA1(pass.constData(), pass.size(), (uchar*)salt->data(), salt->size(), iterCount, key.size(), (uchar*)key.data());
+	PKCS5_PBKDF2_HMAC_SHA1(pass.constData(), pass.size(), (uchar *)salt->data(), salt->size(), iterCount, key.size(),
+	                       (uchar *)key.data());
 
 	*result = std::make_shared<MTP::AuthKey>(key);
 }
 
 struct FileReadDescriptor {
-	FileReadDescriptor() : version(0) {
-	}
+	FileReadDescriptor()
+	    : version(0) {}
 	qint32 version;
 	QByteArray data;
 	QBuffer buffer;
@@ -185,8 +188,7 @@ struct FileReadDescriptor {
 };
 
 struct EncryptedDescriptor {
-	EncryptedDescriptor() {
-	}
+	EncryptedDescriptor() {}
 	EncryptedDescriptor(quint32 size) {
 		quint32 fullSize = sizeof(quint32) + size;
 		if (fullSize & 0x0F) fullSize += 0x10 - (fullSize & 0x0F);
@@ -252,7 +254,7 @@ struct FileWriteDescriptor {
 		if (file.open(QIODevice::WriteOnly)) {
 			file.write(tdfMagic, tdfMagicLen);
 			qint32 version = AppVersion;
-			file.write((const char*)&version, sizeof(version));
+			file.write((const char *)&version, sizeof(version));
 
 			stream.setDevice(&file);
 			stream.setVersion(QDataStream::Qt_5_1);
@@ -283,7 +285,7 @@ struct FileWriteDescriptor {
 			toEncrypt.resize(fullSize);
 			memset_rand(toEncrypt.data() + size, fullSize - size);
 		}
-		*(quint32*)toEncrypt.data() = size;
+		*(quint32 *)toEncrypt.data() = size;
 		QByteArray encrypted(0x10 + fullSize, Qt::Uninitialized); // 128bit of sha1 - key128, sizeof(data), data
 		hashSha1(toEncrypt.constData(), toEncrypt.size(), encrypted.data());
 		MTP::aesEncryptLocal(toEncrypt.constData(), encrypted.data() + 0x10, fullSize, key, encrypted.constData());
@@ -302,7 +304,7 @@ struct FileWriteDescriptor {
 		qint32 version = AppVersion;
 		md5.feed(&version, sizeof(version));
 		md5.feed(tdfMagic, tdfMagicLen);
-		file.write((const char*)md5.result(), 0x10);
+		file.write((const char *)md5.result(), 0x10);
 		file.close();
 
 		if (!toDelete.isEmpty()) {
@@ -322,7 +324,8 @@ struct FileWriteDescriptor {
 	}
 };
 
-bool readFile(FileReadDescriptor &result, const QString &name, FileOptions options = FileOption::User | FileOption::Safe) {
+bool readFile(FileReadDescriptor &result, const QString &name,
+              FileOptions options = FileOption::User | FileOption::Safe) {
 	if (options & FileOption::User) {
 		if (!_userWorking()) return false;
 	} else {
@@ -372,7 +375,7 @@ bool readFile(FileReadDescriptor &result, const QString &name, FileOptions optio
 
 		// read app version
 		qint32 version;
-		if (f.read((char*)&version, sizeof(version)) != sizeof(version)) {
+		if (f.read((char *)&version, sizeof(version)) != sizeof(version)) {
 			DEBUG_LOG(("App Info: failed to read version from '%1'").arg(name));
 			continue;
 		}
@@ -436,9 +439,12 @@ bool decryptLocal(EncryptedDescriptor &result, const QByteArray &encrypted, cons
 		return false;
 	}
 
-	quint32 dataLen = *(const quint32*)decrypted.constData();
+	quint32 dataLen = *(const quint32 *)decrypted.constData();
 	if (dataLen > quint32(decrypted.size()) || dataLen <= fullLen - 16 || dataLen < sizeof(quint32)) {
-		LOG(("App Error: bad decrypted part size: %1, fullLen: %2, decrypted size: %3").arg(dataLen).arg(fullLen).arg(decrypted.size()));
+		LOG(("App Error: bad decrypted part size: %1, fullLen: %2, decrypted size: %3")
+		        .arg(dataLen)
+		        .arg(fullLen)
+		        .arg(decrypted.size()));
 		return false;
 	}
 
@@ -455,7 +461,9 @@ bool decryptLocal(EncryptedDescriptor &result, const QByteArray &encrypted, cons
 	return true;
 }
 
-bool readEncryptedFile(FileReadDescriptor &result, const QString &name, FileOptions options = FileOption::User | FileOption::Safe, const MTP::AuthKeyPtr &key = LocalKey) {
+bool readEncryptedFile(FileReadDescriptor &result, const QString &name,
+                       FileOptions options = FileOption::User | FileOption::Safe,
+                       const MTP::AuthKeyPtr &key = LocalKey) {
 	if (!readFile(result, name, options)) {
 		return false;
 	}
@@ -485,7 +493,9 @@ bool readEncryptedFile(FileReadDescriptor &result, const QString &name, FileOpti
 	return true;
 }
 
-bool readEncryptedFile(FileReadDescriptor &result, const FileKey &fkey, FileOptions options = FileOption::User | FileOption::Safe, const MTP::AuthKeyPtr &key = LocalKey) {
+bool readEncryptedFile(FileReadDescriptor &result, const FileKey &fkey,
+                       FileOptions options = FileOption::User | FileOption::Safe,
+                       const MTP::AuthKeyPtr &key = LocalKey) {
 	return readEncryptedFile(result, toFilePart(fkey), options, key);
 }
 
@@ -574,7 +584,7 @@ enum {
 	dbiVideoVolume = 0x42,
 	dbiStickersRecentLimit = 0x43,
 	dbiNativeNotifications = 0x44,
-	dbiNotificationsCount  = 0x45,
+	dbiNotificationsCount = 0x45,
 	dbiNotificationsCorner = 0x46,
 	dbiThemeKey = 0x47,
 	dbiDialogsWidthRatio = 0x48,
@@ -620,7 +630,8 @@ TrustedBots _trustedBots;
 bool _trustedBotsRead = false;
 
 FileKey _recentStickersKeyOld = 0;
-FileKey _installedStickersKey = 0, _featuredStickersKey = 0, _recentStickersKey = 0, _favedStickersKey = 0, _archivedStickersKey = 0;
+FileKey _installedStickersKey = 0, _featuredStickersKey = 0, _recentStickersKey = 0, _favedStickersKey = 0,
+        _archivedStickersKey = 0;
 FileKey _savedGifsKey = 0;
 
 FileKey _backgroundKey = 0;
@@ -695,7 +706,7 @@ void _writeLocations(WriteMapWhen when = WriteMapWhen::Soon) {
 			size += Serialize::dateTimeSize() + sizeof(quint32);
 		}
 
-		//end mark
+		// end mark
 		size += sizeof(quint64) * 2 + sizeof(quint32) + Serialize::stringSize(QString());
 		if (AppVersion > 9013) {
 			size += Serialize::bytearraySize(QByteArray());
@@ -703,7 +714,8 @@ void _writeLocations(WriteMapWhen when = WriteMapWhen::Soon) {
 		size += Serialize::dateTimeSize() + sizeof(quint32);
 
 		size += sizeof(quint32); // aliases count
-		for (FileLocationAliases::const_iterator i = _fileLocationAliases.cbegin(), e = _fileLocationAliases.cend(); i != e; ++i) {
+		for (FileLocationAliases::const_iterator i = _fileLocationAliases.cbegin(), e = _fileLocationAliases.cend();
+		     i != e; ++i) {
 			// alias + location
 			size += sizeof(quint64) * 2 + sizeof(quint64) * 2;
 		}
@@ -717,7 +729,8 @@ void _writeLocations(WriteMapWhen when = WriteMapWhen::Soon) {
 		EncryptedDescriptor data(size);
 		auto legacyTypeField = 0;
 		for (FileLocations::const_iterator i = _fileLocations.cbegin(); i != _fileLocations.cend(); ++i) {
-			data.stream << quint64(i.key().first) << quint64(i.key().second) << quint32(legacyTypeField) << i.value().name();
+			data.stream << quint64(i.key().first) << quint64(i.key().second) << quint32(legacyTypeField)
+			            << i.value().name();
 			if (AppVersion > 9013) {
 				data.stream << i.value().bookmark();
 			}
@@ -731,8 +744,10 @@ void _writeLocations(WriteMapWhen when = WriteMapWhen::Soon) {
 		data.stream << QDateTime::currentDateTime() << quint32(0);
 
 		data.stream << quint32(_fileLocationAliases.size());
-		for (FileLocationAliases::const_iterator i = _fileLocationAliases.cbegin(), e = _fileLocationAliases.cend(); i != e; ++i) {
-			data.stream << quint64(i.key().first) << quint64(i.key().second) << quint64(i.value().first) << quint64(i.value().second);
+		for (FileLocationAliases::const_iterator i = _fileLocationAliases.cbegin(), e = _fileLocationAliases.cend();
+		     i != e; ++i) {
+			data.stream << quint64(i.key().first) << quint64(i.key().second) << quint64(i.value().first)
+			            << quint64(i.value().second);
 		}
 
 		data.stream << quint32(_webFilesMap.size());
@@ -1287,7 +1302,12 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting
 		stream >> position.moncrc >> position.maximized;
 		if (!_checkStreamStatus(stream)) return false;
 
-		DEBUG_LOG(("Window Pos: Read from storage %1, %2, %3, %4 (maximized %5)").arg(position.x).arg(position.y).arg(position.w).arg(position.h).arg(Logs::b(position.maximized)));
+		DEBUG_LOG(("Window Pos: Read from storage %1, %2, %3, %4 (maximized %5)")
+		              .arg(position.x)
+		              .arg(position.y)
+		              .arg(position.w)
+		              .arg(position.h)
+		              .arg(Logs::b(position.maximized)));
 		cSetWindowPos(position);
 	} break;
 
@@ -1565,9 +1585,7 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting
 		Global::SetVideoVolume(snap(v / 1e6, 0., 1.));
 	} break;
 
-	default:
-	LOG(("App Error: unknown blockId in _readSetting: %1").arg(blockId));
-	return false;
+	default: LOG(("App Error: unknown blockId in _readSetting: %1").arg(blockId)); return false;
 	}
 
 	return true;
@@ -1648,9 +1666,12 @@ void _readOldUserSettingsFields(QIODevice *device, qint32 &version, ReadSettings
 				LOG(("App Error: bad decrypt key, data from old user config not decrypted"));
 				continue;
 			}
-			quint32 dataLen = *(const quint32*)decrypted.constData();
+			quint32 dataLen = *(const quint32 *)decrypted.constData();
 			if (dataLen > quint32(decrypted.size()) || dataLen <= fullDataLen - 16 || dataLen < 4) {
-				LOG(("App Error: bad decrypted part size in old user config: %1, fullDataLen: %2, decrypted size: %3").arg(dataLen).arg(fullDataLen).arg(decrypted.size()));
+				LOG(("App Error: bad decrypted part size in old user config: %1, fullDataLen: %2, decrypted size: %3")
+				        .arg(dataLen)
+				        .arg(fullDataLen)
+				        .arg(decrypted.size()));
 				continue;
 			}
 			decrypted.resize(dataLen);
@@ -1723,9 +1744,12 @@ void _readOldMtpDataFields(QIODevice *device, qint32 &version, ReadSettingsConte
 				LOG(("MTP Error: bad decrypt key, data from old keys not decrypted"));
 				continue;
 			}
-			quint32 dataLen = *(const quint32*)decrypted.constData();
+			quint32 dataLen = *(const quint32 *)decrypted.constData();
 			if (dataLen > quint32(decrypted.size()) || dataLen <= fullDataLen - 16 || dataLen < 4) {
-				LOG(("MTP Error: bad decrypted part size in old keys: %1, fullDataLen: %2, decrypted size: %3").arg(dataLen).arg(fullDataLen).arg(decrypted.size()));
+				LOG(("MTP Error: bad decrypted part size in old keys: %1, fullDataLen: %2, decrypted size: %3")
+				        .arg(dataLen)
+				        .arg(fullDataLen)
+				        .arg(decrypted.size()));
 				continue;
 			}
 			decrypted.resize(dataLen);
@@ -1775,7 +1799,8 @@ void _writeUserSettings() {
 			recentEmojiPreloadData.push_back(qMakePair(item.first->id(), item.second));
 		}
 	}
-	auto userDataInstance = StoredAuthSessionCache ? &StoredAuthSessionCache->data : Messenger::Instance().getAuthSessionData();
+	auto userDataInstance =
+	    StoredAuthSessionCache ? &StoredAuthSessionCache->data : Messenger::Instance().getAuthSessionData();
 	auto userData = userDataInstance ? userDataInstance->serialize() : QByteArray();
 	auto dialogsWidthRatio = [] {
 		if (StoredAuthSessionCache) {
@@ -1789,7 +1814,8 @@ void _writeUserSettings() {
 	};
 
 	quint32 size = 21 * (sizeof(quint32) + sizeof(qint32));
-	size += sizeof(quint32) + Serialize::stringSize(Global::AskDownloadPath() ? QString() : Global::DownloadPath()) + Serialize::bytearraySize(Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark());
+	size += sizeof(quint32) + Serialize::stringSize(Global::AskDownloadPath() ? QString() : Global::DownloadPath()) +
+	        Serialize::bytearraySize(Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark());
 
 	size += sizeof(quint32) + sizeof(qint32);
 	for (auto &item : recentEmojiPreloadData) {
@@ -1797,12 +1823,15 @@ void _writeUserSettings() {
 	}
 
 	size += sizeof(quint32) + sizeof(qint32) + cEmojiVariants().size() * (sizeof(quint32) + sizeof(quint64));
-	size += sizeof(quint32) + sizeof(qint32) + (cRecentStickersPreload().isEmpty() ? cGetRecentStickers().size() : cRecentStickersPreload().size()) * (sizeof(quint64) + sizeof(ushort));
+	size += sizeof(quint32) + sizeof(qint32) +
+	        (cRecentStickersPreload().isEmpty() ? cGetRecentStickers().size() : cRecentStickersPreload().size()) *
+	            (sizeof(quint64) + sizeof(ushort));
 	size += sizeof(quint32) + Serialize::stringSize(cDialogLastPath());
 	size += sizeof(quint32) + 3 * sizeof(qint32);
 	size += sizeof(quint32) + 2 * sizeof(qint32);
 	if (!Global::HiddenPinnedMessages().isEmpty()) {
-		size += sizeof(quint32) + sizeof(qint32) + Global::HiddenPinnedMessages().size() * (sizeof(PeerId) + sizeof(MsgId));
+		size +=
+		    sizeof(quint32) + sizeof(qint32) + Global::HiddenPinnedMessages().size() * (sizeof(PeerId) + sizeof(MsgId));
 	}
 	if (!userData.isEmpty()) {
 		size += sizeof(quint32) + Serialize::bytearraySize(userData);
@@ -1823,30 +1852,33 @@ void _writeUserSettings() {
 	data.stream << quint32(dbiNotificationsCount) << qint32(Global::NotificationsCount());
 	data.stream << quint32(dbiNotificationsCorner) << qint32(Global::NotificationsCorner());
 	data.stream << quint32(dbiAskDownloadPath) << qint32(Global::AskDownloadPath());
-	data.stream << quint32(dbiDownloadPath) << (Global::AskDownloadPath() ? QString() : Global::DownloadPath()) << (Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark());
+	data.stream << quint32(dbiDownloadPath) << (Global::AskDownloadPath() ? QString() : Global::DownloadPath())
+	            << (Global::AskDownloadPath() ? QByteArray() : Global::DownloadPathBookmark());
 	data.stream << quint32(dbiCompressPastedImage) << qint32(cCompressPastedImage());
 	data.stream << quint32(dbiDialogLastPath) << cDialogLastPath();
 	data.stream << quint32(dbiSongVolume) << qint32(std::round(Global::SongVolume() * 1e6));
 	data.stream << quint32(dbiVideoVolume) << qint32(std::round(Global::VideoVolume() * 1e6));
-	data.stream << quint32(dbiAutoDownload) << qint32(cAutoDownloadPhoto()) << qint32(cAutoDownloadAudio()) << qint32(cAutoDownloadGif());
-	data.stream << quint32(dbiDialogsMode) << qint32(Global::DialogsModeEnabled() ? 1 : 0) << static_cast<qint32>(Global::DialogsMode());
+	data.stream << quint32(dbiAutoDownload) << qint32(cAutoDownloadPhoto()) << qint32(cAutoDownloadAudio())
+	            << qint32(cAutoDownloadGif());
+	data.stream << quint32(dbiDialogsMode) << qint32(Global::DialogsModeEnabled() ? 1 : 0)
+	            << static_cast<qint32>(Global::DialogsMode());
 	data.stream << quint32(dbiModerateMode) << qint32(Global::ModerateModeEnabled() ? 1 : 0);
 	data.stream << quint32(dbiAutoPlay) << qint32(cAutoPlayGif() ? 1 : 0);
-	data.stream << quint32(dbiDialogsWidthRatio) << qint32(snap<int>(std::round(dialogsWidthRatio() * 1000000), 0, 1000000));
+	data.stream << quint32(dbiDialogsWidthRatio)
+	            << qint32(snap<int>(std::round(dialogsWidthRatio() * 1000000), 0, 1000000));
 	data.stream << quint32(dbiUseExternalVideoPlayer) << qint32(cUseExternalVideoPlayer());
 	if (!userData.isEmpty()) {
 		data.stream << quint32(dbiAuthSessionData) << userData;
 	}
 
-	{
-		data.stream << quint32(dbiRecentEmoji) << recentEmojiPreloadData;
-	}
+	{ data.stream << quint32(dbiRecentEmoji) << recentEmojiPreloadData; }
 	data.stream << quint32(dbiEmojiVariants) << cEmojiVariants();
 	{
 		RecentStickerPreload v(cRecentStickersPreload());
 		if (v.isEmpty()) {
 			v.reserve(cGetRecentStickers().size());
-			for (RecentStickerPack::const_iterator i = cGetRecentStickers().cbegin(), e = cGetRecentStickers().cend(); i != e; ++i) {
+			for (RecentStickerPack::const_iterator i = cGetRecentStickers().cbegin(), e = cGetRecentStickers().cend();
+			     i != e; ++i) {
 				v.push_back(qMakePair(i->first->id, i->second));
 			}
 		}
@@ -1990,7 +2022,8 @@ ReadMapState _readMap(const QByteArray &pass) {
 	qint64 storageImagesSize = 0, storageStickersSize = 0, storageAudiosSize = 0;
 	quint64 locationsKey = 0, reportSpamStatusesKey = 0, trustedBotsKey = 0;
 	quint64 recentStickersKeyOld = 0;
-	quint64 installedStickersKey = 0, featuredStickersKey = 0, recentStickersKey = 0, favedStickersKey = 0, archivedStickersKey = 0;
+	quint64 installedStickersKey = 0, featuredStickersKey = 0, recentStickersKey = 0, favedStickersKey = 0,
+	        archivedStickersKey = 0;
 	quint64 savedGifsKey = 0;
 	quint64 backgroundKey = 0, userSettingsKey = 0, recentHashtagsAndBotsKey = 0, savedPeersKey = 0;
 	while (!map.stream.atEnd()) {
@@ -2094,9 +2127,7 @@ ReadMapState _readMap(const QByteArray &pass) {
 		case lskSavedPeers: {
 			map.stream >> savedPeersKey;
 		} break;
-		default:
-		LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType));
-		return ReadMapFailed;
+		default: LOG(("App Error: unknown key type in encrypted map: %1").arg(keyType)); return ReadMapFailed;
 		}
 		if (!_checkStreamStatus(map.stream)) {
 			return ReadMapFailed;
@@ -2190,9 +2221,12 @@ void _writeMap(WriteMapWhen when) {
 	quint32 mapSize = 0;
 	if (!_draftsMap.isEmpty()) mapSize += sizeof(quint32) * 2 + _draftsMap.size() * sizeof(quint64) * 2;
 	if (!_draftCursorsMap.isEmpty()) mapSize += sizeof(quint32) * 2 + _draftCursorsMap.size() * sizeof(quint64) * 2;
-	if (!_imagesMap.isEmpty()) mapSize += sizeof(quint32) * 2 + _imagesMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
-	if (!_stickerImagesMap.isEmpty()) mapSize += sizeof(quint32) * 2 + _stickerImagesMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
-	if (!_audiosMap.isEmpty()) mapSize += sizeof(quint32) * 2 + _audiosMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
+	if (!_imagesMap.isEmpty())
+		mapSize += sizeof(quint32) * 2 + _imagesMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
+	if (!_stickerImagesMap.isEmpty())
+		mapSize += sizeof(quint32) * 2 + _stickerImagesMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
+	if (!_audiosMap.isEmpty())
+		mapSize += sizeof(quint32) * 2 + _audiosMap.size() * (sizeof(quint64) * 3 + sizeof(qint32));
 	if (_locationsKey) mapSize += sizeof(quint32) + sizeof(quint64);
 	if (_reportSpamStatusesKey) mapSize += sizeof(quint32) + sizeof(quint64);
 	if (_trustedBotsKey) mapSize += sizeof(quint32) + sizeof(quint64);
@@ -2222,19 +2256,22 @@ void _writeMap(WriteMapWhen when) {
 	if (!_imagesMap.isEmpty()) {
 		mapData.stream << quint32(lskImages) << quint32(_imagesMap.size());
 		for (StorageMap::const_iterator i = _imagesMap.cbegin(), e = _imagesMap.cend(); i != e; ++i) {
-			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second) << qint32(i.value().second);
+			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second)
+			               << qint32(i.value().second);
 		}
 	}
 	if (!_stickerImagesMap.isEmpty()) {
 		mapData.stream << quint32(lskStickerImages) << quint32(_stickerImagesMap.size());
 		for (StorageMap::const_iterator i = _stickerImagesMap.cbegin(), e = _stickerImagesMap.cend(); i != e; ++i) {
-			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second) << qint32(i.value().second);
+			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second)
+			               << qint32(i.value().second);
 		}
 	}
 	if (!_audiosMap.isEmpty()) {
 		mapData.stream << quint32(lskAudios) << quint32(_audiosMap.size());
 		for (StorageMap::const_iterator i = _audiosMap.cbegin(), e = _audiosMap.cend(); i != e; ++i) {
-			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second) << qint32(i.value().second);
+			mapData.stream << quint64(i.value().first) << quint64(i.key().first) << quint64(i.key().second)
+			               << qint32(i.value().second);
 		}
 	}
 	if (_locationsKey) {
@@ -2251,7 +2288,8 @@ void _writeMap(WriteMapWhen when) {
 	}
 	if (_installedStickersKey || _featuredStickersKey || _recentStickersKey || _archivedStickersKey) {
 		mapData.stream << quint32(lskStickersKeys);
-		mapData.stream << quint64(_installedStickersKey) << quint64(_featuredStickersKey) << quint64(_recentStickersKey) << quint64(_archivedStickersKey);
+		mapData.stream << quint64(_installedStickersKey) << quint64(_featuredStickersKey) << quint64(_recentStickersKey)
+		               << quint64(_archivedStickersKey);
 	}
 	if (_favedStickersKey) {
 		mapData.stream << quint32(lskFavedStickers) << quint64(_favedStickersKey);
@@ -2375,7 +2413,8 @@ void writeSettings() {
 
 	auto &proxy = Global::ConnectionProxy();
 	size += sizeof(quint32) + sizeof(qint32) + sizeof(qint32);
-	size += Serialize::stringSize(proxy.host) + sizeof(qint32) + Serialize::stringSize(proxy.user) + Serialize::stringSize(proxy.password);
+	size += Serialize::stringSize(proxy.host) + sizeof(qint32) + Serialize::stringSize(proxy.user) +
+	        Serialize::stringSize(proxy.password);
 
 	if (_themeKey) {
 		size += sizeof(quint32) + sizeof(quint64);
@@ -2413,10 +2452,16 @@ void writeSettings() {
 	}
 
 	auto position = cWindowPos();
-	data.stream << quint32(dbiWindowPosition) << qint32(position.x) << qint32(position.y) << qint32(position.w) << qint32(position.h);
+	data.stream << quint32(dbiWindowPosition) << qint32(position.x) << qint32(position.y) << qint32(position.w)
+	            << qint32(position.h);
 	data.stream << qint32(position.moncrc) << qint32(position.maximized);
 
-	DEBUG_LOG(("Window Pos: Writing to storage %1, %2, %3, %4 (maximized %5)").arg(position.x).arg(position.y).arg(position.w).arg(position.h).arg(Logs::b(position.maximized)));
+	DEBUG_LOG(("Window Pos: Writing to storage %1, %2, %3, %4 (maximized %5)")
+	              .arg(position.x)
+	              .arg(position.y)
+	              .arg(position.w)
+	              .arg(position.h)
+	              .arg(Logs::b(position.maximized)));
 
 	settings.writeEncrypted(data, SettingsKey);
 }
@@ -2522,8 +2567,10 @@ void writeDrafts(const PeerId &peer, const MessageDraft &localDraft, const Messa
 		auto editTags = Ui::FlatTextarea::serializeTagsList(editDraft.textWithTags.tags);
 
 		int size = sizeof(quint64);
-		size += Serialize::stringSize(localDraft.textWithTags.text) + Serialize::bytearraySize(msgTags) + 2 * sizeof(qint32);
-		size += Serialize::stringSize(editDraft.textWithTags.text) + Serialize::bytearraySize(editTags) + 2 * sizeof(qint32);
+		size += Serialize::stringSize(localDraft.textWithTags.text) + Serialize::bytearraySize(msgTags) +
+		        2 * sizeof(qint32);
+		size += Serialize::stringSize(editDraft.textWithTags.text) + Serialize::bytearraySize(editTags) +
+		        2 * sizeof(qint32);
 
 		EncryptedDescriptor data(size);
 		data.stream << quint64(peer);
@@ -2659,7 +2706,8 @@ void writeDraftCursors(const PeerId &peer, const MessageCursor &msgCursor, const
 		}
 
 		EncryptedDescriptor data(sizeof(quint64) + sizeof(qint32) * 3);
-		data.stream << quint64(peer) << qint32(msgCursor.position) << qint32(msgCursor.anchor) << qint32(msgCursor.scroll);
+		data.stream << quint64(peer) << qint32(msgCursor.position) << qint32(msgCursor.anchor)
+		            << qint32(msgCursor.scroll);
 		data.stream << qint32(editCursor.position) << qint32(editCursor.anchor) << qint32(editCursor.scroll);
 
 		FileWriteDescriptor file(i.value());
@@ -2693,7 +2741,8 @@ void writeFileLocation(MediaKey location, const FileLocation &local) {
 			return;
 		}
 		if (i.value().first != location) {
-			for (FileLocations::iterator j = _fileLocations.find(i.value().first), e = _fileLocations.end(); (j != e) && (j.key() == i.value().first);) {
+			for (FileLocations::iterator j = _fileLocations.find(i.value().first), e = _fileLocations.end();
+			     (j != e) && (j.key() == i.value().first);) {
 				if (j.value() == i.value().second) {
 					_fileLocations.erase(j);
 					break;
@@ -2714,7 +2763,8 @@ FileLocation readFileLocation(MediaKey location, bool check) {
 	}
 
 	FileLocations::iterator i = _fileLocations.find(location);
-	for (FileLocations::iterator i = _fileLocations.find(location); (i != _fileLocations.end()) && (i.key() == location);) {
+	for (FileLocations::iterator i = _fileLocations.find(location);
+	     (i != _fileLocations.end()) && (i.key() == location);) {
 		if (check) {
 			if (!i.value().check()) {
 				_fileLocationPairs.remove(i.value().fname);
@@ -2732,7 +2782,8 @@ qint32 _storageImageSize(qint32 rawlen) {
 	// fulllen + storagekey + type + len + data
 	qint32 result = sizeof(quint32) + sizeof(quint64) * 2 + sizeof(quint32) + sizeof(quint32) + rawlen;
 	if (result & 0x0F) result += 0x10 - (result & 0x0F);
-	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 + 0x10; // magic + version + len of encrypted + part of sha1 + md5
+	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 +
+	          0x10; // magic + version + len of encrypted + part of sha1 + md5
 	return result;
 }
 
@@ -2740,7 +2791,8 @@ qint32 _storageStickerSize(qint32 rawlen) {
 	// fulllen + storagekey + len + data
 	qint32 result = sizeof(quint32) + sizeof(quint64) * 2 + sizeof(quint32) + rawlen;
 	if (result & 0x0F) result += 0x10 - (result & 0x0F);
-	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 + 0x10; // magic + version + len of encrypted + part of sha1 + md5
+	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 +
+	          0x10; // magic + version + len of encrypted + part of sha1 + md5
 	return result;
 }
 
@@ -2748,7 +2800,8 @@ qint32 _storageAudioSize(qint32 rawlen) {
 	// fulllen + storagekey + len + data
 	qint32 result = sizeof(quint32) + sizeof(quint64) * 2 + sizeof(quint32) + rawlen;
 	if (result & 0x0F) result += 0x10 - (result & 0x0F);
-	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 + 0x10; // magic + version + len of encrypted + part of sha1 + md5
+	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 +
+	          0x10; // magic + version + len of encrypted + part of sha1 + md5
 	return result;
 }
 
@@ -2790,10 +2843,12 @@ void writeImage(const StorageKey &location, const StorageImageSaved &image, bool
 
 class AbstractCachedLoadTask : public Task {
 public:
-
-	AbstractCachedLoadTask(const FileKey &key, const StorageKey &location, bool readImageFlag, mtpFileLoader *loader) :
-		_key(key), _location(location), _readImageFlag(readImageFlag), _loader(loader), _result(0) {
-	}
+	AbstractCachedLoadTask(const FileKey &key, const StorageKey &location, bool readImageFlag, mtpFileLoader *loader)
+	    : _key(key)
+	    , _location(location)
+	    , _readImageFlag(readImageFlag)
+	    , _loader(loader)
+	    , _result(0) {}
 	void process() {
 		FileReadDescriptor image;
 		if (!readEncryptedFile(image, _key, FileOption::User)) {
@@ -2806,7 +2861,7 @@ public:
 		readFromStream(image.stream, locFirst, locSecond, imageData);
 
 		// we're saving files now before we have actual location
-		//if (locFirst != _location.first || locSecond != _location.second) {
+		// if (locFirst != _location.first || locSecond != _location.second) {
 		//	return;
 		//}
 
@@ -2831,7 +2886,8 @@ protected:
 	StorageKey _location;
 	bool _readImageFlag;
 	struct Result {
-		Result(const QByteArray &data, bool readImageFlag) : image(data) {
+		Result(const QByteArray &data, bool readImageFlag)
+		    : image(data) {
 			if (readImageFlag) {
 				auto realFormat = QByteArray();
 				pixmap = App::pixmapFromImageInPlace(App::readImage(data, &realFormat, false));
@@ -2843,18 +2899,15 @@ protected:
 		StorageImageSaved image;
 		QByteArray format;
 		QPixmap pixmap;
-
 	};
 	mtpFileLoader *_loader;
 	Result *_result;
-
 };
 
 class ImageLoadTask : public AbstractCachedLoadTask {
 public:
-	ImageLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader) :
-	AbstractCachedLoadTask(key, location, true, loader) {
-	}
+	ImageLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader)
+	    : AbstractCachedLoadTask(key, location, true, loader) {}
 	void readFromStream(QDataStream &stream, quint64 &first, quint64 &second, QByteArray &data) override {
 		qint32 legacyTypeField = 0;
 		stream >> first >> second >> legacyTypeField >> data;
@@ -2911,9 +2964,8 @@ void writeStickerImage(const StorageKey &location, const QByteArray &sticker, bo
 
 class StickerImageLoadTask : public AbstractCachedLoadTask {
 public:
-	StickerImageLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader) :
-	AbstractCachedLoadTask(key, location, true, loader) {
-	}
+	StickerImageLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader)
+	    : AbstractCachedLoadTask(key, location, true, loader) {}
 	void readFromStream(QDataStream &stream, quint64 &first, quint64 &second, QByteArray &data) {
 		stream >> first >> second >> data;
 	}
@@ -2984,9 +3036,8 @@ void writeAudio(const StorageKey &location, const QByteArray &audio, bool overwr
 
 class AudioLoadTask : public AbstractCachedLoadTask {
 public:
-	AudioLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader) :
-	AbstractCachedLoadTask(key, location, false, loader) {
-	}
+	AudioLoadTask(const FileKey &key, const StorageKey &location, mtpFileLoader *loader)
+	    : AbstractCachedLoadTask(key, location, false, loader) {}
 	void readFromStream(QDataStream &stream, quint64 &first, quint64 &second, QByteArray &data) {
 		stream >> first >> second >> data;
 	}
@@ -3031,7 +3082,8 @@ qint32 _storageWebFileSize(const QString &url, qint32 rawlen) {
 	// fulllen + url + len + data
 	qint32 result = sizeof(quint32) + Serialize::stringSize(url) + sizeof(quint32) + rawlen;
 	if (result & 0x0F) result += 0x10 - (result & 0x0F);
-	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 + 0x10; // magic + version + len of encrypted + part of sha1 + md5
+	result += tdfMagicLen + sizeof(qint32) + sizeof(quint32) + 0x10 +
+	          0x10; // magic + version + len of encrypted + part of sha1 + md5
 	return result;
 }
 
@@ -3061,11 +3113,10 @@ void writeWebFile(const QString &url, const QByteArray &content, bool overwrite)
 class WebFileLoadTask : public Task {
 public:
 	WebFileLoadTask(const FileKey &key, const QString &url, webFileLoader *loader)
-		: _key(key)
-		, _url(url)
-		, _loader(loader)
-		, _result(0) {
-	}
+	    : _key(key)
+	    , _url(url)
+	    , _loader(loader)
+	    , _result(0) {}
 	void process() {
 		FileReadDescriptor image;
 		if (!readEncryptedFile(image, _key, FileOption::User)) {
@@ -3099,7 +3150,8 @@ protected:
 	FileKey _key;
 	QString _url;
 	struct Result {
-		explicit Result(const QByteArray &data) : image(data) {
+		explicit Result(const QByteArray &data)
+		    : image(data) {
 			QByteArray guessFormat;
 			pixmap = App::pixmapFromImageInPlace(App::readImage(data, &guessFormat, false));
 			if (!pixmap.isNull()) {
@@ -3109,11 +3161,9 @@ protected:
 		StorageImageSaved image;
 		QByteArray format;
 		QPixmap pixmap;
-
 	};
 	webFileLoader *_loader;
 	Result *_result;
-
 };
 
 TaskId startWebFileLoad(const QString &url, webFileLoader *loader) {
@@ -3135,10 +3185,10 @@ qint64 storageWebFilesSize() {
 class CountWaveformTask : public Task {
 public:
 	CountWaveformTask(DocumentData *doc)
-		: _doc(doc)
-		, _loc(doc->location(true))
-		, _data(doc->data())
-		, _wavemax(0) {
+	    : _doc(doc)
+	    , _loc(doc->location(true))
+	    , _data(doc->data())
+	    , _wavemax(0) {
 		if (_data.isEmpty() && !_loc.accessEnable()) {
 			_doc = 0;
 		}
@@ -3171,9 +3221,7 @@ public:
 			auto &items = App::documentItems();
 			auto i = items.constFind(_doc);
 			if (i != items.cend()) {
-				for_const (auto item, i.value()) {
-					Ui::repaintHistoryItem(item);
-				}
+				for_const (auto item, i.value()) { Ui::repaintHistoryItem(item); }
 			}
 		}
 	}
@@ -3189,7 +3237,6 @@ protected:
 	QByteArray _data;
 	VoiceWaveform _waveform;
 	char _wavemax;
-
 };
 
 void countVoiceWaveform(DocumentData *document) {
@@ -3212,13 +3259,15 @@ void cancelTask(TaskId id) {
 void _writeStickerSet(QDataStream &stream, const Stickers::Set &set) {
 	bool notLoaded = (set.flags & MTPDstickerSet_ClientFlag::f_not_loaded);
 	if (notLoaded) {
-		stream << quint64(set.id) << quint64(set.access) << set.title << set.shortName << qint32(-set.count) << qint32(set.hash) << qint32(set.flags);
+		stream << quint64(set.id) << quint64(set.access) << set.title << set.shortName << qint32(-set.count)
+		       << qint32(set.hash) << qint32(set.flags);
 		return;
 	} else {
 		if (set.stickers.isEmpty()) return;
 	}
 
-	stream << quint64(set.id) << quint64(set.access) << set.title << set.shortName << qint32(set.stickers.size()) << qint32(set.hash) << qint32(set.flags);
+	stream << quint64(set.id) << quint64(set.access) << set.title << set.shortName << qint32(set.stickers.size())
+	       << qint32(set.hash) << qint32(set.flags);
 	for (StickerPack::const_iterator j = set.stickers.cbegin(), e = set.stickers.cend(); j != e; ++j) {
 		Serialize::Document::writeToStream(stream, *j);
 	}
@@ -3269,10 +3318,9 @@ void _writeStickerSets(FileKey &stickersKey, CheckSet checkSet, const Stickers::
 		}
 
 		// id + access + title + shortName + stickersCount + hash + flags
-		size += sizeof(quint64) * 2 + Serialize::stringSize(set.title) + Serialize::stringSize(set.shortName) + sizeof(quint32) + sizeof(qint32) * 2;
-		for_const (auto &sticker, set.stickers) {
-			size += Serialize::Document::sizeInStream(sticker);
-		}
+		size += sizeof(quint64) * 2 + Serialize::stringSize(set.title) + Serialize::stringSize(set.shortName) +
+		        sizeof(quint32) + sizeof(qint32) * 2;
+		for_const (auto &sticker, set.stickers) { size += Serialize::Document::sizeInStream(sticker); }
 
 		size += sizeof(qint32); // emojiCount
 		for (auto j = set.emoji.cbegin(), e = set.emoji.cend(); j != e; ++j) {
@@ -3314,7 +3362,8 @@ void _writeStickerSets(FileKey &stickersKey, CheckSet checkSet, const Stickers::
 	file.writeEncrypted(data);
 }
 
-void _readStickerSets(FileKey &stickersKey, Stickers::Order *outOrder = nullptr, MTPDstickerSet::Flags readingFlags = 0) {
+void _readStickerSets(FileKey &stickersKey, Stickers::Order *outOrder = nullptr,
+                      MTPDstickerSet::Flags readingFlags = 0) {
 	FileReadDescriptor stickers;
 	if (!readEncryptedFile(stickers, stickersKey)) {
 		clearKey(stickersKey);
@@ -3345,7 +3394,7 @@ void _readStickerSets(FileKey &stickersKey, Stickers::Order *outOrder = nullptr,
 		if (stickers.version > 8033) {
 			qint32 setFlagsValue = 0;
 			stickers.stream >> setHash >> setFlagsValue;
-			setFlags = MTPDstickerSet::Flags{ setFlagsValue };
+			setFlags = MTPDstickerSet::Flags{setFlagsValue};
 			if (setFlags & MTPDstickerSet_ClientFlag::f_not_loaded__old) {
 				setFlags &= ~MTPDstickerSet_ClientFlag::f_not_loaded__old;
 				setFlags |= MTPDstickerSet_ClientFlag::f_not_loaded;
@@ -3382,7 +3431,8 @@ void _readStickerSets(FileKey &stickersKey, Stickers::Order *outOrder = nullptr,
 		if (it == sets.cend()) {
 			// We will set this flags from order lists when reading those stickers.
 			setFlags &= ~(MTPDstickerSet::Flag::f_installed | MTPDstickerSet_ClientFlag::f_featured);
-			it = sets.insert(setId, Stickers::Set(setId, setAccess, setTitle, setShortName, 0, setHash, MTPDstickerSet::Flags(setFlags)));
+			it = sets.insert(setId, Stickers::Set(setId, setAccess, setTitle, setShortName, 0, setHash,
+			                                      MTPDstickerSet::Flags(setFlags)));
 		}
 		auto &set = it.value();
 		auto inputSet = MTP_inputStickerSetID(MTP_long(set.id), MTP_long(set.access));
@@ -3466,74 +3516,87 @@ void _readStickerSets(FileKey &stickersKey, Stickers::Order *outOrder = nullptr,
 void writeInstalledStickers() {
 	if (!Global::started()) return;
 
-	_writeStickerSets(_installedStickersKey, [](const Stickers::Set &set) {
-		if (set.id == Stickers::CloudRecentSetId || set.id == Stickers::FavedSetId) { // separate files for them
-			return StickerSetCheckResult::Skip;
-		} else if (set.flags & MTPDstickerSet_ClientFlag::f_special) {
-			if (set.stickers.isEmpty()) { // all other special are "installed"
-				return StickerSetCheckResult::Skip;
-			}
-		} else if (!(set.flags & MTPDstickerSet::Flag::f_installed) || (set.flags & MTPDstickerSet::Flag::f_archived)) {
-			return StickerSetCheckResult::Skip;
-		} else if (set.flags & MTPDstickerSet_ClientFlag::f_not_loaded) { // waiting to receive
-			return StickerSetCheckResult::Abort;
-		} else if (set.stickers.isEmpty()) {
-			return StickerSetCheckResult::Skip;
-		}
-		return StickerSetCheckResult::Write;
-	}, Global::StickerSetsOrder());
+	_writeStickerSets(_installedStickersKey,
+	                  [](const Stickers::Set &set) {
+		                  if (set.id == Stickers::CloudRecentSetId ||
+		                      set.id == Stickers::FavedSetId) { // separate files for them
+			                  return StickerSetCheckResult::Skip;
+		                  } else if (set.flags & MTPDstickerSet_ClientFlag::f_special) {
+			                  if (set.stickers.isEmpty()) { // all other special are "installed"
+				                  return StickerSetCheckResult::Skip;
+			                  }
+		                  } else if (!(set.flags & MTPDstickerSet::Flag::f_installed) ||
+		                             (set.flags & MTPDstickerSet::Flag::f_archived)) {
+			                  return StickerSetCheckResult::Skip;
+		                  } else if (set.flags & MTPDstickerSet_ClientFlag::f_not_loaded) { // waiting to receive
+			                  return StickerSetCheckResult::Abort;
+		                  } else if (set.stickers.isEmpty()) {
+			                  return StickerSetCheckResult::Skip;
+		                  }
+		                  return StickerSetCheckResult::Write;
+	                  },
+	                  Global::StickerSetsOrder());
 }
 
 void writeFeaturedStickers() {
 	if (!Global::started()) return;
 
-	_writeStickerSets(_featuredStickersKey, [](const Stickers::Set &set) {
-		if (set.id == Stickers::CloudRecentSetId || set.id == Stickers::FavedSetId) { // separate files for them
-			return StickerSetCheckResult::Skip;
-		} else if (set.flags & MTPDstickerSet_ClientFlag::f_special) {
-			return StickerSetCheckResult::Skip;
-		} else if (!(set.flags & MTPDstickerSet_ClientFlag::f_featured)) {
-			return StickerSetCheckResult::Skip;
-		} else if (set.flags & MTPDstickerSet_ClientFlag::f_not_loaded) { // waiting to receive
-			return StickerSetCheckResult::Abort;
-		} else if (set.stickers.isEmpty()) {
-			return StickerSetCheckResult::Skip;
-		}
-		return StickerSetCheckResult::Write;
-	}, Global::FeaturedStickerSetsOrder());
+	_writeStickerSets(_featuredStickersKey,
+	                  [](const Stickers::Set &set) {
+		                  if (set.id == Stickers::CloudRecentSetId ||
+		                      set.id == Stickers::FavedSetId) { // separate files for them
+			                  return StickerSetCheckResult::Skip;
+		                  } else if (set.flags & MTPDstickerSet_ClientFlag::f_special) {
+			                  return StickerSetCheckResult::Skip;
+		                  } else if (!(set.flags & MTPDstickerSet_ClientFlag::f_featured)) {
+			                  return StickerSetCheckResult::Skip;
+		                  } else if (set.flags & MTPDstickerSet_ClientFlag::f_not_loaded) { // waiting to receive
+			                  return StickerSetCheckResult::Abort;
+		                  } else if (set.stickers.isEmpty()) {
+			                  return StickerSetCheckResult::Skip;
+		                  }
+		                  return StickerSetCheckResult::Write;
+	                  },
+	                  Global::FeaturedStickerSetsOrder());
 }
 
 void writeRecentStickers() {
 	if (!Global::started()) return;
 
-	_writeStickerSets(_recentStickersKey, [](const Stickers::Set &set) {
-		if (set.id != Stickers::CloudRecentSetId || set.stickers.isEmpty()) {
-			return StickerSetCheckResult::Skip;
-		}
-		return StickerSetCheckResult::Write;
-	}, Stickers::Order());
+	_writeStickerSets(_recentStickersKey,
+	                  [](const Stickers::Set &set) {
+		                  if (set.id != Stickers::CloudRecentSetId || set.stickers.isEmpty()) {
+			                  return StickerSetCheckResult::Skip;
+		                  }
+		                  return StickerSetCheckResult::Write;
+	                  },
+	                  Stickers::Order());
 }
 
 void writeFavedStickers() {
 	if (!Global::started()) return;
 
-	_writeStickerSets(_favedStickersKey, [](const Stickers::Set &set) {
-		if (set.id != Stickers::FavedSetId || set.stickers.isEmpty()) {
-			return StickerSetCheckResult::Skip;
-		}
-		return StickerSetCheckResult::Write;
-	}, Stickers::Order());
+	_writeStickerSets(_favedStickersKey,
+	                  [](const Stickers::Set &set) {
+		                  if (set.id != Stickers::FavedSetId || set.stickers.isEmpty()) {
+			                  return StickerSetCheckResult::Skip;
+		                  }
+		                  return StickerSetCheckResult::Write;
+	                  },
+	                  Stickers::Order());
 }
 
 void writeArchivedStickers() {
 	if (!Global::started()) return;
 
-	_writeStickerSets(_archivedStickersKey, [](const Stickers::Set &set) {
-		if (!(set.flags & MTPDstickerSet::Flag::f_archived) || set.stickers.isEmpty()) {
-			return StickerSetCheckResult::Skip;
-		}
-		return StickerSetCheckResult::Write;
-	}, Global::ArchivedStickerSetsOrder());
+	_writeStickerSets(_archivedStickersKey,
+	                  [](const Stickers::Set &set) {
+		                  if (!(set.flags & MTPDstickerSet::Flag::f_archived) || set.stickers.isEmpty()) {
+			                  return StickerSetCheckResult::Skip;
+		                  }
+		                  return StickerSetCheckResult::Write;
+	                  },
+	                  Global::ArchivedStickerSetsOrder());
 }
 
 void importOldRecentStickers() {
@@ -3556,8 +3619,15 @@ void importOldRecentStickers() {
 	auto &recent = cRefRecentStickers();
 	recent.clear();
 
-	auto &def = sets.insert(Stickers::DefaultSetId, Stickers::Set(Stickers::DefaultSetId, 0, lang(lng_stickers_default_set), QString(), 0, 0, MTPDstickerSet::Flag::f_official | MTPDstickerSet::Flag::f_installed | MTPDstickerSet_ClientFlag::f_special)).value();
-	auto &custom = sets.insert(Stickers::CustomSetId, Stickers::Set(Stickers::CustomSetId, 0, qsl("Custom stickers"), QString(), 0, 0, MTPDstickerSet::Flag::f_installed | MTPDstickerSet_ClientFlag::f_special)).value();
+	auto &def = sets.insert(Stickers::DefaultSetId,
+	                        Stickers::Set(Stickers::DefaultSetId, 0, lang(lng_stickers_default_set), QString(), 0, 0,
+	                                      MTPDstickerSet::Flag::f_official | MTPDstickerSet::Flag::f_installed |
+	                                          MTPDstickerSet_ClientFlag::f_special))
+	                .value();
+	auto &custom = sets.insert(Stickers::CustomSetId,
+	                           Stickers::Set(Stickers::CustomSetId, 0, qsl("Custom stickers"), QString(), 0, 0,
+	                                         MTPDstickerSet::Flag::f_installed | MTPDstickerSet_ClientFlag::f_special))
+	                   .value();
 
 	QMap<quint64, bool> read;
 	while (!stickers.stream.atEnd()) {
@@ -3577,13 +3647,15 @@ void importOldRecentStickers() {
 		if (type == AnimatedDocument) {
 			attributes.push_back(MTP_documentAttributeAnimated());
 		} else if (type == StickerDocument) {
-			attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetEmpty(), MTPMaskCoords()));
+			attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetEmpty(),
+			                                                  MTPMaskCoords()));
 		}
 		if (width > 0 && height > 0) {
 			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(width), MTP_int(height)));
 		}
 
-		DocumentData *doc = App::documentSet(id, 0, access, 0, date, attributes, mime, ImagePtr(), dc, size, StorageImageLocation());
+		DocumentData *doc =
+		    App::documentSet(id, 0, access, 0, date, attributes, mime, ImagePtr(), dc, size, StorageImageLocation());
 		if (!doc->sticker()) continue;
 
 		if (value > 0) {
@@ -3622,7 +3694,8 @@ void readInstalledStickers() {
 }
 
 void readFeaturedStickers() {
-	_readStickerSets(_featuredStickersKey, &Global::RefFeaturedStickerSetsOrder(), MTPDstickerSet::Flags() | MTPDstickerSet_ClientFlag::f_featured);
+	_readStickerSets(_featuredStickersKey, &Global::RefFeaturedStickerSetsOrder(),
+	                 MTPDstickerSet::Flags() | MTPDstickerSet_ClientFlag::f_featured);
 
 	auto &sets = Global::StickerSets();
 	int unreadCount = 0;
@@ -3654,7 +3727,7 @@ void readArchivedStickers() {
 	}
 }
 
-qint32 countDocumentVectorHash(const QVector<DocumentData*> vector) {
+qint32 countDocumentVectorHash(const QVector<DocumentData *> vector) {
 	quint32 acc = 0;
 	for_const (auto doc, vector) {
 		auto docId = doc->id;
@@ -3683,8 +3756,8 @@ qint32 countStickersHash(bool checkOutdatedInfo) {
 		if (j != sets.cend()) {
 			if (j->id == Stickers::DefaultSetId) {
 				foundOutdated = true;
-			} else if (!(j->flags & MTPDstickerSet_ClientFlag::f_special)
-				&& !(j->flags & MTPDstickerSet::Flag::f_archived)) {
+			} else if (!(j->flags & MTPDstickerSet_ClientFlag::f_special) &&
+			           !(j->flags & MTPDstickerSet::Flag::f_archived)) {
 				acc = (acc * 20261) + j->hash;
 			}
 		}
@@ -3733,9 +3806,7 @@ void writeSavedGifs() {
 		_writeMap();
 	} else {
 		quint32 size = sizeof(quint32); // count
-		for_const (auto gif, saved) {
-			size += Serialize::Document::sizeInStream(gif);
-		}
+		for_const (auto gif, saved) { size += Serialize::Document::sizeInStream(gif); }
 
 		if (!_savedGifsKey) {
 			_savedGifsKey = genKey();
@@ -3744,9 +3815,7 @@ void writeSavedGifs() {
 		}
 		EncryptedDescriptor data(size);
 		data.stream << quint32(saved.size());
-		for_const (auto gif, saved) {
-			Serialize::Document::writeToStream(data.stream, gif);
-		}
+		for_const (auto gif, saved) { Serialize::Document::writeToStream(data.stream, gif); }
 		FileWriteDescriptor file(_savedGifsKey);
 		file.writeEncrypted(data);
 	}
@@ -3825,9 +3894,7 @@ bool readBackground() {
 	qint32 id;
 	bg.stream >> id >> pngData;
 	auto oldEmptyImage = (bg.stream.status() != QDataStream::Ok);
-	if (oldEmptyImage
-		|| id == Window::Theme::kInitialBackground
-		|| id == Window::Theme::kDefaultBackground) {
+	if (oldEmptyImage || id == Window::Theme::kInitialBackground || id == Window::Theme::kDefaultBackground) {
 		_backgroundCanWrite = false;
 		if (oldEmptyImage || bg.version < 8005) {
 			Window::Theme::Background()->setImage(Window::Theme::kDefaultBackground);
@@ -3885,7 +3952,9 @@ bool readThemeUsingKey(FileKey key) {
 	auto changed = false;
 	if (!file.fileName().isEmpty() && file.exists() && file.open(QIODevice::ReadOnly)) {
 		if (file.size() > kThemeFileSizeLimit) {
-			LOG(("Error: theme file too large: %1 (should be less than 5 MB, got %2)").arg(file.fileName()).arg(file.size()));
+			LOG(("Error: theme file too large: %1 (should be less than 5 MB, got %2)")
+			        .arg(file.fileName())
+			        .arg(file.size()));
 			return false;
 		}
 		auto fileContent = file.readAll();
@@ -3897,7 +3966,8 @@ bool readThemeUsingKey(FileKey key) {
 	}
 	if (!changed) {
 		quint32 backgroundIsTiled = 0;
-		theme.stream >> cache.paletteChecksum >> cache.contentChecksum >> cache.colors >> cache.background >> backgroundIsTiled;
+		theme.stream >> cache.paletteChecksum >> cache.contentChecksum >> cache.colors >> cache.background >>
+		    backgroundIsTiled;
 		cache.tiled = (backgroundIsTiled == 1);
 		if (theme.stream.status() != QDataStream::Ok) {
 			return false;
@@ -3906,7 +3976,8 @@ bool readThemeUsingKey(FileKey key) {
 	return Window::Theme::Load(pathRelative, pathAbsolute, themeContent, cache);
 }
 
-void writeTheme(const QString &pathRelative, const QString &pathAbsolute, const QByteArray &content, const Window::Theme::Cached &cache) {
+void writeTheme(const QString &pathRelative, const QString &pathAbsolute, const QByteArray &content,
+                const Window::Theme::Cached &cache) {
 	if (content.isEmpty()) {
 		_themeAbsolutePath = _themePaletteAbsolutePath = QString();
 		if (_themeKey) {
@@ -3927,11 +3998,13 @@ void writeTheme(const QString &pathRelative, const QString &pathAbsolute, const
 	auto backgroundTiled = static_cast<quint32>(cache.tiled ? 1 : 0);
 	quint32 size = Serialize::bytearraySize(content);
 	size += Serialize::stringSize(pathRelative) + Serialize::stringSize(pathAbsolute);
-	size += sizeof(qint32) * 2 + Serialize::bytearraySize(cache.colors) + Serialize::bytearraySize(cache.background) + sizeof(quint32);
+	size += sizeof(qint32) * 2 + Serialize::bytearraySize(cache.colors) + Serialize::bytearraySize(cache.background) +
+	        sizeof(quint32);
 	EncryptedDescriptor data(size);
 	data.stream << content;
 	data.stream << pathRelative << pathAbsolute;
-	data.stream << cache.paletteChecksum << cache.contentChecksum << cache.colors << cache.background << backgroundTiled;
+	data.stream << cache.paletteChecksum << cache.contentChecksum << cache.colors << cache.background
+	            << backgroundTiled;
 
 	FileWriteDescriptor file(_themeKey, FileOption::Safe);
 	file.writeEncrypted(data, SettingsKey);
@@ -4010,7 +4083,8 @@ quint32 _peerSize(PeerData *peer) {
 		UserData *user = peer->asUser();
 
 		// first + last + phone + username + access
-		result += Serialize::stringSize(user->firstName) + Serialize::stringSize(user->lastName) + Serialize::stringSize(user->phone()) + Serialize::stringSize(user->username) + sizeof(quint64);
+		result += Serialize::stringSize(user->firstName) + Serialize::stringSize(user->lastName) +
+		          Serialize::stringSize(user->phone()) + Serialize::stringSize(user->username) + sizeof(quint64);
 
 		// flags
 		if (AppVersion >= 9012) {
@@ -4023,12 +4097,14 @@ quint32 _peerSize(PeerData *peer) {
 		ChatData *chat = peer->asChat();
 
 		// name + count + date + version + admin + forbidden + left + inviteLink
-		result += Serialize::stringSize(chat->name) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + Serialize::stringSize(chat->inviteLink());
+		result += Serialize::stringSize(chat->name) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) +
+		          sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + Serialize::stringSize(chat->inviteLink());
 	} else if (peer->isChannel()) {
 		ChannelData *channel = peer->asChannel();
 
 		// name + access + date + version + forbidden + flags + inviteLink
-		result += Serialize::stringSize(channel->name) + sizeof(quint64) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + sizeof(qint32) + Serialize::stringSize(channel->inviteLink());
+		result += Serialize::stringSize(channel->name) + sizeof(quint64) + sizeof(qint32) + sizeof(qint32) +
+		          sizeof(qint32) + sizeof(qint32) + Serialize::stringSize(channel->inviteLink());
 	}
 	return result;
 }
@@ -4046,13 +4122,15 @@ void _writePeer(QDataStream &stream, PeerData *peer) {
 		if (AppVersion >= 9016) {
 			stream << (user->botInfo ? user->botInfo->inlinePlaceholder : QString());
 		}
-		stream << qint32(user->onlineTill) << qint32(user->contact) << qint32(user->botInfo ? user->botInfo->version : -1);
+		stream << qint32(user->onlineTill) << qint32(user->contact)
+		       << qint32(user->botInfo ? user->botInfo->version : -1);
 	} else if (peer->isChat()) {
 		ChatData *chat = peer->asChat();
 
 		qint32 flagsData = (AppVersion >= 9012) ? chat->flags : (chat->haveLeft() ? 1 : 0);
 
-		stream << chat->name << qint32(chat->count) << qint32(chat->date) << qint32(chat->version) << qint32(chat->creator);
+		stream << chat->name << qint32(chat->count) << qint32(chat->date) << qint32(chat->version)
+		       << qint32(chat->creator);
 		stream << qint32(chat->isForbidden() ? 1 : 0) << qint32(flagsData) << chat->inviteLink();
 	} else if (peer->isChannel()) {
 		ChannelData *channel = peer->asChannel();
@@ -4109,8 +4187,10 @@ PeerData *_readPeer(FileReadDescriptor &from, qint32 fileVersion = 0) {
 				user->input = MTP_inputPeerSelf();
 				user->inputUser = MTP_inputUserSelf();
 			} else {
-				user->input = MTP_inputPeerUser(MTP_int(peerToUser(user->id)), MTP_long(user->isInaccessible() ? 0 : user->access));
-				user->inputUser = MTP_inputUser(MTP_int(peerToUser(user->id)), MTP_long(user->isInaccessible() ? 0 : user->access));
+				user->input = MTP_inputPeerUser(MTP_int(peerToUser(user->id)),
+				                                MTP_long(user->isInaccessible() ? 0 : user->access));
+				user->inputUser =
+				    MTP_inputUser(MTP_int(peerToUser(user->id)), MTP_long(user->isInaccessible() ? 0 : user->access));
 			}
 
 			user->setUserpic(photoLoc.isNull() ? ImagePtr() : ImagePtr(photoLoc));
@@ -4189,7 +4269,7 @@ void writeRecentHashtagsAndBots() {
 			_writeMap(WriteMapWhen::Fast);
 		}
 		quint32 size = sizeof(quint32) * 3, writeCnt = 0, searchCnt = 0, botsCnt = cRecentInlineBots().size();
-		for (RecentHashtagPack::const_iterator i = write.cbegin(), e = write.cend(); i != e;  ++i) {
+		for (RecentHashtagPack::const_iterator i = write.cbegin(), e = write.cend(); i != e; ++i) {
 			if (!i->first.isEmpty()) {
 				size += Serialize::stringSize(i->first) + sizeof(quint16);
 				++writeCnt;
@@ -4267,7 +4347,8 @@ void readRecentHashtagsAndBots() {
 			bots.reserve(botsCount);
 			for (quint32 i = 0; i < botsCount; ++i) {
 				PeerData *peer = _readPeer(hashtags, 9016);
-				if (peer && peer->isUser() && peer->asUser()->botInfo && !peer->asUser()->botInfo->inlinePlaceholder.isEmpty() && !peer->asUser()->username.isEmpty()) {
+				if (peer && peer->isUser() && peer->asUser()->botInfo &&
+				    !peer->asUser()->botInfo->inlinePlaceholder.isEmpty() && !peer->asUser()->username.isEmpty()) {
 					bots.push_back(peer->asUser());
 				}
 			}
@@ -4331,7 +4412,7 @@ void readSavedPeers() {
 	saved.stream >> count;
 	cRefSavedPeers().clear();
 	cRefSavedPeersByTime().clear();
-	QList<PeerData*> peers;
+	QList<PeerData *> peers;
 	peers.reserve(count);
 	for (quint32 i = 0; i < count; ++i) {
 		PeerData *peer = _readPeer(saved);
@@ -4397,9 +4478,7 @@ void writeTrustedBots() {
 		quint32 size = sizeof(qint32) + _trustedBots.size() * sizeof(quint64);
 		EncryptedDescriptor data(size);
 		data.stream << qint32(_trustedBots.size());
-		for_const (auto botId, _trustedBots) {
-			data.stream << quint64(botId);
-		}
+		for_const (auto botId, _trustedBots) { data.stream << quint64(botId); }
 
 		FileWriteDescriptor file(_trustedBotsKey);
 		file.writeEncrypted(data);
@@ -4466,7 +4545,8 @@ struct ClearManagerData {
 	bool working;
 };
 
-ClearManager::ClearManager() : data(new ClearManagerData()) {
+ClearManager::ClearManager()
+    : data(new ClearManagerData()) {
 	data->thread = new QThread();
 	data->working = true;
 }
@@ -4551,7 +4631,8 @@ bool ClearManager::addTask(int task) {
 			if (data->stickers.isEmpty()) {
 				data->stickers = _stickerImagesMap;
 			} else {
-				for (StorageMap::const_iterator i = _stickerImagesMap.cbegin(), e = _stickerImagesMap.cend(); i != e; ++i) {
+				for (StorageMap::const_iterator i = _stickerImagesMap.cbegin(), e = _stickerImagesMap.cend(); i != e;
+				     ++i) {
 					StorageKey k = i.key();
 					while (data->stickers.constFind(k) != data->stickers.cend()) {
 						++k.second;
@@ -4662,7 +4743,7 @@ void ClearManager::onStart() {
 			QDirIterator di(_userBasePath, QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
 			while (di.hasNext()) {
 				di.next();
-				const QFileInfo& fi = di.fileInfo();
+				const QFileInfo &fi = di.fileInfo();
 				if (fi.isDir() && !fi.isSymLink()) {
 					if (!QDir(di.filePath()).removeRecursively()) result = false;
 				} else {
@@ -4673,9 +4754,7 @@ void ClearManager::onStart() {
 				}
 			}
 		} break;
-		case ClearManagerDownloads:
-			result = QDir(cTempDir()).removeRecursively();
-		break;
+		case ClearManagerDownloads: result = QDir(cTempDir()).removeRecursively(); break;
 		case ClearManagerStorage:
 			for (StorageMap::const_iterator i = images.cbegin(), e = images.cend(); i != e; ++i) {
 				clearKey(i.value().first, FileOption::User);
@@ -4690,7 +4769,7 @@ void ClearManager::onStart() {
 				clearKey(i.value().first, FileOption::User);
 			}
 			result = true;
-		break;
+			break;
 		}
 		{
 			QMutexLocker lock(&data->mutex);
diff --git a/Telegram/SourceFiles/storage/localstorage.h b/Telegram/SourceFiles/storage/localstorage.h
index 16df21893..4c1504eb1 100644
--- a/Telegram/SourceFiles/storage/localstorage.h
+++ b/Telegram/SourceFiles/storage/localstorage.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "core/basic_types.h"
-#include "storage/file_download.h"
 #include "auth_session.h"
+#include "core/basic_types.h"
 #include "history/history.h"
+#include "storage/file_download.h"
 
 namespace Window {
 namespace Theme {
@@ -79,7 +79,6 @@ private:
 	~ClearManager();
 
 	ClearManagerData *data;
-
 };
 
 enum ReadMapState {
@@ -94,10 +93,9 @@ qint32 oldSettingsVersion();
 
 struct MessageDraft {
 	MessageDraft(MsgId msgId = 0, TextWithTags textWithTags = TextWithTags(), bool previewCancelled = false)
-		: msgId(msgId)
-		, textWithTags(textWithTags)
-		, previewCancelled(previewCancelled) {
-	}
+	    : msgId(msgId)
+	    , textWithTags(textWithTags)
+	    , previewCancelled(previewCancelled) {}
 	MsgId msgId;
 	TextWithTags textWithTags;
 	bool previewCancelled;
@@ -161,7 +159,8 @@ qint32 countSavedGifsHash();
 void writeBackground(qint32 id, const QImage &img);
 bool readBackground();
 
-void writeTheme(const QString &pathRelative, const QString &pathAbsolute, const QByteArray &content, const Window::Theme::Cached &cache);
+void writeTheme(const QString &pathRelative, const QString &pathAbsolute, const QByteArray &content,
+                const Window::Theme::Cached &cache);
 void clearTheme();
 bool hasTheme();
 QString themeAbsolutePath();
@@ -206,7 +205,6 @@ public slots:
 private:
 	QTimer _mapWriteTimer;
 	QTimer _locationsWriteTimer;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/storage/serialize_common.h b/Telegram/SourceFiles/storage/serialize_common.h
index 933fc17c4..bb2a5bfee 100644
--- a/Telegram/SourceFiles/storage/serialize_common.h
+++ b/Telegram/SourceFiles/storage/serialize_common.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/images.h"
 #include "mtproto/auth_key.h"
+#include "ui/images.h"
 
 namespace Serialize {
 
@@ -42,7 +42,7 @@ struct ReadBytesVectorWrap {
 };
 
 inline ReadBytesVectorWrap bytes(base::byte_vector &bytes) {
-	return ReadBytesVectorWrap { bytes };
+	return ReadBytesVectorWrap{bytes};
 }
 
 // Compatible with QDataStream &operator>>(QDataStream &, QByteArray &);
@@ -59,7 +59,7 @@ inline QDataStream &operator>>(QDataStream &stream, ReadBytesVectorWrap data) {
 	for (auto allocated = quint32(0); allocated < len;) {
 		auto blockSize = qMin(kStep, len - allocated);
 		bytes.resize(allocated + blockSize);
-		if (stream.readRawData(reinterpret_cast<char*>(bytes.data()) + allocated, blockSize) != blockSize) {
+		if (stream.readRawData(reinterpret_cast<char *>(bytes.data()) + allocated, blockSize) != blockSize) {
 			bytes.clear();
 			stream.setStatus(QDataStream::ReadPastEnd);
 			return stream;
@@ -75,7 +75,7 @@ struct WriteBytesWrap {
 };
 
 inline WriteBytesWrap bytes(base::const_byte_span bytes) {
-	return WriteBytesWrap { bytes };
+	return WriteBytesWrap{bytes};
 }
 
 inline QDataStream &operator<<(QDataStream &stream, WriteBytesWrap data) {
@@ -85,13 +85,13 @@ inline QDataStream &operator<<(QDataStream &stream, WriteBytesWrap data) {
 	} else {
 		auto size = quint32(bytes.size());
 		stream << size;
-		stream.writeRawData(reinterpret_cast<const char*>(bytes.data()), size);
+		stream.writeRawData(reinterpret_cast<const char *>(bytes.data()), size);
 	}
 	return stream;
 }
 
 inline QDataStream &operator<<(QDataStream &stream, ReadBytesVectorWrap data) {
-	return stream << WriteBytesWrap { data.bytes };
+	return stream << WriteBytesWrap{data.bytes};
 }
 
 inline int dateTimeSize() {
@@ -102,17 +102,15 @@ void writeStorageImageLocation(QDataStream &stream, const StorageImageLocation &
 StorageImageLocation readStorageImageLocation(QDataStream &stream);
 int storageImageLocationSize();
 
-template <typename T>
-inline T read(QDataStream &stream) {
+template <typename T> inline T read(QDataStream &stream) {
 	auto result = T();
 	stream >> result;
 	return result;
 }
 
-template <>
-inline MTP::AuthKey::Data read<MTP::AuthKey::Data>(QDataStream &stream) {
+template <> inline MTP::AuthKey::Data read<MTP::AuthKey::Data>(QDataStream &stream) {
 	auto result = MTP::AuthKey::Data();
-	stream.readRawData(reinterpret_cast<char*>(result.data()), result.size());
+	stream.readRawData(reinterpret_cast<char *>(result.data()), result.size());
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp
index f8bf17315..44ec3932a 100644
--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "storage/serialize_document.h"
 
-#include "storage/serialize_common.h"
-#include "facades.h"
 #include "app.h"
+#include "facades.h"
+#include "storage/serialize_common.h"
 
 namespace {
 
@@ -52,9 +52,7 @@ void Document::writeToStream(QDataStream &stream, DocumentData *document) {
 			stream << qint32(StickerSetTypeShortName);
 		} break;
 		case mtpc_inputStickerSetEmpty:
-		default: {
-			stream << qint32(StickerSetTypeEmpty);
-		} break;
+		default: { stream << qint32(StickerSetTypeEmpty); } break;
 		}
 		writeStorageImageLocation(stream, document->sticker()->loc);
 	} else {
@@ -92,22 +90,29 @@ DocumentData *Document::readFromStreamHelper(int streamAppVersion, QDataStream &
 		thumb = readStorageImageLocation(stream);
 
 		if (typeOfSet == StickerSetTypeEmpty) {
-			attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetEmpty(), MTPMaskCoords()));
+			attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetEmpty(),
+			                                                  MTPMaskCoords()));
 		} else if (info) {
-			if (info->setId == Stickers::DefaultSetId || info->setId == Stickers::CloudRecentSetId || info->setId == Stickers::FavedSetId || info->setId == Stickers::CustomSetId) {
+			if (info->setId == Stickers::DefaultSetId || info->setId == Stickers::CloudRecentSetId ||
+			    info->setId == Stickers::FavedSetId || info->setId == Stickers::CustomSetId) {
 				typeOfSet = StickerSetTypeEmpty;
 			}
 
 			switch (typeOfSet) {
 			case StickerSetTypeID: {
-				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetID(MTP_long(info->setId), MTP_long(info->accessHash)), MTPMaskCoords()));
+				attributes.push_back(MTP_documentAttributeSticker(
+				    MTP_flags(0), MTP_string(alt),
+				    MTP_inputStickerSetID(MTP_long(info->setId), MTP_long(info->accessHash)), MTPMaskCoords()));
 			} break;
 			case StickerSetTypeShortName: {
-				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetShortName(MTP_string(info->shortName)), MTPMaskCoords()));
+				attributes.push_back(MTP_documentAttributeSticker(
+				    MTP_flags(0), MTP_string(alt), MTP_inputStickerSetShortName(MTP_string(info->shortName)),
+				    MTPMaskCoords()));
 			} break;
 			case StickerSetTypeEmpty:
 			default: {
-				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt), MTP_inputStickerSetEmpty(), MTPMaskCoords()));
+				attributes.push_back(MTP_documentAttributeSticker(MTP_flags(0), MTP_string(alt),
+				                                                  MTP_inputStickerSetEmpty(), MTPMaskCoords()));
 			} break;
 			}
 		}
@@ -124,7 +129,8 @@ DocumentData *Document::readFromStreamHelper(int streamAppVersion, QDataStream &
 			if (type == RoundVideoDocument) {
 				flags |= MTPDdocumentAttributeVideo::Flag::f_round_message;
 			}
-			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(duration), MTP_int(width), MTP_int(height)));
+			attributes.push_back(
+			    MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(duration), MTP_int(width), MTP_int(height)));
 		} else {
 			attributes.push_back(MTP_documentAttributeImageSize(MTP_int(width), MTP_int(height)));
 		}
@@ -133,7 +139,8 @@ DocumentData *Document::readFromStreamHelper(int streamAppVersion, QDataStream &
 	if (!dc && !access) {
 		return nullptr;
 	}
-	return App::documentSet(id, nullptr, access, version, date, attributes, mime, thumb.isNull() ? ImagePtr() : ImagePtr(thumb), dc, size, thumb);
+	return App::documentSet(id, nullptr, access, version, date, attributes, mime,
+	                        thumb.isNull() ? ImagePtr() : ImagePtr(thumb), dc, size, thumb);
 }
 
 DocumentData *Document::readStickerFromStream(int streamAppVersion, QDataStream &stream, const StickerSetInfo &info) {
diff --git a/Telegram/SourceFiles/storage/serialize_document.h b/Telegram/SourceFiles/storage/serialize_document.h
index a6290c0cd..6759c834a 100644
--- a/Telegram/SourceFiles/storage/serialize_document.h
+++ b/Telegram/SourceFiles/storage/serialize_document.h
@@ -26,13 +26,11 @@ namespace Serialize {
 
 class Document {
 public:
-
 	struct StickerSetInfo {
 		StickerSetInfo(quint64 setId, quint64 accessHash, QString shortName)
-			: setId(setId)
-			, accessHash(accessHash)
-			, shortName(shortName) {
-		}
+		    : setId(setId)
+		    , accessHash(accessHash)
+		    , shortName(shortName) {}
 		quint64 setId;
 		quint64 accessHash;
 		QString shortName;
@@ -45,7 +43,6 @@ public:
 
 private:
 	static DocumentData *readFromStreamHelper(int streamAppVersion, QDataStream &stream, const StickerSetInfo *info);
-
 };
 
 } // namespace Serialize
diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
index c6ad1d3ef..97cd50321 100644
--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@@ -20,24 +20,24 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "structs.h"
 
-#include "lang/lang_keys.h"
-#include "inline_bots/inline_bot_layout_item.h"
-#include "observer_peer.h"
-#include "mainwidget.h"
-#include "application.h"
-#include "storage/file_upload.h"
-#include "mainwindow.h"
-#include "core/file_utilities.h"
 #include "apiwrap.h"
+#include "application.h"
+#include "auth_session.h"
 #include "boxes/confirm_box.h"
-#include "media/media_audio.h"
-#include "storage/localstorage.h"
+#include "core/file_utilities.h"
 #include "history/history_media_types.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_audio.h"
+#include "messenger.h"
+#include "observer_peer.h"
+#include "storage/file_download.h"
+#include "storage/file_upload.h"
+#include "storage/localstorage.h"
 #include "styles/style_history.h"
 #include "window/themes/window_theme.h"
-#include "auth_session.h"
-#include "messenger.h"
-#include "storage/file_download.h"
 #include <QImageReader>
 
 namespace {
@@ -67,21 +67,16 @@ ImagePtr generateUserpicImage(const style::icon &icon) {
 
 style::color peerUserpicColor(int index) {
 	static style::color peerColors[kUserColorsCount] = {
-		st::historyPeer1UserpicBg,
-		st::historyPeer2UserpicBg,
-		st::historyPeer3UserpicBg,
-		st::historyPeer4UserpicBg,
-		st::historyPeer5UserpicBg,
-		st::historyPeer6UserpicBg,
-		st::historyPeer7UserpicBg,
-		st::historyPeer8UserpicBg,
+	    st::historyPeer1UserpicBg, st::historyPeer2UserpicBg, st::historyPeer3UserpicBg, st::historyPeer4UserpicBg,
+	    st::historyPeer5UserpicBg, st::historyPeer6UserpicBg, st::historyPeer7UserpicBg, st::historyPeer8UserpicBg,
 	};
 	return peerColors[index];
 }
 
 class EmptyUserpic::Impl {
 public:
-	Impl(int index, const QString &name) : _color(peerUserpicColor(index)) {
+	Impl(int index, const QString &name)
+	    : _color(peerUserpicColor(index)) {
 		fillString(name);
 	}
 
@@ -91,14 +86,12 @@ public:
 	StorageKey uniqueKey() const;
 
 private:
-	template <typename PaintBackground>
-	void paint(Painter &p, int x, int y, int size, PaintBackground paintBackground);
+	template <typename PaintBackground> void paint(Painter &p, int x, int y, int size, PaintBackground paintBackground);
 
 	void fillString(const QString &name);
 
 	style::color _color;
 	QString _string;
-
 };
 
 template <typename PaintBackground>
@@ -119,21 +112,15 @@ void EmptyUserpic::Impl::paint(Painter &p, int x, int y, int size, PaintBackgrou
 }
 
 void EmptyUserpic::Impl::paint(Painter &p, int x, int y, int size) {
-	paint(p, x, y, size, [&p, x, y, size] {
-		p.drawEllipse(x, y, size, size);
-	});
+	paint(p, x, y, size, [&p, x, y, size] { p.drawEllipse(x, y, size, size); });
 }
 
 void EmptyUserpic::Impl::paintRounded(Painter &p, int x, int y, int size) {
-	paint(p, x, y, size, [&p, x, y, size] {
-		p.drawRoundedRect(x, y, size, size, st::buttonRadius, st::buttonRadius);
-	});
+	paint(p, x, y, size, [&p, x, y, size] { p.drawRoundedRect(x, y, size, size, st::buttonRadius, st::buttonRadius); });
 }
 
 void EmptyUserpic::Impl::paintSquare(Painter &p, int x, int y, int size) {
-	paint(p, x, y, size, [&p, x, y, size] {
-		p.fillRect(x, y, size, size, p.brush());
-	});
+	paint(p, x, y, size, [&p, x, y, size] { p.fillRect(x, y, size, size, p.brush()); });
 }
 
 StorageKey EmptyUserpic::Impl::uniqueKey() const {
@@ -202,8 +189,8 @@ void EmptyUserpic::Impl::fillString(const QString &name) {
 
 EmptyUserpic::EmptyUserpic() = default;
 
-EmptyUserpic::EmptyUserpic(int index, const QString &name) : _impl(std::make_unique<Impl>(index, name)) {
-}
+EmptyUserpic::EmptyUserpic(int index, const QString &name)
+    : _impl(std::make_unique<Impl>(index, name)) {}
 
 void EmptyUserpic::set(int index, const QString &name) {
 	_impl = std::make_unique<Impl>(index, name);
@@ -249,16 +236,18 @@ EmptyUserpic::~EmptyUserpic() = default;
 using UpdateFlag = Notify::PeerUpdate::Flag;
 
 NotifySettings globalNotifyAll, globalNotifyUsers, globalNotifyChats;
-NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings, globalNotifyChatsPtr = UnknownNotifySettings;
+NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings,
+                  globalNotifyChatsPtr = UnknownNotifySettings;
 
-PeerClickHandler::PeerClickHandler(not_null<PeerData*> peer) : _peer(peer) {
-}
+PeerClickHandler::PeerClickHandler(not_null<PeerData *> peer)
+    : _peer(peer) {}
 
 void PeerClickHandler::onClick(Qt::MouseButton button) const {
 	if (button == Qt::LeftButton && App::main()) {
 		if (_peer && _peer->isChannel() && App::main()->historyPeer() != _peer) {
 			if (!_peer->asChannel()->isPublic() && !_peer->asChannel()->amIn()) {
-				Ui::show(Box<InformBox>(lang((_peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
+				Ui::show(Box<InformBox>(
+				    lang((_peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible)));
 			} else {
 				Ui::showPeerHistory(_peer, ShowAtUnreadMsgId, Ui::ShowWay::Forward);
 			}
@@ -268,7 +257,9 @@ void PeerClickHandler::onClick(Qt::MouseButton button) const {
 	}
 }
 
-PeerData::PeerData(const PeerId &id) : id(id), _colorIndex(peerColorIndex(id)) {
+PeerData::PeerData(const PeerId &id)
+    : id(id)
+    , _colorIndex(peerColorIndex(id)) {
 	nameText.setText(st::msgNameStyle, QString(), _textNameOptions);
 	_userpicEmpty.set(_colorIndex, QString());
 }
@@ -433,13 +424,15 @@ void UserData::setPhoto(const MTPUserProfilePhoto &p) { // see Local::readPeer a
 		newPhotoId = d.vphoto_id.v;
 		newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small);
 		newPhoto = newPhotoLoc.isNull() ? ImagePtr() : ImagePtr(newPhotoLoc);
-		//App::feedPhoto(App::photoFromUserPhoto(peerToUser(id), MTP_int(unixtime()), p));
+		// App::feedPhoto(App::photoFromUserPhoto(peerToUser(id), MTP_int(unixtime()), p));
 	} break;
 	default: {
 		newPhotoId = 0;
 		if (id == ServiceUserId) {
 			if (!_userpic) {
-				newPhoto = ImagePtr(App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaledToWidth(160, Qt::SmoothTransformation)), "PNG");
+				newPhoto = ImagePtr(App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaledToWidth(
+				                        160, Qt::SmoothTransformation)),
+				                    "PNG");
 			}
 		} else {
 			newPhoto = ImagePtr();
@@ -463,7 +456,8 @@ void PeerData::fillNames() {
 		toIndex += ' ' + translitRusEng(toIndex);
 	}
 	if (isUser()) {
-		if (!asUser()->nameOrPhone.isEmpty() && asUser()->nameOrPhone != name) toIndex += ' ' + TextUtilities::RemoveAccents(asUser()->nameOrPhone);
+		if (!asUser()->nameOrPhone.isEmpty() && asUser()->nameOrPhone != name)
+			toIndex += ' ' + TextUtilities::RemoveAccents(asUser()->nameOrPhone);
 		if (!asUser()->username.isEmpty()) toIndex += ' ' + TextUtilities::RemoveAccents(asUser()->username);
 	} else if (isChannel()) {
 		if (!asChannel()->username.isEmpty()) toIndex += ' ' + TextUtilities::RemoveAccents(asChannel()->username);
@@ -500,7 +494,8 @@ void UserData::setCommonChatsCount(int count) {
 	}
 }
 
-void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName, const QString &newUsername) {
+void UserData::setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName,
+                       const QString &newUsername) {
 	bool changeName = !newFirstName.isEmpty() || !newLastName.isEmpty();
 
 	QString newFullName;
@@ -644,13 +639,13 @@ void ChatData::setPhoto(const MTPChatPhoto &p, const PhotoId &phId) { // see Loc
 		}
 		newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small);
 		newPhoto = newPhotoLoc.isNull() ? ImagePtr() : ImagePtr(newPhotoLoc);
-//		photoFull = newPhoto ? ImagePtr(640, 640, d.vphoto_big, ImagePtr()) : ImagePtr();
+		//		photoFull = newPhoto ? ImagePtr(640, 640, d.vphoto_big, ImagePtr()) : ImagePtr();
 	} break;
 	default: {
 		newPhotoId = 0;
 		newPhotoLoc = StorageImageLocation();
 		newPhoto = ImagePtr();
-//		photoFull = ImagePtr();
+		//		photoFull = ImagePtr();
 	} break;
 	}
 	if (newPhotoId != photoId || newPhoto.v() != _userpic.v() || newPhotoLoc != photoLoc) {
@@ -675,7 +670,8 @@ void ChatData::invalidateParticipants() {
 	if (wasCanEdit != canEdit()) {
 		Notify::peerUpdatedDelayed(this, Notify::PeerUpdate::Flag::ChatCanEdit);
 	}
-	Notify::peerUpdatedDelayed(this, Notify::PeerUpdate::Flag::MembersChanged | Notify::PeerUpdate::Flag::AdminsChanged);
+	Notify::peerUpdatedDelayed(this,
+	                           Notify::PeerUpdate::Flag::MembersChanged | Notify::PeerUpdate::Flag::AdminsChanged);
 }
 
 void ChatData::setInviteLink(const QString &newInviteLink) {
@@ -697,13 +693,13 @@ void ChannelData::setPhoto(const MTPChatPhoto &p, const PhotoId &phId) { // see
 		}
 		newPhotoLoc = App::imageLocation(160, 160, d.vphoto_small);
 		newPhoto = newPhotoLoc.isNull() ? ImagePtr() : ImagePtr(newPhotoLoc);
-//		photoFull = newPhoto ? ImagePtr(640, 640, d.vphoto_big, newPhoto) : ImagePtr();
+		//		photoFull = newPhoto ? ImagePtr(640, 640, d.vphoto_big, newPhoto) : ImagePtr();
 	} break;
 	default: {
 		newPhotoId = 0;
 		newPhotoLoc = StorageImageLocation();
 		newPhoto = ImagePtr();
-//		photoFull = ImagePtr();
+		//		photoFull = ImagePtr();
 	} break;
 	}
 	if (newPhotoId != photoId || newPhoto.v() != _userpic.v() || newPhotoLoc != photoLoc) {
@@ -787,11 +783,13 @@ void ChannelData::setKickedCount(int newKickedCount) {
 
 MTPChannelBannedRights ChannelData::KickedRestrictedRights() {
 	using Flag = MTPDchannelBannedRights::Flag;
-	auto flags = Flag::f_view_messages | Flag::f_send_messages | Flag::f_send_media | Flag::f_embed_links | Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline;
+	auto flags = Flag::f_view_messages | Flag::f_send_messages | Flag::f_send_media | Flag::f_embed_links |
+	             Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_games | Flag::f_send_inline;
 	return MTP_channelBannedRights(MTP_flags(flags), MTP_int(std::numeric_limits<qint32>::max()));
 }
 
-void ChannelData::applyEditAdmin(not_null<UserData*> user, const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights) {
+void ChannelData::applyEditAdmin(not_null<UserData *> user, const MTPChannelAdminRights &oldRights,
+                                 const MTPChannelAdminRights &newRights) {
 	auto flags = Notify::PeerUpdate::Flag::AdminsChanged | Notify::PeerUpdate::Flag::None;
 	if (mgInfo) {
 		if (!mgInfo->lastParticipants.contains(user)) { // If rights are empty - still add participant? TODO check
@@ -812,7 +810,7 @@ void ChannelData::applyEditAdmin(not_null<UserData*> user, const MTPChannelAdmin
 		}
 		auto it = mgInfo->lastAdmins.find(user);
 		if (newRights.c_channelAdminRights().vflags.v != 0) {
-			auto lastAdmin = MegagroupInfo::Admin { newRights };
+			auto lastAdmin = MegagroupInfo::Admin{newRights};
 			lastAdmin.canEdit = true;
 			if (it == mgInfo->lastAdmins.cend()) {
 				mgInfo->lastAdmins.insert(user, lastAdmin);
@@ -846,7 +844,8 @@ void ChannelData::applyEditAdmin(not_null<UserData*> user, const MTPChannelAdmin
 	Notify::peerUpdatedDelayed(this, flags);
 }
 
-void ChannelData::applyEditBanned(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights) {
+void ChannelData::applyEditBanned(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+                                  const MTPChannelBannedRights &newRights) {
 	auto flags = Notify::PeerUpdate::Flag::BannedUsersChanged | Notify::PeerUpdate::Flag::None;
 	if (mgInfo) {
 		if (mgInfo->lastAdmins.contains(user)) { // If rights are empty - still remove admin? TODO check
@@ -862,7 +861,7 @@ void ChannelData::applyEditBanned(not_null<UserData*> user, const MTPChannelBann
 		auto it = mgInfo->lastRestricted.find(user);
 		if (isRestricted) {
 			if (it == mgInfo->lastRestricted.cend()) {
-				mgInfo->lastRestricted.insert(user, MegagroupInfo::Restricted { newRights });
+				mgInfo->lastRestricted.insert(user, MegagroupInfo::Restricted{newRights});
 				setRestrictedCount(restrictedCount() + 1);
 			} else {
 				it->rights = newRights;
@@ -916,7 +915,7 @@ void ChannelData::setRestrictionReason(const QString &text) {
 	}
 }
 
-bool ChannelData::canNotEditLastAdmin(not_null<UserData*> user) const {
+bool ChannelData::canNotEditLastAdmin(not_null<UserData *> user) const {
 	if (mgInfo) {
 		auto i = mgInfo->lastAdmins.constFind(user);
 		if (i != mgInfo->lastAdmins.cend()) {
@@ -927,7 +926,7 @@ bool ChannelData::canNotEditLastAdmin(not_null<UserData*> user) const {
 	return false;
 }
 
-bool ChannelData::canEditAdmin(not_null<UserData*> user) const {
+bool ChannelData::canEditAdmin(not_null<UserData *> user) const {
 	if (user->isSelf()) {
 		return false;
 	} else if (amCreator()) {
@@ -938,7 +937,7 @@ bool ChannelData::canEditAdmin(not_null<UserData*> user) const {
 	return adminRights().is_add_admins();
 }
 
-bool ChannelData::canRestrictUser(not_null<UserData*> user) const {
+bool ChannelData::canRestrictUser(not_null<UserData *> user) const {
 	if (user->isSelf()) {
 		return false;
 	} else if (amCreator()) {
@@ -957,7 +956,7 @@ void ChannelData::setAdminRights(const MTPChannelAdminRights &rights) {
 	if (isMegagroup()) {
 		if (hasAdminRights()) {
 			if (!amCreator()) {
-				auto me = MegagroupInfo::Admin { _adminRights };
+				auto me = MegagroupInfo::Admin{_adminRights};
 				me.canEdit = false;
 				mgInfo->lastAdmins.insert(App::self(), me);
 			}
@@ -966,19 +965,20 @@ void ChannelData::setAdminRights(const MTPChannelAdminRights &rights) {
 			mgInfo->lastAdmins.remove(App::self());
 		}
 	}
-	Notify::peerUpdatedDelayed(this, UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged | UpdateFlag::BannedUsersChanged);
+	Notify::peerUpdatedDelayed(this, UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged |
+	                                     UpdateFlag::BannedUsersChanged);
 }
 
 void ChannelData::setRestrictedRights(const MTPChannelBannedRights &rights) {
-	if (rights.c_channelBannedRights().vflags.v == _restrictedRights.c_channelBannedRights().vflags.v
-		&& rights.c_channelBannedRights().vuntil_date.v == _restrictedRights.c_channelBannedRights().vuntil_date.v) {
+	if (rights.c_channelBannedRights().vflags.v == _restrictedRights.c_channelBannedRights().vflags.v &&
+	    rights.c_channelBannedRights().vuntil_date.v == _restrictedRights.c_channelBannedRights().vuntil_date.v) {
 		return;
 	}
 	_restrictedRights = rights;
 	if (isMegagroup()) {
 		if (hasRestrictedRights()) {
 			if (!amCreator()) {
-				auto me = MegagroupInfo::Restricted { _restrictedRights };
+				auto me = MegagroupInfo::Restricted{_restrictedRights};
 				mgInfo->lastRestricted.insert(App::self(), me);
 			}
 			mgInfo->lastAdmins.remove(App::self());
@@ -986,7 +986,8 @@ void ChannelData::setRestrictedRights(const MTPChannelBannedRights &rights) {
 			mgInfo->lastRestricted.remove(App::self());
 		}
 	}
-	Notify::peerUpdatedDelayed(this, UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged | UpdateFlag::BannedUsersChanged);
+	Notify::peerUpdatedDelayed(this, UpdateFlag::ChannelRightsChanged | UpdateFlag::AdminsChanged |
+	                                     UpdateFlag::BannedUsersChanged);
 }
 
 quint64 PtsWaiter::ptsKey(PtsSkippedQueue queue, qint32 pts) {
@@ -1117,7 +1118,8 @@ bool PtsWaiter::updateAndApply(ChannelData *channel, qint32 pts, qint32 count) {
 	return true;
 }
 
-bool PtsWaiter::check(ChannelData *channel, qint32 pts, qint32 count) { // return false if need to save that update and apply later
+bool PtsWaiter::check(ChannelData *channel, qint32 pts,
+                      qint32 count) { // return false if need to save that update and apply later
 	if (!inited()) {
 		init(pts);
 		return true;
@@ -1136,14 +1138,14 @@ bool PtsWaiter::check(ChannelData *channel, qint32 pts, qint32 count) { // retur
 	return !count;
 }
 
-PhotoData::PhotoData(const PhotoId &id, const quint64 &access, qint32 date, const ImagePtr &thumb, const ImagePtr &medium, const ImagePtr &full)
-: id(id)
-, access(access)
-, date(date)
-, thumb(thumb)
-, medium(medium)
-, full(full) {
-}
+PhotoData::PhotoData(const PhotoId &id, const quint64 &access, qint32 date, const ImagePtr &thumb,
+                     const ImagePtr &medium, const ImagePtr &full)
+    : id(id)
+    , access(access)
+    , date(date)
+    , thumb(thumb)
+    , medium(medium)
+    , full(full) {}
 
 void PhotoData::automaticLoad(const HistoryItem *item) {
 	full->automaticLoad(item);
@@ -1184,11 +1186,9 @@ void PhotoData::cancel() {
 
 void PhotoData::notifyLayoutChanged() const {
 	auto &items = App::photoItems();
-	auto i = items.constFind(const_cast<PhotoData*>(this));
+	auto i = items.constFind(const_cast<PhotoData *>(this));
 	if (i != items.cend()) {
-		for_const (auto item, i.value()) {
-			Notify::historyItemLayoutChanged(item);
-		}
+		for_const (auto item, i.value()) { Notify::historyItemLayoutChanged(item); }
 	}
 }
 
@@ -1223,7 +1223,10 @@ ImagePtr PhotoData::makeReplyPreview() {
 			int w = thumb->width(), h = thumb->height();
 			if (w <= 0) w = 1;
 			if (h <= 0) h = 1;
-			replyPreview = ImagePtr(w > h ? thumb->pix(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : thumb->pix(st::msgReplyBarSize.height()), "PNG");
+			replyPreview =
+			    ImagePtr(w > h ? thumb->pix(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) :
+			                     thumb->pix(st::msgReplyBarSize.height()),
+			             "PNG");
 		} else {
 			thumb->load();
 		}
@@ -1247,9 +1250,10 @@ void PhotoCancelClickHandler::onClickImpl() const {
 	if (!data->date) return;
 
 	if (data->uploading()) {
-		if (auto item = App::hoveredLinkItem() ? App::hoveredLinkItem() : (App::contextItem() ? App::contextItem() : nullptr)) {
+		if (auto item =
+		        App::hoveredLinkItem() ? App::hoveredLinkItem() : (App::contextItem() ? App::contextItem() : nullptr)) {
 			if (auto media = item->getMedia()) {
-				if (media->type() == MediaTypePhoto && static_cast<HistoryPhoto*>(media)->photo() == data) {
+				if (media->type() == MediaTypePhoto && static_cast<HistoryPhoto *>(media)->photo() == data) {
 					App::contextItem(item);
 					App::main()->cancelUploadLayer();
 				}
@@ -1276,7 +1280,8 @@ QString joinList(const QStringList &list, const QString &sep) {
 	return result;
 }
 
-QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs, const QDir &dir) {
+QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs,
+                     const QDir &dir) {
 #ifdef Q_OS_WIN
 	name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_"));
 #elif defined Q_OS_MAC
@@ -1306,13 +1311,21 @@ QString saveFileName(const QString &title, const QString &filter, const QString
 					QString first = filters.at(0);
 					qint32 start = first.indexOf(qsl("(*."));
 					if (start >= 0) {
-						if (!QRegularExpression(qsl("\\(\\*\\.") + ext + qsl("[\\)\\s]"), QRegularExpression::CaseInsensitiveOption).match(first).hasMatch()) {
-							QRegularExpressionMatch m = QRegularExpression(qsl(" \\*\\.") + ext + qsl("[\\)\\s]"), QRegularExpression::CaseInsensitiveOption).match(first);
+						if (!QRegularExpression(qsl("\\(\\*\\.") + ext + qsl("[\\)\\s]"),
+						                        QRegularExpression::CaseInsensitiveOption)
+						         .match(first)
+						         .hasMatch()) {
+							QRegularExpressionMatch m = QRegularExpression(qsl(" \\*\\.") + ext + qsl("[\\)\\s]"),
+							                                               QRegularExpression::CaseInsensitiveOption)
+							                                .match(first);
 							if (m.hasMatch() && m.capturedStart() > start + 3) {
 								qint32 oldpos = m.capturedStart(), oldend = m.capturedEnd();
-								fil = first.mid(0, start + 3) + ext + qsl(" *.") + first.mid(start + 3, oldpos - start - 3) + first.mid(oldend - 1) + sep + joinList(filters.mid(1), sep);
+								fil = first.mid(0, start + 3) + ext + qsl(" *.") +
+								      first.mid(start + 3, oldpos - start - 3) + first.mid(oldend - 1) + sep +
+								      joinList(filters.mid(1), sep);
 							} else {
-								fil = first.mid(0, start + 3) + ext + qsl(" *.") + first.mid(start + 3) + sep + joinList(filters.mid(1), sep);
+								fil = first.mid(0, start + 3) + ext + qsl(" *.") + first.mid(start + 3) + sep +
+								      joinList(filters.mid(1), sep);
 							}
 						}
 					} else {
@@ -1367,13 +1380,15 @@ bool StickerData::setInstalled() const {
 	switch (set.type()) {
 	case mtpc_inputStickerSetID: {
 		auto it = Global::StickerSets().constFind(set.c_inputStickerSetID().vid.v);
-		return (it != Global::StickerSets().cend()) && !(it->flags & MTPDstickerSet::Flag::f_archived) && (it->flags & MTPDstickerSet::Flag::f_installed);
+		return (it != Global::StickerSets().cend()) && !(it->flags & MTPDstickerSet::Flag::f_archived) &&
+		       (it->flags & MTPDstickerSet::Flag::f_installed);
 	} break;
 	case mtpc_inputStickerSetShortName: {
 		auto name = qs(set.c_inputStickerSetShortName().vshort_name).toLower();
 		for (auto it = Global::StickerSets().cbegin(), e = Global::StickerSets().cend(); it != e; ++it) {
 			if (it->shortName.toLower() == name) {
-				return !(it->flags & MTPDstickerSet::Flag::f_archived) && (it->flags & MTPDstickerSet::Flag::f_installed);
+				return !(it->flags & MTPDstickerSet::Flag::f_archived) &&
+				       (it->flags & MTPDstickerSet::Flag::f_installed);
 			}
 		}
 	} break;
@@ -1381,7 +1396,8 @@ bool StickerData::setInstalled() const {
 	return false;
 }
 
-QString documentSaveFilename(const DocumentData *data, bool forceSavingAs = false, const QString already = QString(), const QDir &dir = QDir()) {
+QString documentSaveFilename(const DocumentData *data, bool forceSavingAs = false, const QString already = QString(),
+                             const QDir &dir = QDir()) {
 	auto alreadySavingFilename = data->loadingFilePath();
 	if (!alreadySavingFilename.isEmpty()) {
 		return alreadySavingFilename;
@@ -1554,7 +1570,9 @@ void DocumentSaveClickHandler::doSave(DocumentData *data, bool forceSavingAs) {
 		auto newfname = documentSaveFilename(data, forceSavingAs, filename, filedir);
 		if (!newfname.isEmpty()) {
 			auto action = (filename.isEmpty() || forceSavingAs) ? ActionOnLoadNone : ActionOnLoadOpenWith;
-			auto actionMsgId = App::hoveredLinkItem() ? App::hoveredLinkItem()->fullId() : (App::contextItem() ? App::contextItem()->fullId() : FullMsgId());
+			auto actionMsgId = App::hoveredLinkItem() ?
+			                       App::hoveredLinkItem()->fullId() :
+			                       (App::contextItem() ? App::contextItem()->fullId() : FullMsgId());
 			data->save(newfname, action, actionMsgId);
 		}
 	}
@@ -1569,7 +1587,8 @@ void DocumentCancelClickHandler::onClickImpl() const {
 	if (!data->date) return;
 
 	if (data->uploading()) {
-		if (auto item = App::hoveredLinkItem() ? App::hoveredLinkItem() : (App::contextItem() ? App::contextItem() : nullptr)) {
+		if (auto item =
+		        App::hoveredLinkItem() ? App::hoveredLinkItem() : (App::contextItem() ? App::contextItem() : nullptr)) {
 			if (auto media = item->getMedia()) {
 				if (media->getDocument() == data) {
 					App::contextItem(item);
@@ -1590,12 +1609,13 @@ VoiceData::~VoiceData() {
 	}
 }
 
-DocumentData::DocumentData(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QString &url, const QVector<MTPDocumentAttribute> &attributes)
-: id(id)
-, _dc(dc)
-, _access(accessHash)
-, _version(version)
-, _url(url) {
+DocumentData::DocumentData(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QString &url,
+                           const QVector<MTPDocumentAttribute> &attributes)
+    : id(id)
+    , _dc(dc)
+    , _access(accessHash)
+    , _version(version)
+    , _url(url) {
 	setattributes(attributes);
 	if (_dc && _access) {
 		_location = Local::readFileLocation(mediaKey());
@@ -1606,7 +1626,8 @@ DocumentData *DocumentData::create(DocumentId id) {
 	return new DocumentData(id, 0, 0, 0, QString(), QVector<MTPDocumentAttribute>());
 }
 
-DocumentData *DocumentData::create(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QVector<MTPDocumentAttribute> &attributes) {
+DocumentData *DocumentData::create(DocumentId id, qint32 dc, quint64 accessHash, qint32 version,
+                                   const QVector<MTPDocumentAttribute> &attributes) {
 	return new DocumentData(id, dc, accessHash, version, QString(), attributes);
 }
 
@@ -1621,10 +1642,12 @@ void DocumentData::setattributes(const QVector<MTPDocumentAttribute> &attributes
 			auto &d = attributes[i].c_documentAttributeImageSize();
 			dimensions = QSize(d.vw.v, d.vh.v);
 		} break;
-		case mtpc_documentAttributeAnimated: if (type == FileDocument || type == StickerDocument || type == VideoDocument) {
-			type = AnimatedDocument;
-			_additional = nullptr;
-		} break;
+		case mtpc_documentAttributeAnimated:
+			if (type == FileDocument || type == StickerDocument || type == VideoDocument) {
+				type = AnimatedDocument;
+				_additional = nullptr;
+			}
+			break;
 		case mtpc_documentAttributeSticker: {
 			auto &d = attributes[i].c_documentAttributeSticker();
 			if (type == FileDocument) {
@@ -1677,11 +1700,8 @@ void DocumentData::setattributes(const QVector<MTPDocumentAttribute> &attributes
 		}
 	}
 	if (type == StickerDocument) {
-		if (dimensions.width() <= 0
-			|| dimensions.height() <= 0
-			|| dimensions.width() > StickerMaxSize
-			|| dimensions.height() > StickerMaxSize
-			|| !saveToCache()) {
+		if (dimensions.width() <= 0 || dimensions.height() <= 0 || dimensions.width() > StickerMaxSize ||
+		    dimensions.height() > StickerMaxSize || !saveToCache()) {
 			type = FileDocument;
 			_additional = nullptr;
 		}
@@ -1689,9 +1709,8 @@ void DocumentData::setattributes(const QVector<MTPDocumentAttribute> &attributes
 }
 
 bool DocumentData::saveToCache() const {
-	return (type == StickerDocument && size < Storage::kMaxStickerInMemory)
-		|| (isAnimation() && size < Storage::kMaxAnimationInMemory)
-		|| (voice() && size < Storage::kMaxVoiceInMemory);
+	return (type == StickerDocument && size < Storage::kMaxStickerInMemory) ||
+	       (isAnimation() && size < Storage::kMaxAnimationInMemory) || (voice() && size < Storage::kMaxVoiceInMemory);
 }
 
 void DocumentData::forget() {
@@ -1718,7 +1737,8 @@ void DocumentData::automaticLoad(const HistoryItem *item) {
 			} else { // if load at least anywhere
 				loadFromCloud = !(cAutoDownloadGif() & dbiadNoPrivate) || !(cAutoDownloadGif() & dbiadNoGroups);
 			}
-			save(QString(), _actionOnLoad, _actionOnLoadMsgId, loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly, true);
+			save(QString(), _actionOnLoad, _actionOnLoadMsgId, loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly,
+			     true);
 		} else if (voice()) {
 			if (item) {
 				bool loadFromCloud = false;
@@ -1727,14 +1747,16 @@ void DocumentData::automaticLoad(const HistoryItem *item) {
 				} else {
 					loadFromCloud = !(cAutoDownloadAudio() & dbiadNoGroups);
 				}
-				save(QString(), _actionOnLoad, _actionOnLoadMsgId, loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly, true);
+				save(QString(), _actionOnLoad, _actionOnLoadMsgId,
+				     loadFromCloud ? LoadFromCloudOrLocal : LoadFromLocalOnly, true);
 			}
 		}
 	}
 }
 
 void DocumentData::automaticLoadSettingsChanged() {
-	if (loaded() || status != FileReady || (!isAnimation() && !voice()) || !saveToCache() || _loader != CancelledMtpFileLoader) {
+	if (loaded() || status != FileReady || (!isAnimation() && !voice()) || !saveToCache() ||
+	    _loader != CancelledMtpFileLoader) {
 		return;
 	}
 	_loader = nullptr;
@@ -1749,7 +1771,9 @@ void DocumentData::performActionOnLoad() {
 	auto showImage = !isVideo() && (size < App::kImageSizeLimit);
 	auto playVoice = voice() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
 	auto playMusic = tryPlaySong() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
-	auto playAnimation = isAnimation() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen) && showImage && item && item->getMedia();
+	auto playAnimation = isAnimation() &&
+	                     (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen) && showImage &&
+	                     item && item->getMedia();
 	if (auto applyTheme = isTheme()) {
 		if (!loc.isEmpty() && loc.accessEnable()) {
 			Messenger::Instance().showDocument(this, item);
@@ -1830,7 +1854,7 @@ bool DocumentData::loaded(FilePathResolveType type) const {
 		if (_loader->cancelled()) {
 			destroyLoaderDelayed(CancelledMtpFileLoader);
 		} else {
-			auto that = const_cast<DocumentData*>(this);
+			auto that = const_cast<DocumentData *>(this);
 			that->_location = FileLocation(_loader->fileName());
 			that->_data = _loader->bytes();
 			if (that->sticker() && !_loader->imagePixmap().isNull()) {
@@ -1876,7 +1900,8 @@ bool DocumentData::uploading() const {
 	return status == FileUploading;
 }
 
-void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMsgId &actionMsgId, LoadFromCloudSetting fromCloud, bool autoLoading) {
+void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMsgId &actionMsgId,
+                        LoadFromCloudSetting fromCloud, bool autoLoading) {
 	if (loaded(FilePathResolveChecked)) {
 		auto &l = location(true);
 		if (!toFile.isEmpty()) {
@@ -1920,10 +1945,13 @@ void DocumentData::save(const QString &toFile, ActionOnLoad action, const FullMs
 		if (!_access && !_url.isEmpty()) {
 			_loader = new webFileLoader(_url, toFile, fromCloud, autoLoading);
 		} else {
-			_loader = new mtpFileLoader(_dc, id, _access, _version, locationType(), toFile, size, (saveToCache() ? LoadToCacheAsWell : LoadToFileOnly), fromCloud, autoLoading);
+			_loader = new mtpFileLoader(_dc, id, _access, _version, locationType(), toFile, size,
+			                            (saveToCache() ? LoadToCacheAsWell : LoadToFileOnly), fromCloud, autoLoading);
 		}
-		_loader->connect(_loader, SIGNAL(progress(FileLoader*)), App::main(), SLOT(documentLoadProgress(FileLoader*)));
-		_loader->connect(_loader, SIGNAL(failed(FileLoader*,bool)), App::main(), SLOT(documentLoadFailed(FileLoader*,bool)));
+		_loader->connect(_loader, SIGNAL(progress(FileLoader *)), App::main(),
+		                 SLOT(documentLoadProgress(FileLoader *)));
+		_loader->connect(_loader, SIGNAL(failed(FileLoader *, bool)), App::main(),
+		                 SLOT(documentLoadFailed(FileLoader *, bool)));
 		_loader->start();
 	}
 	notifyLayoutChanged();
@@ -1947,12 +1975,12 @@ void DocumentData::cancel() {
 
 void DocumentData::notifyLayoutChanged() const {
 	auto &items = App::documentItems();
-	for (auto item : items.value(const_cast<DocumentData*>(this))) {
+	for (auto item : items.value(const_cast<DocumentData *>(this))) {
 		Notify::historyItemLayoutChanged(item);
 	}
 
 	if (auto items = InlineBots::Layout::documentItems()) {
-		for (auto item : items->value(const_cast<DocumentData*>(this))) {
+		for (auto item : items->value(const_cast<DocumentData *>(this))) {
 			item->layoutChanged();
 		}
 	}
@@ -1978,14 +2006,14 @@ VoiceWaveform documentWaveformDecode(const QByteArray &encoded5bit) {
 	for (auto i = 0, l = valuesCount - 1; i != l; ++i) {
 		auto byteIndex = (i * 5) / 8;
 		auto bitShift = (i * 5) % 8;
-		auto value = *reinterpret_cast<const quint16*>(bitsData + byteIndex);
+		auto value = *reinterpret_cast<const quint16 *>(bitsData + byteIndex);
 		result[i] = static_cast<char>((value >> bitShift) & 0x1F);
 	}
 	auto lastByteIndex = ((valuesCount - 1) * 5) / 8;
 	auto lastBitShift = ((valuesCount - 1) * 5) % 8;
-	auto lastValue = (lastByteIndex == encoded5bit.size() - 1)
-		? static_cast<quint16>(*reinterpret_cast<const uchar*>(bitsData + lastByteIndex))
-		: *reinterpret_cast<const quint16*>(bitsData + lastByteIndex);
+	auto lastValue = (lastByteIndex == encoded5bit.size() - 1) ?
+	                     static_cast<quint16>(*reinterpret_cast<const uchar *>(bitsData + lastByteIndex)) :
+	                     *reinterpret_cast<const quint16 *>(bitsData + lastByteIndex);
 	result[valuesCount - 1] = static_cast<char>((lastValue >> lastBitShift) & 0x1F);
 
 	return result;
@@ -2004,7 +2032,7 @@ QByteArray documentWaveformEncode5bit(const VoiceWaveform &waveform) {
 		auto byteIndex = (i * 5) / 8;
 		auto bitShift = (i * 5) % 8;
 		auto value = (static_cast<quint16>(waveform[i]) & 0x1F) << bitShift;
-		*reinterpret_cast<quint16*>(bitsData + byteIndex) |= value;
+		*reinterpret_cast<quint16 *>(bitsData + byteIndex) |= value;
 	}
 	result.resize(bytesCount);
 	return result;
@@ -2016,7 +2044,7 @@ QByteArray DocumentData::data() const {
 
 const FileLocation &DocumentData::location(bool check) const {
 	if (check && !_location.check()) {
-		const_cast<DocumentData*>(this)->_location = Local::readFileLocation(mediaKey());
+		const_cast<DocumentData *>(this)->_location = Local::readFileLocation(mediaKey());
 	}
 	return _location;
 }
@@ -2045,7 +2073,7 @@ QString DocumentData::filepath(FilePathResolveType type, bool forceSavingAs) con
 			if (f.open(QIODevice::WriteOnly)) {
 				if (f.write(data()) == data().size()) {
 					f.close();
-					const_cast<DocumentData*>(this)->_location = FileLocation(filename);
+					const_cast<DocumentData *>(this)->_location = FileLocation(filename);
 					Local::writeFileLocation(mediaKey(), _location);
 					result = filename;
 				}
@@ -2061,9 +2089,11 @@ ImagePtr DocumentData::makeReplyPreview() {
 			int w = thumb->width(), h = thumb->height();
 			if (w <= 0) w = 1;
 			if (h <= 0) h = 1;
-			auto thumbSize = (w > h) ? QSize(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) : QSize(st::msgReplyBarSize.height(), h * st::msgReplyBarSize.height() / w);
+			auto thumbSize = (w > h) ? QSize(w * st::msgReplyBarSize.height() / h, st::msgReplyBarSize.height()) :
+			                           QSize(st::msgReplyBarSize.height(), h * st::msgReplyBarSize.height() / w);
 			thumbSize *= cIntRetinaFactor();
-			auto options = Images::Option::Smooth | (isRoundVideo() ? Images::Option::Circled : Images::Option::None) | Images::Option::TransparentBackground;
+			auto options = Images::Option::Smooth | (isRoundVideo() ? Images::Option::Circled : Images::Option::None) |
+			               Images::Option::TransparentBackground;
 			auto outerSize = st::msgReplyBarSize.height();
 			auto image = thumb->pixNoCache(thumbSize.width(), thumbSize.height(), options, outerSize, outerSize);
 			replyPreview = ImagePtr(image, "PNG");
@@ -2078,16 +2108,11 @@ bool fileIsImage(const QString &name, const QString &mime) {
 	QString lowermime = mime.toLower(), namelower = name.toLower();
 	if (lowermime.startsWith(qstr("image/"))) {
 		return true;
-	} else if (namelower.endsWith(qstr(".bmp"))
-		|| namelower.endsWith(qstr(".jpg"))
-		|| namelower.endsWith(qstr(".jpeg"))
-		|| namelower.endsWith(qstr(".gif"))
-		|| namelower.endsWith(qstr(".webp"))
-		|| namelower.endsWith(qstr(".tga"))
-		|| namelower.endsWith(qstr(".tiff"))
-		|| namelower.endsWith(qstr(".tif"))
-		|| namelower.endsWith(qstr(".psd"))
-		|| namelower.endsWith(qstr(".png"))) {
+	} else if (namelower.endsWith(qstr(".bmp")) || namelower.endsWith(qstr(".jpg")) ||
+	           namelower.endsWith(qstr(".jpeg")) || namelower.endsWith(qstr(".gif")) ||
+	           namelower.endsWith(qstr(".webp")) || namelower.endsWith(qstr(".tga")) ||
+	           namelower.endsWith(qstr(".tiff")) || namelower.endsWith(qstr(".tif")) ||
+	           namelower.endsWith(qstr(".psd")) || namelower.endsWith(qstr(".png"))) {
 		return true;
 	}
 	return false;
@@ -2157,7 +2182,8 @@ DocumentData::~DocumentData() {
 	}
 }
 
-QString DocumentData::composeNameString(const QString &filename, const QString &songTitle, const QString &songPerformer) {
+QString DocumentData::composeNameString(const QString &filename, const QString &songTitle,
+                                        const QString &songPerformer) {
 	if (songTitle.isEmpty() && songPerformer.isEmpty()) {
 		return filename.isEmpty() ? qsl("Unknown File") : filename;
 	}
@@ -2170,28 +2196,32 @@ QString DocumentData::composeNameString(const QString &filename, const QString &
 	return songPerformer + QString::fromUtf8(" \xe2\x80\x93 ") + trackTitle;
 }
 
-WebPageData::WebPageData(const WebPageId &id, WebPageType type, const QString &url, const QString &displayUrl, const QString &siteName, const QString &title, const TextWithEntities &description, DocumentData *document, PhotoData *photo, qint32 duration, const QString &author, qint32 pendingTill) : id(id)
-, type(type)
-, url(url)
-, displayUrl(displayUrl)
-, siteName(siteName)
-, title(title)
-, description(description)
-, duration(duration)
-, author(author)
-, photo(photo)
-, document(document)
-, pendingTill(pendingTill) {
-}
+WebPageData::WebPageData(const WebPageId &id, WebPageType type, const QString &url, const QString &displayUrl,
+                         const QString &siteName, const QString &title, const TextWithEntities &description,
+                         DocumentData *document, PhotoData *photo, qint32 duration, const QString &author,
+                         qint32 pendingTill)
+    : id(id)
+    , type(type)
+    , url(url)
+    , displayUrl(displayUrl)
+    , siteName(siteName)
+    , title(title)
+    , description(description)
+    , duration(duration)
+    , author(author)
+    , photo(photo)
+    , document(document)
+    , pendingTill(pendingTill) {}
 
-GameData::GameData(const GameId &id, const quint64 &accessHash, const QString &shortName, const QString &title, const QString &description, PhotoData *photo, DocumentData *document) : id(id)
-, accessHash(accessHash)
-, shortName(shortName)
-, title(title)
-, description(description)
-, photo(photo)
-, document(document) {
-}
+GameData::GameData(const GameId &id, const quint64 &accessHash, const QString &shortName, const QString &title,
+                   const QString &description, PhotoData *photo, DocumentData *document)
+    : id(id)
+    , accessHash(accessHash)
+    , shortName(shortName)
+    , title(title)
+    , description(description)
+    , photo(photo)
+    , document(document) {}
 
 MsgId clientMsgId() {
 	static MsgId currentClientMsgId = StartClientMsgId;
diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h
index e54e0d3e9..f005b6b50 100644
--- a/Telegram/SourceFiles/structs.h
+++ b/Telegram/SourceFiles/structs.h
@@ -21,19 +21,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <QPair>
-#include <QTextEdit>
-#include <QTextCursor>
 #include <QScrollBar>
+#include <QTextCursor>
+#include <QTextEdit>
 
 #include "scheme.h"
 #include "ui/images.h"
-#include "ui/twidget.h"
 #include "ui/text/text.h"
+#include "ui/twidget.h"
 
 using MediaKey = QPair<quint64, quint64>;
 
 inline quint64 mediaMix32To64(qint32 a, qint32 b) {
-	return (quint64(*reinterpret_cast<quint32*>(&a)) << 32) | quint64(*reinterpret_cast<quint32*>(&b));
+	return (quint64(*reinterpret_cast<quint32 *>(&a)) << 32) | quint64(*reinterpret_cast<quint32 *>(&b));
 }
 
 enum LocationType {
@@ -46,7 +46,7 @@ enum LocationType {
 };
 
 // Old method, should not be used anymore.
-//inline MediaKey mediaKey(LocationType type, qint32 dc, const quint64 &id) {
+// inline MediaKey mediaKey(LocationType type, qint32 dc, const quint64 &id) {
 //	return MediaKey(mediaMix32To64(type, dc), id);
 //}
 // New method when version was introduced, type is not relevant anymore (all files are Documents).
@@ -66,17 +66,18 @@ static const ChannelId NoChannel = 0;
 typedef qint32 MsgId;
 struct FullMsgId {
 	FullMsgId() = default;
-	FullMsgId(ChannelId channel, MsgId msg) : channel(channel), msg(msg) {
-	}
+	FullMsgId(ChannelId channel, MsgId msg)
+	    : channel(channel)
+	    , msg(msg) {}
 	ChannelId channel = NoChannel;
 	MsgId msg = 0;
 };
 
 typedef quint64 PeerId;
-static const quint64 PeerIdMask         = 0xFFFFFFFFULL;
-static const quint64 PeerIdTypeMask     = 0x300000000ULL;
-static const quint64 PeerIdUserShift    = 0x000000000ULL;
-static const quint64 PeerIdChatShift    = 0x100000000ULL;
+static const quint64 PeerIdMask = 0xFFFFFFFFULL;
+static const quint64 PeerIdTypeMask = 0x300000000ULL;
+static const quint64 PeerIdUserShift = 0x000000000ULL;
+static const quint64 PeerIdChatShift = 0x100000000ULL;
 static const quint64 PeerIdChannelShift = 0x200000000ULL;
 inline bool peerIsUser(const PeerId &id) {
 	return (id & PeerIdTypeMask) == PeerIdUserShift;
@@ -208,8 +209,9 @@ constexpr const MsgId ServerMaxMsgId = 0x3FFFFFFF;
 constexpr const MsgId ShowAtUnreadMsgId = 0;
 
 struct NotifySettings {
-	NotifySettings() : flags(MTPDpeerNotifySettings::Flag::f_show_previews), sound(qsl("default")) {
-	}
+	NotifySettings()
+	    : flags(MTPDpeerNotifySettings::Flag::f_show_previews)
+	    , sound(qsl("default")) {}
 	MTPDpeerNotifySettings::Flags flags;
 	TimeId mute = 0;
 	QString sound;
@@ -267,7 +269,6 @@ private:
 	class Impl;
 	std::unique_ptr<Impl> _impl;
 	friend class Impl;
-
 };
 
 static const PhotoId UnknownPeerPhotoId = 0xFFFFFFFFFFFFFFFFULL;
@@ -281,16 +282,15 @@ class PeerData;
 
 class PeerClickHandler : public ClickHandler {
 public:
-	PeerClickHandler(not_null<PeerData*> peer);
+	PeerClickHandler(not_null<PeerData *> peer);
 	void onClick(Qt::MouseButton button) const override;
 
-	not_null<PeerData*> peer() const {
+	not_null<PeerData *> peer() const {
 		return _peer;
 	}
 
 private:
-	not_null<PeerData*> _peer;
-
+	not_null<PeerData *> _peer;
 };
 
 class UserData;
@@ -429,13 +429,13 @@ private:
 
 	int _colorIndex = 0;
 	TimeMs _lastFullUpdate = 0;
-
 };
 
 class BotCommand {
 public:
-	BotCommand(const QString &command, const QString &description) : command(command), _description(description) {
-	}
+	BotCommand(const QString &command, const QString &description)
+	    : command(command)
+	    , _description(description) {}
 	QString command;
 
 	bool setDescription(const QString &description) {
@@ -452,7 +452,6 @@ public:
 private:
 	QString _description;
 	mutable Text _descriptionText;
-
 };
 
 struct BotInfo {
@@ -462,7 +461,7 @@ struct BotInfo {
 	int version = 0;
 	QString description, inlinePlaceholder;
 	QList<BotCommand> commands;
-	Text text = Text{ int(st::msgMinWidth) }; // description
+	Text text = Text{int(st::msgMinWidth)}; // description
 
 	QString startToken, startGroupToken, shareGameShortName;
 	PeerId inlineReturnPeerId = 0;
@@ -471,12 +470,12 @@ struct BotInfo {
 class PhotoData;
 class UserData : public PeerData {
 public:
-	UserData(const PeerId &id) : PeerData(id) {
-	}
+	UserData(const PeerId &id)
+	    : PeerData(id) {}
 	void setPhoto(const MTPUserProfilePhoto &photo);
 
-	void setName(const QString &newFirstName, const QString &newLastName
-		, const QString &newPhoneName, const QString &newUsername);
+	void setName(const QString &newFirstName, const QString &newLastName, const QString &newPhoneName,
+	             const QString &newUsername);
 
 	void setPhone(const QString &newPhone);
 	void setBotInfoVersion(int version);
@@ -531,7 +530,8 @@ public:
 	QString nameOrPhone;
 	Text phoneText;
 	TimeId onlineTill = 0;
-	qint32 contact = -1; // -1 - not contact, cant add (self, empty, deleted, foreign), 0 - not contact, can add (request), 1 - contact
+	qint32 contact = -1; // -1 - not contact, cant add (self, empty, deleted, foreign), 0 - not contact, can add
+	                     // (request), 1 - contact
 
 	enum class BlockStatus {
 		Unknown,
@@ -558,7 +558,7 @@ public:
 	bool hasCalls() const;
 	void setCallsStatus(CallsStatus callsStatus);
 
-	typedef QList<PhotoData*> Photos;
+	typedef QList<PhotoData *> Photos;
 	Photos photos;
 	int photosCount = -1; // -1 not loaded, 0 all loaded
 
@@ -588,13 +588,13 @@ private:
 	int _commonChatsCount = 0;
 
 	static constexpr const quint64 NoAccess = 0xFFFFFFFFFFFFFFFFULL;
-
 };
 
 class ChatData : public PeerData {
 public:
-	ChatData(const PeerId &id) : PeerData(id), inputChat(MTP_int(bareId())) {
-	}
+	ChatData(const PeerId &id)
+	    : PeerData(id)
+	    , inputChat(MTP_int(bareId())) {}
 	void setPhoto(const MTPChatPhoto &photo, const PhotoId &phId = UnknownPeerPhotoId);
 
 	void setName(const QString &newName);
@@ -650,13 +650,13 @@ public:
 	bool isMigrated() const {
 		return flags & MTPDchat::Flag::f_migrated_to;
 	}
-	QMap<not_null<UserData*>, int> participants;
-	OrderedSet<not_null<UserData*>> invitedByMe;
-	OrderedSet<not_null<UserData*>> admins;
-	QList<not_null<UserData*>> lastAuthors;
-	OrderedSet<not_null<PeerData*>> markupSenders;
+	QMap<not_null<UserData *>, int> participants;
+	OrderedSet<not_null<UserData *>> invitedByMe;
+	OrderedSet<not_null<UserData *>> admins;
+	QList<not_null<UserData *>> lastAuthors;
+	OrderedSet<not_null<PeerData *>> markupSenders;
 	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
-//	ImagePtr photoFull;
+	//	ImagePtr photoFull;
 
 	void setInviteLink(const QString &newInviteLink);
 	QString inviteLink() const {
@@ -666,7 +666,6 @@ public:
 private:
 	bool _isForbidden = false;
 	QString _inviteLink;
-
 };
 
 enum PtsSkippedQueue {
@@ -675,16 +674,14 @@ enum PtsSkippedQueue {
 };
 class PtsWaiter {
 public:
-
 	PtsWaiter()
-		: _good(0)
-		, _last(0)
-		, _count(0)
-		, _applySkippedLevel(0)
-		, _requesting(false)
-		, _waitingForSkipped(false)
-		, _waitingForShortPoll(false) {
-	}
+	    : _good(0)
+	    , _last(0)
+	    , _count(0)
+	    , _applySkippedLevel(0)
+	    , _requesting(false)
+	    , _waitingForSkipped(false)
+	    , _waitingForShortPoll(false) {}
 	void init(qint32 pts) {
 		_good = _last = _count = pts;
 		clearSkippedUpdates();
@@ -709,7 +706,7 @@ public:
 	}
 	void setWaitingForSkipped(ChannelData *channel, qint32 ms); // < 0 - not waiting
 	void setWaitingForShortPoll(ChannelData *channel, qint32 ms); // < 0 - not waiting
-	qint32 current() const{
+	qint32 current() const {
 		return _good;
 	}
 	bool updated(ChannelData *channel, qint32 pts, qint32 count, const MTPUpdates &updates);
@@ -722,7 +719,8 @@ public:
 	void clearSkippedUpdates();
 
 private:
-	bool check(ChannelData *channel, qint32 pts, qint32 count); // return false if need to save that update and apply later
+	bool check(ChannelData *channel, qint32 pts,
+	           qint32 count); // return false if need to save that update and apply later
 	quint64 ptsKey(PtsSkippedQueue queue, qint32 pts);
 	void checkForWaiting(ChannelData *channel);
 	QMap<quint64, PtsSkippedQueue> _queue;
@@ -736,23 +734,24 @@ private:
 
 struct MegagroupInfo {
 	struct Admin {
-		explicit Admin(MTPChannelAdminRights rights) : rights(rights) {
-		}
-		Admin(MTPChannelAdminRights rights, bool canEdit) : rights(rights), canEdit(canEdit) {
-		}
+		explicit Admin(MTPChannelAdminRights rights)
+		    : rights(rights) {}
+		Admin(MTPChannelAdminRights rights, bool canEdit)
+		    : rights(rights)
+		    , canEdit(canEdit) {}
 		MTPChannelAdminRights rights;
 		bool canEdit = false;
 	};
 	struct Restricted {
-		explicit Restricted(MTPChannelBannedRights rights) : rights(rights) {
-		}
+		explicit Restricted(MTPChannelBannedRights rights)
+		    : rights(rights) {}
 		MTPChannelBannedRights rights;
 	};
-	QList<not_null<UserData*>> lastParticipants;
-	QMap<not_null<UserData*>, Admin> lastAdmins;
-	QMap<not_null<UserData*>, Restricted> lastRestricted;
-	OrderedSet<not_null<PeerData*>> markupSenders;
-	OrderedSet<not_null<UserData*>> bots;
+	QList<not_null<UserData *>> lastParticipants;
+	QMap<not_null<UserData *>, Admin> lastAdmins;
+	QMap<not_null<UserData *>, Restricted> lastRestricted;
+	OrderedSet<not_null<PeerData *>> markupSenders;
+	OrderedSet<not_null<UserData *>> bots;
 
 	UserData *creator = nullptr; // nullptr means unknown
 	int botStatus = 0; // -1 - no bots, 0 - unknown, 1 - one bot, that sees all history, 2 - other
@@ -761,21 +760,21 @@ struct MegagroupInfo {
 	MTPInputStickerSet stickerSet = MTP_inputStickerSetEmpty();
 
 	enum LastParticipantsStatus {
-		LastParticipantsUpToDate       = 0x00,
+		LastParticipantsUpToDate = 0x00,
 		LastParticipantsAdminsOutdated = 0x01,
-		LastParticipantsCountOutdated  = 0x02,
+		LastParticipantsCountOutdated = 0x02,
 	};
 	mutable int lastParticipantsStatus = LastParticipantsUpToDate;
 	int lastParticipantsCount = 0;
 
 	ChatData *migrateFromPtr = nullptr;
-
 };
 
 class ChannelData : public PeerData {
 public:
-	ChannelData(const PeerId &id) : PeerData(id), inputChannel(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))) {
-	}
+	ChannelData(const PeerId &id)
+	    : PeerData(id)
+	    , inputChannel(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))) {}
 	void setPhoto(const MTPChatPhoto &photo, const PhotoId &phId = UnknownPeerPhotoId);
 
 	void setName(const QString &name, const QString &username);
@@ -836,8 +835,10 @@ public:
 	static bool IsRestrictedForever(TimeId until) {
 		return !until || (until == kRestrictUntilForever);
 	}
-	void applyEditAdmin(not_null<UserData*> user, const MTPChannelAdminRights &oldRights, const MTPChannelAdminRights &newRights);
-	void applyEditBanned(not_null<UserData*> user, const MTPChannelBannedRights &oldRights, const MTPChannelBannedRights &newRights);
+	void applyEditAdmin(not_null<UserData *> user, const MTPChannelAdminRights &oldRights,
+	                    const MTPChannelAdminRights &newRights);
+	void applyEditBanned(not_null<UserData *> user, const MTPChannelBannedRights &oldRights,
+	                     const MTPChannelBannedRights &newRights);
 
 	qint32 date = 0;
 	int version = 0;
@@ -903,7 +904,8 @@ public:
 		return (flags & MTPDchannel::Flag::f_democracy);
 	}
 	bool canAddMembers() const {
-		return adminRights().is_invite_users() || amCreator() || (anyoneCanAddMembers() && amIn() && !hasRestrictedRights());
+		return adminRights().is_invite_users() || amCreator() ||
+		       (anyoneCanAddMembers() && amIn() && !hasRestrictedRights());
 	}
 	bool canAddAdmins() const {
 		return adminRights().is_add_admins() || amCreator();
@@ -939,8 +941,8 @@ public:
 		constexpr auto kDeleteChannelMembersLimit = 1000;
 		return amCreator() && (membersCount() <= kDeleteChannelMembersLimit);
 	}
-	bool canEditAdmin(not_null<UserData*> user) const;
-	bool canRestrictUser(not_null<UserData*> user) const;
+	bool canEditAdmin(not_null<UserData *> user) const;
+	bool canRestrictUser(not_null<UserData *> user) const;
 
 	void setInviteLink(const QString &newInviteLink);
 	QString inviteLink() const {
@@ -996,7 +998,7 @@ public:
 	void setRestrictionReason(const QString &reason);
 
 private:
-	bool canNotEditLastAdmin(not_null<UserData*> user) const;
+	bool canNotEditLastAdmin(not_null<UserData *> user) const;
 
 	PtsWaiter _ptsWaiter;
 
@@ -1013,20 +1015,19 @@ private:
 	QString _about;
 
 	QString _inviteLink;
-
 };
 
 inline bool isUser(const PeerData *peer) {
 	return peer ? peer->isUser() : false;
 }
 inline UserData *PeerData::asUser() {
-	return isUser() ? static_cast<UserData*>(this) : nullptr;
+	return isUser() ? static_cast<UserData *>(this) : nullptr;
 }
 inline UserData *asUser(PeerData *peer) {
 	return peer ? peer->asUser() : nullptr;
 }
 inline const UserData *PeerData::asUser() const {
-	return isUser() ? static_cast<const UserData*>(this) : nullptr;
+	return isUser() ? static_cast<const UserData *>(this) : nullptr;
 }
 inline const UserData *asUser(const PeerData *peer) {
 	return peer ? peer->asUser() : nullptr;
@@ -1035,13 +1036,13 @@ inline bool isChat(const PeerData *peer) {
 	return peer ? peer->isChat() : false;
 }
 inline ChatData *PeerData::asChat() {
-	return isChat() ? static_cast<ChatData*>(this) : nullptr;
+	return isChat() ? static_cast<ChatData *>(this) : nullptr;
 }
 inline ChatData *asChat(PeerData *peer) {
 	return peer ? peer->asChat() : nullptr;
 }
 inline const ChatData *PeerData::asChat() const {
-	return isChat() ? static_cast<const ChatData*>(this) : nullptr;
+	return isChat() ? static_cast<const ChatData *>(this) : nullptr;
 }
 inline const ChatData *asChat(const PeerData *peer) {
 	return peer ? peer->asChat() : nullptr;
@@ -1050,25 +1051,25 @@ inline bool isChannel(const PeerData *peer) {
 	return peer ? peer->isChannel() : false;
 }
 inline ChannelData *PeerData::asChannel() {
-	return isChannel() ? static_cast<ChannelData*>(this) : nullptr;
+	return isChannel() ? static_cast<ChannelData *>(this) : nullptr;
 }
 inline ChannelData *asChannel(PeerData *peer) {
 	return peer ? peer->asChannel() : nullptr;
 }
 inline const ChannelData *PeerData::asChannel() const {
-	return isChannel() ? static_cast<const ChannelData*>(this) : nullptr;
+	return isChannel() ? static_cast<const ChannelData *>(this) : nullptr;
 }
 inline const ChannelData *asChannel(const PeerData *peer) {
 	return peer ? peer->asChannel() : nullptr;
 }
 inline ChannelData *PeerData::asMegagroup() {
-	return isMegagroup() ? static_cast<ChannelData*>(this) : nullptr;
+	return isMegagroup() ? static_cast<ChannelData *>(this) : nullptr;
 }
 inline ChannelData *asMegagroup(PeerData *peer) {
 	return peer ? peer->asMegagroup() : nullptr;
 }
 inline const ChannelData *PeerData::asMegagroup() const {
-	return isMegagroup() ? static_cast<const ChannelData*>(this) : nullptr;
+	return isMegagroup() ? static_cast<const ChannelData *>(this) : nullptr;
 }
 inline const ChannelData *asMegagroup(const PeerData *peer) {
 	return peer ? peer->asMegagroup() : nullptr;
@@ -1083,7 +1084,8 @@ inline ChannelData *PeerData::migrateTo() const {
 	return (isChat() && asChat()->migrateToPtr && asChat()->migrateToPtr->amIn()) ? asChat()->migrateToPtr : nullptr;
 }
 inline const Text &PeerData::dialogName() const {
-	return migrateTo() ? migrateTo()->dialogName() : ((isUser() && !asUser()->phoneText.isEmpty()) ? asUser()->phoneText : nameText);
+	return migrateTo() ? migrateTo()->dialogName() :
+	                     ((isUser() && !asUser()->phoneText.isEmpty()) ? asUser()->phoneText : nameText);
 }
 inline const QString &PeerData::shortName() const {
 	return isUser() ? asUser()->firstName : name;
@@ -1098,20 +1100,17 @@ inline bool PeerData::isMegagroup() const {
 	return isChannel() ? asChannel()->isMegagroup() : false;
 }
 inline bool PeerData::canWrite() const {
-	return isChannel() ? asChannel()->canWrite() : (isChat() ? asChat()->canWrite() : (isUser() ? asUser()->canWrite() : false));
+	return isChannel() ? asChannel()->canWrite() :
+	                     (isChat() ? asChat()->canWrite() : (isUser() ? asUser()->canWrite() : false));
 }
 
-enum ActionOnLoad {
-	ActionOnLoadNone,
-	ActionOnLoadOpen,
-	ActionOnLoadOpenWith,
-	ActionOnLoadPlayInline
-};
+enum ActionOnLoad { ActionOnLoadNone, ActionOnLoadOpen, ActionOnLoadOpenWith, ActionOnLoadPlayInline };
 
 typedef QMap<char, QPixmap> PreparedPhotoThumbs;
 class PhotoData {
 public:
-	PhotoData(const PhotoId &id, const quint64 &access = 0, qint32 date = 0, const ImagePtr &thumb = ImagePtr(), const ImagePtr &medium = ImagePtr(), const ImagePtr &full = ImagePtr());
+	PhotoData(const PhotoId &id, const quint64 &access = 0, qint32 date = 0, const ImagePtr &thumb = ImagePtr(),
+	          const ImagePtr &medium = ImagePtr(), const ImagePtr &full = ImagePtr());
 
 	void automaticLoad(const HistoryItem *item);
 	void automaticLoadSettingsChanged();
@@ -1139,8 +1138,8 @@ public:
 	// geo, caption
 
 	struct UploadingData {
-		UploadingData(int size) : size(size) {
-		}
+		UploadingData(int size)
+		    : size(size) {}
 		int offset = 0;
 		int size = 0;
 	};
@@ -1148,14 +1147,14 @@ public:
 
 private:
 	void notifyLayoutChanged() const;
-
 };
 
 class PhotoClickHandler : public LeftButtonClickHandler {
 public:
-	PhotoClickHandler(not_null<PhotoData*> photo, PeerData *peer = nullptr) : _photo(photo), _peer(peer) {
-	}
-	not_null<PhotoData*> photo() const {
+	PhotoClickHandler(not_null<PhotoData *> photo, PeerData *peer = nullptr)
+	    : _photo(photo)
+	    , _peer(peer) {}
+	not_null<PhotoData *> photo() const {
 		return _photo;
 	}
 	PeerData *peer() const {
@@ -1163,14 +1162,14 @@ public:
 	}
 
 private:
-	not_null<PhotoData*> _photo;
+	not_null<PhotoData *> _photo;
 	PeerData *_peer;
-
 };
 
 class PhotoOpenClickHandler : public PhotoClickHandler {
 public:
 	using PhotoClickHandler::PhotoClickHandler;
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1178,6 +1177,7 @@ protected:
 class PhotoSaveClickHandler : public PhotoClickHandler {
 public:
 	using PhotoClickHandler::PhotoClickHandler;
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1185,6 +1185,7 @@ protected:
 class PhotoCancelClickHandler : public PhotoClickHandler {
 public:
 	using PhotoClickHandler::PhotoClickHandler;
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1198,18 +1199,17 @@ enum FileStatus {
 
 // Don't change the values. This type is used for serialization.
 enum DocumentType {
-	FileDocument       = 0,
-	VideoDocument      = 1,
-	SongDocument       = 2,
-	StickerDocument    = 3,
-	AnimatedDocument   = 4,
-	VoiceDocument      = 5,
+	FileDocument = 0,
+	VideoDocument = 1,
+	SongDocument = 2,
+	StickerDocument = 3,
+	AnimatedDocument = 4,
+	VoiceDocument = 5,
 	RoundVideoDocument = 6,
 };
 
 struct DocumentAdditionalData {
 	virtual ~DocumentAdditionalData() = default;
-
 };
 
 struct StickerData : public DocumentAdditionalData {
@@ -1220,13 +1220,11 @@ struct StickerData : public DocumentAdditionalData {
 	bool setInstalled() const;
 
 	StorageImageLocation loc; // doc thumb location
-
 };
 
 struct SongData : public DocumentAdditionalData {
 	qint32 duration = 0;
 	QString title, performer;
-
 };
 
 typedef QVector<char> VoiceWaveform; // [0] == -1 -- counting, [0] == -2 -- could not count
@@ -1242,12 +1240,13 @@ bool fileIsImage(const QString &name, const QString &mime);
 
 namespace Serialize {
 class Document;
-} // namespace Serialize;
+} // namespace Serialize
 
 class DocumentData {
 public:
 	static DocumentData *create(DocumentId id);
-	static DocumentData *create(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QVector<MTPDocumentAttribute> &attributes);
+	static DocumentData *create(DocumentId id, qint32 dc, quint64 accessHash, qint32 version,
+	                            const QVector<MTPDocumentAttribute> &attributes);
 	static DocumentData *create(DocumentId id, const QString &url, const QVector<MTPDocumentAttribute> &attributes);
 
 	void setattributes(const QVector<MTPDocumentAttribute> &attributes);
@@ -1265,7 +1264,8 @@ public:
 	bool loading() const;
 	QString loadingFilePath() const;
 	bool displayLoading() const;
-	void save(const QString &toFile, ActionOnLoad action = ActionOnLoadNone, const FullMsgId &actionMsgId = FullMsgId(), LoadFromCloudSetting fromCloud = LoadFromCloudOrLocal, bool autoLoading = false);
+	void save(const QString &toFile, ActionOnLoad action = ActionOnLoadNone, const FullMsgId &actionMsgId = FullMsgId(),
+	          LoadFromCloudSetting fromCloud = LoadFromCloudOrLocal, bool autoLoading = false);
 	void cancel();
 	double progress() const;
 	qint32 loadOffset() const;
@@ -1285,7 +1285,7 @@ public:
 	ImagePtr makeReplyPreview();
 
 	StickerData *sticker() {
-		return (type == StickerDocument) ? static_cast<StickerData*>(_additional.get()) : nullptr;
+		return (type == StickerDocument) ? static_cast<StickerData *>(_additional.get()) : nullptr;
 	}
 	void checkSticker() {
 		StickerData *s = sticker();
@@ -1305,16 +1305,16 @@ public:
 		}
 	}
 	SongData *song() {
-		return (type == SongDocument) ? static_cast<SongData*>(_additional.get()) : nullptr;
+		return (type == SongDocument) ? static_cast<SongData *>(_additional.get()) : nullptr;
 	}
 	const SongData *song() const {
-		return const_cast<DocumentData*>(this)->song();
+		return const_cast<DocumentData *>(this)->song();
 	}
 	VoiceData *voice() {
-		return (type == VoiceDocument) ? static_cast<VoiceData*>(_additional.get()) : nullptr;
+		return (type == VoiceDocument) ? static_cast<VoiceData *>(_additional.get()) : nullptr;
 	}
 	const VoiceData *voice() const {
-		return const_cast<DocumentData*>(this)->voice();
+		return const_cast<DocumentData *>(this)->voice();
 	}
 	bool isRoundVideo() const {
 		return (type == RoundVideoDocument);
@@ -1326,7 +1326,8 @@ public:
 		return (type == AnimatedDocument) && !mime.compare(qstr("video/mp4"), Qt::CaseInsensitive);
 	}
 	bool isTheme() const {
-		return name.endsWith(qstr(".tdesktop-theme"), Qt::CaseInsensitive) || name.endsWith(qstr(".tdesktop-palette"), Qt::CaseInsensitive);
+		return name.endsWith(qstr(".tdesktop-theme"), Qt::CaseInsensitive) ||
+		       name.endsWith(qstr(".tdesktop-palette"), Qt::CaseInsensitive);
 	}
 	bool tryPlaySong() const {
 		return (song() != nullptr) || mime.startsWith(qstr("audio/"), Qt::CaseInsensitive);
@@ -1402,7 +1403,8 @@ public:
 	}
 
 private:
-	DocumentData(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QString &url, const QVector<MTPDocumentAttribute> &attributes);
+	DocumentData(DocumentId id, qint32 dc, quint64 accessHash, qint32 version, const QString &url,
+	             const QVector<MTPDocumentAttribute> &attributes);
 
 	friend class Serialize::Document;
 
@@ -1428,7 +1430,6 @@ private:
 	void notifyLayoutChanged() const;
 
 	void destroyLoaderDelayed(mtpFileLoader *newValue = nullptr) const;
-
 };
 
 VoiceWaveform documentWaveformDecode(const QByteArray &encoded5bit);
@@ -1444,7 +1445,10 @@ public:
 	};
 
 	AudioMsgId() = default;
-	AudioMsgId(DocumentData *audio, const FullMsgId &msgId, quint32 playId = 0) : _audio(audio), _contextId(msgId), _playId(playId) {
+	AudioMsgId(DocumentData *audio, const FullMsgId &msgId, quint32 playId = 0)
+	    : _audio(audio)
+	    , _contextId(msgId)
+	    , _playId(playId) {
 		setTypeFromAudio();
 	}
 
@@ -1482,7 +1486,6 @@ private:
 	Type _type = Type::Unknown;
 	FullMsgId _contextId;
 	quint32 _playId = 0;
-
 };
 
 inline bool operator<(const AudioMsgId &a, const AudioMsgId &b) {
@@ -1506,21 +1509,21 @@ inline bool operator!=(const AudioMsgId &a, const AudioMsgId &b) {
 
 class DocumentClickHandler : public LeftButtonClickHandler {
 public:
-	DocumentClickHandler(DocumentData *document) : _document(document) {
-	}
+	DocumentClickHandler(DocumentData *document)
+	    : _document(document) {}
 	DocumentData *document() const {
 		return _document;
 	}
 
 private:
 	DocumentData *_document;
-
 };
 
 class DocumentSaveClickHandler : public DocumentClickHandler {
 public:
 	using DocumentClickHandler::DocumentClickHandler;
 	static void doSave(DocumentData *document, bool forceSavingAs = false);
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1529,6 +1532,7 @@ class DocumentOpenClickHandler : public DocumentClickHandler {
 public:
 	using DocumentClickHandler::DocumentClickHandler;
 	static void doOpen(DocumentData *document, HistoryItem *context, ActionOnLoad action = ActionOnLoadOpen);
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1536,6 +1540,7 @@ protected:
 class GifOpenClickHandler : public DocumentOpenClickHandler {
 public:
 	using DocumentOpenClickHandler::DocumentOpenClickHandler;
+
 protected:
 	void onClickImpl() const override;
 };
@@ -1543,24 +1548,20 @@ protected:
 class VoiceSeekClickHandler : public DocumentOpenClickHandler {
 public:
 	using DocumentOpenClickHandler::DocumentOpenClickHandler;
+
 protected:
-	void onClickImpl() const override {
-	}
+	void onClickImpl() const override {}
 };
 
 class DocumentCancelClickHandler : public DocumentClickHandler {
 public:
 	using DocumentClickHandler::DocumentClickHandler;
+
 protected:
 	void onClickImpl() const override;
 };
 
-enum WebPageType {
-	WebPagePhoto,
-	WebPageVideo,
-	WebPageProfile,
-	WebPageArticle
-};
+enum WebPageType { WebPagePhoto, WebPageVideo, WebPageProfile, WebPageArticle };
 inline WebPageType toWebPageType(const QString &type) {
 	if (type == qstr("photo")) return WebPagePhoto;
 	if (type == qstr("video")) return WebPageVideo;
@@ -1569,7 +1570,11 @@ inline WebPageType toWebPageType(const QString &type) {
 }
 
 struct WebPageData {
-	WebPageData(const WebPageId &id, WebPageType type = WebPageArticle, const QString &url = QString(), const QString &displayUrl = QString(), const QString &siteName = QString(), const QString &title = QString(), const TextWithEntities &description = TextWithEntities(), DocumentData *doc = nullptr, PhotoData *photo = nullptr, qint32 duration = 0, const QString &author = QString(), qint32 pendingTill = -1);
+	WebPageData(const WebPageId &id, WebPageType type = WebPageArticle, const QString &url = QString(),
+	            const QString &displayUrl = QString(), const QString &siteName = QString(),
+	            const QString &title = QString(), const TextWithEntities &description = TextWithEntities(),
+	            DocumentData *doc = nullptr, PhotoData *photo = nullptr, qint32 duration = 0,
+	            const QString &author = QString(), qint32 pendingTill = -1);
 
 	void forget() {
 		if (document) document->forget();
@@ -1585,11 +1590,12 @@ struct WebPageData {
 	PhotoData *photo;
 	DocumentData *document;
 	qint32 pendingTill;
-
 };
 
 struct GameData {
-	GameData(const GameId &id, const quint64 &accessHash = 0, const QString &shortName = QString(), const QString &title = QString(), const QString &description = QString(), PhotoData *photo = nullptr, DocumentData *doc = nullptr);
+	GameData(const GameId &id, const quint64 &accessHash = 0, const QString &shortName = QString(),
+	         const QString &title = QString(), const QString &description = QString(), PhotoData *photo = nullptr,
+	         DocumentData *doc = nullptr);
 
 	void forget() {
 		if (document) document->forget();
@@ -1601,16 +1607,18 @@ struct GameData {
 	QString shortName, title, description;
 	PhotoData *photo;
 	DocumentData *document;
-
 };
 
-QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs, const QDir &dir = QDir());
+QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs,
+                     const QDir &dir = QDir());
 MsgId clientMsgId();
 
 struct MessageCursor {
 	MessageCursor() = default;
-	MessageCursor(int position, int anchor, int scroll) : position(position), anchor(anchor), scroll(scroll) {
-	}
+	MessageCursor(int position, int anchor, int scroll)
+	    : position(position)
+	    , anchor(anchor)
+	    , scroll(scroll) {}
 	MessageCursor(const QTextEdit *edit) {
 		fillFrom(edit);
 	}
@@ -1633,7 +1641,6 @@ struct MessageCursor {
 	int position = 0;
 	int anchor = 0;
 	int scroll = QFIXED_MAX;
-
 };
 
 inline bool operator==(const MessageCursor &a, const MessageCursor &b) {
@@ -1655,8 +1662,10 @@ struct SendAction {
 		ChooseContact,
 		PlayGame,
 	};
-	SendAction(Type type, TimeMs until, int progress = 0) : type(type), until(until), progress(progress) {
-	}
+	SendAction(Type type, TimeMs until, int progress = 0)
+	    : type(type)
+	    , until(until)
+	    , progress(progress) {}
 	Type type;
 	TimeMs until;
 	int progress;
diff --git a/Telegram/SourceFiles/ui/abstract_button.h b/Telegram/SourceFiles/ui/abstract_button.h
index 7affcbaa3..da551dd90 100644
--- a/Telegram/SourceFiles/ui/abstract_button.h
+++ b/Telegram/SourceFiles/ui/abstract_button.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "base/flags.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 
@@ -29,7 +29,8 @@ class AbstractButton : public TWidget {
 	Q_OBJECT
 
 public:
-	AbstractButton(QWidget *parent) : TWidget(parent) {
+	AbstractButton(QWidget *parent)
+	    : TWidget(parent) {
 		setMouseTracking(true);
 	}
 
@@ -76,9 +77,9 @@ signals:
 
 protected:
 	enum class StateFlag {
-		None     = 0,
-		Over     = (1 << 0),
-		Down     = (1 << 1),
+		None = 0,
+		Over = (1 << 0),
+		Down = (1 << 1),
 		Disabled = (1 << 2),
 	};
 	using State = base::flags<StateFlag>;
@@ -94,8 +95,7 @@ protected:
 	};
 	void setOver(bool over, StateChangeSource source = StateChangeSource::ByUser);
 
-	virtual void onStateChanged(State was, StateChangeSource source) {
-	}
+	virtual void onStateChanged(State was, StateChangeSource source) {}
 
 private:
 	void updateCursor();
@@ -108,7 +108,6 @@ private:
 	bool _enablePointerCursor = true;
 
 	base::lambda<void()> _clickedCallback;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp
index 6387d7925..07a7a9b3a 100644
--- a/Telegram/SourceFiles/ui/animation.cpp
+++ b/Telegram/SourceFiles/ui/animation.cpp
@@ -48,17 +48,11 @@ bool AnimationsDisabled = false;
 
 namespace anim {
 
-transition linear = [](const double &delta, const double &dt) {
-	return delta * dt;
-};
+transition linear = [](const double &delta, const double &dt) { return delta * dt; };
 
-transition sineInOut = [](const double &delta, const double &dt) {
-	return -(delta / 2) * (cos(M_PI * dt) - 1);
-};
+transition sineInOut = [](const double &delta, const double &dt) { return -(delta / 2) * (cos(M_PI * dt) - 1); };
 
-transition halfSine = [](const double &delta, const double &dt) {
-	return delta * sin(M_PI * dt / 2);
-};
+transition halfSine = [](const double &delta, const double &dt) { return delta * sin(M_PI * dt / 2); };
 
 transition easeOutBack = [](const double &delta, const double &dt) {
 	static constexpr auto s = 1.70158;
@@ -67,18 +61,14 @@ transition easeOutBack = [](const double &delta, const double &dt) {
 	return delta * (t * t * ((s + 1) * t + s) + 1);
 };
 
-transition easeInCirc = [](const double &delta, const double &dt) {
-	return -delta * (sqrt(1 - dt * dt) - 1);
-};
+transition easeInCirc = [](const double &delta, const double &dt) { return -delta * (sqrt(1 - dt * dt) - 1); };
 
 transition easeOutCirc = [](const double &delta, const double &dt) {
 	const double t = dt - 1;
 	return delta * sqrt(1 - t * t);
 };
 
-transition easeInCubic = [](const double &delta, const double &dt) {
-	return delta * dt * dt * dt;
-};
+transition easeInCubic = [](const double &delta, const double &dt) { return delta * dt * dt * dt; };
 
 transition easeOutCubic = [](const double &delta, const double &dt) {
 	const double t = dt - 1;
@@ -109,7 +99,8 @@ void stopManager() {
 }
 
 void registerClipManager(Media::Clip::Manager *manager) {
-	manager->connect(manager, SIGNAL(callback(Media::Clip::Reader*,qint32,qint32)), _manager, SLOT(clipCallback(Media::Clip::Reader*,qint32,qint32)));
+	manager->connect(manager, SIGNAL(callback(Media::Clip::Reader *, qint32, qint32)), _manager,
+	                 SLOT(clipCallback(Media::Clip::Reader *, qint32, qint32)));
 }
 
 bool Disabled() {
@@ -120,7 +111,7 @@ void SetDisabled(bool disabled) {
 	AnimationsDisabled = disabled;
 }
 
-} // anim
+} // namespace anim
 
 void BasicAnimation::start() {
 	if (!_manager) return;
@@ -137,7 +128,9 @@ void BasicAnimation::stop() {
 	_manager->stop(this);
 }
 
-AnimationManager::AnimationManager() : _timer(this), _iterating(false) {
+AnimationManager::AnimationManager()
+    : _timer(this)
+    , _iterating(false) {
 	_timer.setSingleShot(false);
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(timeout()));
 }
@@ -184,15 +177,11 @@ void AnimationManager::timeout() {
 	_iterating = false;
 
 	if (!_starting.isEmpty()) {
-		for_const (auto object, _starting) {
-			_objects.insert(object);
-		}
+		for_const (auto object, _starting) { _objects.insert(object); }
 		_starting.clear();
 	}
 	if (!_stopping.isEmpty()) {
-		for_const (auto object, _stopping) {
-			_objects.remove(object);
-		}
+		for_const (auto object, _stopping) { _objects.remove(object); }
 		_stopping.clear();
 	}
 	if (_objects.empty()) {
@@ -203,4 +192,3 @@ void AnimationManager::timeout() {
 void AnimationManager::clipCallback(Media::Clip::Reader *reader, qint32 threadIndex, qint32 notification) {
 	Media::Clip::Reader::callback(reader, threadIndex, Media::Clip::Notification(notification));
 }
-
diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h
index 2559db78f..3896052e6 100644
--- a/Telegram/SourceFiles/ui/animation.h
+++ b/Telegram/SourceFiles/ui/animation.h
@@ -22,20 +22,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #define _USE_MATH_DEFINES // for M_PI in MSVC (GCC and Clang has it as extension)
 
-#include <QTimer>
-#include <QColor>
-#include <QPen>
 #include <QBrush>
 #include <QColor>
 #include <QPainterPath>
-#include <cstdint>
+#include <QPen>
+#include <QTimer>
 #include <cmath>
+#include <cstdint>
 
+#include "base/lambda.h"
 #include "core/basic_types.h"
 #include "core/utils.h"
-#include "base/lambda.h"
-#include "style/style_core_types.h"
 #include "mtproto/facade.h"
+#include "style/style_core_types.h"
 
 namespace Media {
 namespace Clip {
@@ -43,14 +42,13 @@ namespace Clip {
 class Reader;
 class ReaderPointer {
 public:
-	ReaderPointer(std::nullptr_t = nullptr) {
-	}
-	explicit ReaderPointer(Reader *pointer) : _pointer(pointer) {
-	}
+	ReaderPointer(std::nullptr_t = nullptr) {}
+	explicit ReaderPointer(Reader *pointer)
+	    : _pointer(pointer) {}
 	ReaderPointer(const ReaderPointer &other) = delete;
 	ReaderPointer &operator=(const ReaderPointer &other) = delete;
-	ReaderPointer(ReaderPointer &&other) : _pointer(base::take(other._pointer)) {
-	}
+	ReaderPointer(ReaderPointer &&other)
+	    : _pointer(base::take(other._pointer)) {}
 	ReaderPointer &operator=(ReaderPointer &&other) {
 		swap(other);
 		return *this;
@@ -91,7 +89,6 @@ public:
 private:
 	Reader *_pointer = nullptr;
 	static Reader *const BadPointer;
-
 };
 
 class Manager;
@@ -122,9 +119,7 @@ extern transition easeOutQuint;
 inline transition bumpy(double bump) {
 	auto dt0 = (bump - sqrt(bump * (bump - 1.)));
 	auto k = (1 / (2 * dt0 - 1));
-	return [bump, dt0, k](double delta, double dt) {
-		return delta * (bump - k * (dt - dt0) * (dt - dt0));
-	};
+	return [bump, dt0, k](double delta, double dt) { return delta * (bump - k * (dt - dt0) * (dt - dt0)); };
 }
 
 // Basic animated value.
@@ -133,10 +128,13 @@ public:
 	using ValueType = double;
 
 	value() = default;
-	value(double from) : _cur(from), _from(from) {
-	}
-	value(double from, double to) : _cur(from), _from(from), _delta(to - from) {
-	}
+	value(double from)
+	    : _cur(from)
+	    , _from(from) {}
+	value(double from, double to)
+	    : _cur(from)
+	    , _from(from)
+	    , _delta(to - from) {}
 	void start(double to) {
 		_from = _cur;
 		_delta = to - _from;
@@ -173,7 +171,6 @@ private:
 	double _cur = 0.;
 	double _from = 0.;
 	double _delta = 0.;
-
 };
 
 void startManager();
@@ -194,8 +191,9 @@ using ShiftedMultiplier = quint32;
 
 struct Shifted {
 	Shifted() = default;
-	Shifted(quint32 low, quint32 high) : low(low), high(high) {
-	}
+	Shifted(quint32 low, quint32 high)
+	    : low(low)
+	    , high(high) {}
 	quint32 low = 0;
 	quint32 high = 0;
 };
@@ -213,16 +211,13 @@ FORCE_INLINE Shifted operator*(ShiftedMultiplier multiplier, Shifted shifted) {
 }
 
 FORCE_INLINE Shifted shifted(quint32 components) {
-	return Shifted(
-		(components & 0x000000FFU) | ((components & 0x0000FF00U) << 8),
-		((components & 0x00FF0000U) >> 16) | ((components & 0xFF000000U) >> 8));
+	return Shifted((components & 0x000000FFU) | ((components & 0x0000FF00U) << 8),
+	               ((components & 0x00FF0000U) >> 16) | ((components & 0xFF000000U) >> 8));
 }
 
 FORCE_INLINE quint32 unshifted(Shifted components) {
-	return ((components.low & 0x0000FF00U) >> 8)
-		| ((components.low & 0xFF000000U) >> 16)
-		| ((components.high & 0x0000FF00U) << 8)
-		| (components.high & 0xFF000000U);
+	return ((components.low & 0x0000FF00U) >> 8) | ((components.low & 0xFF000000U) >> 16) |
+	       ((components.high & 0x0000FF00U) << 8) | (components.high & 0xFF000000U);
 }
 
 FORCE_INLINE Shifted reshifted(Shifted components) {
@@ -232,16 +227,18 @@ FORCE_INLINE Shifted reshifted(Shifted components) {
 FORCE_INLINE Shifted shifted(QColor color) {
 	// Make it premultiplied.
 	auto alpha = static_cast<quint32>((color.alpha() & 0xFF) + 1);
-	auto components = Shifted(static_cast<quint32>(color.blue() & 0xFF) | (static_cast<quint32>(color.green() & 0xFF) << 16),
-		static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(255) << 16));
+	auto components =
+	    Shifted(static_cast<quint32>(color.blue() & 0xFF) | (static_cast<quint32>(color.green() & 0xFF) << 16),
+	            static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(255) << 16));
 	return reshifted(components * alpha);
 }
 
 FORCE_INLINE quint32 getPremultiplied(QColor color) {
 	// Make it premultiplied.
 	auto alpha = static_cast<quint32>((color.alpha() & 0xFF) + 1);
-	auto components = Shifted(static_cast<quint32>(color.blue() & 0xFF) | (static_cast<quint32>(color.green() & 0xFF) << 16),
-		static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(255) << 16));
+	auto components =
+	    Shifted(static_cast<quint32>(color.blue() & 0xFF) | (static_cast<quint32>(color.green() & 0xFF) << 16),
+	            static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(255) << 16));
 	return unshifted(components * alpha);
 }
 
@@ -251,7 +248,7 @@ FORCE_INLINE quint32 getAlpha(Shifted components) {
 
 FORCE_INLINE Shifted non_premultiplied(QColor color) {
 	return Shifted(static_cast<quint32>(color.blue() & 0xFF) | (static_cast<quint32>(color.green() & 0xFF) << 16),
-		static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(color.alpha() & 0xFF) << 16));
+	               static_cast<quint32>(color.red() & 0xFF) | (static_cast<quint32>(color.alpha() & 0xFF) << 16));
 }
 
 FORCE_INLINE QColor color(QColor a, QColor b, double b_ratio) {
@@ -259,10 +256,10 @@ FORCE_INLINE QColor color(QColor a, QColor b, double b_ratio) {
 	auto aOpacity = (256 - bOpacity);
 	auto components = (non_premultiplied(a) * aOpacity + non_premultiplied(b) * bOpacity);
 	return {
-		static_cast<int>((components.high >> 8) & 0xFF),
-		static_cast<int>((components.low >> 24) & 0xFF),
-		static_cast<int>((components.low >> 8) & 0xFF),
-		static_cast<int>((components.high >> 24) & 0xFF),
+	    static_cast<int>((components.high >> 8) & 0xFF),
+	    static_cast<int>((components.low >> 24) & 0xFF),
+	    static_cast<int>((components.low >> 8) & 0xFF),
+	    static_cast<int>((components.high >> 24) & 0xFF),
 	};
 }
 
@@ -272,10 +269,10 @@ using ShiftedMultiplier = quint64;
 
 struct Shifted {
 	Shifted() = default;
-	Shifted(quint32 value) : value(value) {
-	}
-	Shifted(quint64 value) : value(value) {
-	}
+	Shifted(quint32 value)
+	    : value(value) {}
+	Shifted(quint64 value)
+	    : value(value) {}
 	quint64 value = 0;
 };
 
@@ -293,17 +290,15 @@ FORCE_INLINE Shifted operator*(ShiftedMultiplier multiplier, Shifted shifted) {
 
 FORCE_INLINE Shifted shifted(quint32 components) {
 	auto wide = static_cast<quint64>(components);
-	return (wide & Q_UINT64_C(0x00000000000000FF))
-		| ((wide & Q_UINT64_C(0x000000000000FF00)) << 8)
-		| ((wide & Q_UINT64_C(0x0000000000FF0000)) << 16)
-		| ((wide & Q_UINT64_C(0x00000000FF000000)) << 24);
+	return (wide & Q_UINT64_C(0x00000000000000FF)) | ((wide & Q_UINT64_C(0x000000000000FF00)) << 8) |
+	       ((wide & Q_UINT64_C(0x0000000000FF0000)) << 16) | ((wide & Q_UINT64_C(0x00000000FF000000)) << 24);
 }
 
 FORCE_INLINE quint32 unshifted(Shifted components) {
-	return static_cast<quint32>((components.value & Q_UINT64_C(0x000000000000FF00)) >> 8)
-		 | static_cast<quint32>((components.value & Q_UINT64_C(0x00000000FF000000)) >> 16)
-		 | static_cast<quint32>((components.value & Q_UINT64_C(0x0000FF0000000000)) >> 24)
-		 | static_cast<quint32>((components.value & Q_UINT64_C(0xFF00000000000000)) >> 32);
+	return static_cast<quint32>((components.value & Q_UINT64_C(0x000000000000FF00)) >> 8) |
+	       static_cast<quint32>((components.value & Q_UINT64_C(0x00000000FF000000)) >> 16) |
+	       static_cast<quint32>((components.value & Q_UINT64_C(0x0000FF0000000000)) >> 24) |
+	       static_cast<quint32>((components.value & Q_UINT64_C(0xFF00000000000000)) >> 32);
 }
 
 FORCE_INLINE Shifted reshifted(Shifted components) {
@@ -313,20 +308,16 @@ FORCE_INLINE Shifted reshifted(Shifted components) {
 FORCE_INLINE Shifted shifted(QColor color) {
 	// Make it premultiplied.
 	auto alpha = static_cast<quint64>((color.alpha() & 0xFF) + 1);
-	auto components = static_cast<quint64>(color.blue() & 0xFF)
-		| (static_cast<quint64>(color.green() & 0xFF) << 16)
-		| (static_cast<quint64>(color.red() & 0xFF) << 32)
-		| (static_cast<quint64>(255) << 48);
+	auto components = static_cast<quint64>(color.blue() & 0xFF) | (static_cast<quint64>(color.green() & 0xFF) << 16) |
+	                  (static_cast<quint64>(color.red() & 0xFF) << 32) | (static_cast<quint64>(255) << 48);
 	return reshifted(components * alpha);
 }
 
 FORCE_INLINE quint32 getPremultiplied(QColor color) {
 	// Make it premultiplied.
 	auto alpha = static_cast<quint64>((color.alpha() & 0xFF) + 1);
-	auto components = static_cast<quint64>(color.blue() & 0xFF)
-		| (static_cast<quint64>(color.green() & 0xFF) << 16)
-		| (static_cast<quint64>(color.red() & 0xFF) << 32)
-		| (static_cast<quint64>(255) << 48);
+	auto components = static_cast<quint64>(color.blue() & 0xFF) | (static_cast<quint64>(color.green() & 0xFF) << 16) |
+	                  (static_cast<quint64>(color.red() & 0xFF) << 32) | (static_cast<quint64>(255) << 48);
 	return unshifted(components * alpha);
 }
 
@@ -335,10 +326,8 @@ FORCE_INLINE quint32 getAlpha(Shifted components) {
 }
 
 FORCE_INLINE Shifted non_premultiplied(QColor color) {
-	return static_cast<quint64>(color.blue() & 0xFF)
-		| (static_cast<quint64>(color.green() & 0xFF) << 16)
-		| (static_cast<quint64>(color.red() & 0xFF) << 32)
-		| (static_cast<quint64>(color.alpha() & 0xFF) << 48);
+	return static_cast<quint64>(color.blue() & 0xFF) | (static_cast<quint64>(color.green() & 0xFF) << 16) |
+	       (static_cast<quint64>(color.red() & 0xFF) << 32) | (static_cast<quint64>(color.alpha() & 0xFF) << 48);
 }
 
 FORCE_INLINE QColor color(QColor a, QColor b, double b_ratio) {
@@ -346,10 +335,10 @@ FORCE_INLINE QColor color(QColor a, QColor b, double b_ratio) {
 	auto aOpacity = (256 - bOpacity);
 	auto components = (non_premultiplied(a) * aOpacity + non_premultiplied(b) * bOpacity);
 	return {
-		static_cast<int>((components.value >> 40) & 0xFF),
-		static_cast<int>((components.value >> 24) & 0xFF),
-		static_cast<int>((components.value >>  8) & 0xFF),
-		static_cast<int>((components.value >> 56) & 0xFF),
+	    static_cast<int>((components.value >> 40) & 0xFF),
+	    static_cast<int>((components.value >> 24) & 0xFF),
+	    static_cast<int>((components.value >> 8) & 0xFF),
+	    static_cast<int>((components.value >> 56) & 0xFF),
 	};
 }
 
@@ -399,8 +388,7 @@ FORCE_INLINE QBrush brush(style::color a, style::color b, double b_ratio) {
 	return (b_ratio > 0) ? ((b_ratio < 1) ? brush(a->c, b->c, b_ratio) : b) : a;
 }
 
-template <int N>
-QPainterPath interpolate(QPointF (&from)[N], QPointF (&to)[N], double k) {
+template <int N> QPainterPath interpolate(QPointF (&from)[N], QPointF (&to)[N], double k) {
 	static_assert(N > 1, "Wrong points count in path!");
 
 	auto from_coef = 1. - k, to_coef = k;
@@ -415,8 +403,7 @@ QPainterPath interpolate(QPointF (&from)[N], QPointF (&to)[N], double k) {
 	return result;
 }
 
-template <int N>
-QPainterPath path(QPointF (&from)[N]) {
+template <int N> QPainterPath path(QPointF (&from)[N]) {
 	static_assert(N > 1, "Wrong points count in path!");
 
 	QPainterPath result;
@@ -433,7 +420,7 @@ QPainterPath path(QPointF (&from)[N]) {
 bool Disabled();
 void SetDisabled(bool disabled);
 
-} // anim namespace
+} // namespace anim
 
 class BasicAnimation;
 
@@ -442,15 +429,16 @@ public:
 	virtual void start() {}
 	virtual void step(BasicAnimation *a, TimeMs ms, bool timer) = 0;
 	virtual ~AnimationImplementation() {}
-
 };
 
 class AnimationCallbacks {
 public:
-	AnimationCallbacks(AnimationImplementation *implementation) : _implementation(implementation) {}
+	AnimationCallbacks(AnimationImplementation *implementation)
+	    : _implementation(implementation) {}
 	AnimationCallbacks(const AnimationCallbacks &other) = delete;
 	AnimationCallbacks &operator=(const AnimationCallbacks &other) = delete;
-	AnimationCallbacks(AnimationCallbacks &&other) : _implementation(other._implementation) {
+	AnimationCallbacks(AnimationCallbacks &&other)
+	    : _implementation(other._implementation) {
 		other._implementation = nullptr;
 	}
 	AnimationCallbacks &operator=(AnimationCallbacks &&other) {
@@ -458,21 +446,25 @@ public:
 		return *this;
 	}
 
-	void start() { _implementation->start();  }
-	void step(BasicAnimation *a, TimeMs ms, bool timer) { _implementation->step(a, ms, timer); }
-	~AnimationCallbacks() { delete base::take(_implementation); }
+	void start() {
+		_implementation->start();
+	}
+	void step(BasicAnimation *a, TimeMs ms, bool timer) {
+		_implementation->step(a, ms, timer);
+	}
+	~AnimationCallbacks() {
+		delete base::take(_implementation);
+	}
 
 private:
 	AnimationImplementation *_implementation;
-
 };
 
 class BasicAnimation {
 public:
 	BasicAnimation(AnimationCallbacks &&callbacks)
-		: _callbacks(std::move(callbacks))
-		, _animating(false) {
-	}
+	    : _callbacks(std::move(callbacks))
+	    , _animating(false) {}
 
 	void start();
 	void stop();
@@ -496,16 +488,15 @@ public:
 private:
 	AnimationCallbacks _callbacks;
 	bool _animating;
-
 };
 
-template <typename Type>
-class AnimationCallbacksRelative : public AnimationImplementation {
+template <typename Type> class AnimationCallbacksRelative : public AnimationImplementation {
 public:
 	typedef void (Type::*Method)(double, bool);
 
-	AnimationCallbacksRelative(Type *obj, Method method) : _obj(obj), _method(method) {
-	}
+	AnimationCallbacksRelative(Type *obj, Method method)
+	    : _obj(obj)
+	    , _method(method) {}
 
 	void start() {
 		_started = getms();
@@ -519,7 +510,6 @@ private:
 	TimeMs _started = 0;
 	Type *_obj = nullptr;
 	Method _method = nullptr;
-
 };
 
 template <typename Type>
@@ -527,13 +517,13 @@ AnimationCallbacks animation(Type *obj, typename AnimationCallbacksRelative<Type
 	return AnimationCallbacks(new AnimationCallbacksRelative<Type>(obj, method));
 }
 
-template <typename Type>
-class AnimationCallbacksAbsolute : public AnimationImplementation {
+template <typename Type> class AnimationCallbacksAbsolute : public AnimationImplementation {
 public:
 	typedef void (Type::*Method)(TimeMs, bool);
 
-	AnimationCallbacksAbsolute(Type *obj, Method method) : _obj(obj), _method(method) {
-	}
+	AnimationCallbacksAbsolute(Type *obj, Method method)
+	    : _obj(obj)
+	    , _method(method) {}
 
 	void step(BasicAnimation *a, TimeMs ms, bool timer) {
 		(_obj->*_method)(ms, timer);
@@ -542,7 +532,6 @@ public:
 private:
 	Type *_obj = nullptr;
 	Method _method = nullptr;
-
 };
 
 template <typename Type>
@@ -550,13 +539,14 @@ AnimationCallbacks animation(Type *obj, typename AnimationCallbacksAbsolute<Type
 	return AnimationCallbacks(new AnimationCallbacksAbsolute<Type>(obj, method));
 }
 
-template <typename Type, typename Param>
-class AnimationCallbacksRelativeWithParam : public AnimationImplementation {
+template <typename Type, typename Param> class AnimationCallbacksRelativeWithParam : public AnimationImplementation {
 public:
 	typedef void (Type::*Method)(Param, double, bool);
 
-	AnimationCallbacksRelativeWithParam(Param param, Type *obj, Method method) : _param(param), _obj(obj), _method(method) {
-	}
+	AnimationCallbacksRelativeWithParam(Param param, Type *obj, Method method)
+	    : _param(param)
+	    , _obj(obj)
+	    , _method(method) {}
 
 	void start() {
 		_started = getms();
@@ -571,21 +561,22 @@ private:
 	Param _param;
 	Type *_obj = nullptr;
 	Method _method = nullptr;
-
 };
 
 template <typename Type, typename Param>
-AnimationCallbacks animation(Param param, Type *obj, typename AnimationCallbacksRelativeWithParam<Type, Param>::Method method) {
+AnimationCallbacks animation(Param param, Type *obj,
+                             typename AnimationCallbacksRelativeWithParam<Type, Param>::Method method) {
 	return AnimationCallbacks(new AnimationCallbacksRelativeWithParam<Type, Param>(param, obj, method));
 }
 
-template <typename Type, typename Param>
-class AnimationCallbacksAbsoluteWithParam : public AnimationImplementation {
+template <typename Type, typename Param> class AnimationCallbacksAbsoluteWithParam : public AnimationImplementation {
 public:
 	typedef void (Type::*Method)(Param, TimeMs, bool);
 
-	AnimationCallbacksAbsoluteWithParam(Param param, Type *obj, Method method) : _param(param), _obj(obj), _method(method) {
-	}
+	AnimationCallbacksAbsoluteWithParam(Param param, Type *obj, Method method)
+	    : _param(param)
+	    , _obj(obj)
+	    , _method(method) {}
 
 	void step(BasicAnimation *a, TimeMs ms, bool timer) {
 		(_obj->*_method)(_param, ms, timer);
@@ -595,11 +586,11 @@ private:
 	Param _param;
 	Type *_obj = nullptr;
 	Method _method = nullptr;
-
 };
 
 template <typename Type, typename Param>
-AnimationCallbacks animation(Param param, Type *obj, typename AnimationCallbacksAbsoluteWithParam<Type, Param>::Method method) {
+AnimationCallbacks animation(Param param, Type *obj,
+                             typename AnimationCallbacksAbsoluteWithParam<Type, Param>::Method method) {
 	return AnimationCallbacks(new AnimationCallbacksAbsoluteWithParam<Type, Param>(param, obj, method));
 }
 
@@ -642,7 +633,8 @@ public:
 	static constexpr auto kLongAnimationDuration = 1000;
 
 	template <typename Lambda>
-	void start(Lambda &&updateCallback, double from, double to, double duration, anim::transition transition = anim::linear) {
+	void start(Lambda &&updateCallback, double from, double to, double duration,
+	           anim::transition transition = anim::linear) {
 		auto isLong = (duration >= kLongAnimationDuration);
 		if (_data) {
 			if (!isLong) {
@@ -668,8 +660,7 @@ public:
 		}
 	}
 
-	template <typename Lambda>
-	void setUpdateCallback(Lambda &&updateCallback) {
+	template <typename Lambda> void setUpdateCallback(Lambda &&updateCallback) {
 		if (_data) {
 			_data->updateCallback = std::forward<Lambda>(updateCallback);
 		}
@@ -679,10 +670,9 @@ private:
 	struct Data {
 		template <typename Lambda>
 		Data(double from, Lambda updateCallback)
-			: value(from, from)
-			, a_animation(animation(this, &Data::step))
-			, updateCallback(std::move(updateCallback)) {
-		}
+		    : value(from, from)
+		    , a_animation(animation(this, &Data::step))
+		    , updateCallback(std::move(updateCallback)) {}
 		void step(double ms, bool timer) {
 			auto dt = (ms >= duration || anim::Disabled()) ? 1. : (ms / duration);
 			if (dt >= 1) {
@@ -703,7 +693,6 @@ private:
 		MTP::PauseHolder pause;
 	};
 	mutable std::unique_ptr<Data> _data;
-
 };
 
 class AnimationManager : public QObject {
@@ -721,9 +710,8 @@ public slots:
 	void clipCallback(Media::Clip::Reader *reader, qint32 threadIndex, qint32 notification);
 
 private:
-	using AnimatingObjects = OrderedSet<BasicAnimation*>;
+	using AnimatingObjects = OrderedSet<BasicAnimation *>;
 	AnimatingObjects _objects, _starting, _stopping;
 	QTimer _timer;
 	bool _iterating;
-
 };
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index a63e55302..22fe505c3 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -20,52 +20,52 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/countryinput.h"
 
-#include "lang/lang_keys.h"
 #include "application.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/multi_select.h"
-#include "ui/effects/ripple_animation.h"
 #include "countries.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "styles/style_intro.h"
-#include "facades.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/multi_select.h"
+#include "ui/widgets/scroll_area.h"
 
 namespace {
 
-	typedef QList<const CountryInfo *> CountriesFiltered;
-	typedef QVector<int> CountriesIds;
-	typedef QHash<QChar, CountriesIds> CountriesByLetter;
-	typedef QVector<QString> CountryNames;
-	typedef QVector<CountryNames> CountriesNames;
+typedef QList<const CountryInfo *> CountriesFiltered;
+typedef QVector<int> CountriesIds;
+typedef QHash<QChar, CountriesIds> CountriesByLetter;
+typedef QVector<QString> CountryNames;
+typedef QVector<CountryNames> CountriesNames;
 
-	CountriesByCode _countriesByCode;
-	CountriesByISO2 _countriesByISO2;
-	CountriesFiltered countriesFiltered, countriesAll, *countriesNow = &countriesAll;
-	CountriesByLetter countriesByLetter;
-	CountriesNames countriesNames;
+CountriesByCode _countriesByCode;
+CountriesByISO2 _countriesByISO2;
+CountriesFiltered countriesFiltered, countriesAll, *countriesNow = &countriesAll;
+CountriesByLetter countriesByLetter;
+CountriesNames countriesNames;
 
-	QString lastValidISO;
-	int countriesCount = sizeof(countries) / sizeof(countries[0]);
+QString lastValidISO;
+int countriesCount = sizeof(countries) / sizeof(countries[0]);
 
-	void initCountries() {
-		if (!_countriesByCode.isEmpty()) return;
+void initCountries() {
+	if (!_countriesByCode.isEmpty()) return;
 
-		_countriesByCode.reserve(countriesCount);
-		_countriesByISO2.reserve(countriesCount);
-		for (int i = 0; i < countriesCount; ++i) {
-			const CountryInfo *info(countries + i);
-			_countriesByCode.insert(info->code, info);
-			CountriesByISO2::const_iterator already = _countriesByISO2.constFind(info->iso2);
-			if (already != _countriesByISO2.cend()) {
-				QString badISO = info->iso2;
-				(void)badISO;
-			}
-			_countriesByISO2.insert(info->iso2, info);
+	_countriesByCode.reserve(countriesCount);
+	_countriesByISO2.reserve(countriesCount);
+	for (int i = 0; i < countriesCount; ++i) {
+		const CountryInfo *info(countries + i);
+		_countriesByCode.insert(info->code, info);
+		CountriesByISO2::const_iterator already = _countriesByISO2.constFind(info->iso2);
+		if (already != _countriesByISO2.cend()) {
+			QString badISO = info->iso2;
+			(void)badISO;
 		}
-		countriesAll.reserve(countriesCount);
-		countriesFiltered.reserve(countriesCount);
-		countriesNames.resize(countriesCount);
+		_countriesByISO2.insert(info->iso2, info);
 	}
+	countriesAll.reserve(countriesCount);
+	countriesFiltered.reserve(countriesCount);
+	countriesNames.resize(countriesCount);
+}
 
 } // namespace
 
@@ -90,17 +90,19 @@ QString findValidCode(QString fullCode) {
 	return "";
 }
 
-CountryInput::CountryInput(QWidget *parent, const style::InputField &st) : TWidget(parent)
-, _st(st)
-, _text(lang(lng_country_code)) {
+CountryInput::CountryInput(QWidget *parent, const style::InputField &st)
+    : TWidget(parent)
+    , _st(st)
+    , _text(lang(lng_country_code)) {
 	initCountries();
 	resize(_st.width, _st.heightMin);
 
-	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() -
+	                      _st.placeholderMargins.right() - 1;
 	auto placeholderFont = _st.placeholderFont->f;
 	placeholderFont.setStyleStrategy(QFont::PreferMatch);
 	auto metrics = QFontMetrics(placeholderFont);
-	auto placeholder = QString();// metrics.elidedText(lang(lng_country_fake_ph), Qt::ElideRight, availableWidth);
+	auto placeholder = QString(); // metrics.elidedText(lang(lng_country_fake_ph), Qt::ElideRight, availableWidth);
 	if (!placeholder.isNull()) {
 		_placeholderPath.addText(0, QFontMetrics(placeholderFont).ascent(), placeholderFont, placeholder);
 	}
@@ -117,7 +119,8 @@ void CountryInput::paintEvent(QPaintEvent *e) {
 		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg);
 	}
 
-	st::introCountryIcon.paint(p, width() - st::introCountryIcon.width() - st::introCountryIconPosition.x(), st::introCountryIconPosition.y(), width());
+	st::introCountryIcon.paint(p, width() - st::introCountryIcon.width() - st::introCountryIconPosition.x(),
+	                           st::introCountryIconPosition.y(), width());
 
 	p.setFont(_st.font);
 	p.setPen(_st.textFg);
@@ -160,7 +163,7 @@ void CountryInput::mousePressEvent(QMouseEvent *e) {
 	mouseMoveEvent(e);
 	if (_active) {
 		auto box = Ui::show(Box<CountrySelectBox>());
-		connect(box, SIGNAL(countryChosen(const QString&)), this, SLOT(onChooseCountry(const QString&)));
+		connect(box, SIGNAL(countryChosen(const QString &)), this, SLOT(onChooseCountry(const QString &)));
 	}
 }
 
@@ -211,9 +214,8 @@ void CountryInput::setText(const QString &newText) {
 	_text = _st.font->elided(newText, width() - _st.textMargins.left() - _st.textMargins.right());
 }
 
-CountrySelectBox::CountrySelectBox(QWidget*)
-: _select(this, st::contactsMultiSelect, langFactory(lng_country_ph)) {
-}
+CountrySelectBox::CountrySelectBox(QWidget *)
+    : _select(this, st::contactsMultiSelect, langFactory(lng_country_ph)) {}
 
 void CountrySelectBox::prepare() {
 	setTitle(langFactory(lng_country_select));
@@ -229,7 +231,7 @@ void CountrySelectBox::prepare() {
 	setDimensions(st::boxWidth, st::boxMaxListHeight);
 
 	connect(_inner, SIGNAL(mustScrollTo(int, int)), this, SLOT(onScrollToY(int, int)));
-	connect(_inner, SIGNAL(countryChosen(const QString&)), this, SIGNAL(countryChosen(const QString&)));
+	connect(_inner, SIGNAL(countryChosen(const QString &)), this, SIGNAL(countryChosen(const QString &)));
 }
 
 void CountrySelectBox::onSubmit() {
@@ -268,8 +270,9 @@ void CountrySelectBox::setInnerFocus() {
 	_select->setInnerFocus();
 }
 
-CountrySelectBox::Inner::Inner(QWidget *parent) : TWidget(parent)
-, _rowHeight(st::countryRowHeight) {
+CountrySelectBox::Inner::Inner(QWidget *parent)
+    : TWidget(parent)
+    , _rowHeight(st::countryRowHeight) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
 	CountriesByISO2::const_iterator l = _countriesByISO2.constFind(lastValidISO);
@@ -279,7 +282,8 @@ CountrySelectBox::Inner::Inner(QWidget *parent) : TWidget(parent)
 	countriesByLetter.clear();
 	const CountryInfo *lastValid = (l == _countriesByISO2.cend()) ? 0 : (*l);
 	for (int i = 0; i < countriesCount; ++i) {
-		const CountryInfo *ins = lastValid ? (i ? (countries + i - (seenLastValid ? 0 : 1)) : lastValid) : (countries + i);
+		const CountryInfo *ins =
+		    lastValid ? (i ? (countries + i - (seenLastValid ? 0 : 1)) : lastValid) : (countries + i);
 		if (lastValid && i && ins == lastValid) {
 			seenLastValid = true;
 			++ins;
@@ -290,7 +294,8 @@ CountrySelectBox::Inner::Inner(QWidget *parent) : TWidget(parent)
 			countriesAll.push_back(ins);
 		}
 
-		QStringList namesList = QString::fromUtf8(ins->name).toLower().split(QRegularExpression("[\\s\\-]"), QString::SkipEmptyParts);
+		QStringList namesList =
+		    QString::fromUtf8(ins->name).toLower().split(QRegularExpression("[\\s\\-]"), QString::SkipEmptyParts);
 		CountryNames &names(countriesNames[i]);
 		int l = namesList.size();
 		names.resize(0);
@@ -343,7 +348,8 @@ void CountrySelectBox::Inner::paintEvent(QPaintEvent *e) {
 
 			auto name = QString::fromUtf8((*countriesNow)[i]->name);
 			auto nameWidth = st::countryRowNameFont->width(name);
-			auto availWidth = width() - st::countryRowPadding.left() - st::countryRowPadding.right() - codeWidth - st::boxLayerScroll.width;
+			auto availWidth = width() - st::countryRowPadding.left() - st::countryRowPadding.right() - codeWidth -
+			                  st::boxLayerScroll.width;
 			if (nameWidth > availWidth) {
 				name = st::countryRowNameFont->elided(name, availWidth);
 				nameWidth = st::countryRowNameFont->width(name);
@@ -355,7 +361,8 @@ void CountrySelectBox::Inner::paintEvent(QPaintEvent *e) {
 
 			p.setFont(st::countryRowCodeFont);
 			p.setPen(selected ? st::countryRowCodeFgOver : st::countryRowCodeFg);
-			p.drawTextLeft(st::countryRowPadding.left() + nameWidth + st::countryRowPadding.right(), y + st::countryRowPadding.top(), width(), code);
+			p.drawTextLeft(st::countryRowPadding.left() + nameWidth + st::countryRowPadding.right(),
+			               y + st::countryRowPadding.top(), width(), code);
 		}
 	} else {
 		p.fillRect(r, st::boxBg);
@@ -397,9 +404,8 @@ void CountrySelectBox::Inner::mousePressEvent(QMouseEvent *e) {
 		}
 		if (!_ripples[_pressed]) {
 			auto mask = Ui::RippleAnimation::rectMask(QSize(width(), _rowHeight));
-			_ripples[_pressed] = std::make_unique<Ui::RippleAnimation>(st::countryRipple, std::move(mask), [this, index = _pressed] {
-				updateRow(index);
-			});
+			_ripples[_pressed] = std::make_unique<Ui::RippleAnimation>(st::countryRipple, std::move(mask),
+			                                                           [this, index = _pressed] { updateRow(index); });
 			_ripples[_pressed]->add(e->pos() - QPoint(0, st::countriesSkip + _pressed * _rowHeight));
 		}
 	}
@@ -497,7 +503,8 @@ void CountrySelectBox::Inner::chooseCountry() {
 }
 
 void CountrySelectBox::Inner::refresh() {
-	resize(width(), countriesNow->length() ? (countriesNow->length() * _rowHeight + st::countriesSkip) : st::noContactsHeight);
+	resize(width(),
+	       countriesNow->length() ? (countriesNow->length() * _rowHeight + st::countriesSkip) : st::noContactsHeight);
 }
 
 void CountrySelectBox::Inner::updateSelected(QPoint localPos) {
@@ -505,7 +512,10 @@ void CountrySelectBox::Inner::updateSelected(QPoint localPos) {
 
 	auto in = parentWidget()->rect().contains(parentWidget()->mapFromGlobal(QCursor::pos()));
 
-	auto selected = (in && localPos.y() >= st::countriesSkip && localPos.y() < st::countriesSkip + countriesNow->size() * _rowHeight) ? ((localPos.y() - st::countriesSkip) / _rowHeight) : -1;
+	auto selected = (in && localPos.y() >= st::countriesSkip &&
+	                 localPos.y() < st::countriesSkip + countriesNow->size() * _rowHeight) ?
+	                    ((localPos.y() - st::countriesSkip) / _rowHeight) :
+	                    -1;
 	if (_selected != selected) {
 		updateSelectedRow();
 		_selected = selected;
diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
index 87e2097ba..d033dbc86 100644
--- a/Telegram/SourceFiles/ui/countryinput.h
+++ b/Telegram/SourceFiles/ui/countryinput.h
@@ -57,14 +57,13 @@ private:
 	bool _active = false;
 	QString _text;
 	QPainterPath _placeholderPath;
-
 };
 
 class CountrySelectBox : public BoxContent {
 	Q_OBJECT
 
 public:
-	CountrySelectBox(QWidget*);
+	CountrySelectBox(QWidget *);
 
 signals:
 	void countryChosen(const QString &iso);
@@ -86,7 +85,6 @@ private:
 
 	class Inner;
 	QPointer<Inner> _inner;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -136,5 +134,4 @@ private:
 	bool _mouseSelection = false;
 
 	std::vector<std::unique_ptr<Ui::RippleAnimation>> _ripples;
-
 };
diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.cpp b/Telegram/SourceFiles/ui/effects/cross_animation.cpp
index 2949cc357..951a1648d 100644
--- a/Telegram/SourceFiles/ui/effects/cross_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/cross_animation.cpp
@@ -49,12 +49,8 @@ constexpr auto kPointCount = 12;
 //
 
 void transformLoadingCross(double loading, std::array<QPointF, kPointCount> &points, int &paintPointsCount) {
-	auto moveTo = [](QPointF &point, QPointF &to, double ratio) {
-		point = point * (1. - ratio) + to * ratio;
-	};
-	auto moveFrom = [](QPointF &point, QPointF &from, double ratio) {
-		point = from * (1. - ratio) + point * ratio;
-	};
+	auto moveTo = [](QPointF &point, QPointF &to, double ratio) { point = point * (1. - ratio) + to * ratio; };
+	auto moveFrom = [](QPointF &point, QPointF &from, double ratio) { point = from * (1. - ratio) + point * ratio; };
 	auto paintPoints = [&points, &paintPointsCount](std::initializer_list<int> &&indices) {
 		auto index = 0;
 		for (auto paintIndex : indices) {
@@ -71,32 +67,32 @@ void transformLoadingCross(double loading, std::array<QPointF, kPointCount> &poi
 		auto ratio = (loading - 0.125) / 0.125;
 		moveTo(points[9], points[8], ratio);
 		moveTo(points[10], points[11], ratio);
-		paintPoints({ 0, 1, 2, 3, 4, 9, 10, 11 });
+		paintPoints({0, 1, 2, 3, 4, 9, 10, 11});
 	} else if (loading < 0.375) {
 		auto ratio = (loading - 0.25) / 0.125;
 		moveTo(points[0], points[11], ratio);
 		moveTo(points[1], points[2], ratio);
-		paintPoints({ 0, 1, 2, 3, 4, 8 });
+		paintPoints({0, 1, 2, 3, 4, 8});
 	} else if (loading < 0.5) {
 		auto ratio = (loading - 0.375) / 0.125;
 		moveTo(points[8], points[4], ratio);
 		moveTo(points[11], points[3], ratio);
-		paintPoints({ 3, 4, 8, 11 });
+		paintPoints({3, 4, 8, 11});
 	} else if (loading < 0.625) {
 		auto ratio = (loading - 0.5) / 0.125;
 		moveFrom(points[8], points[4], ratio);
 		moveFrom(points[11], points[3], ratio);
-		paintPoints({ 3, 4, 8, 11 });
+		paintPoints({3, 4, 8, 11});
 	} else if (loading < 0.75) {
 		auto ratio = (loading - 0.625) / 0.125;
 		moveFrom(points[6], points[5], ratio);
 		moveFrom(points[7], points[8], ratio);
-		paintPoints({ 3, 4, 5, 6, 7, 11 });
+		paintPoints({3, 4, 5, 6, 7, 11});
 	} else if (loading < 0.875) {
 		auto ratio = (loading - 0.75) / 0.125;
 		moveFrom(points[9], points[8], ratio);
 		moveFrom(points[10], points[11], ratio);
-		paintPoints({ 3, 4, 5, 6, 7, 8, 9, 10 });
+		paintPoints({3, 4, 5, 6, 7, 8, 9, 10});
 	} else {
 		auto ratio = (loading - 0.875) / 0.125;
 		moveFrom(points[0], points[11], ratio);
@@ -106,7 +102,8 @@ void transformLoadingCross(double loading, std::array<QPointF, kPointCount> &poi
 
 } // namespace
 
-void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y, int outerWidth, double shown, double loading) {
+void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y,
+                           int outerWidth, double shown, double loading) {
 	PainterHighQualityEnabler hq(p);
 
 	auto sqrt2 = sqrt(2.);
@@ -117,20 +114,20 @@ void CrossAnimation::paint(Painter &p, const style::CrossAnimation &st, style::c
 	auto deleteWidth = st.size - 2 * deleteSkip;
 	auto deleteHeight = st.size - 2 * deleteSkip;
 	auto deleteStroke = st.stroke / sqrt2;
-	std::array<QPointF, kPointCount> pathDelete = { {
-		{ deleteLeft, deleteTop + deleteStroke },
-		{ deleteLeft + deleteStroke, deleteTop },
-		{ deleteLeft + (deleteWidth / 2.), deleteTop + (deleteHeight / 2.) - deleteStroke },
-		{ deleteLeft + deleteWidth - deleteStroke, deleteTop },
-		{ deleteLeft + deleteWidth, deleteTop + deleteStroke },
-		{ deleteLeft + (deleteWidth / 2.) + deleteStroke, deleteTop + (deleteHeight / 2.) },
-		{ deleteLeft + deleteWidth, deleteTop + deleteHeight - deleteStroke },
-		{ deleteLeft + deleteWidth - deleteStroke, deleteTop + deleteHeight },
-		{ deleteLeft + (deleteWidth / 2.), deleteTop + (deleteHeight / 2.) + deleteStroke },
-		{ deleteLeft + deleteStroke, deleteTop + deleteHeight },
-		{ deleteLeft, deleteTop + deleteHeight - deleteStroke },
-		{ deleteLeft + (deleteWidth / 2.) - deleteStroke, deleteTop + (deleteHeight / 2.) },
-	} };
+	std::array<QPointF, kPointCount> pathDelete = {{
+	    {deleteLeft, deleteTop + deleteStroke},
+	    {deleteLeft + deleteStroke, deleteTop},
+	    {deleteLeft + (deleteWidth / 2.), deleteTop + (deleteHeight / 2.) - deleteStroke},
+	    {deleteLeft + deleteWidth - deleteStroke, deleteTop},
+	    {deleteLeft + deleteWidth, deleteTop + deleteStroke},
+	    {deleteLeft + (deleteWidth / 2.) + deleteStroke, deleteTop + (deleteHeight / 2.)},
+	    {deleteLeft + deleteWidth, deleteTop + deleteHeight - deleteStroke},
+	    {deleteLeft + deleteWidth - deleteStroke, deleteTop + deleteHeight},
+	    {deleteLeft + (deleteWidth / 2.), deleteTop + (deleteHeight / 2.) + deleteStroke},
+	    {deleteLeft + deleteStroke, deleteTop + deleteHeight},
+	    {deleteLeft, deleteTop + deleteHeight - deleteStroke},
+	    {deleteLeft + (deleteWidth / 2.) - deleteStroke, deleteTop + (deleteHeight / 2.)},
+	}};
 	auto pathDeleteSize = kPointCount;
 
 	auto loadingArcLength = 0;
diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.h b/Telegram/SourceFiles/ui/effects/cross_animation.h
index 4e72f5b70..505e0cf86 100644
--- a/Telegram/SourceFiles/ui/effects/cross_animation.h
+++ b/Telegram/SourceFiles/ui/effects/cross_animation.h
@@ -29,8 +29,8 @@ namespace Ui {
 
 class CrossAnimation {
 public:
-	static void paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y, int outerWidth, double shown, double loading = 0.);
-
+	static void paint(Painter &p, const style::CrossAnimation &st, style::color color, int x, int y, int outerWidth,
+	                  double shown, double loading = 0.);
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/panel_animation.cpp b/Telegram/SourceFiles/ui/effects/panel_animation.cpp
index 5726ed5c1..cc4a42bf6 100644
--- a/Telegram/SourceFiles/ui/effects/panel_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/panel_animation.cpp
@@ -19,9 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/effects/panel_animation.h"
-#include "ui/twidget.h"
-#include "ui/animation.h"
 #include "app.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 
@@ -32,7 +32,7 @@ void RoundShadowAnimation::start(int frameWidth, int frameHeight, double deviceP
 	_frame = QImage(_frameWidth, _frameHeight, QImage::Format_ARGB32_Premultiplied);
 	_frame.setDevicePixelRatio(devicePixelRatio);
 	_frameIntsPerLine = (_frame.bytesPerLine() >> 2);
-	_frameInts = reinterpret_cast<quint32*>(_frame.bits());
+	_frameInts = reinterpret_cast<quint32 *>(_frame.bits());
 	_frameIntsPerLineAdded = _frameIntsPerLine - _frameWidth;
 	Assert(_frame.depth() == static_cast<int>(sizeof(quint32) << 3));
 	Assert(_frame.bytesPerLine() == (_frameIntsPerLine << 2));
@@ -50,25 +50,17 @@ void RoundShadowAnimation::setShadow(const style::Shadow &st) {
 		_shadow.bottomRight = cloneImage(st.bottomRight);
 		_shadow.bottom = cloneImage(st.bottom);
 		_shadow.bottomLeft = cloneImage(st.bottomLeft);
-		Assert(!_shadow.topLeft.isNull()
-			&& !_shadow.top.isNull()
-			&& !_shadow.topRight.isNull()
-			&& !_shadow.right.isNull()
-			&& !_shadow.bottomRight.isNull()
-			&& !_shadow.bottom.isNull()
-			&& !_shadow.bottomLeft.isNull());
+		Assert(!_shadow.topLeft.isNull() && !_shadow.top.isNull() && !_shadow.topRight.isNull() &&
+		       !_shadow.right.isNull() && !_shadow.bottomRight.isNull() && !_shadow.bottom.isNull() &&
+		       !_shadow.bottomLeft.isNull());
 	} else {
-		_shadow.topLeft =
-			_shadow.top =
-			_shadow.topRight =
-			_shadow.right =
-			_shadow.bottomRight =
-			_shadow.bottom =
-			_shadow.bottomLeft = QImage();
+		_shadow.topLeft = _shadow.top = _shadow.topRight = _shadow.right = _shadow.bottomRight = _shadow.bottom =
+		    _shadow.bottomLeft = QImage();
 	}
 }
 
-void RoundShadowAnimation::setCornerMasks(const QImage &topLeft, const QImage &topRight, const QImage &bottomLeft, const QImage &bottomRight) {
+void RoundShadowAnimation::setCornerMasks(const QImage &topLeft, const QImage &topRight, const QImage &bottomLeft,
+                                          const QImage &bottomRight) {
 	setCornerMask(_topLeft, topLeft);
 	setCornerMask(_topRight, topRight);
 	setCornerMask(_bottomLeft, bottomLeft);
@@ -128,15 +120,17 @@ void RoundShadowAnimation::paintShadow(int left, int top, int right, int bottom)
 	paintShadowCorner(right - _shadow.bottomRight.width(), bottom - _shadow.bottomRight.height(), _shadow.bottomRight);
 	paintShadowCorner(left, bottom - _shadow.bottomLeft.height(), _shadow.bottomLeft);
 	paintShadowVertical(left, top + _shadow.topLeft.height(), bottom - _shadow.bottomLeft.height(), _shadow.left);
-	paintShadowVertical(right - _shadow.right.width(), top + _shadow.topRight.height(), bottom - _shadow.bottomRight.height(), _shadow.right);
+	paintShadowVertical(right - _shadow.right.width(), top + _shadow.topRight.height(),
+	                    bottom - _shadow.bottomRight.height(), _shadow.right);
 	paintShadowHorizontal(left + _shadow.topLeft.width(), right - _shadow.topRight.width(), top, _shadow.top);
-	paintShadowHorizontal(left + _shadow.bottomLeft.width(), right - _shadow.bottomRight.width(), bottom - _shadow.bottom.height(), _shadow.bottom);
+	paintShadowHorizontal(left + _shadow.bottomLeft.width(), right - _shadow.bottomRight.width(),
+	                      bottom - _shadow.bottom.height(), _shadow.bottom);
 }
 
 void RoundShadowAnimation::paintShadowCorner(int left, int top, const QImage &image) {
 	auto imageWidth = image.width();
 	auto imageHeight = image.height();
-	auto imageInts = reinterpret_cast<const quint32*>(image.constBits());
+	auto imageInts = reinterpret_cast<const quint32 *>(image.constBits());
 	auto imageIntsPerLine = (image.bytesPerLine() >> 2);
 	auto imageIntsPerLineAdded = imageIntsPerLine - imageWidth;
 	if (left < 0) {
@@ -174,7 +168,7 @@ void RoundShadowAnimation::paintShadowCorner(int left, int top, const QImage &im
 
 void RoundShadowAnimation::paintShadowVertical(int left, int top, int bottom, const QImage &image) {
 	auto imageWidth = image.width();
-	auto imageInts = reinterpret_cast<const quint32*>(image.constBits());
+	auto imageInts = reinterpret_cast<const quint32 *>(image.constBits());
 	if (left < 0) {
 		auto shift = -base::take(left);
 		imageWidth -= shift;
@@ -202,7 +196,7 @@ void RoundShadowAnimation::paintShadowVertical(int left, int top, int bottom, co
 
 void RoundShadowAnimation::paintShadowHorizontal(int left, int right, int top, const QImage &image) {
 	auto imageHeight = image.height();
-	auto imageInts = reinterpret_cast<const quint32*>(image.constBits());
+	auto imageInts = reinterpret_cast<const quint32 *>(image.constBits());
 	auto imageIntsPerLine = (image.bytesPerLine() >> 2);
 	if (top < 0) {
 		auto shift = -base::take(top);
@@ -231,7 +225,8 @@ void RoundShadowAnimation::paintShadowHorizontal(int left, int right, int top, c
 
 void PanelAnimation::setFinalImage(QImage &&finalImage, QRect inner) {
 	Assert(!started());
-	_finalImage = App::pixmapFromImageInPlace(std::move(finalImage).convertToFormat(QImage::Format_ARGB32_Premultiplied));
+	_finalImage =
+	    App::pixmapFromImageInPlace(std::move(finalImage).convertToFormat(QImage::Format_ARGB32_Premultiplied));
 
 	Assert(!_finalImage.isNull());
 	_finalWidth = _finalImage.width();
@@ -264,8 +259,7 @@ void PanelAnimation::setFinalImage(QImage &&finalImage, QRect inner) {
 
 	auto checkCorner = [this, inner](Corner &corner) {
 		if (!corner.valid()) return;
-		if ((_startWidth >= 0 && _startWidth < _finalWidth)
-			|| (_startHeight >= 0 && _startHeight < _finalHeight)) {
+		if ((_startWidth >= 0 && _startWidth < _finalWidth) || (_startHeight >= 0 && _startHeight < _finalHeight)) {
 			Assert(corner.width <= inner.width());
 			Assert(corner.height <= inner.height());
 		}
@@ -303,14 +297,16 @@ void PanelAnimation::createFadeMask() {
 	int finalAlpha = std::round(_st.fadeOpacity * 255);
 	Assert(finalAlpha >= 0 && finalAlpha < 256);
 	auto result = QImage(cIntRetinaFactor(), resultHeight, QImage::Format_ARGB32_Premultiplied);
-	auto ints = reinterpret_cast<quint32*>(result.bits());
+	auto ints = reinterpret_cast<quint32 *>(result.bits());
 	auto intsPerLineAdded = (result.bytesPerLine() >> 2) - cIntRetinaFactor();
 	auto up = (_origin == PanelAnimation::Origin::BottomLeft || _origin == PanelAnimation::Origin::BottomRight);
 	auto from = up ? resultHeight : 0, to = resultHeight - from, delta = up ? -1 : 1;
 	auto fadeFirstAlpha = up ? (finalAlpha + 1) : 1;
 	auto fadeLastAlpha = up ? 1 : (finalAlpha + 1);
-	_fadeFirst = QBrush(QColor(_st.fadeBg->c.red(), _st.fadeBg->c.green(), _st.fadeBg->c.blue(), (_st.fadeBg->c.alpha() * fadeFirstAlpha) >> 8));
-	_fadeLast = QBrush(QColor(_st.fadeBg->c.red(), _st.fadeBg->c.green(), _st.fadeBg->c.blue(), (_st.fadeBg->c.alpha() * fadeLastAlpha) >> 8));
+	_fadeFirst = QBrush(QColor(_st.fadeBg->c.red(), _st.fadeBg->c.green(), _st.fadeBg->c.blue(),
+	                           (_st.fadeBg->c.alpha() * fadeFirstAlpha) >> 8));
+	_fadeLast = QBrush(QColor(_st.fadeBg->c.red(), _st.fadeBg->c.green(), _st.fadeBg->c.blue(),
+	                          (_st.fadeBg->c.alpha() * fadeLastAlpha) >> 8));
 	for (auto y = from; y != to; y += delta) {
 		auto alpha = static_cast<quint32>(finalAlpha * y) / resultHeight;
 		auto value = (0xFFU << 24) | (alpha << 16) | (alpha << 8) | alpha;
@@ -372,20 +368,28 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, doubl
 	if (dt < _alphaDuration) opacity *= transition(1., dt / _alphaDuration);
 	_frameAlpha = anim::interpolate(1, 256, opacity);
 
-	auto frameWidth = (_startWidth < 0 || dt >= _widthDuration) ? _finalInnerWidth : anim::interpolate(_startWidth, _finalInnerWidth, transition(1., dt / _widthDuration));
-	auto frameHeight = (_startHeight < 0 || dt >= _heightDuration) ? _finalInnerHeight : anim::interpolate(_startHeight, _finalInnerHeight, transition(1., dt / _heightDuration));
+	auto frameWidth = (_startWidth < 0 || dt >= _widthDuration) ?
+	                      _finalInnerWidth :
+	                      anim::interpolate(_startWidth, _finalInnerWidth, transition(1., dt / _widthDuration));
+	auto frameHeight = (_startHeight < 0 || dt >= _heightDuration) ?
+	                       _finalInnerHeight :
+	                       anim::interpolate(_startHeight, _finalInnerHeight, transition(1., dt / _heightDuration));
 	if (auto decrease = (frameWidth % cIntRetinaFactor())) {
 		frameWidth -= decrease;
 	}
 	if (auto decrease = (frameHeight % cIntRetinaFactor())) {
 		frameHeight -= decrease;
 	}
-	auto frameLeft = (_origin == Origin::TopLeft || _origin == Origin::BottomLeft) ? _finalInnerLeft : (_finalInnerRight - frameWidth);
-	auto frameTop = (_origin == Origin::TopLeft || _origin == Origin::TopRight) ? _finalInnerTop : (_finalInnerBottom - frameHeight);
+	auto frameLeft = (_origin == Origin::TopLeft || _origin == Origin::BottomLeft) ? _finalInnerLeft :
+	                                                                                 (_finalInnerRight - frameWidth);
+	auto frameTop = (_origin == Origin::TopLeft || _origin == Origin::TopRight) ? _finalInnerTop :
+	                                                                              (_finalInnerBottom - frameHeight);
 	auto frameRight = frameLeft + frameWidth;
 	auto frameBottom = frameTop + frameHeight;
 
-	auto fadeTop = (_fadeHeight > 0) ? snap(anim::interpolate(_startFadeTop, _finalInnerHeight, transition(1., dt)), 0, frameHeight) : frameHeight;
+	auto fadeTop = (_fadeHeight > 0) ?
+	                   snap(anim::interpolate(_startFadeTop, _finalInnerHeight, transition(1., dt)), 0, frameHeight) :
+	                   frameHeight;
 	if (auto decrease = (fadeTop % cIntRetinaFactor())) {
 		fadeTop -= decrease;
 	}
@@ -418,7 +422,8 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, doubl
 				auto painterFadeTop = fadeTop / cIntRetinaFactor();
 				auto painterFrameWidth = frameWidth / cIntRetinaFactor();
 				auto painterFrameHeight = frameHeight / cIntRetinaFactor();
-				p.drawPixmap(painterFrameLeft, painterFadeTop, painterFrameWidth, painterFadeBottom - painterFadeTop, _fadeMask, 0, fadeSkipLines, cIntRetinaFactor(), fadeBottom - fadeTop);
+				p.drawPixmap(painterFrameLeft, painterFadeTop, painterFrameWidth, painterFadeBottom - painterFadeTop,
+				             _fadeMask, 0, fadeSkipLines, cIntRetinaFactor(), fadeBottom - fadeTop);
 			}
 			if (fadeBottom != frameBottom) {
 				p.fillRect(painterFrameLeft, painterFadeBottom, frameWidth, frameBottom - fadeBottom, _fadeLast);
@@ -507,7 +512,8 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, doubl
 	//		frameInts += _frameIntsPerLineAdded;
 	//	}
 
-	p.drawImage(rtlpoint(x + (outerLeft / cIntRetinaFactor()), y + (outerTop / cIntRetinaFactor()), outerWidth), _frame, QRect(outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop));
+	p.drawImage(rtlpoint(x + (outerLeft / cIntRetinaFactor()), y + (outerTop / cIntRetinaFactor()), outerWidth), _frame,
+	            QRect(outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop));
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/panel_animation.h b/Telegram/SourceFiles/ui/effects/panel_animation.h
index abaf03989..25d3448e2 100644
--- a/Telegram/SourceFiles/ui/effects/panel_animation.h
+++ b/Telegram/SourceFiles/ui/effects/panel_animation.h
@@ -26,7 +26,8 @@ namespace Ui {
 
 class RoundShadowAnimation {
 public:
-	void setCornerMasks(const QImage &topLeft, const QImage &topRight, const QImage &bottomLeft, const QImage &bottomRight);
+	void setCornerMasks(const QImage &topLeft, const QImage &topRight, const QImage &bottomLeft,
+	                    const QImage &bottomRight);
 
 protected:
 	void start(int frameWidth, int frameHeight, double devicePixelRatio);
@@ -79,7 +80,6 @@ protected:
 	int _frameAlpha = 0; // recounted each getFrame()
 	int _frameIntsPerLine = 0;
 	int _frameIntsPerLineAdded = 0;
-
 };
 
 class PanelAnimation : public RoundShadowAnimation {
@@ -90,8 +90,9 @@ public:
 		BottomLeft,
 		BottomRight,
 	};
-	PanelAnimation(const style::PanelAnimation &st, Origin origin) : _st(st), _origin(origin) {
-	}
+	PanelAnimation(const style::PanelAnimation &st, Origin origin)
+	    : _st(st)
+	    , _origin(origin) {}
 
 	void setFinalImage(QImage &&finalImage, QRect inner);
 	void setSkipShadow(bool skipShadow);
@@ -135,7 +136,6 @@ private:
 	double _widthDuration = 1.;
 	double _heightDuration = 1.;
 	double _alphaDuration = 1.;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.cpp b/Telegram/SourceFiles/ui/effects/radial_animation.cpp
index 596f6d9e0..01a43518a 100644
--- a/Telegram/SourceFiles/ui/effects/radial_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/radial_animation.cpp
@@ -24,13 +24,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Ui {
 
 RadialAnimation::RadialAnimation(AnimationCallbacks &&callbacks)
-	: a_arcStart(0, FullArcLength)
-	, _animation(std::move(callbacks)) {
-}
+    : a_arcStart(0, FullArcLength)
+    , _animation(std::move(callbacks)) {}
 
 void RadialAnimation::start(double prg) {
 	_firstStart = _lastStart = _lastTime = getms();
-	qint32 iprg = std::round(std::max(prg, 0.0001) * AlmostFullArcLength), iprgstrict = std::round(prg * AlmostFullArcLength);
+	qint32 iprg = std::round(std::max(prg, 0.0001) * AlmostFullArcLength),
+	       iprgstrict = std::round(prg * AlmostFullArcLength);
 	a_arcEnd = anim::value(iprgstrict, iprg);
 	_animation.start();
 }
diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.h b/Telegram/SourceFiles/ui/effects/radial_animation.h
index 0aeba0c16..5966fd52c 100644
--- a/Telegram/SourceFiles/ui/effects/radial_animation.h
+++ b/Telegram/SourceFiles/ui/effects/radial_animation.h
@@ -54,7 +54,6 @@ private:
 	anim::value a_arcEnd;
 	anim::value a_arcStart;
 	BasicAnimation _animation;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp
index 86125a794..6bb459dee 100644
--- a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp
@@ -19,9 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/effects/ripple_animation.h"
-#include "ui/twidget.h"
-#include "ui/animation.h"
 #include "app.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
 
 #include <QPainter>
 
@@ -29,7 +29,8 @@ namespace Ui {
 
 class RippleAnimation::Ripple {
 public:
-	Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, const UpdateCallback &update);
+	Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask,
+	       const UpdateCallback &update);
 	Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update);
 
 	void paint(QPainter &p, const QPixmap &mask, TimeMs ms, const QColor *colorOverride);
@@ -54,22 +55,22 @@ private:
 	Animation _hide;
 	QPixmap _cache;
 	QImage _frame;
-
 };
 
-RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, const UpdateCallback &update)
-: _st(st)
-, _update(update)
-, _origin(origin)
-, _radiusFrom(startRadius)
-, _frame(mask.size(), QImage::Format_ARGB32_Premultiplied) {
+RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask,
+                                const UpdateCallback &update)
+    : _st(st)
+    , _update(update)
+    , _origin(origin)
+    , _radiusFrom(startRadius)
+    , _frame(mask.size(), QImage::Format_ARGB32_Premultiplied) {
 	_frame.setDevicePixelRatio(mask.devicePixelRatio());
 
 	QPoint points[] = {
-		{ 0, 0 },
-		{ _frame.width() / cIntRetinaFactor(), 0 },
-		{ _frame.width() / cIntRetinaFactor(), _frame.height() / cIntRetinaFactor() },
-		{ 0, _frame.height() / cIntRetinaFactor() },
+	    {0, 0},
+	    {_frame.width() / cIntRetinaFactor(), 0},
+	    {_frame.width() / cIntRetinaFactor(), _frame.height() / cIntRetinaFactor()},
+	    {0, _frame.height() / cIntRetinaFactor()},
 	};
 	for (auto point : points) {
 		accumulate_max(_radiusTo, style::point::dotProduct(_origin - point, _origin - point));
@@ -80,11 +81,11 @@ RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin,
 }
 
 RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap &mask, const UpdateCallback &update)
-: _st(st)
-, _update(update)
-, _origin(mask.width() / (2 * cIntRetinaFactor()), mask.height() / (2 * cIntRetinaFactor()))
-, _radiusFrom(mask.width() + mask.height())
-, _frame(mask.size(), QImage::Format_ARGB32_Premultiplied) {
+    : _st(st)
+    , _update(update)
+    , _origin(mask.width() / (2 * cIntRetinaFactor()), mask.height() / (2 * cIntRetinaFactor()))
+    , _radiusFrom(mask.width() + mask.height())
+    , _frame(mask.size(), QImage::Format_ARGB32_Premultiplied) {
 	_frame.setDevicePixelRatio(mask.devicePixelRatio());
 	_radiusTo = _radiusFrom;
 	_hide.start(UpdateCallback(_update), 0., 1., _st.hideDuration);
@@ -151,10 +152,9 @@ void RippleAnimation::Ripple::finish() {
 }
 
 RippleAnimation::RippleAnimation(const style::RippleAnimation &st, QImage mask, const UpdateCallback &callback)
-: _st(st)
-, _mask(App::pixmapFromImageInPlace(std::move(mask)))
-, _update(callback) {
-}
+    : _st(st)
+    , _mask(App::pixmapFromImageInPlace(std::move(mask)))
+    , _update(callback) {}
 
 
 void RippleAnimation::add(QPoint origin, int startRadius) {
@@ -215,7 +215,7 @@ QImage RippleAnimation::maskByDrawer(QSize size, bool filled, base::lambda<void(
 }
 
 QImage RippleAnimation::rectMask(QSize size) {
-	return maskByDrawer(size, true, base::lambda<void(QPainter&)>());
+	return maskByDrawer(size, true, base::lambda<void(QPainter &)>());
 }
 
 QImage RippleAnimation::roundRectMask(QSize size, int radius) {
@@ -225,9 +225,7 @@ QImage RippleAnimation::roundRectMask(QSize size, int radius) {
 }
 
 QImage RippleAnimation::ellipseMask(QSize size) {
-	return maskByDrawer(size, false, [size](QPainter &p) {
-		p.drawEllipse(0, 0, size.width(), size.height());
-	});
+	return maskByDrawer(size, false, [size](QPainter &p) { p.drawEllipse(0, 0, size.width(), size.height()); });
 }
 
 void RippleAnimation::clearFinished() {
diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.h b/Telegram/SourceFiles/ui/effects/ripple_animation.h
index 1b1227950..aeec827b2 100644
--- a/Telegram/SourceFiles/ui/effects/ripple_animation.h
+++ b/Telegram/SourceFiles/ui/effects/ripple_animation.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "styles/style_widgets.h"
 #include "base/lambda.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 
@@ -62,8 +62,7 @@ private:
 	UpdateCallback _update;
 
 	class Ripple;
-	QList<Ripple*> _ripples;
-
+	QList<Ripple *> _ripples;
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index fb00eed43..6b04e2f03 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -19,21 +19,23 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/effects/round_checkbox.h"
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 
-#include <QPainter>
 #include "app.h"
+#include <QPainter>
 
 namespace Ui {
 namespace {
 
 static constexpr int kWideScale = 3;
 
-void prepareCheckCaches(const style::RoundCheckbox *st, bool displayInactive, QPixmap &checkBgCache, QPixmap &checkFullCache) {
+void prepareCheckCaches(const style::RoundCheckbox *st, bool displayInactive, QPixmap &checkBgCache,
+                        QPixmap &checkFullCache) {
 	auto size = st->size;
 	auto wideSize = size * kWideScale;
-	auto cache = QImage(wideSize * cIntRetinaFactor(), wideSize * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto cache =
+	    QImage(wideSize * cIntRetinaFactor(), wideSize * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	cache.setDevicePixelRatio(cRetinaFactor());
 	cache.fill(Qt::transparent);
 	{
@@ -64,9 +66,8 @@ void prepareCheckCaches(const style::RoundCheckbox *st, bool displayInactive, QP
 } // namespace
 
 RoundCheckbox::RoundCheckbox(const style::RoundCheckbox &st, base::lambda<void()> updateCallback)
-: _st(st)
-, _updateCallback(updateCallback) {
-}
+    : _st(st)
+    , _updateCallback(updateCallback) {}
 
 QRect RoundCheckbox::cacheDestRect(int x, int y, double scale) const {
 	auto iconSizeFull = kWideScale * _st.size;
@@ -109,8 +110,11 @@ void RoundCheckbox::paint(Painter &p, TimeMs ms, int x, int y, int outerWidth, d
 			auto realDivider = ((kWideScale - 1) * _st.size / 2 + std::max(fadeIn - 0.5, 0.) * 2. * _st.size);
 			auto divider = std::round(realDivider * masterScale);
 			auto cacheDivider = std::round(realDivider) * cIntRetinaFactor();
-			p.drawPixmapLeft(QRect(to.x(), to.y(), divider, to.height()), outerWidth, _wideCheckFullCache, QRect(0, 0, cacheDivider, cacheFrom.height()));
-			p.drawPixmapLeft(QRect(to.x() + divider, to.y(), to.width() - divider, to.height()), outerWidth, _wideCheckBgCache, QRect(cacheDivider, 0, cacheFrom.width() - cacheDivider, _wideCheckBgCache.height()));
+			p.drawPixmapLeft(QRect(to.x(), to.y(), divider, to.height()), outerWidth, _wideCheckFullCache,
+			                 QRect(0, 0, cacheDivider, cacheFrom.height()));
+			p.drawPixmapLeft(QRect(to.x() + divider, to.y(), to.width() - divider, to.height()), outerWidth,
+			                 _wideCheckBgCache,
+			                 QRect(cacheDivider, 0, cacheFrom.width() - cacheDivider, _wideCheckBgCache.height()));
 		}
 	}
 	p.setOpacity(1.);
@@ -189,17 +193,21 @@ void RoundCheckbox::removeFadeOutedIcons() {
 void RoundCheckbox::prepareWideCheckIconCache(Icon *icon) {
 	auto cacheWidth = _wideCheckBgCache.width() / _wideCheckBgCache.devicePixelRatio();
 	auto cacheHeight = _wideCheckBgCache.height() / _wideCheckBgCache.devicePixelRatio();
-	auto wideCache = QImage(cacheWidth * cIntRetinaFactor(), cacheHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto wideCache =
+	    QImage(cacheWidth * cIntRetinaFactor(), cacheHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	wideCache.setDevicePixelRatio(cRetinaFactor());
 	{
 		Painter p(&wideCache);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
 		auto iconSize = kWideScale * _st.size;
-		auto realDivider = ((kWideScale - 1) * _st.size / 2 + std::max(icon->fadeIn.current(1.) - 0.5, 0.) * 2. * _st.size);
+		auto realDivider =
+		    ((kWideScale - 1) * _st.size / 2 + std::max(icon->fadeIn.current(1.) - 0.5, 0.) * 2. * _st.size);
 		auto divider = std::round(realDivider);
 		auto cacheDivider = std::round(realDivider) * cIntRetinaFactor();
-		p.drawPixmapLeft(QRect(0, 0, divider, iconSize), cacheWidth, _wideCheckFullCache, QRect(0, 0, divider * cIntRetinaFactor(), _wideCheckFullCache.height()));
-		p.drawPixmapLeft(QRect(divider, 0, iconSize - divider, iconSize), cacheWidth, _wideCheckBgCache, QRect(cacheDivider, 0, _wideCheckBgCache.width() - cacheDivider, _wideCheckBgCache.height()));
+		p.drawPixmapLeft(QRect(0, 0, divider, iconSize), cacheWidth, _wideCheckFullCache,
+		                 QRect(0, 0, divider * cIntRetinaFactor(), _wideCheckFullCache.height()));
+		p.drawPixmapLeft(QRect(divider, 0, iconSize - divider, iconSize), cacheWidth, _wideCheckBgCache,
+		                 QRect(cacheDivider, 0, _wideCheckBgCache.width() - cacheDivider, _wideCheckBgCache.height()));
 	}
 	icon->wideCheckCache = App::pixmapFromImageInPlace(std::move(wideCache));
 	icon->wideCheckCache.setDevicePixelRatio(cRetinaFactor());
@@ -209,7 +217,8 @@ void RoundCheckbox::prepareInactiveCache() {
 	auto wideSize = _st.size * kWideScale;
 	auto ellipse = QRect((wideSize - _st.size) / 2, (wideSize - _st.size) / 2, _st.size, _st.size);
 
-	auto cacheBg = QImage(wideSize * cIntRetinaFactor(), wideSize * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto cacheBg =
+	    QImage(wideSize * cIntRetinaFactor(), wideSize * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	cacheBg.setDevicePixelRatio(cRetinaFactor());
 	cacheBg.fill(Qt::transparent);
 	auto cacheFg = cacheBg;
@@ -236,19 +245,20 @@ void RoundCheckbox::prepareInactiveCache() {
 	_inactiveCacheFg = App::pixmapFromImageInPlace(std::move(cacheFg));
 }
 
-RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda<void()> updateCallback, PaintRoundImage &&paintRoundImage)
-: _st(st)
-, _updateCallback(updateCallback)
-, _paintRoundImage(std::move(paintRoundImage))
-, _check(_st.check, _updateCallback) {
-}
+RoundImageCheckbox::RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda<void()> updateCallback,
+                                       PaintRoundImage &&paintRoundImage)
+    : _st(st)
+    , _updateCallback(updateCallback)
+    , _paintRoundImage(std::move(paintRoundImage))
+    , _check(_st.check, _updateCallback) {}
 
 void RoundImageCheckbox::paint(Painter &p, TimeMs ms, int x, int y, int outerWidth) {
 	_selection.step(ms);
 
 	auto selectionLevel = _selection.current(checked() ? 1. : 0.);
 	if (_selection.animating()) {
-		auto userpicRadius = std::round(kWideScale * (_st.imageRadius + (_st.imageSmallRadius - _st.imageRadius) * selectionLevel));
+		auto userpicRadius =
+		    std::round(kWideScale * (_st.imageRadius + (_st.imageSmallRadius - _st.imageRadius) * selectionLevel));
 		auto userpicShift = kWideScale * _st.imageRadius - userpicRadius;
 		auto userpicLeft = x - (kWideScale - 1) * _st.imageRadius + userpicShift;
 		auto userpicTop = y - (kWideScale - 1) * _st.imageRadius + userpicShift;
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index ba1e39742..296e1ba47 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "styles/style_widgets.h"
 #include "base/lambda.h"
+#include "styles/style_widgets.h"
 #include "ui/animation.h"
 
 #include <QPixmap>
@@ -70,13 +70,13 @@ private:
 
 	// Those pixmaps are shared among all checkboxes that have the same style.
 	QPixmap _wideCheckBgCache, _wideCheckFullCache;
-
 };
 
 class RoundImageCheckbox {
 public:
 	using PaintRoundImage = base::lambda<void(Painter &p, int x, int y, int outerWidth, int size)>;
-	RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda<void()> updateCallback, PaintRoundImage &&paintRoundImage);
+	RoundImageCheckbox(const style::RoundImageCheckbox &st, base::lambda<void()> updateCallback,
+	                   PaintRoundImage &&paintRoundImage);
 
 	void paint(Painter &p, TimeMs ms, int x, int y, int outerWidth);
 	double checkedAnimationRatio() const;
@@ -102,7 +102,6 @@ private:
 	Animation _selection;
 
 	RoundCheckbox _check;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 31020fddc..cd0dfb4ef 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -30,13 +30,13 @@ constexpr int kTypingDotsCount = 3;
 constexpr int kRecordArcsCount = 4;
 constexpr int kUploadArrowsCount = 3;
 
-using ImplementationsMap = QMap<SendAction::Type, const SendActionAnimation::Impl::MetaData*>;
+using ImplementationsMap = QMap<SendAction::Type, const SendActionAnimation::Impl::MetaData *>;
 NeverFreedPointer<ImplementationsMap> Implementations;
 
 class TypingAnimation : public SendActionAnimation::Impl {
 public:
-	TypingAnimation() : Impl(st::historySendActionTypingDuration) {
-	}
+	TypingAnimation()
+	    : Impl(st::historySendActionTypingDuration) {}
 
 	static const MetaData kMeta;
 	static std::unique_ptr<Impl> create() {
@@ -52,10 +52,9 @@ public:
 
 private:
 	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
-
 };
 
-const TypingAnimation::MetaData TypingAnimation::kMeta = { 0, &TypingAnimation::create };
+const TypingAnimation::MetaData TypingAnimation::kMeta = {0, &TypingAnimation::create};
 
 void TypingAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
 	PainterHighQualityEnabler hq(p);
@@ -65,23 +64,26 @@ void TypingAnimation::paintFrame(Painter &p, style::color color, int x, int y, i
 	for (auto i = 0; i != kTypingDotsCount; ++i) {
 		auto r = st::historySendActionTypingSmallNumerator / st::historySendActionTypingDenominator;
 		if (frameMs < 2 * st::historySendActionTypingHalfPeriod) {
-			auto delta = (st::historySendActionTypingLargeNumerator - st::historySendActionTypingSmallNumerator) / st::historySendActionTypingDenominator;
+			auto delta = (st::historySendActionTypingLargeNumerator - st::historySendActionTypingSmallNumerator) /
+			             st::historySendActionTypingDenominator;
 			if (frameMs < st::historySendActionTypingHalfPeriod) {
 				r += delta * anim::easeOutCirc(1., double(frameMs) / st::historySendActionTypingHalfPeriod);
 			} else {
-				r += delta * (1. - anim::easeOutCirc(1., double(frameMs - st::historySendActionTypingHalfPeriod) / st::historySendActionTypingHalfPeriod));
+				r += delta * (1. - anim::easeOutCirc(1., double(frameMs - st::historySendActionTypingHalfPeriod) /
+				                                             st::historySendActionTypingHalfPeriod));
 			}
 		}
 		p.drawEllipse(position, r, r);
 		position.setX(position.x() + st::historySendActionTypingDelta);
-		frameMs = (frameMs + st::historySendActionTypingDuration - st::historySendActionTypingDeltaTime) % st::historySendActionTypingDuration;
+		frameMs = (frameMs + st::historySendActionTypingDuration - st::historySendActionTypingDeltaTime) %
+		          st::historySendActionTypingDuration;
 	}
 }
 
 class RecordAnimation : public SendActionAnimation::Impl {
 public:
-	RecordAnimation() : Impl(st::historySendActionRecordDuration) {
-	}
+	RecordAnimation()
+	    : Impl(st::historySendActionRecordDuration) {}
 
 	static const MetaData kMeta;
 	static std::unique_ptr<Impl> create() {
@@ -97,10 +99,9 @@ public:
 
 private:
 	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
-
 };
 
-const RecordAnimation::MetaData RecordAnimation::kMeta = { 0, &RecordAnimation::create };
+const RecordAnimation::MetaData RecordAnimation::kMeta = {0, &RecordAnimation::create};
 
 void RecordAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
 	PainterHighQualityEnabler hq(p);
@@ -124,8 +125,8 @@ void RecordAnimation::paintFrame(Painter &p, style::color color, int x, int y, i
 
 class UploadAnimation : public SendActionAnimation::Impl {
 public:
-	UploadAnimation() : Impl(st::historySendActionUploadDuration) {
-	}
+	UploadAnimation()
+	    : Impl(st::historySendActionUploadDuration) {}
 
 	static const MetaData kMeta;
 	static std::unique_ptr<Impl> create() {
@@ -141,10 +142,9 @@ public:
 
 private:
 	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
-
 };
 
-const UploadAnimation::MetaData UploadAnimation::kMeta = { 0, &UploadAnimation::create };
+const UploadAnimation::MetaData UploadAnimation::kMeta = {0, &UploadAnimation::create};
 
 void UploadAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
 	PainterHighQualityEnabler hq(p);
@@ -178,23 +178,15 @@ void CreateImplementationsMap() {
 	using Type = SendAction::Type;
 	Implementations.createIfNull();
 	Type recordTypes[] = {
-		Type::RecordVideo,
-		Type::RecordVoice,
-		Type::RecordRound,
+	    Type::RecordVideo,
+	    Type::RecordVoice,
+	    Type::RecordRound,
 	};
-	for_const (auto type, recordTypes) {
-		Implementations->insert(type, &RecordAnimation::kMeta);
-	}
+	for_const (auto type, recordTypes) { Implementations->insert(type, &RecordAnimation::kMeta); }
 	Type uploadTypes[] = {
-		Type::UploadFile,
-		Type::UploadPhoto,
-		Type::UploadVideo,
-		Type::UploadVoice,
-		Type::UploadRound,
+	    Type::UploadFile, Type::UploadPhoto, Type::UploadVideo, Type::UploadVoice, Type::UploadRound,
 	};
-	for_const (auto type, uploadTypes) {
-		Implementations->insert(type, &UploadAnimation::kMeta);
-	}
+	for_const (auto type, uploadTypes) { Implementations->insert(type, &UploadAnimation::kMeta); }
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h
index 0a216677a..f3b35d409 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.h
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h
@@ -48,8 +48,9 @@ public:
 	public:
 		using Type = SendAction::Type;
 
-		Impl(int period) : _period(period), _started(getms()) {
-		}
+		Impl(int period)
+		    : _period(period)
+		    , _started(getms()) {}
 
 		struct MetaData {
 			int index;
@@ -70,7 +71,6 @@ public:
 
 		int _period = 1;
 		TimeMs _started = 0;
-
 	};
 
 	~SendActionAnimation();
@@ -79,7 +79,6 @@ private:
 	std::unique_ptr<Impl> createByType(Type type);
 
 	std::unique_ptr<Impl> _impl;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.cpp b/Telegram/SourceFiles/ui/effects/slide_animation.cpp
index 129838712..430a976ca 100644
--- a/Telegram/SourceFiles/ui/effects/slide_animation.cpp
+++ b/Telegram/SourceFiles/ui/effects/slide_animation.cpp
@@ -40,21 +40,26 @@ void SlideAnimation::paintFrame(Painter &p, int x, int y, int outerWidth, TimeMs
 	auto easeIn = anim::easeInCirc(1., dt);
 	auto arrivingAlpha = easeIn;
 	auto departingAlpha = 1. - easeOut;
-	auto leftCoord = (_slideLeft ? anim::interpolate(-_leftSnapshotWidth, 0, easeOut) : anim::interpolate(0, -_leftSnapshotWidth, easeIn));
+	auto leftCoord = (_slideLeft ? anim::interpolate(-_leftSnapshotWidth, 0, easeOut) :
+	                               anim::interpolate(0, -_leftSnapshotWidth, easeIn));
 	auto leftAlpha = (_slideLeft ? arrivingAlpha : departingAlpha);
-	auto rightCoord = (_slideLeft ? anim::interpolate(0, _rightSnapshotWidth, easeIn) : anim::interpolate(_rightSnapshotWidth, 0, easeOut));
+	auto rightCoord = (_slideLeft ? anim::interpolate(0, _rightSnapshotWidth, easeIn) :
+	                                anim::interpolate(_rightSnapshotWidth, 0, easeOut));
 	auto rightAlpha = (_slideLeft ? departingAlpha : arrivingAlpha);
 
 	if (_overflowHidden) {
 		auto leftWidth = (_leftSnapshotWidth + leftCoord);
 		if (leftWidth > 0) {
 			p.setOpacity(leftAlpha);
-			p.drawPixmap(x, y, leftWidth, _leftSnapshotHeight, _leftSnapshot, (_leftSnapshot.width() - leftWidth * cIntRetinaFactor()), 0, leftWidth * cIntRetinaFactor(), _leftSnapshot.height());
+			p.drawPixmap(x, y, leftWidth, _leftSnapshotHeight, _leftSnapshot,
+			             (_leftSnapshot.width() - leftWidth * cIntRetinaFactor()), 0, leftWidth * cIntRetinaFactor(),
+			             _leftSnapshot.height());
 		}
 		auto rightWidth = _rightSnapshotWidth - rightCoord;
 		if (rightWidth > 0) {
 			p.setOpacity(rightAlpha);
-			p.drawPixmap(x + rightCoord, y, _rightSnapshot, 0, 0, rightWidth * cIntRetinaFactor(), _rightSnapshot.height());
+			p.drawPixmap(x + rightCoord, y, _rightSnapshot, 0, 0, rightWidth * cIntRetinaFactor(),
+			             _rightSnapshot.height());
 		}
 	} else {
 		p.setOpacity(leftAlpha);
diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.h b/Telegram/SourceFiles/ui/effects/slide_animation.h
index 33dfaa5c2..4cc785d9a 100644
--- a/Telegram/SourceFiles/ui/effects/slide_animation.h
+++ b/Telegram/SourceFiles/ui/effects/slide_animation.h
@@ -35,8 +35,7 @@ public:
 		_overflowHidden = hidden;
 	}
 
-	template <typename Lambda>
-	void start(bool slideLeft, Lambda &&updateCallback, double duration);
+	template <typename Lambda> void start(bool slideLeft, Lambda &&updateCallback, double duration);
 
 	void paintFrame(Painter &p, int x, int y, int outerWidth, TimeMs ms);
 
@@ -53,11 +52,9 @@ private:
 	int _leftSnapshotWidth = 0;
 	int _leftSnapshotHeight = 0;
 	int _rightSnapshotWidth = 0;
-
 };
 
-template <typename Lambda>
-void SlideAnimation::start(bool slideLeft, Lambda &&updateCallback, double duration) {
+template <typename Lambda> void SlideAnimation::start(bool slideLeft, Lambda &&updateCallback, double duration) {
 	_slideLeft = slideLeft;
 	if (_slideLeft) {
 		std::swap(_leftSnapshot, _rightSnapshot);
diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp
index 175ba9b9a..6a4648451 100644
--- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp
+++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp
@@ -19,11 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/effects/widget_fade_wrap.h"
-#include "ui/twidget.h"
 #include "app.h"
+#include "ui/twidget.h"
 
-#include <QWidget>
 #include <QPixmap>
+#include <QWidget>
 
 namespace Ui {
 namespace {
@@ -33,9 +33,8 @@ constexpr int kWideScale = 5;
 } // namespace
 
 FadeAnimation::FadeAnimation(TWidget *widget, bool scaled)
-: _widget(widget)
-, _scaled(scaled) {
-}
+    : _widget(widget)
+    , _scaled(scaled) {}
 
 bool FadeAnimation::paint(Painter &p) {
 	if (_cache.isNull()) return false;
@@ -44,7 +43,8 @@ bool FadeAnimation::paint(Painter &p) {
 	p.setOpacity(opacity);
 	if (_scaled) {
 		PainterHighQualityEnabler hq(p);
-		auto targetRect = QRect((1 - kWideScale) / 2 * _size.width(), (1 - kWideScale) / 2 * _size.height(), kWideScale * _size.width(), kWideScale * _size.height());
+		auto targetRect = QRect((1 - kWideScale) / 2 * _size.width(), (1 - kWideScale) / 2 * _size.height(),
+		                        kWideScale * _size.width(), kWideScale * _size.height());
 		auto scale = opacity;
 		auto shownWidth = anim::interpolate((1 - kWideScale) / 2 * _size.width(), 0, scale);
 		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * _size.height(), 0, scale);
@@ -158,15 +158,13 @@ void FadeAnimation::updateCallback() {
 	}
 }
 
-WidgetFadeWrap<TWidget>::WidgetFadeWrap(QWidget *parent
-, object_ptr<TWidget> entity
-, int duration
-, base::lambda<void()> updateCallback
-, bool scaled) : TWidget(parent)
-, _entity(std::move(entity))
-, _duration(duration)
-, _updateCallback(std::move(updateCallback))
-, _animation(this, scaled) {
+WidgetFadeWrap<TWidget>::WidgetFadeWrap(QWidget *parent, object_ptr<TWidget> entity, int duration,
+                                        base::lambda<void()> updateCallback, bool scaled)
+    : TWidget(parent)
+    , _entity(std::move(entity))
+    , _duration(duration)
+    , _updateCallback(std::move(updateCallback))
+    , _animation(this, scaled) {
 	_animation.show();
 	installCallbacks();
 	_entity->setParent(this);
diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
index 8387c2941..461296016 100644
--- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
+++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h
@@ -21,14 +21,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 
-#include "ui/twidget.h"
 #include "base/lambda.h"
 #include "base/object_ptr.h"
 #include "styles/style_widgets.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 
-#include <QSize>
 #include <QPixmap>
+#include <QSize>
 
 class QWidget;
 class QPaintEvent;
@@ -82,20 +82,14 @@ private:
 
 	FinishedCallback _finishedCallback;
 	UpdatedCallback _updatedCallback;
-
 };
 
-template <typename Widget>
-class WidgetFadeWrap;
+template <typename Widget> class WidgetFadeWrap;
 
-template <>
-class WidgetFadeWrap<TWidget> : public TWidget {
+template <> class WidgetFadeWrap<TWidget> : public TWidget {
 public:
-	WidgetFadeWrap(QWidget *parent
-		, object_ptr<TWidget> entity
-		, int duration = st::widgetFadeDuration
-		, base::lambda<void()> updateCallback = base::lambda<void()>()
-		, bool scaled = false);
+	WidgetFadeWrap(QWidget *parent, object_ptr<TWidget> entity, int duration = st::widgetFadeDuration,
+	               base::lambda<void()> updateCallback = base::lambda<void()>(), bool scaled = false);
 
 	void showAnimated() {
 		toggleAnimated(true);
@@ -169,44 +163,26 @@ private:
 	base::lambda<void()> _updateCallback;
 
 	FadeAnimation _animation;
-
 };
 
-template <typename Widget>
-class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
+template <typename Widget> class WidgetFadeWrap : public WidgetFadeWrap<TWidget> {
 public:
-	WidgetFadeWrap(QWidget *parent
-		, object_ptr<Widget> entity
-		, int duration = st::widgetFadeDuration
-		, base::lambda<void()> updateCallback = base::lambda<void()>()
-		, bool scaled = false) : WidgetFadeWrap<TWidget>(parent
-			, std::move(entity)
-			, duration
-			, std::move(updateCallback)
-			, scaled) {
-	}
+	WidgetFadeWrap(QWidget *parent, object_ptr<Widget> entity, int duration = st::widgetFadeDuration,
+	               base::lambda<void()> updateCallback = base::lambda<void()>(), bool scaled = false)
+	    : WidgetFadeWrap<TWidget>(parent, std::move(entity), duration, std::move(updateCallback), scaled) {}
 	Widget *entity() {
-		return static_cast<Widget*>(WidgetFadeWrap<TWidget>::entity());
+		return static_cast<Widget *>(WidgetFadeWrap<TWidget>::entity());
 	}
 	const Widget *entity() const {
-		return static_cast<const Widget*>(WidgetFadeWrap<TWidget>::entity());
+		return static_cast<const Widget *>(WidgetFadeWrap<TWidget>::entity());
 	}
-
 };
 
-template <typename Widget>
-class WidgetScaledFadeWrap : public WidgetFadeWrap<Widget> {
+template <typename Widget> class WidgetScaledFadeWrap : public WidgetFadeWrap<Widget> {
 public:
-	WidgetScaledFadeWrap(QWidget *parent
-		, object_ptr<Widget> entity
-		, int duration = st::widgetFadeDuration
-		, base::lambda<void()> updateCallback = base::lambda<void()>()) : WidgetFadeWrap<Widget>(parent
-			, std::move(entity)
-			, duration
-			, std::move(updateCallback)
-			, true) {
-	}
-
+	WidgetScaledFadeWrap(QWidget *parent, object_ptr<Widget> entity, int duration = st::widgetFadeDuration,
+	                     base::lambda<void()> updateCallback = base::lambda<void()>())
+	    : WidgetFadeWrap<Widget>(parent, std::move(entity), duration, std::move(updateCallback), true) {}
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
index aec40d9b7..dc7516af8 100644
--- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
+++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.cpp
@@ -22,15 +22,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Ui {
 
-WidgetSlideWrap<TWidget>::WidgetSlideWrap(QWidget *parent
-, object_ptr<TWidget> entity
-, style::margins entityPadding
-, base::lambda<void()> updateCallback
-, int duration) : TWidget(parent)
-, _entity(std::move(entity))
-, _padding(entityPadding)
-, _duration(duration)
-, _updateCallback(std::move(updateCallback)) {
+WidgetSlideWrap<TWidget>::WidgetSlideWrap(QWidget *parent, object_ptr<TWidget> entity, style::margins entityPadding,
+                                          base::lambda<void()> updateCallback, int duration)
+    : TWidget(parent)
+    , _entity(std::move(entity))
+    , _padding(entityPadding)
+    , _duration(duration)
+    , _updateCallback(std::move(updateCallback)) {
 	_entity->setParent(this);
 	auto margins = getMargins();
 	_entity->moveToLeft(margins.left() + _padding.left(), margins.top() + _padding.top());
diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
index 1535e9720..437875354 100644
--- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
+++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h
@@ -21,22 +21,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "styles/style_widgets.h"
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 
-template <typename Widget>
-class WidgetSlideWrap;
+template <typename Widget> class WidgetSlideWrap;
 
-template <>
-class WidgetSlideWrap<TWidget> : public TWidget {
+template <> class WidgetSlideWrap<TWidget> : public TWidget {
 public:
-	WidgetSlideWrap(QWidget *parent
-		, object_ptr<TWidget> entity
-		, style::margins entityPadding
-		, base::lambda<void()> updateCallback
-		, int duration = st::widgetSlideDuration);
+	WidgetSlideWrap(QWidget *parent, object_ptr<TWidget> entity, style::margins entityPadding,
+	                base::lambda<void()> updateCallback, int duration = st::widgetSlideDuration);
 
 	void showAnimated();
 	void hideAnimated();
@@ -96,29 +91,19 @@ private:
 	int _forceHeight = -1;
 	Animation _a_height;
 	bool _hiding = false;
-
 };
 
-template <typename Widget>
-class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
+template <typename Widget> class WidgetSlideWrap : public WidgetSlideWrap<TWidget> {
 public:
-	WidgetSlideWrap(QWidget *parent
-		, object_ptr<Widget> entity
-		, style::margins entityPadding
-		, base::lambda<void()> updateCallback
-		, int duration = st::widgetSlideDuration) : WidgetSlideWrap<TWidget>(parent
-			, std::move(entity)
-			, entityPadding
-			, std::move(updateCallback)
-			, duration) {
-	}
+	WidgetSlideWrap(QWidget *parent, object_ptr<Widget> entity, style::margins entityPadding,
+	                base::lambda<void()> updateCallback, int duration = st::widgetSlideDuration)
+	    : WidgetSlideWrap<TWidget>(parent, std::move(entity), entityPadding, std::move(updateCallback), duration) {}
 	Widget *entity() {
-		return static_cast<Widget*>(WidgetSlideWrap<TWidget>::entity());
+		return static_cast<Widget *>(WidgetSlideWrap<TWidget>::entity());
 	}
 	const Widget *entity() const {
-		return static_cast<const Widget*>(WidgetSlideWrap<TWidget>::entity());
+		return static_cast<const Widget *>(WidgetSlideWrap<TWidget>::entity());
 	}
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/emoji_config.cpp b/Telegram/SourceFiles/ui/emoji_config.cpp
index 15e4e1687..7ef4d3332 100644
--- a/Telegram/SourceFiles/ui/emoji_config.cpp
+++ b/Telegram/SourceFiles/ui/emoji_config.cpp
@@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "emoji_config.h"
 
-#include "chat_helpers/emoji_suggestions_helper.h"
 #include "auth_session.h"
+#include "chat_helpers/emoji_suggestions_helper.h"
 
 namespace Ui {
 namespace Emoji {
@@ -134,23 +134,49 @@ QString IdFromOldKey(quint64 oldKey) {
 	auto sequenceIndex = int(code & 0xFFFFU);
 	switch (sequenceIndex) {
 	case 0: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7");
-	case 1: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 2: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 3: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
+	case 1:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 2:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 3:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
 	case 4: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6");
 	case 5: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7");
-	case 6: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 7: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 8: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
+	case 6:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 7:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 8:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa9\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
 	case 9: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6");
 	case 10: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7");
-	case 11: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 12: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
-	case 13: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
-	case 14: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9");
-	case 15: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8");
-	case 16: return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa9");
-	case 17: return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91\xa8");
+	case 11:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 12:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa6\xe2\x80\x8d\xf0\x9f\x91\xa6");
+	case 13:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa8\xe2\x80\x8d\xf0\x9f\x91\xa7\xe2\x80\x8d\xf0\x9f\x91\xa7");
+	case 14:
+		return QString::fromUtf8("\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa9");
+	case 15:
+		return QString::fromUtf8("\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x91\xa8");
+	case 16:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa9\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91"
+		    "\xa9");
+	case 17:
+		return QString::fromUtf8(
+		    "\xf0\x9f\x91\xa8\xe2\x80\x8d\xe2\x9d\xa4\xef\xb8\x8f\xe2\x80\x8d\xf0\x9f\x92\x8b\xe2\x80\x8d\xf0\x9f\x91"
+		    "\xa8");
 	case 18: return QString::fromUtf8("\xf0\x9f\x91\x81\xe2\x80\x8d\xf0\x9f\x97\xa8");
 	}
 	return QString();
@@ -173,11 +199,13 @@ void ReplaceInText(TextWithEntities &result) {
 		while (currentEntity != entitiesEnd && ch >= emojiStart + currentEntity->offset() + currentEntity->length()) {
 			++currentEntity;
 		}
-		if (emoji &&
-			(ch == emojiStart || !ch->isLetterOrNumber() || !(ch - 1)->isLetterOrNumber()) &&
-			(newEmojiEnd == end || !newEmojiEnd->isLetterOrNumber() || newEmojiEnd == emojiStart || !(newEmojiEnd - 1)->isLetterOrNumber()) &&
-			(currentEntity == entitiesEnd || (ch < emojiStart + currentEntity->offset() && newEmojiEnd <= emojiStart + currentEntity->offset()) || (ch >= emojiStart + currentEntity->offset() + currentEntity->length() && newEmojiEnd > emojiStart + currentEntity->offset() + currentEntity->length()))
-			) {
+		if (emoji && (ch == emojiStart || !ch->isLetterOrNumber() || !(ch - 1)->isLetterOrNumber()) &&
+		    (newEmojiEnd == end || !newEmojiEnd->isLetterOrNumber() || newEmojiEnd == emojiStart ||
+		     !(newEmojiEnd - 1)->isLetterOrNumber()) &&
+		    (currentEntity == entitiesEnd ||
+		     (ch < emojiStart + currentEntity->offset() && newEmojiEnd <= emojiStart + currentEntity->offset()) ||
+		     (ch >= emojiStart + currentEntity->offset() + currentEntity->length() &&
+		      newEmojiEnd > emojiStart + currentEntity->offset() + currentEntity->length()))) {
 			if (newText.text.isEmpty()) newText.text.reserve(result.text.size());
 
 			AppendPartToResult(newText, emojiStart, emojiEnd, ch);
@@ -233,40 +261,11 @@ RecentEmojiPack &GetRecent() {
 			}
 		}
 		auto defaultRecent = {
-			0xD83DDE02LLU,
-			0xD83DDE18LLU,
-			0x2764LLU,
-			0xD83DDE0DLLU,
-			0xD83DDE0ALLU,
-			0xD83DDE01LLU,
-			0xD83DDC4DLLU,
-			0x263ALLU,
-			0xD83DDE14LLU,
-			0xD83DDE04LLU,
-			0xD83DDE2DLLU,
-			0xD83DDC8BLLU,
-			0xD83DDE12LLU,
-			0xD83DDE33LLU,
-			0xD83DDE1CLLU,
-			0xD83DDE48LLU,
-			0xD83DDE09LLU,
-			0xD83DDE03LLU,
-			0xD83DDE22LLU,
-			0xD83DDE1DLLU,
-			0xD83DDE31LLU,
-			0xD83DDE21LLU,
-			0xD83DDE0FLLU,
-			0xD83DDE1ELLU,
-			0xD83DDE05LLU,
-			0xD83DDE1ALLU,
-			0xD83DDE4ALLU,
-			0xD83DDE0CLLU,
-			0xD83DDE00LLU,
-			0xD83DDE0BLLU,
-			0xD83DDE06LLU,
-			0xD83DDC4CLLU,
-			0xD83DDE10LLU,
-			0xD83DDE15LLU,
+		    0xD83DDE02LLU, 0xD83DDE18LLU, 0x2764LLU,     0xD83DDE0DLLU, 0xD83DDE0ALLU, 0xD83DDE01LLU, 0xD83DDC4DLLU,
+		    0x263ALLU,     0xD83DDE14LLU, 0xD83DDE04LLU, 0xD83DDE2DLLU, 0xD83DDC8BLLU, 0xD83DDE12LLU, 0xD83DDE33LLU,
+		    0xD83DDE1CLLU, 0xD83DDE48LLU, 0xD83DDE09LLU, 0xD83DDE03LLU, 0xD83DDE22LLU, 0xD83DDE1DLLU, 0xD83DDE31LLU,
+		    0xD83DDE21LLU, 0xD83DDE0FLLU, 0xD83DDE1ELLU, 0xD83DDE05LLU, 0xD83DDE1ALLU, 0xD83DDE4ALLU, 0xD83DDE0CLLU,
+		    0xD83DDE00LLU, 0xD83DDE0BLLU, 0xD83DDE06LLU, 0xD83DDC4CLLU, 0xD83DDE10LLU, 0xD83DDE15LLU,
 		};
 		for (auto oldKey : defaultRecent) {
 			if (result.size() >= kPanelPerRow * kPanelRowsPerPage) break;
diff --git a/Telegram/SourceFiles/ui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h
index 609c5d87f..19ba8626c 100644
--- a/Telegram/SourceFiles/ui/emoji_config.h
+++ b/Telegram/SourceFiles/ui/emoji_config.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "emoji.h"
 #include "settings.h"
 #include "ui/text/text.h"
-#include "emoji.h"
 
 namespace Ui {
 namespace Emoji {
@@ -34,18 +34,18 @@ constexpr auto kPanelRowsPerPage = 6;
 void Init();
 
 class One {
-	struct CreationTag {
-	};
+	struct CreationTag {};
 
 public:
 	One(One &&other) = default;
-	One(const QString &id, quint16 x, quint16 y, bool hasPostfix, bool colorizable, EmojiPtr original, const CreationTag &)
-	: _id(id)
-	, _x(x)
-	, _y(y)
-	, _hasPostfix(hasPostfix)
-	, _colorizable(colorizable)
-	, _original(original) {
+	One(const QString &id, quint16 x, quint16 y, bool hasPostfix, bool colorizable, EmojiPtr original,
+	    const CreationTag &)
+	    : _id(id)
+	    , _x(x)
+	    , _y(y)
+	    , _hasPostfix(hasPostfix)
+	    , _colorizable(colorizable)
+	    , _original(original) {
 		Expects(!_colorizable || !colored());
 	}
 
@@ -98,7 +98,6 @@ private:
 	const EmojiPtr _original = nullptr;
 
 	friend void internal::Init();
-
 };
 
 inline EmojiPtr FromUrl(const QString &url) {
@@ -139,17 +138,14 @@ inline int ColorIndexFromOldKey(quint64 oldKey) {
 }
 
 inline int Size(int index = Index()) {
-	int sizes[] = { 18, 22, 27, 36, 45 };
+	int sizes[] = {18, 22, 27, 36, 45};
 	return sizes[index];
 }
 
 inline QString Filename(int index = Index()) {
 	const char *EmojiNames[] = {
-		":/gui/art/emoji.webp",
-		":/gui/art/emoji_125x.webp",
-		":/gui/art/emoji_150x.webp",
-		":/gui/art/emoji_200x.webp",
-		":/gui/art/emoji_250x.webp",
+	    ":/gui/art/emoji.webp",      ":/gui/art/emoji_125x.webp", ":/gui/art/emoji_150x.webp",
+	    ":/gui/art/emoji_200x.webp", ":/gui/art/emoji_250x.webp",
 	};
 	return QString::fromLatin1(EmojiNames[index]);
 }
diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp
index 5171aa29b..b9ba458be 100644
--- a/Telegram/SourceFiles/ui/images.cpp
+++ b/Telegram/SourceFiles/ui/images.cpp
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/images.h"
 
-#include "mainwidget.h"
-#include "storage/localstorage.h"
-#include "platform/platform_specific.h"
 #include "auth_session.h"
+#include "mainwidget.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"
 
 #include <QBuffer>
 #include <QImageReader>
@@ -118,11 +118,12 @@ QImage prepareBlur(QImage img) {
 
 				x = 0;
 
-#define update(start, middle, end) \
-rgb[y * w + x] = (rgbsum >> 4) & 0x00FF00FF00FF00FFLL; \
-rgballsum += blurGetColors(&pix[yw + (start) * 4]) - 2 * blurGetColors(&pix[yw + (middle) * 4]) + blurGetColors(&pix[yw + (end) * 4]); \
-rgbsum += rgballsum; \
-x++;
+#define update(start, middle, end)                                                                                     \
+	rgb[y * w + x] = (rgbsum >> 4) & 0x00FF00FF00FF00FFLL;                                                             \
+	rgballsum += blurGetColors(&pix[yw + (start)*4]) - 2 * blurGetColors(&pix[yw + (middle)*4]) +                      \
+	             blurGetColors(&pix[yw + (end)*4]);                                                                    \
+	rgbsum += rgballsum;                                                                                               \
+	x++;
 
 				while (x < r1) {
 					update(0, x, x + r1);
@@ -151,16 +152,16 @@ x++;
 				y = 0;
 				int yi = x * 4;
 
-#define update(start, middle, end) \
-quint64 res = rgbsum >> 4; \
-pix[yi] = res & 0xFF; \
-pix[yi + 1] = (res >> 16) & 0xFF; \
-pix[yi + 2] = (res >> 32) & 0xFF; \
-pix[yi + 3] = (res >> 48) & 0xFF; \
-rgballsum += rgb[x + (start) * w] - 2 * rgb[x + (middle) * w] + rgb[x + (end) * w]; \
-rgbsum += rgballsum; \
-y++; \
-yi += stride;
+#define update(start, middle, end)                                                                                     \
+	quint64 res = rgbsum >> 4;                                                                                         \
+	pix[yi] = res & 0xFF;                                                                                              \
+	pix[yi + 1] = (res >> 16) & 0xFF;                                                                                  \
+	pix[yi + 2] = (res >> 32) & 0xFF;                                                                                  \
+	pix[yi + 3] = (res >> 48) & 0xFF;                                                                                  \
+	rgballsum += rgb[x + (start)*w] - 2 * rgb[x + (middle)*w] + rgb[x + (end)*w];                                      \
+	rgbsum += rgballsum;                                                                                               \
+	y++;                                                                                                               \
+	yi += stride;
 
 				while (y < r1) {
 					update(0, y, y + r1);
@@ -224,12 +225,13 @@ void prepareRound(QImage &image, QImage *cornerMasks, ImageRoundCorners corners)
 	Assert(image.depth() == static_cast<int>((imageIntsPerPixel * sizeof(quint32)) << 3));
 	Assert(image.bytesPerLine() == (imageIntsPerLine << 2));
 
-	auto ints = reinterpret_cast<quint32*>(image.bits());
+	auto ints = reinterpret_cast<quint32 *>(image.bits());
 	auto intsTopLeft = ints;
 	auto intsTopRight = ints + imageWidth - cornerWidth;
 	auto intsBottomLeft = ints + (imageHeight - cornerHeight) * imageWidth;
 	auto intsBottomRight = ints + (imageHeight - cornerHeight + 1) * imageWidth - cornerWidth;
-	auto maskCorner = [imageWidth, imageHeight, imageIntsPerPixel, imageIntsPerLine](quint32 *imageInts, const QImage &mask) {
+	auto maskCorner = [imageWidth, imageHeight, imageIntsPerPixel, imageIntsPerLine](quint32 *imageInts,
+	                                                                                 const QImage &mask) {
 		auto maskWidth = mask.width();
 		auto maskHeight = mask.height();
 		auto maskBytesPerPixel = (mask.depth() >> 3);
@@ -264,7 +266,8 @@ QImage prepareColored(style::color add, QImage image) {
 	}
 
 	if (auto pix = image.bits()) {
-		int ca = int(add->c.alphaF() * 0xFF), cr = int(add->c.redF() * 0xFF), cg = int(add->c.greenF() * 0xFF), cb = int(add->c.blueF() * 0xFF);
+		int ca = int(add->c.alphaF() * 0xFF), cr = int(add->c.redF() * 0xFF), cg = int(add->c.greenF() * 0xFF),
+		    cb = int(add->c.blueF() * 0xFF);
 		const int w = image.width(), h = image.height(), size = w * h * 4;
 		for (qint32 i = 0; i < size; i += 4) {
 			int b = pix[i], g = pix[i + 1], r = pix[i + 2], a = pix[i + 3], aca = a * ca;
@@ -280,7 +283,7 @@ QImage prepareColored(style::color add, QImage image) {
 QImage prepareOpaque(QImage image) {
 	if (image.hasAlphaChannel()) {
 		image = std::move(image).convertToFormat(QImage::Format_ARGB32_Premultiplied);
-		auto ints = reinterpret_cast<quint32*>(image.bits());
+		auto ints = reinterpret_cast<quint32 *>(image.bits());
 		auto bg = anim::shifted(st::imageBgTransparent->c);
 		auto width = image.width();
 		auto height = image.height();
@@ -304,10 +307,12 @@ QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, in
 	}
 	if (w <= 0 || (w == img.width() && (h <= 0 || h == img.height()))) {
 	} else if (h <= 0) {
-		img = img.scaledToWidth(w, (options & Images::Option::Smooth) ? Qt::SmoothTransformation : Qt::FastTransformation);
+		img = img.scaledToWidth(w,
+		                        (options & Images::Option::Smooth) ? Qt::SmoothTransformation : Qt::FastTransformation);
 		Assert(!img.isNull());
 	} else {
-		img = img.scaled(w, h, Qt::IgnoreAspectRatio, (options & Images::Option::Smooth) ? Qt::SmoothTransformation : Qt::FastTransformation);
+		img = img.scaled(w, h, Qt::IgnoreAspectRatio,
+		                 (options & Images::Option::Smooth) ? Qt::SmoothTransformation : Qt::FastTransformation);
 		Assert(!img.isNull());
 	}
 	if (outerw > 0 && outerh > 0) {
@@ -325,17 +330,19 @@ QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, in
 				if (w < outerw || h < outerh) {
 					p.fillRect(0, 0, result.width(), result.height(), st::imageBg);
 				}
-				p.drawImage((result.width() - img.width()) / (2 * cIntRetinaFactor()), (result.height() - img.height()) / (2 * cIntRetinaFactor()), img);
+				p.drawImage((result.width() - img.width()) / (2 * cIntRetinaFactor()),
+				            (result.height() - img.height()) / (2 * cIntRetinaFactor()), img);
 			}
 			img = result;
 			Assert(!img.isNull());
 		}
 	}
 	auto corners = [](Images::Options options) {
-		return ((options & Images::Option::RoundedTopLeft) ? ImageRoundCorner::TopLeft : ImageRoundCorner::None)
-			| ((options & Images::Option::RoundedTopRight) ? ImageRoundCorner::TopRight : ImageRoundCorner::None)
-			| ((options & Images::Option::RoundedBottomLeft) ? ImageRoundCorner::BottomLeft : ImageRoundCorner::None)
-			| ((options & Images::Option::RoundedBottomRight) ? ImageRoundCorner::BottomRight : ImageRoundCorner::None);
+		return ((options & Images::Option::RoundedTopLeft) ? ImageRoundCorner::TopLeft : ImageRoundCorner::None) |
+		       ((options & Images::Option::RoundedTopRight) ? ImageRoundCorner::TopRight : ImageRoundCorner::None) |
+		       ((options & Images::Option::RoundedBottomLeft) ? ImageRoundCorner::BottomLeft : ImageRoundCorner::None) |
+		       ((options & Images::Option::RoundedBottomRight) ? ImageRoundCorner::BottomRight :
+		                                                         ImageRoundCorner::None);
 	};
 	if (options & Images::Option::Circled) {
 		prepareCircle(img);
@@ -359,10 +366,10 @@ QImage prepare(QImage img, int w, int h, Images::Options options, int outerw, in
 
 namespace {
 
-using LocalImages = QMap<QString, Image*>;
+using LocalImages = QMap<QString, Image *>;
 LocalImages localImages;
 
-using WebImages = QMap<QString, WebImage*>;
+using WebImages = QMap<QString, WebImage *>;
 WebImages webImages;
 
 Image *generateBlankImage() {
@@ -377,10 +384,10 @@ Image *blank() {
 	return blankImage;
 }
 
-using StorageImages = QMap<StorageKey, StorageImage*>;
+using StorageImages = QMap<StorageKey, StorageImage *>;
 StorageImages storageImages;
 
-using WebFileImages = QMap<StorageKey, WebFileImage*>;
+using WebFileImages = QMap<StorageKey, WebFileImage *>;
 WebFileImages webFileImages;
 
 qint64 globalAcquiredSize = 0;
@@ -402,14 +409,16 @@ bool Image::isNull() const {
 	return (this == blank());
 }
 
-ImagePtr::ImagePtr() : Parent(blank()) {
-}
+ImagePtr::ImagePtr()
+    : Parent(blank()) {}
 
-ImagePtr::ImagePtr(qint32 width, qint32 height, const MTPFileLocation &location, ImagePtr def) :
-	Parent((location.type() == mtpc_fileLocation) ? (Image*)(internal::getImage(StorageImageLocation(width, height, location.c_fileLocation()))) : def.v()) {
-}
+ImagePtr::ImagePtr(qint32 width, qint32 height, const MTPFileLocation &location, ImagePtr def)
+    : Parent((location.type() == mtpc_fileLocation) ?
+                 (Image *)(internal::getImage(StorageImageLocation(width, height, location.c_fileLocation()))) :
+                 def.v()) {}
 
-Image::Image(const QString &file, QByteArray fmt) : _forgot(false) {
+Image::Image(const QString &file, QByteArray fmt)
+    : _forgot(false) {
 	_data = App::pixmapFromImageInPlace(App::readImage(file, &fmt, false, 0, &_saved));
 	_format = fmt;
 	if (!_data.isNull()) {
@@ -417,7 +426,8 @@ Image::Image(const QString &file, QByteArray fmt) : _forgot(false) {
 	}
 }
 
-Image::Image(const QByteArray &filecontent, QByteArray fmt) : _forgot(false) {
+Image::Image(const QByteArray &filecontent, QByteArray fmt)
+    : _forgot(false) {
 	_data = App::pixmapFromImageInPlace(App::readImage(filecontent, &fmt, false));
 	_format = fmt;
 	_saved = filecontent;
@@ -426,13 +436,20 @@ Image::Image(const QByteArray &filecontent, QByteArray fmt) : _forgot(false) {
 	}
 }
 
-Image::Image(const QPixmap &pixmap, QByteArray format) : _format(format), _forgot(false), _data(pixmap) {
+Image::Image(const QPixmap &pixmap, QByteArray format)
+    : _format(format)
+    , _forgot(false)
+    , _data(pixmap) {
 	if (!_data.isNull()) {
 		globalAcquiredSize += qint64(_data.width()) * _data.height() * 4;
 	}
 }
 
-Image::Image(const QByteArray &filecontent, QByteArray fmt, const QPixmap &pixmap) : _saved(filecontent), _format(fmt), _forgot(false), _data(pixmap) {
+Image::Image(const QByteArray &filecontent, QByteArray fmt, const QPixmap &pixmap)
+    : _saved(filecontent)
+    , _format(fmt)
+    , _forgot(false)
+    , _data(pixmap) {
 	_data = pixmap;
 	_format = fmt;
 	_saved = filecontent;
@@ -445,17 +462,17 @@ const QPixmap &Image::pix(qint32 w, qint32 h) const {
 	checkload();
 
 	if (w <= 0 || !width() || !height()) {
-        w = width();
-    } else if (cRetina()) {
-        w *= cIntRetinaFactor();
-        h *= cIntRetinaFactor();
-    }
+		w = width();
+	} else if (cRetina()) {
+		w *= cIntRetinaFactor();
+		h *= cIntRetinaFactor();
+	}
 	auto options = Images::Option::Smooth | Images::Option::None;
 	auto k = PixKey(w, h, options);
 	auto i = _sizesCache.constFind(k);
 	if (i == _sizesCache.cend()) {
 		auto p = pixNoCache(w, h, options);
-        if (cRetina()) p.setDevicePixelRatio(cRetinaFactor());
+		if (cRetina()) p.setDevicePixelRatio(cRetinaFactor());
 		i = _sizesCache.insert(k, p);
 		if (!p.isNull()) {
 			globalAcquiredSize += qint64(p.width()) * p.height() * 4;
@@ -475,10 +492,10 @@ const QPixmap &Image::pixRounded(qint32 w, qint32 h, ImageRoundRadius radius, Im
 	}
 	auto options = Images::Option::Smooth | Images::Option::None;
 	auto cornerOptions = [](ImageRoundCorners corners) {
-		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
+		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
 	};
 	if (radius == ImageRoundRadius::Large) {
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
@@ -615,7 +632,8 @@ const QPixmap &Image::pixBlurredColored(style::color add, qint32 w, qint32 h) co
 	return i.value();
 }
 
-const QPixmap &Image::pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners, const style::color *colored) const {
+const QPixmap &Image::pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+                                ImageRoundCorners corners, const style::color *colored) const {
 	checkload();
 
 	if (w <= 0 || !width() || !height()) {
@@ -627,10 +645,10 @@ const QPixmap &Image::pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh
 
 	auto options = Images::Option::Smooth | Images::Option::None;
 	auto cornerOptions = [](ImageRoundCorners corners) {
-		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
+		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
 	};
 	if (radius == ImageRoundRadius::Large) {
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
@@ -645,7 +663,8 @@ const QPixmap &Image::pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh
 
 	auto k = SinglePixKey(options);
 	auto i = _sizesCache.constFind(k);
-	if (i == _sizesCache.cend() || i->width() != (outerw * cIntRetinaFactor()) || i->height() != (outerh * cIntRetinaFactor())) {
+	if (i == _sizesCache.cend() || i->width() != (outerw * cIntRetinaFactor()) ||
+	    i->height() != (outerh * cIntRetinaFactor())) {
 		if (i != _sizesCache.cend()) {
 			globalAcquiredSize -= qint64(i->width()) * i->height() * 4;
 		}
@@ -659,7 +678,8 @@ const QPixmap &Image::pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh
 	return i.value();
 }
 
-const QPixmap &Image::pixBlurredSingle(int w, int h, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners) const {
+const QPixmap &Image::pixBlurredSingle(int w, int h, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+                                       ImageRoundCorners corners) const {
 	checkload();
 
 	if (w <= 0 || !width() || !height()) {
@@ -671,10 +691,10 @@ const QPixmap &Image::pixBlurredSingle(int w, int h, qint32 outerw, qint32 outer
 
 	auto options = Images::Option::Smooth | Images::Option::Blurred;
 	auto cornerOptions = [](ImageRoundCorners corners) {
-		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None)
-			| (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
+		return (corners & ImageRoundCorner::TopLeft ? Images::Option::RoundedTopLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::TopRight ? Images::Option::RoundedTopRight : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomLeft ? Images::Option::RoundedBottomLeft : Images::Option::None) |
+		       (corners & ImageRoundCorner::BottomRight ? Images::Option::RoundedBottomRight : Images::Option::None);
 	};
 	if (radius == ImageRoundRadius::Large) {
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
@@ -686,7 +706,8 @@ const QPixmap &Image::pixBlurredSingle(int w, int h, qint32 outerw, qint32 outer
 
 	auto k = SinglePixKey(options);
 	auto i = _sizesCache.constFind(k);
-	if (i == _sizesCache.cend() || i->width() != (outerw * cIntRetinaFactor()) || i->height() != (outerh * cIntRetinaFactor())) {
+	if (i == _sizesCache.cend() || i->width() != (outerw * cIntRetinaFactor()) ||
+	    i->height() != (outerh * cIntRetinaFactor())) {
 		if (i != _sizesCache.cend()) {
 			globalAcquiredSize -= qint64(i->width()) * i->height() * 4;
 		}
@@ -700,8 +721,9 @@ const QPixmap &Image::pixBlurredSingle(int w, int h, qint32 outerw, qint32 outer
 	return i.value();
 }
 
-QPixmap Image::pixNoCache(int w, int h, Images::Options options, int outerw, int outerh, const style::color *colored) const {
-	if (!loading()) const_cast<Image*>(this)->load();
+QPixmap Image::pixNoCache(int w, int h, Images::Options options, int outerw, int outerh,
+                          const style::color *colored) const {
+	if (!loading()) const_cast<Image *>(this)->load();
 	restore();
 
 	if (_data.isNull()) {
@@ -722,20 +744,26 @@ QPixmap Image::pixNoCache(int w, int h, Images::Options options, int outerw, int
 			QPainter p(&result);
 			if (w < outerw) {
 				p.fillRect(0, 0, (outerw - w) / 2, result.height(), st::imageBg);
-				p.fillRect(((outerw - w) / 2) + w, 0, result.width() - (((outerw - w) / 2) + w), result.height(), st::imageBg);
+				p.fillRect(((outerw - w) / 2) + w, 0, result.width() - (((outerw - w) / 2) + w), result.height(),
+				           st::imageBg);
 			}
 			if (h < outerh) {
-				p.fillRect(std::max(0, (outerw - w) / 2), 0, std::min(result.width(), w), (outerh - h) / 2, st::imageBg);
-				p.fillRect(std::max(0, (outerw - w) / 2), ((outerh - h) / 2) + h, std::min(result.width(), w), result.height() - (((outerh - h) / 2) + h), st::imageBg);
+				p.fillRect(std::max(0, (outerw - w) / 2), 0, std::min(result.width(), w), (outerh - h) / 2,
+				           st::imageBg);
+				p.fillRect(std::max(0, (outerw - w) / 2), ((outerh - h) / 2) + h, std::min(result.width(), w),
+				           result.height() - (((outerh - h) / 2) + h), st::imageBg);
 			}
-			p.fillRect(std::max(0, (outerw - w) / 2), std::max(0, (outerh - h) / 2), std::min(result.width(), w), std::min(result.height(), h), st::imageBgTransparent);
+			p.fillRect(std::max(0, (outerw - w) / 2), std::max(0, (outerh - h) / 2), std::min(result.width(), w),
+			           std::min(result.height(), h), st::imageBgTransparent);
 		}
 
 		auto corners = [](Images::Options options) {
-			return ((options & Images::Option::RoundedTopLeft) ? ImageRoundCorner::TopLeft : ImageRoundCorner::None)
-				| ((options & Images::Option::RoundedTopRight) ? ImageRoundCorner::TopRight : ImageRoundCorner::None)
-				| ((options & Images::Option::RoundedBottomLeft) ? ImageRoundCorner::BottomLeft : ImageRoundCorner::None)
-				| ((options & Images::Option::RoundedBottomRight) ? ImageRoundCorner::BottomRight : ImageRoundCorner::None);
+			return ((options & Images::Option::RoundedTopLeft) ? ImageRoundCorner::TopLeft : ImageRoundCorner::None) |
+			       ((options & Images::Option::RoundedTopRight) ? ImageRoundCorner::TopRight : ImageRoundCorner::None) |
+			       ((options & Images::Option::RoundedBottomLeft) ? ImageRoundCorner::BottomLeft :
+			                                                        ImageRoundCorner::None) |
+			       ((options & Images::Option::RoundedBottomRight) ? ImageRoundCorner::BottomRight :
+			                                                         ImageRoundCorner::None);
 		};
 		if (options & Images::Option::Circled) {
 			Images::prepareCircle(result);
@@ -755,7 +783,7 @@ QPixmap Image::pixNoCache(int w, int h, Images::Options options, int outerw, int
 }
 
 QPixmap Image::pixColoredNoCache(style::color add, qint32 w, qint32 h, bool smooth) const {
-	const_cast<Image*>(this)->load();
+	const_cast<Image *>(this)->load();
 	restore();
 	if (_data.isNull()) return blank()->pix();
 
@@ -764,13 +792,15 @@ QPixmap Image::pixColoredNoCache(style::color add, qint32 w, qint32 h, bool smoo
 		return App::pixmapFromImageInPlace(Images::prepareColored(add, std::move(img)));
 	}
 	if (h <= 0) {
-		return App::pixmapFromImageInPlace(Images::prepareColored(add, img.scaledToWidth(w, smooth ? Qt::SmoothTransformation : Qt::FastTransformation)));
+		return App::pixmapFromImageInPlace(Images::prepareColored(
+		    add, img.scaledToWidth(w, smooth ? Qt::SmoothTransformation : Qt::FastTransformation)));
 	}
-	return App::pixmapFromImageInPlace(Images::prepareColored(add, img.scaled(w, h, Qt::IgnoreAspectRatio, smooth ? Qt::SmoothTransformation : Qt::FastTransformation)));
+	return App::pixmapFromImageInPlace(Images::prepareColored(
+	    add, img.scaled(w, h, Qt::IgnoreAspectRatio, smooth ? Qt::SmoothTransformation : Qt::FastTransformation)));
 }
 
 QPixmap Image::pixBlurredColoredNoCache(style::color add, qint32 w, qint32 h) const {
-	const_cast<Image*>(this)->load();
+	const_cast<Image *>(this)->load();
 	restore();
 	if (_data.isNull()) return blank()->pix();
 
@@ -876,7 +906,7 @@ void RemoteImage::doCheckload() const {
 	_format = _loader->imageFormat(shrinkBox());
 	_data = data;
 	_saved = _loader->bytes();
-	const_cast<RemoteImage*>(this)->setInformation(_saved.size(), _data.width(), _data.height());
+	const_cast<RemoteImage *>(this)->setInformation(_saved.size(), _data.width(), _data.height());
 	globalAcquiredSize += qint64(_data.width()) * _data.height() * 4;
 
 	invalidateSizeCache();
@@ -1002,13 +1032,12 @@ qint32 RemoteImage::loadOffset() const {
 }
 
 StorageImage::StorageImage(const StorageImageLocation &location, qint32 size)
-: _location(location)
-, _size(size) {
-}
+    : _location(location)
+    , _size(size) {}
 
 StorageImage::StorageImage(const StorageImageLocation &location, QByteArray &bytes)
-: _location(location)
-, _size(bytes.size()) {
+    : _location(location)
+    , _size(bytes.size()) {
 	setData(bytes);
 	if (!_location.isNull()) {
 		Local::writeImage(storageKey(_location), StorageImageSaved(bytes));
@@ -1034,9 +1063,8 @@ FileLoader *StorageImage::createLoader(LoadFromCloudSetting fromCloud, bool auto
 }
 
 WebFileImage::WebFileImage(const WebFileImageLocation &location, qint32 size)
-: _location(location)
-, _size(size) {
-}
+    : _location(location)
+    , _size(size) {}
 
 qint32 WebFileImage::countWidth() const {
 	return _location.width();
@@ -1056,23 +1084,23 @@ FileLoader *WebFileImage::createLoader(LoadFromCloudSetting fromCloud, bool auto
 	return new mtpFileLoader(&_location, _size, fromCloud, autoLoading);
 }
 
-DelayedStorageImage::DelayedStorageImage() : StorageImage(StorageImageLocation())
-, _loadRequested(false)
-, _loadCancelled(false)
-, _loadFromCloud(false) {
-}
+DelayedStorageImage::DelayedStorageImage()
+    : StorageImage(StorageImageLocation())
+    , _loadRequested(false)
+    , _loadCancelled(false)
+    , _loadFromCloud(false) {}
 
-DelayedStorageImage::DelayedStorageImage(qint32 w, qint32 h) : StorageImage(StorageImageLocation(w, h, 0, 0, 0, 0))
-, _loadRequested(false)
-, _loadCancelled(false)
-, _loadFromCloud(false) {
-}
+DelayedStorageImage::DelayedStorageImage(qint32 w, qint32 h)
+    : StorageImage(StorageImageLocation(w, h, 0, 0, 0, 0))
+    , _loadRequested(false)
+    , _loadCancelled(false)
+    , _loadFromCloud(false) {}
 
-DelayedStorageImage::DelayedStorageImage(QByteArray &bytes) : StorageImage(StorageImageLocation(), bytes)
-, _loadRequested(false)
-, _loadCancelled(false)
-, _loadFromCloud(false) {
-}
+DelayedStorageImage::DelayedStorageImage(QByteArray &bytes)
+    : StorageImage(StorageImageLocation(), bytes)
+    , _loadRequested(false)
+    , _loadCancelled(false)
+    , _loadFromCloud(false) {}
 
 void DelayedStorageImage::setStorageLocation(const StorageImageLocation location) {
 	_location = location;
@@ -1139,11 +1167,18 @@ void DelayedStorageImage::cancel() {
 	StorageImage::cancel();
 }
 
-WebImage::WebImage(const QString &url, QSize box) : _url(url), _box(box), _size(0), _width(0), _height(0) {
-}
+WebImage::WebImage(const QString &url, QSize box)
+    : _url(url)
+    , _box(box)
+    , _size(0)
+    , _width(0)
+    , _height(0) {}
 
-WebImage::WebImage(const QString &url, int width, int height) : _url(url), _size(0), _width(width), _height(height) {
-}
+WebImage::WebImage(const QString &url, int width, int height)
+    : _url(url)
+    , _size(0)
+    , _width(width)
+    , _height(height) {}
 
 void WebImage::setSize(int width, int height) {
 	_width = width;
@@ -1170,7 +1205,8 @@ FileLoader *WebImage::createLoader(LoadFromCloudSetting fromCloud, bool autoLoad
 namespace internal {
 
 Image *getImage(const QString &file, QByteArray format) {
-	if (file.startsWith(qstr("http://"), Qt::CaseInsensitive) || file.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
+	if (file.startsWith(qstr("http://"), Qt::CaseInsensitive) ||
+	    file.startsWith(qstr("https://"), Qt::CaseInsensitive)) {
 		QString key = file;
 		WebImages::const_iterator i = webImages.constFind(key);
 		if (i == webImages.cend()) {
@@ -1260,17 +1296,20 @@ WebFileImage *getImage(const WebFileImageLocation &location, qint32 size) {
 
 } // namespace internal
 
-ReadAccessEnabler::ReadAccessEnabler(const PsFileBookmark *bookmark) : _bookmark(bookmark), _failed(_bookmark ? !_bookmark->enable() : false) {
-}
+ReadAccessEnabler::ReadAccessEnabler(const PsFileBookmark *bookmark)
+    : _bookmark(bookmark)
+    , _failed(_bookmark ? !_bookmark->enable() : false) {}
 
-ReadAccessEnabler::ReadAccessEnabler(const QSharedPointer<PsFileBookmark> &bookmark) : _bookmark(bookmark.data()), _failed(_bookmark ? !_bookmark->enable() : false) {
-}
+ReadAccessEnabler::ReadAccessEnabler(const QSharedPointer<PsFileBookmark> &bookmark)
+    : _bookmark(bookmark.data())
+    , _failed(_bookmark ? !_bookmark->enable() : false) {}
 
 ReadAccessEnabler::~ReadAccessEnabler() {
 	if (_bookmark && !_failed) _bookmark->disable();
 }
 
-FileLocation::FileLocation(const QString &name) : fname(name) {
+FileLocation::FileLocation(const QString &name)
+    : fname(name) {
 	if (fname.isEmpty()) {
 		size = 0;
 	} else {
@@ -1300,7 +1339,7 @@ bool FileLocation::check() const {
 
 	ReadAccessEnabler enabler(_bookmark);
 	if (enabler.failed()) {
-		const_cast<FileLocation*>(this)->_bookmark.clear();
+		const_cast<FileLocation *>(this)->_bookmark.clear();
 	}
 
 	QFileInfo f(name());
@@ -1318,7 +1357,9 @@ bool FileLocation::check() const {
 	}
 	auto realModified = f.lastModified();
 	if (realModified != modified) {
-		DEBUG_LOG(("File location check: Wrong last modified time %1 when should be %2").arg(realModified.toMSecsSinceEpoch()).arg(modified.toMSecsSinceEpoch()));
+		DEBUG_LOG(("File location check: Wrong last modified time %1 when should be %2")
+		              .arg(realModified.toMSecsSinceEpoch())
+		              .arg(modified.toMSecsSinceEpoch()));
 		return false;
 	}
 	return true;
diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h
index e24be91cb..1bedc44cd 100644
--- a/Telegram/SourceFiles/ui/images.h
+++ b/Telegram/SourceFiles/ui/images.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QPixmap>
 #include "base/flags.h"
-#include "style/style_core_types.h"
 #include "scheme.h"
+#include "style/style_core_types.h"
+#include <QPixmap>
 
 class FileLoader;
 class mtpFileLoader;
@@ -45,15 +45,17 @@ enum class ImageRoundRadius {
 	Ellipse,
 };
 enum class ImageRoundCorner {
-	None        = 0x00,
-	TopLeft     = 0x01,
-	TopRight    = 0x02,
-	BottomLeft  = 0x04,
+	None = 0x00,
+	TopLeft = 0x01,
+	TopRight = 0x02,
+	BottomLeft = 0x04,
 	BottomRight = 0x08,
-	All         = 0x0f,
+	All = 0x0f,
 };
 using ImageRoundCorners = base::flags<ImageRoundCorner>;
-inline constexpr auto is_flag_type(ImageRoundCorner) { return true; };
+inline constexpr auto is_flag_type(ImageRoundCorner) {
+	return true;
+};
 
 inline quint32 packInt(qint32 a) {
 	return (a < 0) ? quint32(qint64(a) + 0x100000000LL) : quint32(a);
@@ -89,10 +91,17 @@ inline qint32 unpackIntSecond(quint64 v) {
 class StorageImageLocation {
 public:
 	StorageImageLocation() = default;
-	StorageImageLocation(qint32 width, qint32 height, qint32 dc, const quint64 &volume, qint32 local, const quint64 &secret) : _widthheight(packIntInt(width, height)), _dclocal(packIntInt(dc, local)), _volume(volume), _secret(secret) {
-	}
-	StorageImageLocation(qint32 width, qint32 height, const MTPDfileLocation &location) : _widthheight(packIntInt(width, height)), _dclocal(packIntInt(location.vdc_id.v, location.vlocal_id.v)), _volume(location.vvolume_id.v), _secret(location.vsecret.v) {
-	}
+	StorageImageLocation(qint32 width, qint32 height, qint32 dc, const quint64 &volume, qint32 local,
+	                     const quint64 &secret)
+	    : _widthheight(packIntInt(width, height))
+	    , _dclocal(packIntInt(dc, local))
+	    , _volume(volume)
+	    , _secret(secret) {}
+	StorageImageLocation(qint32 width, qint32 height, const MTPDfileLocation &location)
+	    : _widthheight(packIntInt(width, height))
+	    , _dclocal(packIntInt(location.vdc_id.v, location.vlocal_id.v))
+	    , _volume(location.vvolume_id.v)
+	    , _secret(location.vsecret.v) {}
 	bool isNull() const {
 		return !_dclocal;
 	}
@@ -129,7 +138,6 @@ private:
 	friend inline bool operator==(const StorageImageLocation &a, const StorageImageLocation &b) {
 		return (a._dclocal == b._dclocal) && (a._volume == b._volume) && (a._secret == b._secret);
 	}
-
 };
 
 inline bool operator!=(const StorageImageLocation &a, const StorageImageLocation &b) {
@@ -139,8 +147,11 @@ inline bool operator!=(const StorageImageLocation &a, const StorageImageLocation
 class WebFileImageLocation {
 public:
 	WebFileImageLocation() = default;
-	WebFileImageLocation(qint32 width, qint32 height, qint32 dc, const QByteArray &url, quint64 accessHash) : _widthheight(packIntInt(width, height)), _accessHash(accessHash), _url(url), _dc(dc) {
-	}
+	WebFileImageLocation(qint32 width, qint32 height, qint32 dc, const QByteArray &url, quint64 accessHash)
+	    : _widthheight(packIntInt(width, height))
+	    , _accessHash(accessHash)
+	    , _url(url)
+	    , _dc(dc) {}
 	bool isNull() const {
 		return !_dc;
 	}
@@ -174,7 +185,6 @@ private:
 	friend inline bool operator==(const WebFileImageLocation &a, const WebFileImageLocation &b) {
 		return (a._dc == b._dc) && (a._accessHash == b._accessHash) && (a._url == b._url);
 	}
-
 };
 
 inline bool operator!=(const WebFileImageLocation &a, const WebFileImageLocation &b) {
@@ -191,25 +201,29 @@ QImage prepareColored(style::color add, QImage image);
 QImage prepareOpaque(QImage image);
 
 enum class Option {
-	None                  = 0,
-	Smooth                = (1 << 0),
-	Blurred               = (1 << 1),
-	Circled               = (1 << 2),
-	RoundedLarge          = (1 << 3),
-	RoundedSmall          = (1 << 4),
-	RoundedTopLeft        = (1 << 5),
-	RoundedTopRight       = (1 << 6),
-	RoundedBottomLeft     = (1 << 7),
-	RoundedBottomRight    = (1 << 8),
-	Colored               = (1 << 9),
+	None = 0,
+	Smooth = (1 << 0),
+	Blurred = (1 << 1),
+	Circled = (1 << 2),
+	RoundedLarge = (1 << 3),
+	RoundedSmall = (1 << 4),
+	RoundedTopLeft = (1 << 5),
+	RoundedTopRight = (1 << 6),
+	RoundedBottomLeft = (1 << 7),
+	RoundedBottomRight = (1 << 8),
+	Colored = (1 << 9),
 	TransparentBackground = (1 << 10),
 };
 using Options = base::flags<Option>;
-inline constexpr auto is_flag_type(Option) { return true; };
+inline constexpr auto is_flag_type(Option) {
+	return true;
+};
 
-QImage prepare(QImage img, int w, int h, Options options, int outerw, int outerh, const style::color *colored = nullptr);
+QImage prepare(QImage img, int w, int h, Options options, int outerw, int outerh,
+               const style::color *colored = nullptr);
 
-inline QPixmap pixmap(QImage img, int w, int h, Options options, int outerw, int outerh, const style::color *colored = nullptr) {
+inline QPixmap pixmap(QImage img, int w, int h, Options options, int outerw, int outerh,
+                      const style::color *colored = nullptr) {
 	return QPixmap::fromImage(prepare(img, w, h, options, outerw, outerh, colored), Qt::ColorOnly);
 }
 
@@ -227,8 +241,7 @@ public:
 
 	virtual void automaticLoad(const HistoryItem *item) { // auto load photo
 	}
-	virtual void automaticLoadSettingsChanged() {
-	}
+	virtual void automaticLoadSettingsChanged() {}
 
 	virtual bool loaded() const {
 		return true;
@@ -239,8 +252,7 @@ public:
 	virtual bool displayLoading() const {
 		return false;
 	}
-	virtual void cancel() {
-	}
+	virtual void cancel() {}
 	virtual double progress() const {
 		return 1;
 	}
@@ -249,15 +261,20 @@ public:
 	}
 
 	const QPixmap &pix(qint32 w = 0, qint32 h = 0) const;
-	const QPixmap &pixRounded(qint32 w = 0, qint32 h = 0, ImageRoundRadius radius = ImageRoundRadius::None, ImageRoundCorners corners = ImageRoundCorner::All) const;
+	const QPixmap &pixRounded(qint32 w = 0, qint32 h = 0, ImageRoundRadius radius = ImageRoundRadius::None,
+	                          ImageRoundCorners corners = ImageRoundCorner::All) const;
 	const QPixmap &pixBlurred(qint32 w = 0, qint32 h = 0) const;
 	const QPixmap &pixColored(style::color add, qint32 w = 0, qint32 h = 0) const;
 	const QPixmap &pixBlurredColored(style::color add, qint32 w = 0, qint32 h = 0) const;
-	const QPixmap &pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners = ImageRoundCorner::All, const style::color *colored = nullptr) const;
-	const QPixmap &pixBlurredSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius, ImageRoundCorners corners = ImageRoundCorner::All) const;
+	const QPixmap &pixSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+	                         ImageRoundCorners corners = ImageRoundCorner::All,
+	                         const style::color *colored = nullptr) const;
+	const QPixmap &pixBlurredSingle(qint32 w, qint32 h, qint32 outerw, qint32 outerh, ImageRoundRadius radius,
+	                                ImageRoundCorners corners = ImageRoundCorner::All) const;
 	const QPixmap &pixCircled(qint32 w = 0, qint32 h = 0) const;
 	const QPixmap &pixBlurredCircled(qint32 w = 0, qint32 h = 0) const;
-	QPixmap pixNoCache(int w = 0, int h = 0, Images::Options options = 0, int outerw = -1, int outerh = -1, const style::color *colored = nullptr) const;
+	QPixmap pixNoCache(int w = 0, int h = 0, Images::Options options = 0, int outerw = -1, int outerh = -1,
+	                   const style::color *colored = nullptr) const;
 	QPixmap pixColoredNoCache(style::color add, qint32 w = 0, qint32 h = 0, bool smooth = false) const;
 	QPixmap pixBlurredColoredNoCache(style::color add, qint32 w, qint32 h = 0) const;
 
@@ -269,11 +286,9 @@ public:
 		return qMax(countHeight(), 1);
 	}
 
-	virtual void load(bool loadFirst = false, bool prior = true) {
-	}
+	virtual void load(bool loadFirst = false, bool prior = true) {}
 
-	virtual void loadEvenCancelled(bool loadFirst = false, bool prior = true) {
-	}
+	virtual void loadEvenCancelled(bool loadFirst = false, bool prior = true) {}
 
 	virtual const StorageImageLocation &location() const {
 		return StorageImageLocation::Null;
@@ -300,12 +315,12 @@ public:
 	virtual ~Image();
 
 protected:
-	Image(QByteArray format = "PNG") : _format(format), _forgot(false) {
-	}
+	Image(QByteArray format = "PNG")
+	    : _format(format)
+	    , _forgot(false) {}
 
 	void restore() const;
-	virtual void checkload() const {
-	}
+	virtual void checkload() const {}
 	void invalidateSizeCache() const;
 
 	virtual qint32 countWidth() const {
@@ -325,12 +340,11 @@ protected:
 private:
 	using Sizes = QMap<quint64, QPixmap>;
 	mutable Sizes _sizesCache;
-
 };
 
 typedef QPair<quint64, quint64> StorageKey;
 inline quint64 storageMix32To64(qint32 a, qint32 b) {
-	return (quint64(*reinterpret_cast<quint32*>(&a)) << 32) | quint64(*reinterpret_cast<quint32*>(&b));
+	return (quint64(*reinterpret_cast<quint32 *>(&a)) << 32) | quint64(*reinterpret_cast<quint32 *>(&b));
 }
 inline StorageKey storageKey(qint32 dc, const quint64 &volume, qint32 local) {
 	return StorageKey(storageMix32To64(dc, local), volume);
@@ -344,7 +358,8 @@ inline StorageKey storageKey(const StorageImageLocation &location) {
 inline StorageKey storageKey(const WebFileImageLocation &location) {
 	auto url = location.url();
 	auto sha = hashSha1(url.data(), url.size());
-	return storageKey(location.dc(), *reinterpret_cast<const quint64*>(sha.data()), *reinterpret_cast<const qint32*>(sha.data() + sizeof(quint64)));
+	return storageKey(location.dc(), *reinterpret_cast<const quint64 *>(sha.data()),
+	                  *reinterpret_cast<const qint32 *>(sha.data() + sizeof(quint64)));
 }
 
 class RemoteImage : public Image {
@@ -388,7 +403,6 @@ private:
 	void doCheckload() const;
 
 	void destroyLoaderDelayed(FileLoader *newValue = nullptr) const;
-
 };
 
 class StorageImage : public RemoteImage {
@@ -409,7 +423,6 @@ protected:
 
 	qint32 countWidth() const override;
 	qint32 countHeight() const override;
-
 };
 
 class WebFileImage : public RemoteImage {
@@ -425,12 +438,10 @@ protected:
 
 	qint32 countWidth() const override;
 	qint32 countHeight() const override;
-
 };
 
 class DelayedStorageImage : public StorageImage {
 public:
-
 	DelayedStorageImage();
 	DelayedStorageImage(qint32 w, qint32 h);
 	DelayedStorageImage(QByteArray &bytes);
@@ -458,12 +469,10 @@ public:
 
 private:
 	bool _loadRequested, _loadCancelled, _loadFromCloud;
-
 };
 
 class WebImage : public RemoteImage {
 public:
-
 	// If !box.isEmpty() then resize the image to fit in this box.
 	WebImage(const QString &url, QSize box = QSize());
 	WebImage(const QString &url, int width, int height);
@@ -471,7 +480,6 @@ public:
 	void setSize(int width, int height);
 
 protected:
-
 	QSize shrinkBox() const override {
 		return _box;
 	}
@@ -485,51 +493,49 @@ private:
 	QString _url;
 	QSize _box;
 	qint32 _size, _width, _height;
-
 };
 
 namespace internal {
-	Image *getImage(const QString &file, QByteArray format);
-	Image *getImage(const QString &url, QSize box);
-	Image *getImage(const QString &url, int width, int height);
-	Image *getImage(const QByteArray &filecontent, QByteArray format);
-	Image *getImage(const QPixmap &pixmap, QByteArray format);
-	Image *getImage(const QByteArray &filecontent, QByteArray format, const QPixmap &pixmap);
-	Image *getImage(qint32 width, qint32 height);
-	StorageImage *getImage(const StorageImageLocation &location, qint32 size = 0);
-	StorageImage *getImage(const StorageImageLocation &location, const QByteArray &bytes);
-	WebFileImage *getImage(const WebFileImageLocation &location, qint32 size = 0);
+Image *getImage(const QString &file, QByteArray format);
+Image *getImage(const QString &url, QSize box);
+Image *getImage(const QString &url, int width, int height);
+Image *getImage(const QByteArray &filecontent, QByteArray format);
+Image *getImage(const QPixmap &pixmap, QByteArray format);
+Image *getImage(const QByteArray &filecontent, QByteArray format, const QPixmap &pixmap);
+Image *getImage(qint32 width, qint32 height);
+StorageImage *getImage(const StorageImageLocation &location, qint32 size = 0);
+StorageImage *getImage(const StorageImageLocation &location, const QByteArray &bytes);
+WebFileImage *getImage(const WebFileImageLocation &location, qint32 size = 0);
 } // namespace internal
 
 class ImagePtr : public ManagedPtr<Image> {
 public:
 	ImagePtr();
-	ImagePtr(const QString &file, QByteArray format = QByteArray()) : Parent(internal::getImage(file, format)) {
-	}
-	ImagePtr(const QString &url, QSize box) : Parent(internal::getImage(url, box)) {
-	}
-	ImagePtr(const QString &url, int width, int height) : Parent(internal::getImage(url, width, height)) {
-	}
-	ImagePtr(const QByteArray &filecontent, QByteArray format = QByteArray()) : Parent(internal::getImage(filecontent, format)) {
-	}
-	ImagePtr(const QByteArray &filecontent, QByteArray format, const QPixmap &pixmap) : Parent(internal::getImage(filecontent, format, pixmap)) {
-	}
-	ImagePtr(const QPixmap &pixmap, QByteArray format) : Parent(internal::getImage(pixmap, format)) {
-	}
-	ImagePtr(const StorageImageLocation &location, qint32 size = 0) : Parent(internal::getImage(location, size)) {
-	}
-	ImagePtr(const StorageImageLocation &location, const QByteArray &bytes) : Parent(internal::getImage(location, bytes)) {
-	}
-	ImagePtr(const WebFileImageLocation &location, qint32 size = 0) : Parent(internal::getImage(location, size)) {
-	}
+	ImagePtr(const QString &file, QByteArray format = QByteArray())
+	    : Parent(internal::getImage(file, format)) {}
+	ImagePtr(const QString &url, QSize box)
+	    : Parent(internal::getImage(url, box)) {}
+	ImagePtr(const QString &url, int width, int height)
+	    : Parent(internal::getImage(url, width, height)) {}
+	ImagePtr(const QByteArray &filecontent, QByteArray format = QByteArray())
+	    : Parent(internal::getImage(filecontent, format)) {}
+	ImagePtr(const QByteArray &filecontent, QByteArray format, const QPixmap &pixmap)
+	    : Parent(internal::getImage(filecontent, format, pixmap)) {}
+	ImagePtr(const QPixmap &pixmap, QByteArray format)
+	    : Parent(internal::getImage(pixmap, format)) {}
+	ImagePtr(const StorageImageLocation &location, qint32 size = 0)
+	    : Parent(internal::getImage(location, size)) {}
+	ImagePtr(const StorageImageLocation &location, const QByteArray &bytes)
+	    : Parent(internal::getImage(location, bytes)) {}
+	ImagePtr(const WebFileImageLocation &location, qint32 size = 0)
+	    : Parent(internal::getImage(location, size)) {}
 	ImagePtr(qint32 width, qint32 height, const MTPFileLocation &location, ImagePtr def = ImagePtr());
-	ImagePtr(qint32 width, qint32 height) : Parent(internal::getImage(width, height)) {
-	}
+	ImagePtr(qint32 width, qint32 height)
+	    : Parent(internal::getImage(width, height)) {}
 
 	explicit operator bool() const {
 		return (_data != nullptr) && !_data->isNull();
 	}
-
 };
 
 inline QSize shrinkToKeepAspect(qint32 width, qint32 height, qint32 towidth, qint32 toheight) {
@@ -561,7 +567,6 @@ public:
 private:
 	const PsFileBookmark *_bookmark;
 	bool _failed;
-
 };
 
 class FileLocation {
@@ -586,7 +591,6 @@ public:
 
 private:
 	QSharedPointer<PsFileBookmark> _bookmark;
-
 };
 inline bool operator==(const FileLocation &a, const FileLocation &b) {
 	return (a.name() == b.name()) && (a.modified == b.modified) && (a.size == b.size);
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index a487979e9..8bb669eb2 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/special_buttons.h"
 
+#include "app.h"
+#include "dialogs/dialogs_layout.h"
+#include "structs.h"
 #include "styles/style_boxes.h"
 #include "styles/style_history.h"
-#include "dialogs/dialogs_layout.h"
-#include "ui/effects/ripple_animation.h"
 #include "twidget.h"
-#include "structs.h"
-#include "app.h"
+#include "ui/effects/ripple_animation.h"
 
 #include <qevent.h>
 
@@ -37,8 +37,9 @@ constexpr int kWideScale = 5;
 
 } // namespace
 
-HistoryDownButton::HistoryDownButton(QWidget *parent, const style::TwoIconButton &st) : RippleButton(parent, st.ripple)
-, _st(st) {
+HistoryDownButton::HistoryDownButton(QWidget *parent, const style::TwoIconButton &st)
+    : RippleButton(parent, st.ripple)
+    , _st(st) {
 	resize(_st.width, _st.height);
 	setCursor(style::cur_pointer);
 
@@ -84,9 +85,10 @@ void HistoryDownButton::setUnreadCount(int unreadCount) {
 	}
 }
 
-EmojiButton::EmojiButton(QWidget *parent, const style::IconButton &st) : RippleButton(parent, st.ripple)
-, _st(st)
-, _a_loading(animation(this, &EmojiButton::step_loading)) {
+EmojiButton::EmojiButton(QWidget *parent, const style::IconButton &st)
+    : RippleButton(parent, st.ripple)
+    , _st(st)
+    , _a_loading(animation(this, &EmojiButton::step_loading)) {
 	resize(_st.width, _st.height);
 	setCursor(style::cur_pointer);
 }
@@ -97,7 +99,8 @@ void EmojiButton::paintEvent(QPaintEvent *e) {
 	auto ms = getms();
 
 	p.fillRect(e->rect(), st::historyComposeAreaBg);
-	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), ms, _rippleOverride ? &(*_rippleOverride)->c : nullptr);
+	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), ms,
+	            _rippleOverride ? &(*_rippleOverride)->c : nullptr);
 
 	auto loading = a_loading.current(ms, _loading ? 1 : 0);
 	p.setOpacity(1 - loading);
@@ -107,17 +110,20 @@ void EmojiButton::paintEvent(QPaintEvent *e) {
 	icon->paint(p, _st.iconPosition, width());
 
 	p.setOpacity(1.);
-	auto pen = _colorOverride ? (*_colorOverride)->p : (over ? st::historyEmojiCircleFgOver : st::historyEmojiCircleFg)->p;
+	auto pen =
+	    _colorOverride ? (*_colorOverride)->p : (over ? st::historyEmojiCircleFgOver : st::historyEmojiCircleFg)->p;
 	pen.setWidth(st::historyEmojiCircleLine);
 	pen.setCapStyle(Qt::RoundCap);
 	p.setPen(pen);
 	p.setBrush(Qt::NoBrush);
 
 	PainterHighQualityEnabler hq(p);
-	QRect inner(QPoint((width() - st::historyEmojiCircle.width()) / 2, st::historyEmojiCircleTop), st::historyEmojiCircle);
+	QRect inner(QPoint((width() - st::historyEmojiCircle.width()) / 2, st::historyEmojiCircleTop),
+	            st::historyEmojiCircle);
 	if (loading > 0) {
 		qint32 full = FullArcLength;
-		qint32 start = std::round(full * double(ms % st::historyEmojiCirclePeriod) / st::historyEmojiCirclePeriod), part = std::round(loading * full / st::historyEmojiCirclePart);
+		qint32 start = std::round(full * double(ms % st::historyEmojiCirclePeriod) / st::historyEmojiCirclePeriod),
+		       part = std::round(loading * full / st::historyEmojiCirclePart);
 		p.drawArc(inner, start, full - part);
 	} else {
 		p.drawEllipse(inner);
@@ -137,7 +143,8 @@ void EmojiButton::setLoading(bool loading) {
 	}
 }
 
-void EmojiButton::setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride, const style::color *rippleOverride) {
+void EmojiButton::setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride,
+                                    const style::color *rippleOverride) {
 	_iconOverride = iconOverride;
 	_colorOverride = colorOverride;
 	_rippleOverride = rippleOverride;
@@ -160,7 +167,8 @@ QImage EmojiButton::prepareRippleMask() const {
 	return RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
 }
 
-SendButton::SendButton(QWidget *parent) : RippleButton(parent, st::historyReplyCancel.ripple) {
+SendButton::SendButton(QWidget *parent)
+    : RippleButton(parent, st::historyReplyCancel.ripple) {
 	resize(st::historySendSize);
 }
 
@@ -182,7 +190,8 @@ void SendButton::setType(Type type) {
 void SendButton::setRecordActive(bool recordActive) {
 	if (_recordActive != recordActive) {
 		_recordActive = recordActive;
-		_a_recordActive.start([this] { recordAnimationCallback(); }, _recordActive ? 0. : 1., _recordActive ? 1. : 0, st::historyRecordVoiceDuration);
+		_a_recordActive.start([this] { recordAnimationCallback(); }, _recordActive ? 0. : 1., _recordActive ? 1. : 0,
+		                      st::historyRecordVoiceDuration);
 		update();
 	}
 }
@@ -211,18 +220,22 @@ void SendButton::paintEvent(QPaintEvent *e) {
 	if (changed < 1.) {
 		PainterHighQualityEnabler hq(p);
 		p.setOpacity(1. - changed);
-		auto targetRect = QRect((1 - kWideScale) / 2 * width(), (1 - kWideScale) / 2 * height(), kWideScale * width(), kWideScale * height());
+		auto targetRect = QRect((1 - kWideScale) / 2 * width(), (1 - kWideScale) / 2 * height(), kWideScale * width(),
+		                        kWideScale * height());
 		auto hiddenWidth = anim::interpolate(0, (1 - kWideScale) / 2 * width(), changed);
 		auto hiddenHeight = anim::interpolate(0, (1 - kWideScale) / 2 * height(), changed);
-		p.drawPixmap(targetRect.marginsAdded(QMargins(hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight)), _contentFrom);
+		p.drawPixmap(targetRect.marginsAdded(QMargins(hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight)),
+		             _contentFrom);
 		p.setOpacity(changed);
 		auto shownWidth = anim::interpolate((1 - kWideScale) / 2 * width(), 0, changed);
 		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * height(), 0, changed);
 		p.drawPixmap(targetRect.marginsAdded(QMargins(shownWidth, shownHeight, shownWidth, shownHeight)), _contentTo);
 	} else if (_type == Type::Record) {
 		auto recordActive = recordActiveRatio();
-		auto rippleColor = anim::color(st::historyAttachEmoji.ripple.color, st::historyRecordVoiceRippleBgActive, recordActive);
-		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y(), ms, &rippleColor);
+		auto rippleColor =
+		    anim::color(st::historyAttachEmoji.ripple.color, st::historyRecordVoiceRippleBgActive, recordActive);
+		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2,
+		            st::historyAttachEmoji.rippleAreaPosition.y(), ms, &rippleColor);
 
 		auto fastIcon = [recordActive, over, this] {
 			if (recordActive == 1.) {
@@ -242,7 +255,8 @@ void SendButton::paintEvent(QPaintEvent *e) {
 		auto &saveIcon = over ? st::historyEditSaveIconOver : st::historyEditSaveIcon;
 		saveIcon.paint(p, st::historySendIconPosition, width());
 	} else if (_type == Type::Cancel) {
-		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y(), ms);
+		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2,
+		            st::historyAttachEmoji.rippleAreaPosition.y(), ms);
 
 		auto &cancelIcon = over ? st::historyReplyCancelIconOver : st::historyReplyCancelIcon;
 		cancelIcon.paintInCenter(p, rect());
@@ -292,7 +306,8 @@ QImage SendButton::prepareRippleMask() const {
 QPoint SendButton::prepareRippleStartPosition() const {
 	auto real = mapFromGlobal(QCursor::pos());
 	auto size = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaSize : st::historyReplyCancel.rippleAreaSize;
-	auto y = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaPosition.y() : (height() - st::historyReplyCancel.rippleAreaSize) / 2;
+	auto y = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaPosition.y() :
+	                                   (height() - st::historyReplyCancel.rippleAreaSize) / 2;
 	return real - QPoint((width() - size) / 2, y);
 }
 
@@ -303,9 +318,10 @@ void SendButton::recordAnimationCallback() {
 	}
 }
 
-PeerAvatarButton::PeerAvatarButton(QWidget *parent, PeerData *peer, const style::PeerAvatarButton &st) : AbstractButton(parent)
-, _peer(peer)
-, _st(st) {
+PeerAvatarButton::PeerAvatarButton(QWidget *parent, PeerData *peer, const style::PeerAvatarButton &st)
+    : AbstractButton(parent)
+    , _peer(peer)
+    , _st(st) {
 	resize(_st.size, _st.size);
 }
 
@@ -316,8 +332,9 @@ void PeerAvatarButton::paintEvent(QPaintEvent *e) {
 	}
 }
 
-NewAvatarButton::NewAvatarButton(QWidget *parent, int size, QPoint position) : RippleButton(parent, st::defaultActiveButton.ripple)
-, _position(position) {
+NewAvatarButton::NewAvatarButton(QWidget *parent, int size, QPoint position)
+    : RippleButton(parent, st::defaultActiveButton.ripple)
+    , _position(position) {
 	resize(size, size);
 }
 
diff --git a/Telegram/SourceFiles/ui/special_buttons.h b/Telegram/SourceFiles/ui/special_buttons.h
index 802138a3b..82afe5235 100644
--- a/Telegram/SourceFiles/ui/special_buttons.h
+++ b/Telegram/SourceFiles/ui/special_buttons.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/widgets/buttons.h"
-#include "styles/style_window.h"
 #include "styles/style_widgets.h"
+#include "styles/style_window.h"
+#include "ui/widgets/buttons.h"
 
 class PeerData;
 
@@ -47,7 +47,6 @@ private:
 	const style::TwoIconButton &_st;
 
 	int _unreadCount = 0;
-
 };
 
 class EmojiButton : public RippleButton {
@@ -55,7 +54,8 @@ public:
 	EmojiButton(QWidget *parent, const style::IconButton &st);
 
 	void setLoading(bool loading);
-	void setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride, const style::color *rippleOverride);
+	void setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride,
+	                       const style::color *rippleOverride);
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -80,7 +80,6 @@ private:
 	const style::icon *_iconOverride = nullptr;
 	const style::color *_colorOverride = nullptr;
 	const style::color *_rippleOverride = nullptr;
-
 };
 
 class SendButton : public RippleButton {
@@ -141,12 +140,11 @@ private:
 	base::lambda<void(bool active)> _recordStopCallback;
 	base::lambda<void(QPoint globalPos)> _recordUpdateCallback;
 	base::lambda<void()> _recordAnimationCallback;
-
 };
 
 class PeerAvatarButton : public AbstractButton {
 public:
-	PeerAvatarButton(QWidget *parent,PeerData *peer, const style::PeerAvatarButton &st);
+	PeerAvatarButton(QWidget *parent, PeerData *peer, const style::PeerAvatarButton &st);
 
 	void setPeer(PeerData *peer) {
 		_peer = peer;
@@ -159,7 +157,6 @@ protected:
 private:
 	PeerData *_peer = nullptr;
 	const style::PeerAvatarButton &_st;
-
 };
 
 class NewAvatarButton : public RippleButton {
@@ -176,7 +173,6 @@ protected:
 private:
 	QPixmap _image;
 	QPoint _position;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/style/style_core.cpp b/Telegram/SourceFiles/ui/style/style_core.cpp
index 46956f206..85b340f0b 100644
--- a/Telegram/SourceFiles/ui/style/style_core.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core.cpp
@@ -26,23 +26,19 @@ namespace style {
 namespace internal {
 namespace {
 
-using ModulesList = QList<internal::ModuleBase*>;
+using ModulesList = QList<internal::ModuleBase *>;
 NeverFreedPointer<ModulesList> styleModules;
 
 void startModules() {
 	if (!styleModules) return;
 
-	for_const (auto module, *styleModules) {
-		module->start();
-	}
+	for_const (auto module, *styleModules) { module->start(); }
 }
 
 void stopModules() {
 	if (!styleModules) return;
 
-	for_const (auto module, *styleModules) {
-		module->stop();
-	}
+	for_const (auto module, *styleModules) { module->stop(); }
 }
 
 } // namespace
@@ -92,7 +88,8 @@ void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect
 	constexpr auto resultIntsPerPixel = 1;
 	auto resultIntsPerLine = (outResult->bytesPerLine() >> 2);
 	auto resultIntsAdded = resultIntsPerLine - width * resultIntsPerPixel;
-	auto resultInts = reinterpret_cast<quint32*>(outResult->bits()) + dstPoint.y() * resultIntsPerLine + dstPoint.x() * resultIntsPerPixel;
+	auto resultInts = reinterpret_cast<quint32 *>(outResult->bits()) + dstPoint.y() * resultIntsPerLine +
+	                  dstPoint.x() * resultIntsPerPixel;
 	Assert(resultIntsAdded >= 0);
 	Assert(outResult->depth() == static_cast<int>((resultIntsPerPixel * sizeof(quint32)) << 3));
 	Assert(outResult->bytesPerLine() == (resultIntsPerLine << 2));
@@ -128,7 +125,6 @@ QBrush transparentPlaceholderBrush() {
 	}
 	transparent.setDevicePixelRatio(cRetinaFactor());
 	return QBrush(transparent);
-
 }
 
 namespace internal {
diff --git a/Telegram/SourceFiles/ui/style/style_core.h b/Telegram/SourceFiles/ui/style/style_core.h
index b690d8540..bd0f3ac64 100644
--- a/Telegram/SourceFiles/ui/style/style_core.h
+++ b/Telegram/SourceFiles/ui/style/style_core.h
@@ -21,13 +21,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <QBrush>
-#include <QImage>
 #include <QColor>
+#include <QImage>
 #include <QRect>
 #include <QRectF>
 
-#include "ui/style/style_core_types.h"
 #include "settings.h"
+#include "ui/style/style_core_types.h"
 
 inline QPoint rtlpoint(int x, int y, int outerw) {
 	return QPoint(rtl() ? (outerw - x) : x, y);
@@ -48,7 +48,8 @@ inline QRectF rtlrect(const QRectF &r, int outerw) {
 	return rtl() ? QRectF(outerw - r.x() - r.width(), r.y(), r.width(), r.height()) : r;
 }
 inline QRect centerrect(const QRect &inRect, const QRect &rect) {
-	return QRect(inRect.x() + (inRect.width() - rect.width()) / 2, inRect.y() + (inRect.height() - rect.height()) / 2, rect.width(), rect.height());
+	return QRect(inRect.x() + (inRect.width() - rect.width()) / 2, inRect.y() + (inRect.height() - rect.height()) / 2,
+	             rect.width(), rect.height());
 }
 inline QRect centerrect(const QRect &inRect, const style::icon &icon) {
 	return centerrect(inRect, QRect(0, 0, icon.width(), icon.height()));
@@ -78,7 +79,8 @@ void stopManager();
 
 // *outResult must be r.width() x r.height(), ARGB32_Premultiplied.
 // QRect(0, 0, src.width(), src.height()) must contain r.
-void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect = QRect(), QPoint dstPoint = QPoint(0, 0));
+void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect = QRect(),
+                   QPoint dstPoint = QPoint(0, 0));
 
 inline QImage colorizeImage(const QImage &src, QColor c, QRect srcRect = QRect()) {
 	if (srcRect.isNull()) srcRect = src.rect();
diff --git a/Telegram/SourceFiles/ui/style/style_core_color.cpp b/Telegram/SourceFiles/ui/style/style_core_color.cpp
index a5a811509..b7893c33b 100644
--- a/Telegram/SourceFiles/ui/style/style_core_color.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core_color.cpp
@@ -29,8 +29,10 @@ Color::Proxy Color::operator[](const style::palette &paletteOverride) const {
 	return Proxy((index >= 0) ? paletteOverride.colorAtIndex(index) : (*this));
 }
 
-ColorData::ColorData(uchar r, uchar g, uchar b, uchar a) : c(int(r), int(g), int(b), int(a)), p(c), b(c) {
-}
+ColorData::ColorData(uchar r, uchar g, uchar b, uchar a)
+    : c(int(r), int(g), int(b), int(a))
+    , p(c)
+    , b(c) {}
 
 void ColorData::set(uchar r, uchar g, uchar b, uchar a) {
 	this->c = QColor(int(r), int(g), int(b), int(a));
diff --git a/Telegram/SourceFiles/ui/style/style_core_color.h b/Telegram/SourceFiles/ui/style/style_core_color.h
index 24a302233..cd060db60 100644
--- a/Telegram/SourceFiles/ui/style/style_core_color.h
+++ b/Telegram/SourceFiles/ui/style/style_core_color.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include <QBrush>
 #include <QColor>
 #include <QPen>
-#include <QBrush>
 
 namespace style {
 
@@ -50,13 +50,11 @@ private:
 
 	friend class Color;
 	friend class style::palette;
-
 };
 
 class Color {
 public:
-	Color(Qt::Initialization = Qt::Uninitialized) {
-	}
+	Color(Qt::Initialization = Qt::Uninitialized) {}
 	Color(const Color &other) = default;
 	Color &operator=(const Color &other) = default;
 
@@ -88,29 +86,39 @@ public:
 
 private:
 	friend class style::palette;
-	Color(ColorData *data) : _data(data) {
-	}
+	Color(ColorData *data)
+	    : _data(data) {}
 
 	ColorData *_data = nullptr;
-
 };
 
 class Color::Proxy {
 public:
-	Proxy(Color color) : _color(color) {
-	}
+	Proxy(Color color)
+	    : _color(color) {}
 	Proxy(const Proxy &other) = default;
 
-	operator const QBrush &() const { return _color; }
-	operator const QPen &() const { return _color; }
-	ColorData *operator->() const { return _color.v(); }
-	ColorData *v() const { return _color.v(); }
-	explicit operator bool() const { return _color ? true : false; }
-	Color clone() const { return _color; }
+	operator const QBrush &() const {
+		return _color;
+	}
+	operator const QPen &() const {
+		return _color;
+	}
+	ColorData *operator->() const {
+		return _color.v();
+	}
+	ColorData *v() const {
+		return _color.v();
+	}
+	explicit operator bool() const {
+		return _color ? true : false;
+	}
+	Color clone() const {
+		return _color;
+	}
 
 private:
 	Color _color;
-
 };
 
 inline bool operator==(Color a, Color b) {
diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
index 3f19559e7..5cda1d3ac 100644
--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/style/style_core_font.h"
 
+#include "core/basic_types.h"
+#include "ui/twidget.h"
 #include <QMap>
 #include <QString>
 #include <QVector>
-#include "ui/twidget.h"
-#include "core/basic_types.h"
 
 namespace style {
 namespace internal {
@@ -36,7 +36,7 @@ FontFamilyMap fontFamilyMap;
 typedef QVector<QString> FontFamilies;
 FontFamilies fontFamilies;
 
-typedef QMap<quint32, FontData*> FontDatas;
+typedef QMap<quint32, FontData *> FontDatas;
 FontDatas fontsMap;
 
 quint32 fontKey(int size, quint32 flags, int family) {
@@ -63,11 +63,11 @@ int registerFontFamily(const QString &family) {
 }
 
 FontData::FontData(int size, quint32 flags, int family, Font *other)
-: f(Fonts::GetOverride(fontFamilies[family]))
-, m(f)
-, _size(size)
-, _flags(flags)
-, _family(family) {
+    : f(Fonts::GetOverride(fontFamilies[family]))
+    , m(f)
+    , _size(size)
+    , _flags(flags)
+    , _family(family) {
 	if (other) {
 		memcpy(modified, other, sizeof(modified));
 	} else {
diff --git a/Telegram/SourceFiles/ui/style/style_core_font.h b/Telegram/SourceFiles/ui/style/style_core_font.h
index 179a250a6..c04b51d04 100644
--- a/Telegram/SourceFiles/ui/style/style_core_font.h
+++ b/Telegram/SourceFiles/ui/style/style_core_font.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
-#include <QFontMetrics>
 #include <QFont>
+#include <QFontMetrics>
+#include <QString>
 
 namespace style {
 namespace internal {
@@ -33,8 +33,8 @@ int registerFontFamily(const QString &family);
 class FontData;
 class Font {
 public:
-	Font(Qt::Initialization = Qt::Uninitialized) : ptr(0) {
-	}
+	Font(Qt::Initialization = Qt::Uninitialized)
+	    : ptr(0) {}
 	Font(int size, quint32 flags, const QString &family);
 	Font(int size, quint32 flags, int family);
 
@@ -62,11 +62,10 @@ private:
 	void init(int size, quint32 flags, int family, Font *modified);
 	friend void startManager();
 
-	Font(FontData *p) : ptr(p) {
-	}
+	Font(FontData *p)
+	    : ptr(p) {}
 	Font(int size, quint32 flags, int family, Font *modified);
 	friend class FontData;
-
 };
 
 enum FontFlags {
@@ -79,7 +78,6 @@ enum FontFlags {
 
 class FontData {
 public:
-
 	qint32 width(const QString &str) const {
 		return m.width(str);
 	}
@@ -115,7 +113,6 @@ private:
 	int _size;
 	quint32 _flags;
 	int _family;
-
 };
 
 inline bool operator==(const Font &a, const Font &b) {
diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.cpp b/Telegram/SourceFiles/ui/style/style_core_icon.cpp
index 0fd944493..5429538a9 100644
--- a/Telegram/SourceFiles/ui/style/style_core_icon.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core_icon.cpp
@@ -19,9 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/style/style_core_icon.h"
+#include "app.h"
 #include "settings.h"
 #include "style_core.h"
-#include "app.h"
 
 #include <QPainter>
 
@@ -33,9 +33,9 @@ quint32 colorKey(QColor c) {
 	return (((((quint32(c.red()) << 8) | quint32(c.green())) << 8) | quint32(c.blue())) << 8) | quint32(c.alpha());
 }
 
-using IconMasks = QMap<const IconMask*, QImage>;
-using IconPixmaps = QMap<QPair<const IconMask*, quint32>, QPixmap>;
-using IconDatas = OrderedSet<IconData*>;
+using IconMasks = QMap<const IconMask *, QImage>;
+using IconPixmaps = QMap<QPair<const IconMask *, quint32>, QPixmap>;
+using IconDatas = OrderedSet<IconData *>;
 NeverFreedPointer<IconMasks> iconMasks;
 NeverFreedPointer<IconPixmaps> iconPixmaps;
 NeverFreedPointer<IconDatas> iconData;
@@ -88,7 +88,7 @@ QSize readGeneratedSize(const IconMask *mask, DBIScale scale) {
 		if (size > sizeTag.size() && !memcmp(data, sizeTag.data(), sizeTag.size())) {
 			size -= sizeTag.size();
 			data += sizeTag.size();
-			auto baForStream = QByteArray::fromRawData(reinterpret_cast<const char*>(data), size);
+			auto baForStream = QByteArray::fromRawData(reinterpret_cast<const char *>(data), size);
 			QDataStream stream(baForStream);
 			stream.setVersion(QDataStream::Qt_5_1);
 
@@ -101,7 +101,8 @@ QSize readGeneratedSize(const IconMask *mask, DBIScale scale) {
 			case dbisOneAndQuarter: return QSize(pxAdjust(width, 5), pxAdjust(height, 5));
 			case dbisOneAndHalf: return QSize(pxAdjust(width, 6), pxAdjust(height, 6));
 			case dbisTwo: return QSize(width * 2, height * 2);
-			case dbisAuto: case dbisScaleCount: assert(false); // temp
+			case dbisAuto:
+			case dbisScaleCount: assert(false); // temp
 			}
 		} else {
 			Unexpected("Bad data in generated icon!");
@@ -113,10 +114,9 @@ QSize readGeneratedSize(const IconMask *mask, DBIScale scale) {
 } // namespace
 
 MonoIcon::MonoIcon(const IconMask *mask, Color color, QPoint offset)
-: _mask(mask)
-, _color(std::move(color))
-, _offset(offset) {
-}
+    : _mask(mask)
+    , _color(std::move(color))
+    , _offset(offset) {}
 
 void MonoIcon::reset() const {
 	_pixmap = QPixmap();
@@ -317,9 +317,7 @@ QImage IconData::instance(QColor colorOverride, DBIScale scale) const {
 int IconData::width() const {
 	if (_width < 0) {
 		_width = 0;
-		for_const (auto &part, _parts) {
-			accumulate_max(_width, part.offset().x() + part.width());
-		}
+		for_const (auto &part, _parts) { accumulate_max(_width, part.offset().x() + part.width()); }
 	}
 	return _width;
 }
@@ -327,9 +325,7 @@ int IconData::width() const {
 int IconData::height() const {
 	if (_height < 0) {
 		_height = 0;
-		for_const (auto &part, _parts) {
-			accumulate_max(_height, part.offset().x() + part.height());
-		}
+		for_const (auto &part, _parts) { accumulate_max(_height, part.offset().x() + part.height()); }
 	}
 	return _height;
 }
diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.h b/Telegram/SourceFiles/ui/style/style_core_icon.h
index 2e1c3d1fe..346b95641 100644
--- a/Telegram/SourceFiles/ui/style/style_core_icon.h
+++ b/Telegram/SourceFiles/ui/style/style_core_icon.h
@@ -31,7 +31,9 @@ namespace internal {
 class IconMask {
 public:
 	template <int N>
-	IconMask(const uchar (&data)[N]) : _data(data), _size(N) {
+	IconMask(const uchar (&data)[N])
+	    : _data(data)
+	    , _size(N) {
 		static_assert(N > 0, "invalid image data");
 	}
 
@@ -45,7 +47,6 @@ public:
 private:
 	const uchar *_data;
 	const int _size;
-
 };
 
 class MonoIcon {
@@ -75,8 +76,7 @@ public:
 
 	QImage instance(QColor colorOverride, DBIScale scale) const;
 
-	~MonoIcon() {
-	}
+	~MonoIcon() {}
 
 private:
 	void ensureLoaded() const;
@@ -85,49 +85,39 @@ private:
 
 	const IconMask *_mask = nullptr;
 	Color _color;
-	QPoint _offset = { 0, 0 };
+	QPoint _offset = {0, 0};
 	mutable QImage _maskImage, _colorizedImage;
 	mutable QPixmap _pixmap; // for pixmaps
 	mutable QSize _size; // for rects
-
 };
 
 class IconData {
 public:
-	template <typename ...MonoIcons>
-	IconData(MonoIcons &&...icons) {
+	template <typename... MonoIcons> IconData(MonoIcons &&... icons) {
 		created();
 		_parts.reserve(sizeof...(MonoIcons));
 		addIcons(std::forward<MonoIcons>(icons)...);
 	}
 
 	void reset() {
-		for_const (auto &part, _parts) {
-			part.reset();
-		}
+		for_const (auto &part, _parts) { part.reset(); }
 	}
 	bool empty() const {
 		return _parts.empty();
 	}
 
 	void paint(QPainter &p, const QPoint &pos, int outerw) const {
-		for_const (auto &part, _parts) {
-			part.paint(p, pos, outerw);
-		}
+		for_const (auto &part, _parts) { part.paint(p, pos, outerw); }
 	}
 	void fill(QPainter &p, const QRect &rect) const;
 
 	void paint(QPainter &p, const QPoint &pos, int outerw, QColor colorOverride) const {
-		for_const (auto &part, _parts) {
-			part.paint(p, pos, outerw, colorOverride);
-		}
+		for_const (auto &part, _parts) { part.paint(p, pos, outerw, colorOverride); }
 	}
 	void fill(QPainter &p, const QRect &rect, QColor colorOverride) const;
 
 	void paint(QPainter &p, const QPoint &pos, int outerw, const style::palette &paletteOverride) const {
-		for_const (auto &part, _parts) {
-			part.paint(p, pos, outerw, paletteOverride);
-		}
+		for_const (auto &part, _parts) { part.paint(p, pos, outerw, paletteOverride); }
 	}
 	void fill(QPainter &p, const QRect &rect, const style::palette &paletteOverride) const;
 
@@ -139,12 +129,9 @@ public:
 private:
 	void created();
 
-	template <typename ... MonoIcons>
-	void addIcons() {
-	}
+	template <typename... MonoIcons> void addIcons() {}
 
-	template <typename ... MonoIcons>
-	void addIcons(MonoIcon &&icon, MonoIcons&&... icons) {
+	template <typename... MonoIcons> void addIcons(MonoIcon &&icon, MonoIcons &&... icons) {
 		_parts.push_back(std::move(icon));
 		addIcons(std::forward<MonoIcons>(icons)...);
 	}
@@ -152,21 +139,21 @@ private:
 	std::vector<MonoIcon> _parts;
 	mutable int _width = -1;
 	mutable int _height = -1;
-
 };
 
 class Icon {
 public:
-	Icon(Qt::Initialization) {
-	}
+	Icon(Qt::Initialization) {}
 
-	template <typename ... MonoIcons>
-	Icon(MonoIcons&&... icons) : _data(new IconData(std::forward<MonoIcons>(icons)...)), _owner(true) {
-	}
-	Icon(const Icon &other) : _data(other._data) {
-	}
-	Icon(Icon &&other) : _data(base::take(other._data)), _owner(base::take(_owner)) {
-	}
+	template <typename... MonoIcons>
+	Icon(MonoIcons &&... icons)
+	    : _data(new IconData(std::forward<MonoIcons>(icons)...))
+	    , _owner(true) {}
+	Icon(const Icon &other)
+	    : _data(other._data) {}
+	Icon(Icon &&other)
+	    : _data(base::take(other._data))
+	    , _owner(base::take(_owner)) {}
 	Icon &operator=(const Icon &other) {
 		Assert(!_owner);
 		_data = other._data;
@@ -201,7 +188,9 @@ public:
 		return _data->paint(p, QPoint(x, y), outerw);
 	}
 	void paintInCenter(QPainter &p, const QRect &outer) const {
-		return _data->paint(p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2), outer.x() * 2 + outer.width());
+		return _data->paint(
+		    p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2),
+		    outer.x() * 2 + outer.width());
 	}
 	void fill(QPainter &p, const QRect &rect) const {
 		return _data->fill(p, rect);
@@ -214,7 +203,9 @@ public:
 		return _data->paint(p, QPoint(x, y), outerw, colorOverride);
 	}
 	void paintInCenter(QPainter &p, const QRect &outer, QColor colorOverride) const {
-		return _data->paint(p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2), outer.x() * 2 + outer.width(), colorOverride);
+		return _data->paint(
+		    p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2),
+		    outer.x() * 2 + outer.width(), colorOverride);
 	}
 	void fill(QPainter &p, const QRect &rect, QColor colorOverride) const {
 		return _data->fill(p, rect, colorOverride);
@@ -226,14 +217,23 @@ public:
 
 	class Proxy {
 	public:
-		Proxy(const Icon &icon, const style::palette &palette) : _icon(icon), _palette(palette) {
-		}
+		Proxy(const Icon &icon, const style::palette &palette)
+		    : _icon(icon)
+		    , _palette(palette) {}
 		Proxy(const Proxy &other) = default;
 
-		bool empty() const { return _icon.empty(); }
-		int width() const { return _icon.width(); }
-		int height() const { return _icon.height(); }
-		QSize size() const { return _icon.size(); }
+		bool empty() const {
+			return _icon.empty();
+		}
+		int width() const {
+			return _icon.width();
+		}
+		int height() const {
+			return _icon.height();
+		}
+		QSize size() const {
+			return _icon.size();
+		}
 
 		void paint(QPainter &p, const QPoint &pos, int outerw) const {
 			return _icon.paintWithPalette(p, pos, outerw, _palette);
@@ -251,7 +251,6 @@ public:
 	private:
 		const Icon &_icon;
 		const style::palette &_palette;
-
 	};
 	Proxy operator[](const style::palette &paletteOverride) const {
 		return Proxy(*this, paletteOverride);
@@ -275,7 +274,9 @@ private:
 		return _data->paint(p, QPoint(x, y), outerw, paletteOverride);
 	}
 	void paintInCenterWithPalette(QPainter &p, const QRect &outer, const style::palette &paletteOverride) const {
-		return _data->paint(p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2), outer.x() * 2 + outer.width(), paletteOverride);
+		return _data->paint(
+		    p, QPoint(outer.x() + (outer.width() - width()) / 2, outer.y() + (outer.height() - height()) / 2),
+		    outer.x() * 2 + outer.width(), paletteOverride);
 	}
 	void fillWithPalette(QPainter &p, const QRect &rect, const style::palette &paletteOverride) const {
 		return _data->fill(p, rect, paletteOverride);
@@ -283,7 +284,6 @@ private:
 
 	IconData *_data = nullptr;
 	bool _owner = false;
-
 };
 
 void resetIcons();
diff --git a/Telegram/SourceFiles/ui/style/style_core_types.cpp b/Telegram/SourceFiles/ui/style/style_core_types.cpp
index c7530bf50..9bd49c0fa 100644
--- a/Telegram/SourceFiles/ui/style/style_core_types.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core_types.cpp
@@ -20,5 +20,4 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/style/style_core_types.h"
 
-namespace style {
-} // namespace style
+namespace style {} // namespace style
diff --git a/Telegram/SourceFiles/ui/style/style_core_types.h b/Telegram/SourceFiles/ui/style/style_core_types.h
index 8e1b91896..b842854ce 100644
--- a/Telegram/SourceFiles/ui/style/style_core_types.h
+++ b/Telegram/SourceFiles/ui/style/style_core_types.h
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
 #include <QColor>
-#include <QPoint>
-#include <QRect>
 #include <QCursor>
 #include <QFont>
+#include <QPoint>
+#include <QRect>
+#include <QString>
 
-#include "ui/style/style_core_font.h"
 #include "ui/style/style_core_color.h"
+#include "ui/style/style_core_font.h"
 #include "ui/style/style_core_icon.h"
 
 namespace style {
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
index f7668bda5..731379bbf 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@@ -24,18 +24,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "app.h"
 #include "ui/text/text.h"
 
-#include "core/utils.h"                // makeShared
-#include "core/click_handler_types.h"  // UrlClickHandler
+#include "core/click_handler_types.h" // UrlClickHandler
+#include "core/utils.h" // makeShared
 
-#include "ui/text/text_block.h"        // TextBlockTSkip, ...
-#include "styles/style_basic.h"        // style::TextStyle
+#include "styles/style_basic.h" // style::TextStyle
+#include "ui/text/text_block.h" // TextBlockTSkip, ...
 
 class HiddenUrlClickHandler;
 
 namespace {
 
 inline qint32 countBlockHeight(const ITextBlock *b, const style::TextStyle *st) {
-	return (b->type() == TextBlockTSkip) ? static_cast<const SkipBlock*>(b)->height() : (st->lineHeight > st->font->height) ? st->lineHeight : st->font->height;
+	return (b->type() == TextBlockTSkip) ? static_cast<const SkipBlock *>(b)->height() :
+	                                       (st->lineHeight > st->font->height) ? st->lineHeight : st->font->height;
 }
 
 } // namespace
@@ -60,7 +61,11 @@ QString textcmdStartLink(const QString &url) {
 
 	QString result;
 	result.reserve(url.size() + 4);
-	return result.append(TextCommand).append(QChar(TextCommandLinkText)).append(QChar(url.size())).append(url).append(TextCommand);
+	return result.append(TextCommand)
+	    .append(QChar(TextCommandLinkText))
+	    .append(QChar(url.size()))
+	    .append(url)
+	    .append(TextCommand);
 }
 
 QString textcmdStopLink() {
@@ -107,8 +112,7 @@ const QChar *textSkipCommand(const QChar *from, const QChar *end, bool canLink)
 	case TextCommandItalic:
 	case TextCommandNoItalic:
 	case TextCommandUnderline:
-	case TextCommandNoUnderline:
-		break;
+	case TextCommandNoUnderline: break;
 
 	case TextCommandLinkIndex:
 		if (result->unicode() > 0x7FFF) return from;
@@ -121,13 +125,9 @@ const QChar *textSkipCommand(const QChar *from, const QChar *end, bool canLink)
 		result += len + 1;
 	} break;
 
-	case TextCommandSkipBlock:
-		result += 2;
-		break;
+	case TextCommandSkipBlock: result += 2; break;
 
-	case TextCommandLangTag:
-		result += 1;
-		break;
+	case TextCommandLangTag: result += 1; break;
 	}
 	return (result < end && *result == TextCommand) ? (result + 1) : from;
 }
@@ -135,7 +135,7 @@ const QChar *textSkipCommand(const QChar *from, const QChar *end, bool canLink)
 class TextParser {
 public:
 	static Qt::LayoutDirection stringDirection(const QString &str, qint32 from, qint32 to) {
-		const ushort *p = reinterpret_cast<const ushort*>(str.unicode()) + from;
+		const ushort *p = reinterpret_cast<const ushort *>(str.unicode()) + from;
 		const ushort *end = p + (to - from);
 		while (p < end) {
 			uint ucs4 = *p;
@@ -147,13 +147,10 @@ public:
 				}
 			}
 			switch (QChar::direction(ucs4)) {
-			case QChar::DirL:
-				return Qt::LeftToRight;
+			case QChar::DirL: return Qt::LeftToRight;
 			case QChar::DirR:
-			case QChar::DirAL:
-				return Qt::RightToLeft;
-			default:
-				break;
+			case QChar::DirAL: return Qt::RightToLeft;
+			default: break;
 			}
 			++p;
 		}
@@ -181,13 +178,16 @@ public:
 			}
 			lastSkipped = false;
 			if (emoji) {
-				_t->_blocks.push_back(std::make_unique<EmojiBlock>(_t->_st->font, _t->_text, blockStart, len, flags, lnkIndex, emoji));
+				_t->_blocks.push_back(
+				    std::make_unique<EmojiBlock>(_t->_st->font, _t->_text, blockStart, len, flags, lnkIndex, emoji));
 				emoji = 0;
 				lastSkipped = true;
 			} else if (newline) {
-				_t->_blocks.push_back(std::make_unique<NewlineBlock>(_t->_st->font, _t->_text, blockStart, len, flags, lnkIndex));
+				_t->_blocks.push_back(
+				    std::make_unique<NewlineBlock>(_t->_st->font, _t->_text, blockStart, len, flags, lnkIndex));
 			} else {
-				_t->_blocks.push_back(std::make_unique<TextBlock>(_t->_st->font, _t->_text, _t->_minResizeWidth, blockStart, len, flags, lnkIndex));
+				_t->_blocks.push_back(std::make_unique<TextBlock>(_t->_st->font, _t->_text, _t->_minResizeWidth,
+				                                                  blockStart, len, flags, lnkIndex));
 			}
 			blockStart += len;
 			blockCreated();
@@ -257,11 +257,8 @@ public:
 			if (!_t->_blocks.empty() && _t->_blocks.back()->type() != TextBlockTNewline) {
 				createNewlineBlock();
 			}
-		} else if (type == EntityInTextUrl
-		        || type == EntityInTextEmail
-		        || type == EntityInTextMention
-		        || type == EntityInTextHashtag
-		        || type == EntityInTextBotCommand) {
+		} else if (type == EntityInTextUrl || type == EntityInTextEmail || type == EntityInTextMention ||
+		           type == EntityInTextHashtag || type == EntityInTextBotCommand) {
 			linkType = type;
 			linkData = QString(start + waitingEntity->offset(), waitingEntity->length());
 			if (linkType == EntityInTextUrl) {
@@ -300,15 +297,11 @@ public:
 
 		++waitingEntity;
 		if (links.size() >= 0x7FFF) {
-			while (waitingEntity != entitiesEnd && (
-				waitingEntity->type() == EntityInTextUrl ||
-				waitingEntity->type() == EntityInTextCustomUrl ||
-				waitingEntity->type() == EntityInTextEmail ||
-				waitingEntity->type() == EntityInTextHashtag ||
-				waitingEntity->type() == EntityInTextMention ||
-				waitingEntity->type() == EntityInTextMentionName ||
-				waitingEntity->type() == EntityInTextBotCommand ||
-				waitingEntity->length() <= 0)) {
+			while (waitingEntity != entitiesEnd &&
+			       (waitingEntity->type() == EntityInTextUrl || waitingEntity->type() == EntityInTextCustomUrl ||
+			        waitingEntity->type() == EntityInTextEmail || waitingEntity->type() == EntityInTextHashtag ||
+			        waitingEntity->type() == EntityInTextMention || waitingEntity->type() == EntityInTextMentionName ||
+			        waitingEntity->type() == EntityInTextBotCommand || waitingEntity->length() <= 0)) {
 				++waitingEntity;
 			}
 		} else {
@@ -327,9 +320,7 @@ public:
 		++ptr;
 
 		switch (cmd) {
-		case TextCommandSkipBlock:
-			createSkipBlock(ptr->unicode(), (ptr + 1)->unicode());
-		break;
+		case TextCommandSkipBlock: createSkipBlock(ptr->unicode(), (ptr + 1)->unicode()); break;
 		}
 
 		ptr = afterCmd;
@@ -351,63 +342,63 @@ public:
 				createBlock();
 				flags |= TextBlockFBold;
 			}
-		break;
+			break;
 
 		case TextCommandNoBold:
 			if (flags & TextBlockFBold) {
 				createBlock();
 				flags &= ~TextBlockFBold;
 			}
-		break;
+			break;
 
 		case TextCommandSemibold:
-		if (!(flags & TextBlockFSemibold)) {
-			createBlock();
-			flags |= TextBlockFSemibold;
-		}
-		break;
+			if (!(flags & TextBlockFSemibold)) {
+				createBlock();
+				flags |= TextBlockFSemibold;
+			}
+			break;
 
 		case TextCommandNoSemibold:
-		if (flags & TextBlockFSemibold) {
-			createBlock();
-			flags &= ~TextBlockFSemibold;
-		}
-		break;
+			if (flags & TextBlockFSemibold) {
+				createBlock();
+				flags &= ~TextBlockFSemibold;
+			}
+			break;
 
 		case TextCommandItalic:
 			if (!(flags & TextBlockFItalic)) {
 				createBlock();
 				flags |= TextBlockFItalic;
 			}
-		break;
+			break;
 
 		case TextCommandNoItalic:
 			if (flags & TextBlockFItalic) {
 				createBlock();
 				flags &= ~TextBlockFItalic;
 			}
-		break;
+			break;
 
 		case TextCommandUnderline:
 			if (!(flags & TextBlockFUnderline)) {
 				createBlock();
 				flags |= TextBlockFUnderline;
 			}
-		break;
+			break;
 
 		case TextCommandNoUnderline:
 			if (flags & TextBlockFUnderline) {
 				createBlock();
 				flags &= ~TextBlockFUnderline;
 			}
-		break;
+			break;
 
 		case TextCommandLinkIndex:
 			if (ptr->unicode() != lnkIndex) {
 				createBlock();
 				lnkIndex = ptr->unicode();
 			}
-		break;
+			break;
 
 		case TextCommandLinkText: {
 			createBlock();
@@ -416,9 +407,7 @@ public:
 			lnkIndex = 0x8000 + links.size();
 		} break;
 
-		case TextCommandSkipBlock:
-			createSkipBlock(ptr->unicode(), (ptr + 1)->unicode());
-		break;
+		case TextCommandSkipBlock: createSkipBlock(ptr->unicode(), (ptr + 1)->unicode()); break;
 		}
 
 		ptr = afterCmd;
@@ -429,7 +418,8 @@ public:
 		int skipBack = 0;
 		ch = ((ptr < end) ? *ptr : 0);
 		emojiLookback = 0;
-		bool skip = false, isNewLine = multiline && chIsNewline(ch), isSpace = chIsSpace(ch), isDiac = chIsDiac(ch), isTilde = checkTilde && (ch == '~');
+		bool skip = false, isNewLine = multiline && chIsNewline(ch), isSpace = chIsSpace(ch), isDiac = chIsDiac(ch),
+		     isTilde = checkTilde && (ch == '~');
 		if (chIsBad(ch) || ch.isLowSurrogate()) {
 			skip = true;
 		} else if (ch == 0xFE0F && (cPlatform() == dbipMac || cPlatform() == dbipMacOld)) {
@@ -495,22 +485,24 @@ public:
 		emoji = e;
 	}
 
-	TextParser(Text *t, const QString &text, const TextParseOptions &options) : _t(t),
-		source { text },
-		rich(options.flags & TextParseRichText),
-		multiline(options.flags & TextParseMultiline),
-		stopAfterWidth(QFIXED_MAX) {
+	TextParser(Text *t, const QString &text, const TextParseOptions &options)
+	    : _t(t)
+	    , source{text}
+	    , rich(options.flags & TextParseRichText)
+	    , multiline(options.flags & TextParseMultiline)
+	    , stopAfterWidth(QFIXED_MAX) {
 		if (options.flags & TextParseLinks) {
 			TextUtilities::ParseEntities(source, options.flags, rich);
 		}
 		parse(options);
 	}
 
-	TextParser(Text *t, const TextWithEntities &textWithEntities, const TextParseOptions &options) : _t(t),
-		source(textWithEntities),
-		rich(options.flags & TextParseRichText),
-		multiline(options.flags & TextParseMultiline),
-		stopAfterWidth(QFIXED_MAX) {
+	TextParser(Text *t, const TextWithEntities &textWithEntities, const TextParseOptions &options)
+	    : _t(t)
+	    , source(textWithEntities)
+	    , rich(options.flags & TextParseRichText)
+	    , multiline(options.flags & TextParseMultiline)
+	    , stopAfterWidth(QFIXED_MAX) {
 		auto &preparsed = textWithEntities.entities;
 		if ((options.flags & TextParseLinks) && !preparsed.isEmpty()) {
 			bool parseMentions = (options.flags & TextParseMentions);
@@ -525,9 +517,11 @@ public:
 				for (; i < l; ++i) {
 					auto type = preparsed.at(i).type();
 					if (((type == EntityInTextMention || type == EntityInTextMentionName) && !parseMentions) ||
-						(type == EntityInTextHashtag && !parseHashtags) ||
-						(type == EntityInTextBotCommand && !parseBotCommands) ||
-						((type == EntityInTextBold || type == EntityInTextItalic || type == EntityInTextCode || type == EntityInTextPre) && !parseMarkdown)) {
+					    (type == EntityInTextHashtag && !parseHashtags) ||
+					    (type == EntityInTextBotCommand && !parseBotCommands) ||
+					    ((type == EntityInTextBold || type == EntityInTextItalic || type == EntityInTextCode ||
+					      type == EntityInTextPre) &&
+					     !parseMarkdown)) {
 						continue;
 					}
 					source.entities.push_back(preparsed.at(i));
@@ -569,7 +563,8 @@ public:
 
 		ch = emojiLookback = 0;
 		lastSkipped = false;
-		checkTilde = !cRetina() && (_t->_st->font->size() == 13) && (_t->_st->font->flags() == 0) && (_t->_st->font->f.family() == qstr("Open Sans")); // tilde Open Sans fix
+		checkTilde = !cRetina() && (_t->_st->font->size() == 13) && (_t->_st->font->flags() == 0) &&
+		             (_t->_st->font->f.family() == qstr("Open Sans")); // tilde Open Sans fix
 		for (; ptr <= end; ++ptr) {
 			while (checkEntities() || (rich && checkCommand())) {
 			}
@@ -598,29 +593,36 @@ public:
 					auto &link = links[lnkIndex - maxLnkIndex - 1];
 					ClickHandlerPtr handler;
 					switch (link.type) {
-					case EntityInTextInvalid: case EntityInTextBold: case EntityInTextItalic: assert(false); // temp
+					case EntityInTextInvalid:
+					case EntityInTextBold:
+					case EntityInTextItalic: assert(false); // temp
 					case EntityInTextCustomUrl: handler = MakeShared<HiddenUrlClickHandler>(link.data); break;
 					case EntityInTextEmail:
-					case EntityInTextUrl: handler = MakeShared<UrlClickHandler>(link.data, link.displayStatus == LinkDisplayedFull); break;
+					case EntityInTextUrl:
+						handler = MakeShared<UrlClickHandler>(link.data, link.displayStatus == LinkDisplayedFull);
+						break;
 					case EntityInTextBotCommand: handler = MakeShared<BotCommandClickHandler>(link.data); break;
 					case EntityInTextHashtag:
 						if (options.flags & TextTwitterMentions) {
-							handler = MakeShared<UrlClickHandler>(qsl("https://twitter.com/hashtag/") + link.data.mid(1) + qsl("?src=hash"), true);
+							handler = MakeShared<UrlClickHandler>(
+							    qsl("https://twitter.com/hashtag/") + link.data.mid(1) + qsl("?src=hash"), true);
 						} else if (options.flags & TextInstagramMentions) {
-							handler = MakeShared<UrlClickHandler>(qsl("https://instagram.com/explore/tags/") + link.data.mid(1) + '/', true);
+							handler = MakeShared<UrlClickHandler>(
+							    qsl("https://instagram.com/explore/tags/") + link.data.mid(1) + '/', true);
 						} else {
 							handler = MakeShared<HashtagClickHandler>(link.data);
 						}
-					break;
+						break;
 					case EntityInTextMention:
 						if (options.flags & TextTwitterMentions) {
 							handler = MakeShared<UrlClickHandler>(qsl("https://twitter.com/") + link.data.mid(1), true);
 						} else if (options.flags & TextInstagramMentions) {
-							handler = MakeShared<UrlClickHandler>(qsl("https://instagram.com/") + link.data.mid(1) + '/', true);
+							handler = MakeShared<UrlClickHandler>(
+							    qsl("https://instagram.com/") + link.data.mid(1) + '/', true);
 						} else {
 							handler = MakeShared<MentionClickHandler>(link.data);
 						}
-					break;
+						break;
 					case EntityInTextMentionName: {
 						auto fields = TextUtilities::MentionNameDataToFields(link.data);
 						if (fields.userId) {
@@ -652,11 +654,10 @@ private:
 	struct TextLinkData {
 		TextLinkData() = default;
 		TextLinkData(EntityInTextType type, const QString &text, const QString &data, LinkDisplayStatus displayStatus)
-			: type(type)
-			, text(text)
-			, data(data)
-			, displayStatus(displayStatus) {
-		}
+		    : type(type)
+		    , text(text)
+		    , data(data)
+		    , displayStatus(displayStatus) {}
 		EntityInTextType type = EntityInTextInvalid;
 		QString text, data;
 		LinkDisplayStatus displayStatus = LinkDisplayedFull;
@@ -678,7 +679,7 @@ private:
 	typedef QVector<TextLinkData> TextLinks;
 	TextLinks links;
 
-	typedef QMap<const QChar*, QList<qint32> > RemoveFlagsMap;
+	typedef QMap<const QChar *, QList<qint32>> RemoveFlagsMap;
 	RemoveFlagsMap removeFlags;
 
 	quint16 maxLnkIndex = 0;
@@ -707,7 +708,7 @@ struct BidiStatus {
 	BidiStatus() {
 		eor = QChar::DirON;
 		lastStrong = QChar::DirON;
-		last = QChar:: DirON;
+		last = QChar::DirON;
 		dir = QChar::DirON;
 	}
 	QChar::Direction eor;
@@ -721,11 +722,12 @@ enum { _MaxItemLength = 4096 };
 
 struct BidiControl {
 	inline BidiControl(bool rtl)
-		: base(rtl ? 1 : 0), level(rtl ? 1 : 0) {}
+	    : base(rtl ? 1 : 0)
+	    , level(rtl ? 1 : 0) {}
 
 	inline void embed(bool rtl, bool o = false) {
 		unsigned int toAdd = 1;
-		if((level%2 != 0) == rtl ) {
+		if ((level % 2 != 0) == rtl) {
 			++toAdd;
 		}
 		if (level + toAdd <= _MaxBidiLevel) {
@@ -736,7 +738,9 @@ struct BidiControl {
 			level += toAdd;
 		}
 	}
-	inline bool canPop() const { return cCtx != 0; }
+	inline bool canPop() const {
+		return cCtx != 0;
+	}
 	inline void pdf() {
 		Q_ASSERT(cCtx);
 		--cCtx;
@@ -745,13 +749,13 @@ struct BidiControl {
 	}
 
 	inline QChar::Direction basicDirection() const {
-		return (base ? QChar::DirR : QChar:: DirL);
+		return (base ? QChar::DirR : QChar::DirL);
 	}
 	inline unsigned int baseLevel() const {
 		return base;
 	}
 	inline QChar::Direction direction() const {
-		return ((level%2) ? QChar::DirR : QChar:: DirL);
+		return ((level % 2) ? QChar::DirR : QChar::DirL);
 	}
 
 	struct {
@@ -764,21 +768,20 @@ struct BidiControl {
 	bool override = false;
 };
 
-static void eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const BidiControl &control, QChar::Direction dir) {
-	if (start > stop)
-		return;
+static void eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const BidiControl &control,
+                         QChar::Direction dir) {
+	if (start > stop) return;
 
 	int level = control.level;
 
-	if(dir != QChar::DirON && !control.override) {
+	if (dir != QChar::DirON && !control.override) {
 		// add level of run (cases I1 & I2)
-		if(level % 2) {
-			if(dir == QChar::DirL || dir == QChar::DirAN || dir == QChar::DirEN)
-				level++;
+		if (level % 2) {
+			if (dir == QChar::DirL || dir == QChar::DirAN || dir == QChar::DirEN) level++;
 		} else {
-			if(dir == QChar::DirR)
+			if (dir == QChar::DirR)
 				level++;
-			else if(dir == QChar::DirAN || dir == QChar::DirEN)
+			else if (dir == QChar::DirAN || dir == QChar::DirEN)
 				level += 2;
 		}
 	}
@@ -797,8 +800,9 @@ static void eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const
 
 class TextPainter {
 public:
-	TextPainter(Painter *p, const Text *t) : _p(p), _t(t) {
-	}
+	TextPainter(Painter *p, const Text *t)
+	    : _p(p)
+	    , _t(t) {}
 
 	~TextPainter() {
 		restoreAfterElided();
@@ -807,7 +811,8 @@ public:
 		}
 	}
 
-	void draw(qint32 left, qint32 top, qint32 w, style::align align, qint32 yFrom, qint32 yTo, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) {
+	void draw(qint32 left, qint32 top, qint32 w, style::align align, qint32 yFrom, qint32 yTo,
+	          TextSelection selection = {0, 0}, bool fullWidthSelection = true) {
 		if (_t->isEmpty()) return;
 
 		_blocksSize = _t->_blocks.size();
@@ -886,7 +891,7 @@ public:
 					_wLeft -= _elideRemoveFromEnd;
 				}
 
-				_parDirection = static_cast<NewlineBlock*>(b)->nextDirection();
+				_parDirection = static_cast<NewlineBlock *>(b)->nextDirection();
 				if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = cLangDir();
 				initNextParagraph(i + 1);
 
@@ -908,7 +913,7 @@ public:
 			}
 
 			if (_btype == TextBlockTText) {
-				auto t = static_cast<TextBlock*>(b);
+				auto t = static_cast<TextBlock *>(b);
 				if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
 					_last_rPadding += b->f_rpadding();
 
@@ -954,7 +959,8 @@ public:
 						_lineHeight = f_lineHeight;
 						j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
 					}
-					if (!drawLine(elidedLine ? ((j + 1 == en) ? _t->countBlockEnd(i, e) : (j + 1)->from()) : j->from(), i, e)) {
+					if (!drawLine(elidedLine ? ((j + 1 == en) ? _t->countBlockEnd(i, e) : (j + 1)->from()) : j->from(),
+					              i, e)) {
 						return;
 					}
 					_y += _lineHeight;
@@ -1009,7 +1015,8 @@ public:
 		}
 	}
 
-	void drawElided(qint32 left, qint32 top, qint32 w, style::align align, qint32 lines, qint32 yFrom, qint32 yTo, qint32 removeFromEnd, bool breakEverywhere, TextSelection selection) {
+	void drawElided(qint32 left, qint32 top, qint32 w, style::align align, qint32 lines, qint32 yFrom, qint32 yTo,
+	                qint32 removeFromEnd, bool breakEverywhere, TextSelection selection) {
 		if (lines <= 0 || _t->isNull()) return;
 
 		if (yTo < 0 || (lines - 1) * _t->_st->font->height < yTo) {
@@ -1087,7 +1094,7 @@ private:
 		bool rtl = (_parDirection == Qt::RightToLeft);
 		if (!ignore && !rtl) {
 			ignore = true;
-			const ushort *start = reinterpret_cast<const ushort*>(_str) + _parStart;
+			const ushort *start = reinterpret_cast<const ushort *>(_str) + _parStart;
 			const ushort *curr = start;
 			const ushort *end = start + _parLength;
 			while (curr < end) {
@@ -1112,8 +1119,7 @@ private:
 		if (ignore) {
 			memset(analysis, 0, _parLength * sizeof(QScriptAnalysis));
 			if (rtl) {
-				for (int i = 0; i < _parLength; ++i)
-					analysis[i].bidiLevel = 1;
+				for (int i = 0; i < _parLength; ++i) analysis[i].bidiLevel = 1;
 				_parHasBidi = true;
 			}
 		} else {
@@ -1121,7 +1127,8 @@ private:
 		}
 	}
 
-	bool drawLine(quint16 _lineEnd, const Text::TextBlocks::const_iterator &_endBlockIter, const Text::TextBlocks::const_iterator &_end) {
+	bool drawLine(quint16 _lineEnd, const Text::TextBlocks::const_iterator &_endBlockIter,
+	              const Text::TextBlocks::const_iterator &_end) {
 		_yDelta = (_lineHeight - _fontHeight) / 2;
 		if (_yTo >= 0 && (_y + _yDelta >= _yTo || _y >= _yTo)) return false;
 		if (_y + _yDelta + _fontHeight <= _yFrom) {
@@ -1163,7 +1170,9 @@ private:
 
 		qint32 delta = (currentBlock->from() < _lineStart ? std::min(_lineStart - currentBlock->from(), 2) : 0);
 		_localFrom = _lineStart - delta;
-		qint32 lineEnd = (_endBlock && _endBlock->from() < trimmedLineEnd && !elidedLine) ? std::min(quint16(trimmedLineEnd + 2), _t->countBlockEnd(_endBlockIter, _end)) : trimmedLineEnd;
+		qint32 lineEnd = (_endBlock && _endBlock->from() < trimmedLineEnd && !elidedLine) ?
+		                     std::min(quint16(trimmedLineEnd + 2), _t->countBlockEnd(_endBlockIter, _end)) :
+		                     trimmedLineEnd;
 
 		auto lineText = _t->_text.mid(_localFrom, lineEnd - _localFrom);
 		auto lineStart = delta;
@@ -1177,7 +1186,8 @@ private:
 		auto x = _x;
 		if (_align & Qt::AlignHCenter) {
 			x += (_wLeft / 2).toInt();
-		} else if (((_align & Qt::AlignLeft) && _parDirection == Qt::RightToLeft) || ((_align & Qt::AlignRight) && _parDirection == Qt::LeftToRight)) {
+		} else if (((_align & Qt::AlignLeft) && _parDirection == Qt::RightToLeft) ||
+		           ((_align & Qt::AlignRight) && _parDirection == Qt::LeftToRight)) {
 			x += _wLeft;
 		}
 
@@ -1187,11 +1197,14 @@ private:
 					if (_parDirection == Qt::RightToLeft) {
 						_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 						_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+						// _lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd <
+						//_t->_text.size()) &&
+						//(!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
 					} else {
 						_lookupResult.symbol = _lineStart;
 						_lookupResult.afterSymbol = false;
-//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineStart > 0)) ? true : false;
+						// _lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineStart > 0)) ? true
+						//: false;
 					}
 				}
 				if (_lookupLink) {
@@ -1203,11 +1216,14 @@ private:
 				if (_parDirection == Qt::RightToLeft) {
 					_lookupResult.symbol = _lineStart;
 					_lookupResult.afterSymbol = false;
-//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineStart > 0)) ? true : false;
+					// _lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineStart > 0)) ? true : false;
 				} else {
 					_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 					_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+					// _lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) &&
+					//                             (!_endBlock || _endBlock->type() != TextBlockTSkip)) ?
+					//                                true :
+					//                                false;
 				}
 				if (_lookupLink) {
 					_lookupResult.link.clear();
@@ -1219,14 +1235,17 @@ private:
 
 		if (_fullWidthSelection) {
 			bool selectFromStart = (_selection.to > _lineStart) && (_lineStart > 0) && (_selection.from <= _lineStart);
-			bool selectTillEnd = (_selection.to >= _lineEnd) && (_lineEnd < _t->_text.size()) && (_selection.from < _lineEnd) && (!_endBlock || _endBlock->type() != TextBlockTSkip);
+			bool selectTillEnd = (_selection.to >= _lineEnd) && (_lineEnd < _t->_text.size()) &&
+			                     (_selection.from < _lineEnd) && (!_endBlock || _endBlock->type() != TextBlockTSkip);
 
-			if ((selectFromStart && _parDirection == Qt::LeftToRight) || (selectTillEnd && _parDirection == Qt::RightToLeft)) {
+			if ((selectFromStart && _parDirection == Qt::LeftToRight) ||
+			    (selectTillEnd && _parDirection == Qt::RightToLeft)) {
 				if (x > _x) {
 					fillSelectRange(_x, x);
 				}
 			}
-			if ((selectTillEnd && _parDirection == Qt::LeftToRight) || (selectFromStart && _parDirection == Qt::RightToLeft)) {
+			if ((selectTillEnd && _parDirection == Qt::LeftToRight) ||
+			    (selectFromStart && _parDirection == Qt::RightToLeft)) {
 				if (x < _x + _wLeft) {
 					fillSelectRange(x + _w - _wLeft, _x + _w);
 				}
@@ -1249,7 +1268,7 @@ private:
 		eShapeLine(line);
 
 		int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
-	    int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0;
+		int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0;
 		if (!nItems) {
 			return true;
 		}
@@ -1272,11 +1291,14 @@ private:
 			}
 			if (si.analysis.flags == QScriptAnalysis::Object) {
 				if (_type == TextBlockTEmoji || _type == TextBlockTSkip) {
-					si.width = currentBlock->f_width() + (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd) ? 0 : currentBlock->f_rpadding());
+					si.width = currentBlock->f_width() +
+					           (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd) ?
+					                0 :
+					                currentBlock->f_rpadding());
 				}
 			}
 		}
-	    QTextEngine::bidiReorder(nItems, levels.data(), visualOrder.data());
+		QTextEngine::bidiReorder(nItems, levels.data(), visualOrder.data());
 		if (rtl() && skipIndex == nItems - 1) {
 			for (qint32 i = nItems; i > 1;) {
 				--i;
@@ -1311,7 +1333,8 @@ private:
 				TextBlockType _type = currentBlock->type();
 				if (!_p && _lookupX >= x && _lookupX < x + si.width) { // _lookupRequest
 					if (_lookupLink) {
-						if (currentBlock->lnkIndex() && _lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
+						if (currentBlock->lnkIndex() && _lookupY >= _y + _yDelta &&
+						    _lookupY < _y + _yDelta + _fontHeight) {
 							_lookupResult.link = _t->_links.at(currentBlock->lnkIndex() - 1);
 						}
 					}
@@ -1324,7 +1347,8 @@ private:
 								_lookupResult.symbol = _lineStart;
 								_lookupResult.afterSymbol = false;
 							} else {
-								_lookupResult.symbol = (trimmedLineEnd > _lineStart) ? (trimmedLineEnd - 1) : _lineStart;
+								_lookupResult.symbol =
+								    (trimmedLineEnd > _lineStart) ? (trimmedLineEnd - 1) : _lineStart;
 								_lookupResult.afterSymbol = (trimmedLineEnd > _lineStart) ? true : false;
 							}
 							return false;
@@ -1332,7 +1356,8 @@ private:
 
 						// Emoji with spaces after symbol lookup
 						auto chFrom = _str + currentBlock->from();
-						auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+						auto chTo =
+						    chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
 						auto spacesWidth = (si.width - currentBlock->f_width());
 						auto spacesCount = 0;
 						while (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space) {
@@ -1348,11 +1373,13 @@ private:
 								}
 							} else if (_lookupX >= x + si.width - spacesWidth) {
 								_lookupResult.symbol = (chTo - _str); // up to a space, inclided, ltr
-								_lookupResult.afterSymbol = (_lookupX >= x + si.width - spacesWidth + (spacesWidth / 2)) ? true : false;
+								_lookupResult.afterSymbol =
+								    (_lookupX >= x + si.width - spacesWidth + (spacesWidth / 2)) ? true : false;
 								return false;
 							}
 						}
-						if (_lookupX < x + (rtl ? (si.width - currentBlock->f_width()) : 0) + (currentBlock->f_width() / 2)) {
+						if (_lookupX <
+						    x + (rtl ? (si.width - currentBlock->f_width()) : 0) + (currentBlock->f_width() / 2)) {
 							_lookupResult.symbol = ((rtl && chTo > chFrom) ? (chTo - 1) : chFrom) - _str;
 							_lookupResult.afterSymbol = (rtl && chTo > chFrom) ? true : false;
 						} else {
@@ -1369,14 +1396,17 @@ private:
 					}
 					if (_localFrom + si.position < _selection.to) {
 						auto chFrom = _str + currentBlock->from();
-						auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+						auto chTo =
+						    chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
 						if (_localFrom + si.position >= _selection.from) { // could be without space
-							if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || _selection.to >= (chTo - _str)) {
+							if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space ||
+							    _selection.to >= (chTo - _str)) {
 								fillSelectRange(x, x + si.width);
 							} else { // or with space
 								fillSelectRange(glyphX, glyphX + currentBlock->f_width());
 							}
-						} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space && (chTo - 1 - _str) >= _selection.from) {
+						} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space &&
+						           (chTo - 1 - _str) >= _selection.from) {
 							if (rtl) { // rtl space only
 								fillSelectRange(x, glyphX);
 							} else { // ltr space only
@@ -1384,9 +1414,12 @@ private:
 							}
 						}
 					}
-					emojiDraw(*_p, static_cast<EmojiBlock*>(currentBlock)->emoji, (glyphX + st::emojiPadding).toInt(), _y + _yDelta + emojiY);
-//				} else if (_p && currentBlock->type() == TextBlockSkip) { // debug
-//					_p->fillRect(QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock*>(currentBlock)->height()), QColor(0, 0, 0, 32));
+					emojiDraw(*_p, static_cast<EmojiBlock *>(currentBlock)->emoji, (glyphX + st::emojiPadding).toInt(),
+					          _y + _yDelta + emojiY);
+					// } else if (_p && currentBlock->type() == TextBlockSkip) { // debug
+					// 	_p->fillRect(
+					// 	    QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock
+					// *>(currentBlock)->height()), 	    QColor(0, 0, 0, 32));
 				}
 				x += si.width;
 				continue;
@@ -1407,8 +1440,7 @@ private:
 			}
 
 			QFixed itemWidth = 0;
-			for (int g = glyphsStart; g < glyphsEnd; ++g)
-				itemWidth += glyphs.effectiveAdvance(g);
+			for (int g = glyphsStart; g < glyphsEnd; ++g) itemWidth += glyphs.effectiveAdvance(g);
 
 			if (!_p && _lookupX >= x && _lookupX < x + itemWidth) { // _lookupRequest
 				if (_lookupLink) {
@@ -1429,12 +1461,10 @@ private:
 						}
 						for (int charsCount = (ch2 - ch); ch < ch2; ++ch) {
 							QFixed shift1 = QFixed(2 * (charsCount - (ch2 - ch)) + 2) * gwidth / QFixed(2 * charsCount),
-								shift2 = QFixed(2 * (charsCount - (ch2 - ch)) + 1) * gwidth / QFixed(2 * charsCount);
-							if ((rtl && _lookupX >= tmpx - shift1) ||
-								(!rtl && _lookupX < tmpx + shift1)) {
+							       shift2 = QFixed(2 * (charsCount - (ch2 - ch)) + 1) * gwidth / QFixed(2 * charsCount);
+							if ((rtl && _lookupX >= tmpx - shift1) || (!rtl && _lookupX < tmpx + shift1)) {
 								_lookupResult.symbol = _localFrom + itemStart + ch;
-								if ((rtl && _lookupX >= tmpx - shift2) ||
-									(!rtl && _lookupX < tmpx + shift2)) {
+								if ((rtl && _lookupX >= tmpx - shift2) || (!rtl && _lookupX < tmpx + shift2)) {
 									_lookupResult.afterSymbol = false;
 								} else {
 									_lookupResult.afterSymbol = true;
@@ -1459,9 +1489,9 @@ private:
 				return false;
 			} else if (_p) {
 				QTextCharFormat format;
-				QTextItemInt gf(glyphs.mid(glyphsStart, glyphsEnd - glyphsStart),
-								&_e->fnt, engine.layoutData->string.unicode() + itemStart,
-								itemEnd - itemStart, engine.fontEngine(si), format);
+				QTextItemInt gf(glyphs.mid(glyphsStart, glyphsEnd - glyphsStart), &_e->fnt,
+				                engine.layoutData->string.unicode() + itemStart, itemEnd - itemStart,
+				                engine.fontEngine(si), format);
 				gf.logClusters = logClusters + itemStart - si.position;
 				gf.width = itemWidth;
 				gf.justified = false;
@@ -1479,7 +1509,8 @@ private:
 					} else {
 						selWidth = 0;
 						int itemL = itemEnd - itemStart;
-						int selStart = _selection.from - (_localFrom + itemStart), selEnd = _selection.to - (_localFrom + itemStart);
+						int selStart = _selection.from - (_localFrom + itemStart),
+						    selEnd = _selection.to - (_localFrom + itemStart);
 						if (selStart < 0) selStart = 0;
 						if (selEnd > itemL) selEnd = itemL;
 						for (int ch = 0, g; ch < selEnd;) {
@@ -1511,7 +1542,8 @@ private:
 						}
 					}
 					if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
-					selectedRect = QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
+					selectedRect =
+					    QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
 					fillSelectRange(selX, selX + selWidth);
 				}
 				if (Q_UNLIKELY(hasSelected)) {
@@ -1521,7 +1553,10 @@ private:
 						_p->setClipRect(selectedRect, Qt::IntersectClip);
 						_p->setPen(*_currentPenSelected);
 						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
-						auto externalClipping = clippingEnabled ? clippingRegion : QRegion(QRect((_x - _w).toInt(), _y - _lineHeight, (_x + 2 * _w).toInt(), _y + 2 * _lineHeight));
+						auto externalClipping = clippingEnabled ?
+						                            clippingRegion :
+						                            QRegion(QRect((_x - _w).toInt(), _y - _lineHeight,
+						                                          (_x + 2 * _w).toInt(), _y + 2 * _lineHeight));
 						_p->setClipRegion(externalClipping - selectedRect);
 						_p->setPen(*_currentPen);
 						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
@@ -1556,9 +1591,11 @@ private:
 		}
 
 		_elideSavedIndex = blockIndex;
-		auto mutableText = const_cast<Text*>(_t);
+		auto mutableText = const_cast<Text *>(_t);
 		_elideSavedBlock = std::move(mutableText->_blocks[blockIndex]);
-		mutableText->_blocks[blockIndex] = std::make_unique<TextBlock>(_t->_st->font, _t->_text, QFIXED_MAX, elideStart, 0, _elideSavedBlock->flags(), _elideSavedBlock->lnkIndex());
+		mutableText->_blocks[blockIndex] =
+		    std::make_unique<TextBlock>(_t->_st->font, _t->_text, QFIXED_MAX, elideStart, 0, _elideSavedBlock->flags(),
+		                                _elideSavedBlock->lnkIndex());
 		_blocksSize = blockIndex + 1;
 		_endBlock = (blockIndex + 1 < _t->_blocks.size() ? _t->_blocks[blockIndex + 1].get() : nullptr);
 	}
@@ -1573,7 +1610,8 @@ private:
 		}
 	}
 
-	void prepareElidedLine(QString &lineText, qint32 lineStart, qint32 &lineLength, ITextBlock *&_endBlock, int repeat = 0) {
+	void prepareElidedLine(QString &lineText, qint32 lineStart, qint32 &lineLength, ITextBlock *&_endBlock,
+	                       int repeat = 0) {
 		static const QString _Elide = qsl("...");
 
 		_f = _t->_st->font;
@@ -1596,7 +1634,7 @@ private:
 		_wLeft = _w - elideWidth - _elideRemoveFromEnd;
 
 		int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
-	    int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
+		int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
 
 		for (i = 0; i < nItems; ++i) {
 			QScriptItem &si(engine.layoutData->items[firstItem + i]);
@@ -1673,7 +1711,9 @@ private:
 		lineLength += _Elide.size();
 
 		if (!repeat) {
-			for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
+			for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock &&
+			       _t->_blocks[blockIndex]->from() < elideStart;
+			     ++blockIndex) {
 			}
 			if (blockIndex < _blocksSize) {
 				elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
@@ -1683,15 +1723,14 @@ private:
 
 	void restoreAfterElided() {
 		if (_elideSavedBlock) {
-			const_cast<Text*>(_t)->_blocks[_elideSavedIndex] = std::move(_elideSavedBlock);
+			const_cast<Text *>(_t)->_blocks[_elideSavedIndex] = std::move(_elideSavedBlock);
 		}
 	}
 
 	// COPIED FROM qtextengine.cpp AND MODIFIED
 	void eShapeLine(const QScriptLine &line) {
 		int item = _e->findItem(line.from);
-		if (item == -1)
-			return;
+		if (item == -1) return;
 
 #if defined(OS_MAC_OLD) || QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
 		auto end = _e->findItem(line.from + line.length - 1);
@@ -1768,14 +1807,12 @@ private:
 
 	void eItemize() {
 		_e->validate();
-		if (_e->layoutData->items.size())
-			return;
+		if (_e->layoutData->items.size()) return;
 
 		int length = _e->layoutData->string.length();
-		if (!length)
-			return;
+		if (!length) return;
 
-		const ushort *string = reinterpret_cast<const ushort*>(_e->layoutData->string.unicode());
+		const ushort *string = reinterpret_cast<const ushort *>(_e->layoutData->string.unicode());
 
 		auto blockIndex = _lineStartBlock;
 		auto currentBlock = _t->_blocks[blockIndex].get();
@@ -1787,8 +1824,7 @@ private:
 		{
 			QVarLengthArray<uchar> scripts(length);
 			QUnicodeTools::initScripts(string, length, scripts.data());
-			for (int i = 0; i < length; ++i)
-				analysis[i].script = scripts.at(i);
+			for (int i = 0; i < length; ++i) analysis[i].script = scripts.at(i);
 		}
 
 		blockIndex = _lineStartBlock;
@@ -1844,12 +1880,12 @@ private:
 				// the font and because Japanese and Chinese are also aliases of the script "Common",
 				// doing this would break too many things.  So instead we only pass the full stop
 				// along, and nothing else.
-				if (currentBlock == startBlock
-					&& i_analysis[i].bidiLevel == i_analysis[start].bidiLevel
-					&& i_analysis[i].flags == i_analysis[start].flags
-					&& (i_analysis[i].script == i_analysis[start].script || i_string->at(i) == QLatin1Char('.'))
-//					&& i_analysis[i].flags < QScriptAnalysis::SpaceTabOrObject // only emojis are objects here, no tabs
-					&& i - start < _MaxItemLength)
+				if (currentBlock == startBlock && i_analysis[i].bidiLevel == i_analysis[start].bidiLevel &&
+				    i_analysis[i].flags == i_analysis[start].flags &&
+				    (i_analysis[i].script == i_analysis[start].script || i_string->at(i) == QLatin1Char('.'))
+				    // && i_analysis[i].flags < QScriptAnalysis::SpaceTabOrObject // only emojis are objects here, no
+				    // tabs
+				    && i - start < _MaxItemLength)
 					continue;
 				i_items->append(QScriptItem(start, i_analysis[start]));
 				start = i;
@@ -1859,10 +1895,8 @@ private:
 		}
 	}
 
-	QChar::Direction eSkipBoundryNeutrals(QScriptAnalysis *analysis,
-											const ushort *unicode,
-											int &sor, int &eor, BidiControl &control,
-											Text::TextBlocks::const_iterator i) {
+	QChar::Direction eSkipBoundryNeutrals(QScriptAnalysis *analysis, const ushort *unicode, int &sor, int &eor,
+	                                      BidiControl &control, Text::TextBlocks::const_iterator i) {
 		Text::TextBlocks::const_iterator e = _t->_blocks.cend(), n = i + 1;
 
 		QChar::Direction dir = control.basicDirection();
@@ -1887,8 +1921,7 @@ private:
 			else
 				dir = QChar::direction(unicode[sor]);
 			// Keep skipping DirBN as if it doesn't exist
-			if (dir != QChar::DirBN)
-				break;
+			if (dir != QChar::DirBN) break;
 			analysis[sor++].bidiLevel = level;
 		}
 
@@ -1905,7 +1938,7 @@ private:
 		int sor = 0;
 		int eor = -1;
 
-		const ushort *unicode = reinterpret_cast<const ushort*>(_t->_text.unicode()) + _parStart;
+		const ushort *unicode = reinterpret_cast<const ushort *>(_t->_text.unicode()) + _parStart;
 		int current = 0;
 
 		QChar::Direction dir = rightToLeft ? QChar::DirR : QChar::DirL;
@@ -1949,293 +1982,301 @@ private:
 				dirCurrent = QChar::direction(unicode[current]);
 
 			switch (dirCurrent) {
-
 				// embedding and overrides (X1-X9 in the BiDi specs)
 			case QChar::DirRLE:
 			case QChar::DirRLO:
 			case QChar::DirLRE:
-			case QChar::DirLRO:
-				{
-					bool rtl = (dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirRLO);
-					hasBidi |= rtl;
-					bool override = (dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirRLO);
+			case QChar::DirLRO: {
+				bool rtl = (dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirRLO);
+				hasBidi |= rtl;
+				bool override = (dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirRLO);
 
-					unsigned int level = control.level+1;
-					if ((level%2 != 0) == rtl) ++level;
-					if (level < _MaxBidiLevel) {
-						eor = current-1;
-						eAppendItems(analysis, sor, eor, control, dir);
-						eor = current;
-						control.embed(rtl, override);
-						QChar::Direction edir = (rtl ? QChar::DirR : QChar::DirL);
-						dir = status.eor = edir;
-						status.lastStrong = edir;
-					}
-					break;
+				unsigned int level = control.level + 1;
+				if ((level % 2 != 0) == rtl) ++level;
+				if (level < _MaxBidiLevel) {
+					eor = current - 1;
+					eAppendItems(analysis, sor, eor, control, dir);
+					eor = current;
+					control.embed(rtl, override);
+					QChar::Direction edir = (rtl ? QChar::DirR : QChar::DirL);
+					dir = status.eor = edir;
+					status.lastStrong = edir;
 				}
-			case QChar::DirPDF:
-				{
-					if (control.canPop()) {
-						if (dir != control.direction()) {
-							eor = current-1;
-							eAppendItems(analysis, sor, eor, control, dir);
-							dir = control.direction();
-						}
-						eor = current;
+				break;
+			}
+			case QChar::DirPDF: {
+				if (control.canPop()) {
+					if (dir != control.direction()) {
+						eor = current - 1;
 						eAppendItems(analysis, sor, eor, control, dir);
-						control.pdf();
-						dir = QChar::DirON; status.eor = QChar::DirON;
-						status.last = control.direction();
-						if (control.override)
-							dir = control.direction();
-						else
-							dir = QChar::DirON;
-						status.lastStrong = control.direction();
+						dir = control.direction();
 					}
-					break;
+					eor = current;
+					eAppendItems(analysis, sor, eor, control, dir);
+					control.pdf();
+					dir = QChar::DirON;
+					status.eor = QChar::DirON;
+					status.last = control.direction();
+					if (control.override)
+						dir = control.direction();
+					else
+						dir = QChar::DirON;
+					status.lastStrong = control.direction();
 				}
+				break;
+			}
 
 				// strong types
 			case QChar::DirL:
-				if(dir == QChar::DirON)
-					dir = QChar::DirL;
-				switch(status.last)
-					{
-					case QChar::DirL:
-						eor = current; status.eor = QChar::DirL; break;
-					case QChar::DirR:
-					case QChar::DirAL:
-					case QChar::DirEN:
-					case QChar::DirAN:
-						if (eor >= 0) {
+				if (dir == QChar::DirON) dir = QChar::DirL;
+				switch (status.last) {
+				case QChar::DirL:
+					eor = current;
+					status.eor = QChar::DirL;
+					break;
+				case QChar::DirR:
+				case QChar::DirAL:
+				case QChar::DirEN:
+				case QChar::DirAN:
+					if (eor >= 0) {
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
+					} else {
+						eor = current;
+						status.eor = dir;
+					}
+					break;
+				case QChar::DirES:
+				case QChar::DirET:
+				case QChar::DirCS:
+				case QChar::DirBN:
+				case QChar::DirB:
+				case QChar::DirS:
+				case QChar::DirWS:
+				case QChar::DirON:
+					if (dir != QChar::DirL) {
+						// last stuff takes embedding dir
+						if (control.direction() == QChar::DirR) {
+							if (status.eor != QChar::DirR) {
+								// AN or EN
+								eAppendItems(analysis, sor, eor, control, dir);
+								status.eor = QChar::DirON;
+								dir = QChar::DirR;
+							}
+							eor = current - 1;
 							eAppendItems(analysis, sor, eor, control, dir);
 							status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
 						} else {
-							eor = current; status.eor = dir;
-						}
-						break;
-					case QChar::DirES:
-					case QChar::DirET:
-					case QChar::DirCS:
-					case QChar::DirBN:
-					case QChar::DirB:
-					case QChar::DirS:
-					case QChar::DirWS:
-					case QChar::DirON:
-						if(dir != QChar::DirL) {
-							//last stuff takes embedding dir
-							if(control.direction() == QChar::DirR) {
-								if(status.eor != QChar::DirR) {
-									// AN or EN
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirR;
-								}
-								eor = current - 1;
+							if (status.eor != QChar::DirL) {
 								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
+								status.eor = QChar::DirON;
+								dir = QChar::DirL;
 							} else {
-								if(status.eor != QChar::DirL) {
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirL;
-								} else {
-									eor = current; status.eor = QChar::DirL; break;
-								}
+								eor = current;
+								status.eor = QChar::DirL;
+								break;
 							}
-						} else {
-							eor = current; status.eor = QChar::DirL;
 						}
-					default:
-						break;
+					} else {
+						eor = current;
+						status.eor = QChar::DirL;
 					}
+				default: break;
+				}
 				status.lastStrong = QChar::DirL;
 				break;
 			case QChar::DirAL:
 			case QChar::DirR:
 				hasBidi = true;
-				if(dir == QChar::DirON) dir = QChar::DirR;
-				switch(status.last)
-					{
-					case QChar::DirL:
-					case QChar::DirEN:
-					case QChar::DirAN:
-						if (eor >= 0)
+				if (dir == QChar::DirON) dir = QChar::DirR;
+				switch (status.last) {
+				case QChar::DirL:
+				case QChar::DirEN:
+				case QChar::DirAN:
+					if (eor >= 0) eAppendItems(analysis, sor, eor, control, dir);
+					// fall through
+				case QChar::DirR:
+				case QChar::DirAL:
+					dir = QChar::DirR;
+					eor = current;
+					status.eor = QChar::DirR;
+					break;
+				case QChar::DirES:
+				case QChar::DirET:
+				case QChar::DirCS:
+				case QChar::DirBN:
+				case QChar::DirB:
+				case QChar::DirS:
+				case QChar::DirWS:
+				case QChar::DirON:
+					if (status.eor != QChar::DirR && status.eor != QChar::DirAL) {
+						// last stuff takes embedding dir
+						if (control.direction() == QChar::DirR || status.lastStrong == QChar::DirR ||
+						    status.lastStrong == QChar::DirAL) {
 							eAppendItems(analysis, sor, eor, control, dir);
-						// fall through
-					case QChar::DirR:
-					case QChar::DirAL:
-						dir = QChar::DirR; eor = current; status.eor = QChar::DirR; break;
-					case QChar::DirES:
-					case QChar::DirET:
-					case QChar::DirCS:
-					case QChar::DirBN:
-					case QChar::DirB:
-					case QChar::DirS:
-					case QChar::DirWS:
-					case QChar::DirON:
-						if(status.eor != QChar::DirR && status.eor != QChar::DirAL) {
-							//last stuff takes embedding dir
-							if(control.direction() == QChar::DirR
-							   || status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
-								eAppendItems(analysis, sor, eor, control, dir);
-								dir = QChar::DirR; status.eor = QChar::DirON;
-								eor = current;
-							} else {
-								eor = current - 1;
-								eAppendItems(analysis, sor, eor, control, dir);
-								dir = QChar::DirR; status.eor = QChar::DirON;
-							}
+							dir = QChar::DirR;
+							status.eor = QChar::DirON;
+							eor = current;
 						} else {
-							eor = current; status.eor = QChar::DirR;
+							eor = current - 1;
+							eAppendItems(analysis, sor, eor, control, dir);
+							dir = QChar::DirR;
+							status.eor = QChar::DirON;
 						}
-					default:
-						break;
+					} else {
+						eor = current;
+						status.eor = QChar::DirR;
 					}
+				default: break;
+				}
 				status.lastStrong = dirCurrent;
 				break;
 
 				// weak types:
 
 			case QChar::DirNSM:
-				if (eor == current-1)
-					eor = current;
+				if (eor == current - 1) eor = current;
 				break;
 			case QChar::DirEN:
 				// if last strong was AL change EN to AN
-				if(status.lastStrong != QChar::DirAL) {
-					if(dir == QChar::DirON) {
-						if(status.lastStrong == QChar::DirL)
+				if (status.lastStrong != QChar::DirAL) {
+					if (dir == QChar::DirON) {
+						if (status.lastStrong == QChar::DirL)
 							dir = QChar::DirL;
 						else
 							dir = QChar::DirEN;
 					}
-					switch(status.last)
-						{
-						case QChar::DirET:
-							if (status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirON;
-								dir = QChar::DirAN;
-							}
-							// fall through
-						case QChar::DirEN:
-						case QChar::DirL:
-							eor = current;
-							status.eor = dirCurrent;
-							break;
-						case QChar::DirR:
-						case QChar::DirAL:
-						case QChar::DirAN:
-							if (eor >= 0)
-								eAppendItems(analysis, sor, eor, control, dir);
-							else
-								eor = current;
-							status.eor = QChar::DirEN;
-							dir = QChar::DirAN; break;
-						case QChar::DirES:
-						case QChar::DirCS:
-							if(status.eor == QChar::DirEN || dir == QChar::DirAN) {
-								eor = current; break;
-							}
-						case QChar::DirBN:
-						case QChar::DirB:
-						case QChar::DirS:
-						case QChar::DirWS:
-						case QChar::DirON:
-							if(status.eor == QChar::DirR) {
-								// neutrals go to R
-								eor = current - 1;
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirEN;
-								dir = QChar::DirAN;
-							}
-							else if(status.eor == QChar::DirL ||
-									 (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-								eor = current; status.eor = dirCurrent;
-							} else {
-								// numbers on both sides, neutrals get right to left direction
-								if(dir != QChar::DirL) {
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									eor = current - 1;
-									dir = QChar::DirR;
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirAN;
-								} else {
-									eor = current; status.eor = dirCurrent;
-								}
-							}
-						default:
-							break;
+					switch (status.last) {
+					case QChar::DirET:
+						if (status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							dir = QChar::DirAN;
 						}
-					break;
-				}
-			case QChar::DirAN:
-				hasBidi = true;
-				dirCurrent = QChar::DirAN;
-				if(dir == QChar::DirON) dir = QChar::DirAN;
-				switch(status.last)
-					{
+						// fall through
+					case QChar::DirEN:
 					case QChar::DirL:
-					case QChar::DirAN:
-						eor = current; status.eor = QChar::DirAN; break;
+						eor = current;
+						status.eor = dirCurrent;
+						break;
 					case QChar::DirR:
 					case QChar::DirAL:
-					case QChar::DirEN:
-						if (eor >= 0){
+					case QChar::DirAN:
+						if (eor >= 0)
 							eAppendItems(analysis, sor, eor, control, dir);
-						} else {
+						else
 							eor = current;
-						}
-						dir = QChar::DirAN; status.eor = QChar::DirAN;
+						status.eor = QChar::DirEN;
+						dir = QChar::DirAN;
 						break;
-					case QChar::DirCS:
-						if(status.eor == QChar::DirAN) {
-							eor = current; break;
-						}
 					case QChar::DirES:
-					case QChar::DirET:
+					case QChar::DirCS:
+						if (status.eor == QChar::DirEN || dir == QChar::DirAN) {
+							eor = current;
+							break;
+						}
 					case QChar::DirBN:
 					case QChar::DirB:
 					case QChar::DirS:
 					case QChar::DirWS:
 					case QChar::DirON:
-						if(status.eor == QChar::DirR) {
+						if (status.eor == QChar::DirR) {
 							// neutrals go to R
 							eor = current - 1;
 							eAppendItems(analysis, sor, eor, control, dir);
-							status.eor = QChar::DirAN;
+							status.eor = QChar::DirEN;
 							dir = QChar::DirAN;
-						} else if(status.eor == QChar::DirL ||
-								   (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-							eor = current; status.eor = dirCurrent;
+						} else if (status.eor == QChar::DirL ||
+						           (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
+							eor = current;
+							status.eor = dirCurrent;
 						} else {
 							// numbers on both sides, neutrals get right to left direction
-							if(dir != QChar::DirL) {
+							if (dir != QChar::DirL) {
 								eAppendItems(analysis, sor, eor, control, dir);
 								status.eor = QChar::DirON;
 								eor = current - 1;
 								dir = QChar::DirR;
 								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirAN;
+								status.eor = QChar::DirON;
 								dir = QChar::DirAN;
 							} else {
-								eor = current; status.eor = dirCurrent;
+								eor = current;
+								status.eor = dirCurrent;
 							}
 						}
-					default:
+					default: break;
+					}
+					break;
+				}
+			case QChar::DirAN:
+				hasBidi = true;
+				dirCurrent = QChar::DirAN;
+				if (dir == QChar::DirON) dir = QChar::DirAN;
+				switch (status.last) {
+				case QChar::DirL:
+				case QChar::DirAN:
+					eor = current;
+					status.eor = QChar::DirAN;
+					break;
+				case QChar::DirR:
+				case QChar::DirAL:
+				case QChar::DirEN:
+					if (eor >= 0) {
+						eAppendItems(analysis, sor, eor, control, dir);
+					} else {
+						eor = current;
+					}
+					dir = QChar::DirAN;
+					status.eor = QChar::DirAN;
+					break;
+				case QChar::DirCS:
+					if (status.eor == QChar::DirAN) {
+						eor = current;
 						break;
 					}
+				case QChar::DirES:
+				case QChar::DirET:
+				case QChar::DirBN:
+				case QChar::DirB:
+				case QChar::DirS:
+				case QChar::DirWS:
+				case QChar::DirON:
+					if (status.eor == QChar::DirR) {
+						// neutrals go to R
+						eor = current - 1;
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = QChar::DirAN;
+						dir = QChar::DirAN;
+					} else if (status.eor == QChar::DirL ||
+					           (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
+						eor = current;
+						status.eor = dirCurrent;
+					} else {
+						// numbers on both sides, neutrals get right to left direction
+						if (dir != QChar::DirL) {
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							eor = current - 1;
+							dir = QChar::DirR;
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirAN;
+							dir = QChar::DirAN;
+						} else {
+							eor = current;
+							status.eor = dirCurrent;
+						}
+					}
+				default: break;
+				}
 				break;
 			case QChar::DirES:
-			case QChar::DirCS:
-				break;
+			case QChar::DirCS: break;
 			case QChar::DirET:
-				if(status.last == QChar::DirEN) {
+				if (status.last == QChar::DirEN) {
 					dirCurrent = QChar::DirEN;
-					eor = current; status.eor = dirCurrent;
+					eor = current;
+					status.eor = dirCurrent;
 				}
 				break;
 
@@ -2250,33 +2291,27 @@ private:
 				// ### implement rule L1
 				break;
 			case QChar::DirWS:
-			case QChar::DirON:
-				break;
-			default:
-				break;
+			case QChar::DirON: break;
+			default: break;
 			}
 
-			if(current >= (int)_parLength) break;
+			if (current >= (int)_parLength) break;
 
 			// set status.last as needed.
-			switch(dirCurrent) {
+			switch (dirCurrent) {
 			case QChar::DirET:
 			case QChar::DirES:
 			case QChar::DirCS:
 			case QChar::DirS:
 			case QChar::DirWS:
 			case QChar::DirON:
-				switch(status.last)
-				{
+				switch (status.last) {
 				case QChar::DirL:
 				case QChar::DirR:
 				case QChar::DirAL:
 				case QChar::DirEN:
-				case QChar::DirAN:
-					status.last = dirCurrent;
-					break;
-				default:
-					status.last = QChar::DirON;
+				case QChar::DirAN: status.last = dirCurrent; break;
+				default: status.last = QChar::DirON;
 				}
 				break;
 			case QChar::DirNSM:
@@ -2284,21 +2319,16 @@ private:
 				// ignore these
 				break;
 			case QChar::DirLRO:
-			case QChar::DirLRE:
-				status.last = QChar::DirL;
-				break;
+			case QChar::DirLRE: status.last = QChar::DirL; break;
 			case QChar::DirRLO:
-			case QChar::DirRLE:
-				status.last = QChar::DirR;
-				break;
+			case QChar::DirRLE: status.last = QChar::DirR; break;
 			case QChar::DirEN:
 				if (status.last == QChar::DirL) {
 					status.last = QChar::DirL;
 					break;
 				}
 				// fall through
-			default:
-				status.last = dirCurrent;
+			default: status.last = dirCurrent;
 			}
 
 			++current;
@@ -2306,8 +2336,7 @@ private:
 
 		eor = current - 1; // remove dummy char
 
-		if (sor <= eor)
-			eAppendItems(analysis, sor, eor, control, dir);
+		if (sor <= eor) eAppendItems(analysis, sor, eor, control, dir);
 
 		return hasBidi;
 	}
@@ -2343,7 +2372,7 @@ private:
 	int _yFrom = 0;
 	int _yTo = 0;
 	int _yToElide = 0;
-	TextSelection _selection = { 0, 0 };
+	TextSelection _selection = {0, 0};
 	bool _fullWidthSelection = true;
 	const QChar *_str = nullptr;
 
@@ -2377,27 +2406,28 @@ private:
 	bool _lookupLink = false;
 	Text::StateRequest _lookupRequest;
 	Text::StateResult _lookupResult;
-
 };
 
 const TextParseOptions _defaultOptions = {
-	TextParseLinks | TextParseMultiline, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseLinks | TextParseMultiline, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 const TextParseOptions _textPlainOptions = {
-	TextParseMultiline, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
-Text::Text(qint32 minResizeWidth) : _minResizeWidth(minResizeWidth) {
-}
+Text::Text(qint32 minResizeWidth)
+    : _minResizeWidth(minResizeWidth) {}
 
-Text::Text(const style::TextStyle &st, const QString &text, const TextParseOptions &options, qint32 minResizeWidth, bool richText) : _minResizeWidth(minResizeWidth) {
+Text::Text(const style::TextStyle &st, const QString &text, const TextParseOptions &options, qint32 minResizeWidth,
+           bool richText)
+    : _minResizeWidth(minResizeWidth) {
 	if (richText) {
 		setRichText(st, text, options);
 	} else {
@@ -2406,13 +2436,13 @@ Text::Text(const style::TextStyle &st, const QString &text, const TextParseOptio
 }
 
 Text::Text(const Text &other)
-: _minResizeWidth(other._minResizeWidth)
-, _maxWidth(other._maxWidth)
-, _minHeight(other._minHeight)
-, _text(other._text)
-, _st(other._st)
-, _links(other._links)
-, _startDir(other._startDir) {
+    : _minResizeWidth(other._minResizeWidth)
+    , _maxWidth(other._maxWidth)
+    , _minHeight(other._minHeight)
+    , _text(other._text)
+    , _st(other._st)
+    , _links(other._links)
+    , _startDir(other._startDir) {
 	_blocks.reserve(other._blocks.size());
 	for (auto &block : other._blocks) {
 		_blocks.push_back(block->clone());
@@ -2420,14 +2450,14 @@ Text::Text(const Text &other)
 }
 
 Text::Text(Text &&other)
-: _minResizeWidth(other._minResizeWidth)
-, _maxWidth(other._maxWidth)
-, _minHeight(other._minHeight)
-, _text(other._text)
-, _st(other._st)
-, _blocks(std::move(other._blocks))
-, _links(other._links)
-, _startDir(other._startDir) {
+    : _minResizeWidth(other._minResizeWidth)
+    , _maxWidth(other._maxWidth)
+    , _minHeight(other._minHeight)
+    , _text(other._text)
+    , _st(other._st)
+    , _blocks(std::move(other._blocks))
+    , _links(other._links)
+    , _startDir(other._startDir) {
 	other.clearFields();
 }
 
@@ -2462,9 +2492,7 @@ Text &Text::operator=(Text &&other) {
 void Text::setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options) {
 	_st = &st;
 	clear();
-	{
-		TextParser parser(this, text, options);
-	}
+	{ TextParser parser(this, text, options); }
 	recountNaturalSize(true, options.dir);
 }
 
@@ -2493,7 +2521,7 @@ void Text::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 				}
 			}
 			lastNewlineStart = b->from();
-			lastNewline = static_cast<NewlineBlock*>(b);
+			lastNewline = static_cast<NewlineBlock *>(b);
 
 			_minHeight += lineHeight;
 			lineHeight = 0;
@@ -2541,7 +2569,8 @@ void Text::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 	}
 }
 
-void Text::setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options) {
+void Text::setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities,
+                         const TextParseOptions &options) {
 	_st = &st;
 	clear();
 	{
@@ -2579,7 +2608,8 @@ void Text::setMarkedText(const style::TextStyle &st, const TextWithEntities &tex
 	recountNaturalSize(true, options.dir);
 }
 
-void Text::setRichText(const style::TextStyle &st, const QString &text, TextParseOptions options, const TextCustomTagsMap &custom) {
+void Text::setRichText(const style::TextStyle &st, const QString &text, TextParseOptions options,
+                       const TextCustomTagsMap &custom) {
 	QString parsed;
 	parsed.reserve(text.size());
 	const QChar *s = text.constData(), *ch = s;
@@ -2609,7 +2639,7 @@ void Text::setRichText(const style::TextStyle &st, const QString &text, TextPars
 			case 'b': cmd = closing ? TextCommandNoBold : TextCommandBold; break;
 			case 'i': cmd = closing ? TextCommandNoItalic : TextCommandItalic; break;
 			case 'u': cmd = closing ? TextCommandNoUnderline : TextCommandUnderline; break;
-			default : other = true; break;
+			default: other = true; break;
 			}
 
 			if (!other) {
@@ -2672,7 +2702,7 @@ bool Text::hasSkipBlock() const {
 
 void Text::setSkipBlock(qint32 width, qint32 height) {
 	if (!_blocks.empty() && _blocks.back()->type() == TextBlockTSkip) {
-		auto block = static_cast<SkipBlock*>(_blocks.back().get());
+		auto block = static_cast<SkipBlock *>(_blocks.back().get());
 		if (block->width() == width && block->height() == height) return;
 		_text.resize(block->from());
 		_blocks.pop_back();
@@ -2709,20 +2739,16 @@ int Text::countHeight(int width) const {
 		return _minHeight;
 	}
 	int result = 0;
-	enumerateLines(width, [&result](QFixed lineWidth, int lineHeight) {
-		result += lineHeight;
-	});
+	enumerateLines(width, [&result](QFixed lineWidth, int lineHeight) { result += lineHeight; });
 	return result;
 }
 
 void Text::countLineWidths(int width, QVector<int> *lineWidths) const {
-	enumerateLines(width, [lineWidths](QFixed lineWidth, int lineHeight) {
-		lineWidths->push_back(lineWidth.ceil().toInt());
-	});
+	enumerateLines(width,
+	               [lineWidths](QFixed lineWidth, int lineHeight) { lineWidths->push_back(lineWidth.ceil().toInt()); });
 }
 
-template <typename Callback>
-void Text::enumerateLines(int w, Callback callback) const {
+template <typename Callback> void Text::enumerateLines(int w, Callback callback) const {
 	QFixed width = w;
 	if (width < _minResizeWidth) width = _minResizeWidth;
 
@@ -2759,7 +2785,7 @@ void Text::enumerateLines(int w, Callback callback) const {
 		}
 
 		if (_btype == TextBlockTText) {
-			auto t = static_cast<TextBlock*>(b.get());
+			auto t = static_cast<TextBlock *>(b.get());
 			if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
 				last_rPadding += b->f_rpadding();
 
@@ -2831,14 +2857,17 @@ void Text::enumerateLines(int w, Callback callback) const {
 	}
 }
 
-void Text::draw(Painter &painter, qint32 left, qint32 top, qint32 w, style::align align, qint32 yFrom, qint32 yTo, TextSelection selection, bool fullWidthSelection) const {
-//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
+void Text::draw(Painter &painter, qint32 left, qint32 top, qint32 w, style::align align, qint32 yFrom, qint32 yTo,
+                TextSelection selection, bool fullWidthSelection) const {
+	//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
 	TextPainter p(&painter, this);
 	p.draw(left, top, w, align, yFrom, yTo, selection, fullWidthSelection);
 }
 
-void Text::drawElided(Painter &painter, qint32 left, qint32 top, qint32 w, qint32 lines, style::align align, qint32 yFrom, qint32 yTo, qint32 removeFromEnd, bool breakEverywhere, TextSelection selection) const {
-//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
+void Text::drawElided(Painter &painter, qint32 left, qint32 top, qint32 w, qint32 lines, style::align align,
+                      qint32 yFrom, qint32 yTo, qint32 removeFromEnd, bool breakEverywhere,
+                      TextSelection selection) const {
+	//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
 	TextPainter p(&painter, this);
 	p.drawElided(left, top, w, align, lines, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
 }
@@ -2889,7 +2918,7 @@ TextSelection Text::adjustSelection(TextSelection selection, TextSelectType sele
 			}
 		}
 	}
-	return { from, to };
+	return {from, to};
 }
 
 bool Text::isEmpty() const {
@@ -2900,12 +2929,17 @@ quint16 Text::countBlockEnd(const TextBlocks::const_iterator &i, const TextBlock
 	return (i + 1 == e) ? _text.size() : (*(i + 1))->from();
 }
 
-quint16 Text::countBlockLength(const Text::TextBlocks::const_iterator &i, const Text::TextBlocks::const_iterator &e) const {
+quint16 Text::countBlockLength(const Text::TextBlocks::const_iterator &i,
+                               const Text::TextBlocks::const_iterator &e) const {
 	return countBlockEnd(i, e) - (*i)->from();
 }
 
-template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback, typename FlagsChangeCallback>
-void Text::enumerateText(TextSelection selection, AppendPartCallback appendPartCallback, ClickHandlerStartCallback clickHandlerStartCallback, ClickHandlerFinishCallback clickHandlerFinishCallback, FlagsChangeCallback flagsChangeCallback) const {
+template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback,
+          typename FlagsChangeCallback>
+void Text::enumerateText(TextSelection selection, AppendPartCallback appendPartCallback,
+                         ClickHandlerStartCallback clickHandlerStartCallback,
+                         ClickHandlerFinishCallback clickHandlerFinishCallback,
+                         FlagsChangeCallback flagsChangeCallback) const {
 	if (isEmpty() || selection.empty()) {
 		return;
 	}
@@ -2964,7 +2998,8 @@ TextWithEntities Text::originalTextWithEntities(TextSelection selection, ExpandL
 	result.text.reserve(_text.size());
 
 	int lnkStart = 0, italicStart = 0, boldStart = 0, codeStart = 0, preStart = 0;
-	auto flagsChangeCallback = [&result, &italicStart, &boldStart, &codeStart, &preStart](qint32 oldFlags, qint32 newFlags) {
+	auto flagsChangeCallback = [&result, &italicStart, &boldStart, &codeStart, &preStart](qint32 oldFlags,
+	                                                                                      qint32 newFlags) {
 		if ((oldFlags & TextBlockFItalic) && !(newFlags & TextBlockFItalic)) { // write italic
 			result.entities.push_back(EntityInText(EntityInTextItalic, italicStart, result.text.size() - italicStart));
 		} else if ((newFlags & TextBlockFItalic) && !(oldFlags & TextBlockFItalic)) {
@@ -2986,9 +3021,7 @@ TextWithEntities Text::originalTextWithEntities(TextSelection selection, ExpandL
 			preStart = result.text.size();
 		}
 	};
-	auto clickHandlerStartCallback = [&result, &lnkStart]() {
-		lnkStart = result.text.size();
-	};
+	auto clickHandlerStartCallback = [&result, &lnkStart]() { lnkStart = result.text.size(); };
 	auto clickHandlerFinishCallback = [mode, &result, &lnkStart](const QStringRef &r, const ClickHandlerPtr &handler) {
 		auto expanded = handler->getExpandedLinkTextWithEntities(mode, lnkStart, r);
 		if (expanded.text.isEmpty()) {
@@ -3000,11 +3033,10 @@ TextWithEntities Text::originalTextWithEntities(TextSelection selection, ExpandL
 			result.entities.append(expanded.entities);
 		}
 	};
-	auto appendPartCallback = [&result](const QStringRef &r) {
-		result.text += r;
-	};
+	auto appendPartCallback = [&result](const QStringRef &r) { result.text += r; };
 
-	enumerateText(selection, appendPartCallback, clickHandlerStartCallback, clickHandlerFinishCallback, flagsChangeCallback);
+	enumerateText(selection, appendPartCallback, clickHandlerStartCallback, clickHandlerFinishCallback,
+	              flagsChangeCallback);
 
 	return result;
 }
@@ -3013,11 +3045,8 @@ QString Text::originalText(TextSelection selection, ExpandLinksMode mode) const
 	QString result;
 	result.reserve(_text.size());
 
-	auto appendPartCallback = [&result](const QStringRef &r) {
-		result += r;
-	};
-	auto clickHandlerStartCallback = []() {
-	};
+	auto appendPartCallback = [&result](const QStringRef &r) { result += r; };
+	auto clickHandlerStartCallback = []() {};
 	auto clickHandlerFinishCallback = [mode, &result](const QStringRef &r, const ClickHandlerPtr &handler) {
 		auto expanded = handler->getExpandedLinkText(mode, r);
 		if (expanded.isEmpty()) {
@@ -3026,10 +3055,10 @@ QString Text::originalText(TextSelection selection, ExpandLinksMode mode) const
 			result += expanded;
 		}
 	};
-	auto flagsChangeCallback = [](qint32 oldFlags, qint32 newFlags) {
-	};
+	auto flagsChangeCallback = [](qint32 oldFlags, qint32 newFlags) {};
 
-	enumerateText(selection, appendPartCallback, clickHandlerStartCallback, clickHandlerFinishCallback, flagsChangeCallback);
+	enumerateText(selection, appendPartCallback, clickHandlerStartCallback, clickHandlerFinishCallback,
+	              flagsChangeCallback);
 
 	return result;
 }
diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h
index 53d963799..88a76db90 100644
--- a/Telegram/SourceFiles/ui/text/text.h
+++ b/Telegram/SourceFiles/ui/text/text.h
@@ -20,33 +20,33 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QPair>
 #include <QMap>
+#include <QPair>
 #include <QString>
 
+#include "base/flags.h"
+#include "core/click_handler.h"
 #include "private/qfixed_p.h"
 #include "styles/style_basic.h"
-#include "ui/twidget.h"
-#include "core/click_handler.h"
-#include "ui/text/text_entity.h"
 #include "ui/emoji_config.h"
-#include "base/flags.h"
+#include "ui/text/text_entity.h"
+#include "ui/twidget.h"
 
 static const QChar TextCommand(0x0010);
 enum TextCommands {
-	TextCommandBold        = 0x01,
-	TextCommandNoBold      = 0x02,
-	TextCommandItalic      = 0x03,
-	TextCommandNoItalic    = 0x04,
-	TextCommandUnderline   = 0x05,
+	TextCommandBold = 0x01,
+	TextCommandNoBold = 0x02,
+	TextCommandItalic = 0x03,
+	TextCommandNoItalic = 0x04,
+	TextCommandUnderline = 0x05,
 	TextCommandNoUnderline = 0x06,
-	TextCommandSemibold    = 0x07,
-	TextCommandNoSemibold  = 0x08,
-	TextCommandLinkIndex   = 0x09, // 0 - NoLink
-	TextCommandLinkText    = 0x0A,
-	TextCommandSkipBlock   = 0x0D,
+	TextCommandSemibold = 0x07,
+	TextCommandNoSemibold = 0x08,
+	TextCommandLinkIndex = 0x09, // 0 - NoLink
+	TextCommandLinkText = 0x0A,
+	TextCommandSkipBlock = 0x0D,
 
-	TextCommandLangTag     = 0x20,
+	TextCommandLangTag = 0x20,
 };
 
 struct TextParseOptions {
@@ -58,16 +58,18 @@ struct TextParseOptions {
 extern const TextParseOptions _defaultOptions, _textPlainOptions;
 
 enum class TextSelectType {
-	Letters    = 0x01,
-	Words      = 0x02,
+	Letters = 0x01,
+	Words = 0x02,
 	Paragraphs = 0x03,
 };
 
 struct TextSelection {
-	constexpr TextSelection() : from(0), to(0) {
-	}
-	constexpr TextSelection(quint16 from, quint16 to) : from(from), to(to) {
-	}
+	constexpr TextSelection()
+	    : from(0)
+	    , to(0) {}
+	constexpr TextSelection(quint16 from, quint16 to)
+	    : from(from)
+	    , to(to) {}
 	constexpr bool empty() const {
 		return from == to;
 	}
@@ -81,7 +83,7 @@ inline bool operator!=(TextSelection a, TextSelection b) {
 	return !(a == b);
 }
 
-static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
+static constexpr TextSelection AllTextSelection = {0, 0xFFFF};
 
 typedef QPair<QString, QString> TextCustomTag; // open str and close str
 typedef QMap<QChar, TextCustomTag> TextCustomTagsMap;
@@ -90,7 +92,8 @@ class ITextBlock;
 class Text {
 public:
 	Text(qint32 minResizeWidth = QFIXED_MAX);
-	Text(const style::TextStyle &st, const QString &text, const TextParseOptions &options = _defaultOptions, qint32 minResizeWidth = QFIXED_MAX, bool richText = false);
+	Text(const style::TextStyle &st, const QString &text, const TextParseOptions &options = _defaultOptions,
+	     qint32 minResizeWidth = QFIXED_MAX, bool richText = false);
 	Text(const Text &other);
 	Text(Text &&other);
 	Text &operator=(const Text &other);
@@ -100,8 +103,10 @@ public:
 	int countHeight(int width) const;
 	void countLineWidths(int width, QVector<int> *lineWidths) const;
 	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = _defaultOptions);
-	void setRichText(const style::TextStyle &st, const QString &text, TextParseOptions options = _defaultOptions, const TextCustomTagsMap &custom = TextCustomTagsMap());
-	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = _defaultOptions);
+	void setRichText(const style::TextStyle &st, const QString &text, TextParseOptions options = _defaultOptions,
+	                 const TextCustomTagsMap &custom = TextCustomTagsMap());
+	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities,
+	                   const TextParseOptions &options = _defaultOptions);
 
 	void setLink(quint16 lnkIndex, const ClickHandlerPtr &lnk);
 	bool hasLinks() const;
@@ -117,32 +122,47 @@ public:
 		return _minHeight;
 	}
 
-	void draw(Painter &p, qint32 left, qint32 top, qint32 width, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) const;
-	void drawElided(Painter &p, qint32 left, qint32 top, qint32 width, qint32 lines = 1, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, qint32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const;
-	void drawLeft(Painter &p, qint32 left, qint32 top, qint32 width, qint32 outerw, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, TextSelection selection = { 0, 0 }) const {
+	void draw(Painter &p, qint32 left, qint32 top, qint32 width, style::align align = style::al_left, qint32 yFrom = 0,
+	          qint32 yTo = -1, TextSelection selection = {0, 0}, bool fullWidthSelection = true) const;
+	void drawElided(Painter &p, qint32 left, qint32 top, qint32 width, qint32 lines = 1,
+	                style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, qint32 removeFromEnd = 0,
+	                bool breakEverywhere = false, TextSelection selection = {0, 0}) const;
+	void drawLeft(Painter &p, qint32 left, qint32 top, qint32 width, qint32 outerw, style::align align = style::al_left,
+	              qint32 yFrom = 0, qint32 yTo = -1, TextSelection selection = {0, 0}) const {
 		draw(p, rtl() ? (outerw - left - width) : left, top, width, align, yFrom, yTo, selection);
 	}
-	void drawLeftElided(Painter &p, qint32 left, qint32 top, qint32 width, qint32 outerw, qint32 lines = 1, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, qint32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const {
-		drawElided(p, rtl() ? (outerw - left - width) : left, top, width, lines, align, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
+	void drawLeftElided(Painter &p, qint32 left, qint32 top, qint32 width, qint32 outerw, qint32 lines = 1,
+	                    style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1,
+	                    qint32 removeFromEnd = 0, bool breakEverywhere = false,
+	                    TextSelection selection = {0, 0}) const {
+		drawElided(p, rtl() ? (outerw - left - width) : left, top, width, lines, align, yFrom, yTo, removeFromEnd,
+		           breakEverywhere, selection);
 	}
-	void drawRight(Painter &p, qint32 right, qint32 top, qint32 width, qint32 outerw, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, TextSelection selection = { 0, 0 }) const {
+	void drawRight(Painter &p, qint32 right, qint32 top, qint32 width, qint32 outerw,
+	               style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1,
+	               TextSelection selection = {0, 0}) const {
 		draw(p, rtl() ? right : (outerw - right - width), top, width, align, yFrom, yTo, selection);
 	}
-	void drawRightElided(Painter &p, qint32 right, qint32 top, qint32 width, qint32 outerw, qint32 lines = 1, style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1, qint32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const {
-		drawElided(p, rtl() ? right : (outerw - right - width), top, width, lines, align, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
+	void drawRightElided(Painter &p, qint32 right, qint32 top, qint32 width, qint32 outerw, qint32 lines = 1,
+	                     style::align align = style::al_left, qint32 yFrom = 0, qint32 yTo = -1,
+	                     qint32 removeFromEnd = 0, bool breakEverywhere = false,
+	                     TextSelection selection = {0, 0}) const {
+		drawElided(p, rtl() ? right : (outerw - right - width), top, width, lines, align, yFrom, yTo, removeFromEnd,
+		           breakEverywhere, selection);
 	}
 
 	struct StateRequest {
 		enum class Flag {
 			BreakEverywhere = (1 << 0),
-			LookupSymbol    = (1 << 1),
-			LookupLink      = (1 << 2),
+			LookupSymbol = (1 << 1),
+			LookupLink = (1 << 2),
 		};
 		using Flags = base::flags<Flag>;
-		friend inline constexpr auto is_flag_type(Flag) { return true; };
+		friend inline constexpr auto is_flag_type(Flag) {
+			return true;
+		};
 
-		StateRequest() {
-		}
+		StateRequest() {}
 
 		style::align align = style::al_left;
 		Flags flags = Flag::LookupLink;
@@ -158,15 +178,15 @@ public:
 		return getState(rtlpoint(point, outerw), width, request);
 	}
 	struct StateRequestElided : public StateRequest {
-		StateRequestElided() {
-		}
-		StateRequestElided(const StateRequest &other) : StateRequest(other) {
-		}
+		StateRequestElided() {}
+		StateRequestElided(const StateRequest &other)
+		    : StateRequest(other) {}
 		int lines = 1;
 		int removeFromEnd = 0;
-    };
+	};
 	StateResult getStateElided(QPoint point, int width, StateRequestElided request = StateRequestElided()) const;
-	StateResult getStateElidedLeft(QPoint point, int width, int outerw, StateRequestElided request = StateRequestElided()) const {
+	StateResult getStateElidedLeft(QPoint point, int width, int outerw,
+	                               StateRequestElided request = StateRequestElided()) const {
 		return getStateElided(rtlpoint(point, outerw), width, request);
 	}
 
@@ -183,7 +203,8 @@ public:
 		return _text.size();
 	}
 
-	TextWithEntities originalTextWithEntities(TextSelection selection = AllTextSelection, ExpandLinksMode mode = ExpandLinksShortened) const;
+	TextWithEntities originalTextWithEntities(TextSelection selection = AllTextSelection,
+	                                          ExpandLinksMode mode = ExpandLinksShortened) const;
 	QString originalText(TextSelection selection = AllTextSelection, ExpandLinksMode mode = ExpandLinksShortened) const;
 
 	bool lastDots(qint32 dots, qint32 maxdots = 3) { // hack for typing animation
@@ -213,17 +234,21 @@ private:
 	using TextLinks = QVector<ClickHandlerPtr>;
 
 	quint16 countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
-	quint16 countBlockLength(const Text::TextBlocks::const_iterator &i, const Text::TextBlocks::const_iterator &e) const;
+	quint16 countBlockLength(const Text::TextBlocks::const_iterator &i,
+	                         const Text::TextBlocks::const_iterator &e) const;
 
 	// Template method for originalText(), originalTextWithEntities().
-	template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback, typename FlagsChangeCallback>
-	void enumerateText(TextSelection selection, AppendPartCallback appendPartCallback, ClickHandlerStartCallback clickHandlerStartCallback, ClickHandlerFinishCallback clickHandlerFinishCallback, FlagsChangeCallback flagsChangeCallback) const;
+	template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback,
+	          typename FlagsChangeCallback>
+	void enumerateText(TextSelection selection, AppendPartCallback appendPartCallback,
+	                   ClickHandlerStartCallback clickHandlerStartCallback,
+	                   ClickHandlerFinishCallback clickHandlerFinishCallback,
+	                   FlagsChangeCallback flagsChangeCallback) const;
 
 	// Template method for countWidth(), countHeight(), countLineWidths().
 	// callback(lineWidth, lineHeight) will be called for all lines with:
 	// QFixed lineWidth, int lineHeight
-	template <typename Callback>
-	void enumerateLines(int w, Callback callback) const;
+	template <typename Callback> void enumerateLines(int w, Callback callback) const;
 
 	void recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir = Qt::LayoutDirectionAuto);
 
@@ -245,10 +270,9 @@ private:
 
 	friend class TextParser;
 	friend class TextPainter;
-
 };
 inline TextSelection snapSelection(int from, int to) {
-	return { static_cast<quint16>(snap(from, 0, 0xFFFF)), static_cast<quint16>(snap(to, 0, 0xFFFF)) };
+	return {static_cast<quint16>(snap(from, 0, 0xFFFF)), static_cast<quint16>(snap(to, 0, 0xFFFF))};
 }
 inline TextSelection shiftSelection(TextSelection selection, quint16 byLength) {
 	return snapSelection(int(selection.from) + byLength, int(selection.to) + byLength);
@@ -275,13 +299,18 @@ QString textcmdStopSemibold();
 const QChar *textSkipCommand(const QChar *from, const QChar *end, bool canLink = true);
 
 inline bool chIsSpace(QChar ch, bool rich = false) {
-	return ch.isSpace() || (ch < 32 && !(rich && ch == TextCommand)) || (ch == QChar::ParagraphSeparator) || (ch == QChar::LineSeparator) || (ch == QChar::ObjectReplacementCharacter) || (ch == QChar::CarriageReturn) || (ch == QChar::Tabulation);
+	return ch.isSpace() || (ch < 32 && !(rich && ch == TextCommand)) || (ch == QChar::ParagraphSeparator) ||
+	       (ch == QChar::LineSeparator) || (ch == QChar::ObjectReplacementCharacter) || (ch == QChar::CarriageReturn) ||
+	       (ch == QChar::Tabulation);
 }
 inline bool chIsDiac(QChar ch) { // diac and variation selectors
 	return (ch.category() == QChar::Mark_NonSpacing) || (ch == 1652) || (ch >= 64606 && ch <= 64611);
 }
 inline bool chIsBad(QChar ch) {
-	return (ch == 0) || (ch >= 8232 && ch < 8237) || (ch >= 65024 && ch < 65040 && ch != 65039) || (ch >= 127 && ch < 160 && ch != 156) || (cPlatform() == dbipMac && ch >= 0x0B00 && ch <= 0x0B7F && chIsDiac(ch) && cIsElCapitan()); // tmp hack see https://bugreports.qt.io/browse/QTBUG-48910
+	return (ch == 0) || (ch >= 8232 && ch < 8237) || (ch >= 65024 && ch < 65040 && ch != 65039) ||
+	       (ch >= 127 && ch < 160 && ch != 156) ||
+	       (cPlatform() == dbipMac && ch >= 0x0B00 && ch <= 0x0B7F && chIsDiac(ch) &&
+	        cIsElCapitan()); // tmp hack see https://bugreports.qt.io/browse/QTBUG-48910
 }
 inline bool chIsTrimmed(QChar ch, bool rich = false) {
 	return (!rich || ch != TextCommand) && (chIsSpace(ch) || chIsBad(ch));
@@ -290,10 +319,11 @@ inline bool chReplacedBySpace(QChar ch) {
 	// \xe2\x80[\xa8 - \xac\xad] // 8232 - 8237
 	// QString from1 = QString::fromUtf8("\xe2\x80\xa8"), to1 = QString::fromUtf8("\xe2\x80\xad");
 	// \xcc[\xb3\xbf\x8a] // 819, 831, 778
-	// QString bad1 = QString::fromUtf8("\xcc\xb3"), bad2 = QString::fromUtf8("\xcc\xbf"), bad3 = QString::fromUtf8("\xcc\x8a");
+	// QString bad1 = QString::fromUtf8("\xcc\xb3"), bad2 = QString::fromUtf8("\xcc\xbf"), bad3 =
+	// QString::fromUtf8("\xcc\x8a");
 	// [\x00\x01\x02\x07\x08\x0b-\x1f] // '\t' = 0x09
-	return (/*code >= 0x00 && */ch <= 0x02) || (ch >= 0x07 && ch <= 0x09) || (ch >= 0x0b && ch <= 0x1f) ||
-		(ch == 819) || (ch == 831) || (ch == 778) || (ch >= 8232 && ch <= 8237);
+	return (/*code >= 0x00 && */ ch <= 0x02) || (ch >= 0x07 && ch <= 0x09) || (ch >= 0x0b && ch <= 0x1f) ||
+	       (ch == 819) || (ch == 831) || (ch == 778) || (ch >= 8232 && ch <= 8237);
 }
 inline qint32 chMaxDiacAfterSymbol() {
 	return 2;
@@ -302,7 +332,8 @@ inline bool chIsNewline(QChar ch) {
 	return (ch == QChar::LineFeed || ch == 156);
 }
 inline bool chIsLinkEnd(QChar ch) {
-	return ch == TextCommand || chIsBad(ch) || chIsSpace(ch) || chIsNewline(ch) || ch.isLowSurrogate() || ch.isHighSurrogate();
+	return ch == TextCommand || chIsBad(ch) || chIsSpace(ch) || chIsNewline(ch) || ch.isLowSurrogate() ||
+	       ch.isHighSurrogate();
 }
 inline bool chIsAlmostLinkEnd(QChar ch) {
 	switch (ch.unicode()) {
@@ -312,10 +343,8 @@ inline bool chIsAlmostLinkEnd(QChar ch) {
 	case '"':
 	case ':':
 	case '!':
-	case '\'':
-		return true;
-	default:
-		break;
+	case '\'': return true;
+	default: break;
 	}
 	return false;
 }
@@ -352,10 +381,8 @@ inline bool chIsWordSeparator(QChar ch) {
 	case '"':
 	case '`':
 	case '~':
-	case '|':
-		return true;
-	default:
-		break;
+	case '|': return true;
+	default: break;
 	}
 	return false;
 }
@@ -363,10 +390,8 @@ inline bool chIsSentenceEnd(QChar ch) {
 	switch (ch.unicode()) {
 	case '.':
 	case '?':
-	case '!':
-		return true;
-	default:
-		break;
+	case '!': return true;
+	default: break;
 	}
 	return false;
 }
@@ -374,19 +399,15 @@ inline bool chIsSentencePartEnd(QChar ch) {
 	switch (ch.unicode()) {
 	case ',':
 	case ':':
-	case ';':
-		return true;
-	default:
-		break;
+	case ';': return true;
+	default: break;
 	}
 	return false;
 }
 inline bool chIsParagraphSeparator(QChar ch) {
 	switch (ch.unicode()) {
-	case QChar::LineFeed:
-		return true;
-	default:
-		break;
+	case QChar::LineFeed: return true;
+	default: break;
 	}
 	return false;
 }
diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp
index 5dee424ff..283879d53 100644
--- a/Telegram/SourceFiles/ui/text/text_block.cpp
+++ b/Telegram/SourceFiles/ui/text/text_block.cpp
@@ -19,27 +19,29 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/text/text_block.h"
-#include "ui/style/style_core_types.h"
 #include "app.h"
+#include "ui/style/style_core_types.h"
 
 // COPIED FROM qtextlayout.cpp AND MODIFIED
 namespace {
 
 struct ScriptLine {
-	ScriptLine() : length(0), textWidth(0) {
-	}
+	ScriptLine()
+	    : length(0)
+	    , textWidth(0) {}
 
 	qint32 length;
 	QFixed textWidth;
 };
 
 // All members finished with "_" are internal.
-struct LineBreakHelper
-{
+struct LineBreakHelper {
 	LineBreakHelper()
-		: glyphCount(0), maxGlyphs(INT_MAX), currentPosition(0), fontEngine(0), logClusters(0)
-	{
-	}
+	    : glyphCount(0)
+	    , maxGlyphs(INT_MAX)
+	    , currentPosition(0)
+	    , fontEngine(0)
+	    , logClusters(0) {}
 
 
 	ScriptLine tmpData;
@@ -59,18 +61,15 @@ struct LineBreakHelper
 	QFontEngine *fontEngine;
 	const unsigned short *logClusters;
 
-	inline glyph_t currentGlyph() const
-	{
+	inline glyph_t currentGlyph() const {
 		Q_ASSERT(currentPosition > 0);
 		Q_ASSERT(logClusters[currentPosition - 1] < glyphs.numGlyphs);
 
 		return glyphs.glyphs[logClusters[currentPosition - 1]];
 	}
 
-	inline void saveCurrentGlyph()
-	{
-		if (currentPosition > 0 &&
-			logClusters[currentPosition - 1] < glyphs.numGlyphs) {
+	inline void saveCurrentGlyph() {
+		if (currentPosition > 0 && logClusters[currentPosition - 1] < glyphs.numGlyphs) {
 			previousGlyph_ = currentGlyph(); // needed to calculate right bearing later
 			previousFontEngine_ = fontEngine;
 		} else {
@@ -79,8 +78,7 @@ struct LineBreakHelper
 		}
 	}
 
-	inline void calculateRightBearing(QFontEngine *engine, glyph_t glyph)
-	{
+	inline void calculateRightBearing(QFontEngine *engine, glyph_t glyph) {
 		qreal rb;
 		engine->getGlyphBearings(glyph, 0, &rb);
 
@@ -91,18 +89,15 @@ struct LineBreakHelper
 		rightBearing = std::min(QFixed::fromReal(rb), QFixed(0));
 	}
 
-	inline void calculateRightBearing()
-	{
-		if (currentPosition > 0 &&
-			logClusters[currentPosition - 1] < glyphs.numGlyphs) {
+	inline void calculateRightBearing() {
+		if (currentPosition > 0 && logClusters[currentPosition - 1] < glyphs.numGlyphs) {
 			calculateRightBearing(fontEngine, currentGlyph());
 		} else {
 			rightBearing = 0;
 		}
 	}
 
-	inline void calculateRightBearingForPreviousGlyph()
-	{
+	inline void calculateRightBearingForPreviousGlyph() {
 		if (previousGlyph_ > 0) {
 			calculateRightBearing(previousFontEngine_, previousGlyph_);
 		} else {
@@ -113,39 +108,34 @@ struct LineBreakHelper
 	// We always calculate the right bearing right before it is needed.
 	// So we don't need caching / optimizations referred to delayed right bearing calculations.
 
-	//static const QFixed RightBearingNotCalculated;
+	// static const QFixed RightBearingNotCalculated;
 
-	//inline void resetRightBearing()
+	// inline void resetRightBearing()
 	//{
 	//	rightBearing = RightBearingNotCalculated;
 	//}
 
 	// We express the negative right bearing as an absolute number
 	// so that it can be applied to the width using addition.
-	inline QFixed negativeRightBearing() const
-	{
-		//if (rightBearing == RightBearingNotCalculated)
+	inline QFixed negativeRightBearing() const {
+		// if (rightBearing == RightBearingNotCalculated)
 		//	return QFixed(0);
 
 		return qAbs(rightBearing);
 	}
-
 };
 
-//const QFixed LineBreakHelper::RightBearingNotCalculated = QFixed(1);
+// const QFixed LineBreakHelper::RightBearingNotCalculated = QFixed(1);
 
-static inline void addNextCluster(int &pos, int end, ScriptLine &line, int &glyphCount,
-	const QScriptItem &current, const unsigned short *logClusters,
-	const QGlyphLayout &glyphs)
-{
+static inline void addNextCluster(int &pos, int end, ScriptLine &line, int &glyphCount, const QScriptItem &current,
+                                  const unsigned short *logClusters, const QGlyphLayout &glyphs) {
 	int glyphPosition = logClusters[pos];
 	do { // got to the first next cluster
 		++pos;
 		++line.length;
 	} while (pos < end && logClusters[pos] == glyphPosition);
 	do { // calculate the textWidth for the rest of the current cluster.
-		if (!glyphs.attributes[glyphPosition].dontPrint)
-			line.textWidth += glyphs.advances[glyphPosition];
+		if (!glyphs.attributes[glyphPosition].dontPrint) line.textWidth += glyphs.advances[glyphPosition];
 		++glyphPosition;
 	} while (glyphPosition < current.num_glyphs && !glyphs.attributes[glyphPosition].clusterStart);
 
@@ -158,9 +148,10 @@ static inline void addNextCluster(int &pos, int end, ScriptLine &line, int &glyp
 
 class BlockParser {
 public:
-
 	BlockParser(QTextEngine *e, TextBlock *b, QFixed minResizeWidth, qint32 blockFrom, const QString &str)
-		: block(b), eng(e), str(str) {
+	    : block(b)
+	    , eng(e)
+	    , str(str) {
 		parseWords(minResizeWidth, blockFrom);
 	}
 
@@ -173,8 +164,7 @@ public:
 		style::align alignment = eng->option.alignment();
 
 		const QCharAttributes *attributes = eng->attributes();
-		if (!attributes)
-			return;
+		if (!attributes) return;
 		int end = 0;
 		lbh.logClusters = eng->layoutData->logClustersPtr;
 
@@ -193,8 +183,7 @@ public:
 				if (!current.num_glyphs) {
 					eng->shape(item);
 					attributes = eng->attributes();
-					if (!attributes)
-						return;
+					if (!attributes) return;
 					lbh.logClusters = eng->layoutData->logClustersPtr;
 				}
 				lbh.currentPosition = current.position;
@@ -209,11 +198,12 @@ public:
 
 			if (attributes[lbh.currentPosition].whiteSpace) {
 				while (lbh.currentPosition < end && attributes[lbh.currentPosition].whiteSpace)
-					addNextCluster(lbh.currentPosition, end, lbh.spaceData, lbh.glyphCount,
-						current, lbh.logClusters, lbh.glyphs);
+					addNextCluster(lbh.currentPosition, end, lbh.spaceData, lbh.glyphCount, current, lbh.logClusters,
+					               lbh.glyphs);
 
 				if (block->_words.isEmpty()) {
-					block->_words.push_back(TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
+					block->_words.push_back(
+					    TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
 				}
 				block->_words.back().add_rpadding(lbh.spaceData.textWidth);
 				block->_width += lbh.spaceData.textWidth;
@@ -227,14 +217,14 @@ public:
 				lastGraphemeBoundaryLine = ScriptLine();
 			} else {
 				do {
-					addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount,
-						current, lbh.logClusters, lbh.glyphs);
+					addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount, current, lbh.logClusters,
+					               lbh.glyphs);
 
-					if (lbh.currentPosition >= eng->layoutData->string.length()
-						|| attributes[lbh.currentPosition].whiteSpace
-						|| isLineBreak(attributes, lbh.currentPosition)) {
+					if (lbh.currentPosition >= eng->layoutData->string.length() ||
+					    attributes[lbh.currentPosition].whiteSpace || isLineBreak(attributes, lbh.currentPosition)) {
 						lbh.calculateRightBearing();
-						block->_words.push_back(TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
+						block->_words.push_back(
+						    TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
 						block->_width += lbh.tmpData.textWidth;
 						lbh.tmpData.textWidth = 0;
 						lbh.tmpData.length = 0;
@@ -244,7 +234,9 @@ public:
 						if (!addingEachGrapheme && lbh.tmpData.textWidth > minResizeWidth) {
 							if (lastGraphemeBoundaryPosition >= 0) {
 								lbh.calculateRightBearingForPreviousGlyph();
-								block->_words.push_back(TextWord(wordStart + blockFrom, -lastGraphemeBoundaryLine.textWidth, -lbh.negativeRightBearing()));
+								block->_words.push_back(TextWord(wordStart + blockFrom,
+								                                 -lastGraphemeBoundaryLine.textWidth,
+								                                 -lbh.negativeRightBearing()));
 								block->_width += lastGraphemeBoundaryLine.textWidth;
 								lbh.tmpData.textWidth -= lastGraphemeBoundaryLine.textWidth;
 								lbh.tmpData.length -= lastGraphemeBoundaryLine.length;
@@ -254,7 +246,8 @@ public:
 						}
 						if (addingEachGrapheme) {
 							lbh.calculateRightBearing();
-							block->_words.push_back(TextWord(wordStart + blockFrom, -lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
+							block->_words.push_back(
+							    TextWord(wordStart + blockFrom, -lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
 							block->_width += lbh.tmpData.textWidth;
 							lbh.tmpData.textWidth = 0;
 							lbh.tmpData.length = 0;
@@ -267,8 +260,7 @@ public:
 					}
 				} while (lbh.currentPosition < end);
 			}
-			if (lbh.currentPosition == end)
-				newItem = item + 1;
+			if (lbh.currentPosition == end) newItem = item + 1;
 		}
 		if (!block->_words.isEmpty()) {
 			block->_rpadding = block->_words.back().f_rpadding();
@@ -286,18 +278,18 @@ public:
 	}
 
 private:
-
 	TextBlock *block;
 	QTextEngine *eng;
 	const QString &str;
-
 };
 
 QFixed ITextBlock::f_rbearing() const {
-	return (type() == TextBlockTText) ? static_cast<const TextBlock*>(this)->real_f_rbearing() : 0;
+	return (type() == TextBlockTText) ? static_cast<const TextBlock *>(this)->real_f_rbearing() : 0;
 }
 
-TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResizeWidth, quint16 from, quint16 length, uchar flags, quint16 lnkIndex) : ITextBlock(font, str, from, length, flags, lnkIndex) {
+TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResizeWidth, quint16 from, quint16 length,
+                     uchar flags, quint16 lnkIndex)
+    : ITextBlock(font, str, from, length, flags, lnkIndex) {
 	_flags |= ((TextBlockTText & 0x0F) << 8);
 	if (length) {
 		style::font blockFont = font;
@@ -344,8 +336,10 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
 	}
 }
 
-EmojiBlock::EmojiBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex, EmojiPtr emoji) : ITextBlock(font, str, from, length, flags, lnkIndex)
-, emoji(emoji) {
+EmojiBlock::EmojiBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags,
+                       quint16 lnkIndex, EmojiPtr emoji)
+    : ITextBlock(font, str, from, length, flags, lnkIndex)
+    , emoji(emoji) {
 	_flags |= ((TextBlockTEmoji & 0x0F) << 8);
 	_width = int(st::emojiSize + 2 * st::emojiPadding);
 
@@ -360,7 +354,9 @@ EmojiBlock::EmojiBlock(const style::font &font, const QString &str, quint16 from
 	}
 }
 
-SkipBlock::SkipBlock(const style::font &font, const QString &str, quint16 from, qint32 w, qint32 h, quint16 lnkIndex) : ITextBlock(font, str, from, 1, 0, lnkIndex), _height(h) {
+SkipBlock::SkipBlock(const style::font &font, const QString &str, quint16 from, qint32 w, qint32 h, quint16 lnkIndex)
+    : ITextBlock(font, str, from, 1, 0, lnkIndex)
+    , _height(h) {
 	_flags |= ((TextBlockTSkip & 0x0F) << 8);
 	_width = w;
 }
diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h
index 15e90edc5..a10964bfa 100644
--- a/Telegram/SourceFiles/ui/text/text_block.h
+++ b/Telegram/SourceFiles/ui/text/text_block.h
@@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "private/qfontengine_p.h"
-#include "ui/style/style_core_types.h"
 #include "settings.h"
+#include "ui/style/style_core_types.h"
 
 class QString;
 
@@ -45,8 +45,9 @@ enum TextBlockFlags {
 
 class ITextBlock {
 public:
-	ITextBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex) : _from(from), _flags((flags & 0xFF) | ((lnkIndex & 0xFFFF) << 12)) {
-	}
+	ITextBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex)
+	    : _from(from)
+	    , _flags((flags & 0xFF) | ((lnkIndex & 0xFFFF) << 12)) {}
 
 	quint16 from() const {
 		return _from;
@@ -82,8 +83,7 @@ public:
 	}
 
 	virtual std::unique_ptr<ITextBlock> clone() const = 0;
-	virtual ~ITextBlock() {
-	}
+	virtual ~ITextBlock() {}
 
 protected:
 	quint16 _from = 0;
@@ -98,12 +98,14 @@ protected:
 	// (for example a text block after a link block) it is prepended with an empty
 	// word that holds those spaces as a right padding.
 	QFixed _rpadding = 0;
-
 };
 
 class NewlineBlock : public ITextBlock {
 public:
-	NewlineBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex) : ITextBlock(font, str, from, length, flags, lnkIndex), _nextDir(Qt::LayoutDirectionAuto) {
+	NewlineBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags,
+	             quint16 lnkIndex)
+	    : ITextBlock(font, str, from, length, flags, lnkIndex)
+	    , _nextDir(Qt::LayoutDirectionAuto) {
 		_flags |= ((TextBlockTNewline & 0x0F) << 8);
 	}
 
@@ -122,18 +124,16 @@ private:
 	friend class TextParser;
 
 	friend class TextPainter;
-
 };
 
 class TextWord {
 public:
 	TextWord() = default;
 	TextWord(quint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0)
-		: _from(from)
-		, _width(width)
-		, _rpadding(rpadding)
-		, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) {
-	}
+	    : _from(from)
+	    , _width(width)
+	    , _rpadding(rpadding)
+	    , _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) {}
 	quint16 from() const {
 		return _from;
 	}
@@ -154,12 +154,12 @@ private:
 	quint16 _from = 0;
 	QFixed _width, _rpadding;
 	qint16 _rbearing = 0;
-
 };
 
 class TextBlock : public ITextBlock {
 public:
-	TextBlock(const style::font &font, const QString &str, QFixed minResizeWidth, quint16 from, quint16 length, uchar flags, quint16 lnkIndex);
+	TextBlock(const style::font &font, const QString &str, QFixed minResizeWidth, quint16 from, quint16 length,
+	          uchar flags, quint16 lnkIndex);
 
 	std::unique_ptr<ITextBlock> clone() const override {
 		return std::make_unique<TextBlock>(*this);
@@ -179,12 +179,12 @@ private:
 
 	friend class BlockParser;
 	friend class TextPainter;
-
 };
 
 class EmojiBlock : public ITextBlock {
 public:
-	EmojiBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex, EmojiPtr emoji);
+	EmojiBlock(const style::font &font, const QString &str, quint16 from, quint16 length, uchar flags, quint16 lnkIndex,
+	           EmojiPtr emoji);
 
 	std::unique_ptr<ITextBlock> clone() const {
 		return std::make_unique<EmojiBlock>(*this);
@@ -197,7 +197,6 @@ private:
 	friend class TextParser;
 
 	friend class TextPainter;
-
 };
 
 class SkipBlock : public ITextBlock {
@@ -219,5 +218,4 @@ private:
 	friend class TextParser;
 
 	friend class TextPainter;
-
 };
diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp
index 37c2aebb9..7667613ca 100644
--- a/Telegram/SourceFiles/ui/text/text_entity.cpp
+++ b/Telegram/SourceFiles/ui/text/text_entity.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/text/text_entity.h"
 
+#include "app.h"
 #include "auth_session.h"
 #include "lang/lang_tag.h"
-#include "app.h"
 
 #include <QStack>
 
@@ -31,8 +31,7 @@ namespace TextUtilities {
 // note: these names are taken from Unicode Specification.
 // All spaces in this names are replaced to SwitchingCase, all dashes ('-')
 // are replaced to underscore ('_')
-enum UnicodePoints
-{
+enum UnicodePoints {
 	Left_PointingDoubleAngleQuotationMark = 171,
 	Right_PointingDoubleAngleQuotationMark = 187,
 	EmDash = 8212,
@@ -42,12 +41,24 @@ namespace {
 
 QString ExpressionDomain() {
 	// Matches any domain name, containing at least one '.', including "file.txt".
-	return QString::fromUtf8("(?<![\\w\\$\\-\\_%=\\.])(?:([a-zA-Z]+)://)?((?:[A-Za-z" "\xd0\x90-\xd0\xaf\xd0\x81" "\xd0\xb0-\xd1\x8f\xd1\x91" "0-9\\-\\_]+\\.){1,10}([A-Za-z" "\xd1\x80\xd1\x84" "\\-\\d]{2,22})(\\:\\d+)?)");
+	return QString::fromUtf8(
+	    "(?<![\\w\\$\\-\\_%=\\.])(?:([a-zA-Z]+)://)?((?:[A-Za-z"
+	    "\xd0\x90-\xd0\xaf\xd0\x81"
+	    "\xd0\xb0-\xd1\x8f\xd1\x91"
+	    "0-9\\-\\_]+\\.){1,10}([A-Za-z"
+	    "\xd1\x80\xd1\x84"
+	    "\\-\\d]{2,22})(\\:\\d+)?)");
 }
 
 QString ExpressionDomainExplicit() {
 	// Matches any domain name, containing a protocol, including "test://localhost".
-	return QString::fromUtf8("(?<![\\w\\$\\-\\_%=\\.])(?:([a-zA-Z]+)://)((?:[A-Za-z" "\xd0\x90-\xd0\xaf\xd0\x81" "\xd0\xb0-\xd1\x8f\xd1\x91" "0-9\\-\\_]+\\.){0,10}([A-Za-z" "\xd1\x80\xd1\x84" "\\-\\d]{2,22})(\\:\\d+)?)");
+	return QString::fromUtf8(
+	    "(?<![\\w\\$\\-\\_%=\\.])(?:([a-zA-Z]+)://)((?:[A-Za-z"
+	    "\xd0\x90-\xd0\xaf\xd0\x81"
+	    "\xd0\xb0-\xd1\x8f\xd1\x91"
+	    "0-9\\-\\_]+\\.){0,10}([A-Za-z"
+	    "\xd1\x80\xd1\x84"
+	    "\\-\\d]{2,22})(\\:\\d+)?)");
 }
 
 QString ExpressionMailNameAtEnd() {
@@ -71,7 +82,8 @@ QString ExpressionMention() {
 }
 
 QString ExpressionBotCommand() {
-	return qsl("(^|[") + ExpressionSeparators(qsl("`\\*")) + qsl("])/[A-Za-z_0-9]{1,64}(@[A-Za-z_0-9]{5,32})?([\\W]|$)");
+	return qsl("(^|[") + ExpressionSeparators(qsl("`\\*")) +
+	       qsl("])/[A-Za-z_0-9]{1,64}(@[A-Za-z_0-9]{5,32})?([\\W]|$)");
 }
 
 QString ExpressionMarkdownBold() {
@@ -1134,14 +1146,14 @@ inline QChar RemoveOneAccent(quint32 code) {
 	case 65363: return QChar(115);
 	case 65367: return QChar(119);
 	case 1105: return QChar(1077);
-	default:
-	break;
+	default: break;
 	}
 	return QChar(0);
 }
 
 const QRegularExpression &RegExpWordSplit() {
-	static const auto result = QRegularExpression (qsl("[\\@\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\:\\!\\_\\;\\\"\\'\\x0]"));
+	static const auto result =
+	    QRegularExpression(qsl("[\\@\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\:\\!\\_\\;\\\"\\'\\x0]"));
 	return result;
 }
 
@@ -1322,14 +1334,19 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, qint32 limit) {
 	bool goodInEntity = false, goodCanBreakEntity = false;
 
 	qint32 s = 0, half = limit / 2, goodLevel = 0;
-	for (const QChar *start = left.text.constData(), *ch = start, *end = left.text.constEnd(), *good = ch; ch != end; ++ch, ++s) {
-		while (currentEntity < entityCount && ch >= start + left.entities[currentEntity].offset() + left.entities[currentEntity].length()) {
+	for (const QChar *start = left.text.constData(), *ch = start, *end = left.text.constEnd(), *good = ch; ch != end;
+	     ++ch, ++s) {
+		while (currentEntity < entityCount &&
+		       ch >= start + left.entities[currentEntity].offset() + left.entities[currentEntity].length()) {
 			++currentEntity;
 		}
 
 		if (s > half) {
-			bool inEntity = (currentEntity < entityCount) && (ch > start + left.entities[currentEntity].offset()) && (ch < start + left.entities[currentEntity].offset() + left.entities[currentEntity].length());
-			EntityInTextType entityType = (currentEntity < entityCount) ? left.entities[currentEntity].type() : EntityInTextInvalid;
+			bool inEntity =
+			    (currentEntity < entityCount) && (ch > start + left.entities[currentEntity].offset()) &&
+			    (ch < start + left.entities[currentEntity].offset() + left.entities[currentEntity].length());
+			EntityInTextType entityType =
+			    (currentEntity < entityCount) ? left.entities[currentEntity].type() : EntityInTextInvalid;
 			bool canBreakEntity = (entityType == EntityInTextPre || entityType == EntityInTextCode);
 			qint32 noEntityLevel = inEntity ? 0 : 1;
 
@@ -1356,9 +1373,13 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, qint32 limit) {
 						}
 					} else if (ch + 1 < end && chIsNewline(*(ch + 1))) {
 						markGoodAsLevel(15);
-					} else if (currentEntity < entityCount && ch + 1 == start + left.entities[currentEntity].offset() && left.entities[currentEntity].type() == EntityInTextPre) {
+					} else if (currentEntity < entityCount && ch + 1 == start + left.entities[currentEntity].offset() &&
+					           left.entities[currentEntity].type() == EntityInTextPre) {
 						markGoodAsLevel(14);
-					} else if (currentEntity > 0 && ch == start + left.entities[currentEntity - 1].offset() + left.entities[currentEntity - 1].length() && left.entities[currentEntity - 1].type() == EntityInTextPre) {
+					} else if (currentEntity > 0 &&
+					           ch == start + left.entities[currentEntity - 1].offset() +
+					                     left.entities[currentEntity - 1].length() &&
+					           left.entities[currentEntity - 1].type() == EntityInTextPre) {
 						markGoodAsLevel(14);
 					} else {
 						markGoodAsLevel(13);
@@ -1434,7 +1455,8 @@ bool textcmdStartsLink(const QChar *start, qint32 len, qint32 commandOffset) {
 	return false;
 }
 
-bool checkTagStartInCommand(const QChar *start, qint32 len, qint32 tagStart, qint32 &commandOffset, bool &commandIsLink, bool &inLink) {
+bool checkTagStartInCommand(const QChar *start, qint32 len, qint32 tagStart, qint32 &commandOffset, bool &commandIsLink,
+                            bool &inLink) {
 	bool inCommand = false;
 	const QChar *commandEnd = start + commandOffset;
 	while (commandOffset < len && tagStart > commandOffset) { // skip commands, evaluating are we in link or not
@@ -1471,16 +1493,31 @@ EntitiesInText EntitiesFromMTP(const QVector<MTPMessageEntity> &entities) {
 		result.reserve(entities.size());
 		for_const (auto &entity, entities) {
 			switch (entity.type()) {
-			case mtpc_messageEntityUrl: { auto &d = entity.c_messageEntityUrl(); result.push_back(EntityInText(EntityInTextUrl, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityTextUrl: { auto &d = entity.c_messageEntityTextUrl(); result.push_back(EntityInText(EntityInTextCustomUrl, d.voffset.v, d.vlength.v, Clean(qs(d.vurl)))); } break;
-			case mtpc_messageEntityEmail: { auto &d = entity.c_messageEntityEmail(); result.push_back(EntityInText(EntityInTextEmail, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityHashtag: { auto &d = entity.c_messageEntityHashtag(); result.push_back(EntityInText(EntityInTextHashtag, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityMention: { auto &d = entity.c_messageEntityMention(); result.push_back(EntityInText(EntityInTextMention, d.voffset.v, d.vlength.v)); } break;
+			case mtpc_messageEntityUrl: {
+				auto &d = entity.c_messageEntityUrl();
+				result.push_back(EntityInText(EntityInTextUrl, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityTextUrl: {
+				auto &d = entity.c_messageEntityTextUrl();
+				result.push_back(EntityInText(EntityInTextCustomUrl, d.voffset.v, d.vlength.v, Clean(qs(d.vurl))));
+			} break;
+			case mtpc_messageEntityEmail: {
+				auto &d = entity.c_messageEntityEmail();
+				result.push_back(EntityInText(EntityInTextEmail, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityHashtag: {
+				auto &d = entity.c_messageEntityHashtag();
+				result.push_back(EntityInText(EntityInTextHashtag, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityMention: {
+				auto &d = entity.c_messageEntityMention();
+				result.push_back(EntityInText(EntityInTextMention, d.voffset.v, d.vlength.v));
+			} break;
 			case mtpc_messageEntityMentionName: {
 				auto &d = entity.c_messageEntityMentionName();
 				auto data = [&d] {
 					if (auto user = App::userLoaded(peerFromUser(d.vuser_id))) {
-						return MentionNameDataFromFields({ d.vuser_id.v, user->access });
+						return MentionNameDataFromFields({d.vuser_id.v, user->access});
 					}
 					return MentionNameDataFromFields(d.vuser_id.v);
 				};
@@ -1493,7 +1530,7 @@ EntitiesInText EntitiesFromMTP(const QVector<MTPMessageEntity> &entities) {
 						return MentionNameDataFromFields(Auth().userId());
 					} else if (d.vuser_id.type() == mtpc_inputUser) {
 						auto &user = d.vuser_id.c_inputUser();
-						return MentionNameDataFromFields({ user.vuser_id.v, user.vaccess_hash.v });
+						return MentionNameDataFromFields({user.vuser_id.v, user.vaccess_hash.v});
 					}
 					return QString();
 				})();
@@ -1501,11 +1538,26 @@ EntitiesInText EntitiesFromMTP(const QVector<MTPMessageEntity> &entities) {
 					result.push_back(EntityInText(EntityInTextMentionName, d.voffset.v, d.vlength.v, data));
 				}
 			} break;
-			case mtpc_messageEntityBotCommand: { auto &d = entity.c_messageEntityBotCommand(); result.push_back(EntityInText(EntityInTextBotCommand, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityBold: { auto &d = entity.c_messageEntityBold(); result.push_back(EntityInText(EntityInTextBold, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityItalic: { auto &d = entity.c_messageEntityItalic(); result.push_back(EntityInText(EntityInTextItalic, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityCode: { auto &d = entity.c_messageEntityCode(); result.push_back(EntityInText(EntityInTextCode, d.voffset.v, d.vlength.v)); } break;
-			case mtpc_messageEntityPre: { auto &d = entity.c_messageEntityPre(); result.push_back(EntityInText(EntityInTextPre, d.voffset.v, d.vlength.v, Clean(qs(d.vlanguage)))); } break;
+			case mtpc_messageEntityBotCommand: {
+				auto &d = entity.c_messageEntityBotCommand();
+				result.push_back(EntityInText(EntityInTextBotCommand, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityBold: {
+				auto &d = entity.c_messageEntityBold();
+				result.push_back(EntityInText(EntityInTextBold, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityItalic: {
+				auto &d = entity.c_messageEntityItalic();
+				result.push_back(EntityInText(EntityInTextItalic, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityCode: {
+				auto &d = entity.c_messageEntityCode();
+				result.push_back(EntityInText(EntityInTextCode, d.voffset.v, d.vlength.v));
+			} break;
+			case mtpc_messageEntityPre: {
+				auto &d = entity.c_messageEntityPre();
+				result.push_back(EntityInText(EntityInTextPre, d.voffset.v, d.vlength.v, Clean(qs(d.vlanguage))));
+			} break;
 			}
 		}
 	}
@@ -1517,12 +1569,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(const EntitiesInText &entities, Conver
 	v.reserve(entities.size());
 	for_const (auto &entity, entities) {
 		if (entity.length() <= 0) continue;
-		if (option == ConvertOption::SkipLocal
-			&& entity.type() != EntityInTextBold
-			&& entity.type() != EntityInTextItalic
-			&& entity.type() != EntityInTextCode
-			&& entity.type() != EntityInTextPre
-			&& entity.type() != EntityInTextMentionName) {
+		if (option == ConvertOption::SkipLocal && entity.type() != EntityInTextBold &&
+		    entity.type() != EntityInTextItalic && entity.type() != EntityInTextCode &&
+		    entity.type() != EntityInTextPre && entity.type() != EntityInTextMentionName) {
 			continue;
 		}
 
@@ -1531,7 +1580,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(const EntitiesInText &entities, Conver
 		switch (entity.type()) {
 		case EntityInTextInvalid: assert(false); // temp
 		case EntityInTextUrl: v.push_back(MTP_messageEntityUrl(offset, length)); break;
-		case EntityInTextCustomUrl: v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(entity.data()))); break;
+		case EntityInTextCustomUrl:
+			v.push_back(MTP_messageEntityTextUrl(offset, length, MTP_string(entity.data())));
+			break;
 		case EntityInTextEmail: v.push_back(MTP_messageEntityEmail(offset, length)); break;
 		case EntityInTextHashtag: v.push_back(MTP_messageEntityHashtag(offset, length)); break;
 		case EntityInTextMention: v.push_back(MTP_messageEntityMention(offset, length)); break;
@@ -1561,8 +1612,9 @@ MTPVector<MTPMessageEntity> EntitiesToMTP(const EntitiesInText &entities, Conver
 
 struct MarkdownPart {
 	MarkdownPart() = default;
-	MarkdownPart(EntityInTextType type) : type(type), outerStart(-1) {
-	}
+	MarkdownPart(EntityInTextType type)
+	    : type(type)
+	    , outerStart(-1) {}
 	EntityInTextType type = EntityInTextInvalid;
 	int outerStart = 0;
 	int innerStart = 0;
@@ -1627,9 +1679,8 @@ void AdjustMarkdownPrePart(MarkdownPart &result, const TextWithEntities &text, b
 			lastEntityInsideEnd = entity.offset() + entity.length();
 		}
 	}
-	while (result.outerStart > lastEntityBeforeEnd
-		&& chIsSpace(*(start + result.outerStart - 1), rich)
-		&& !chIsNewline(*(start + result.outerStart - 1))) {
+	while (result.outerStart > lastEntityBeforeEnd && chIsSpace(*(start + result.outerStart - 1), rich) &&
+	       !chIsNewline(*(start + result.outerStart - 1))) {
 		--result.outerStart;
 	}
 	result.addNewlineBefore = (result.outerStart > 0 && !chIsNewline(*(start + result.outerStart - 1)));
@@ -1652,9 +1703,8 @@ void AdjustMarkdownPrePart(MarkdownPart &result, const TextWithEntities &text, b
 		}
 	}
 
-	while (result.outerEnd < firstEntityAfterStart
-		&& chIsSpace(*(start + result.outerEnd))
-		&& !chIsNewline(*(start + result.outerEnd))) {
+	while (result.outerEnd < firstEntityAfterStart && chIsSpace(*(start + result.outerEnd)) &&
+	       !chIsNewline(*(start + result.outerEnd))) {
 		++result.outerEnd;
 	}
 	result.addNewlineAfter = (result.outerEnd < length && !chIsNewline(*(start + result.outerEnd)));
@@ -1667,10 +1717,10 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
 	auto newResult = TextWithEntities();
 
 	MarkdownPart computedParts[4] = {
-		{ EntityInTextBold },
-		{ EntityInTextItalic },
-		{ EntityInTextPre },
-		{ EntityInTextCode },
+	    {EntityInTextBold},
+	    {EntityInTextItalic},
+	    {EntityInTextPre},
+	    {EntityInTextCode},
 	};
 
 	auto existingEntityIndex = 0;
@@ -1721,7 +1771,8 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
 		}
 
 		// Check if start sequence intersects a command.
-		auto inCommand = checkTagStartInCommand(start, length, part.outerStart, nextCommandOffset, commandIsLink, inLink);
+		auto inCommand =
+		    checkTagStartInCommand(start, length, part.outerStart, nextCommandOffset, commandIsLink, inLink);
 		if (inCommand || inLink) {
 			matchFromOffset = nextCommandOffset;
 			continue;
@@ -1730,8 +1781,9 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
 		// Check if start or end sequences intersect any existing entity.
 		auto intersectedEntityEnd = 0;
 		for_const (auto &entity, result.entities) {
-			if (std::min(part.innerStart, entity.offset() + entity.length()) > std::max(part.outerStart, entity.offset()) ||
-				std::min(part.outerEnd, entity.offset() + entity.length()) > std::max(part.innerEnd, entity.offset())) {
+			if (std::min(part.innerStart, entity.offset() + entity.length()) >
+			        std::max(part.outerStart, entity.offset()) ||
+			    std::min(part.outerEnd, entity.offset() + entity.length()) > std::max(part.innerEnd, entity.offset())) {
 				intersectedEntityEnd = entity.offset() + entity.length();
 				break;
 			}
@@ -1746,7 +1798,9 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
 		}
 
 		if (newResult.text.isEmpty()) newResult.text.reserve(result.text.size());
-		for (; existingEntityIndex < existingEntitiesCount && result.entities[existingEntityIndex].offset() < part.innerStart; ++existingEntityIndex) {
+		for (; existingEntityIndex < existingEntitiesCount &&
+		       result.entities[existingEntityIndex].offset() < part.innerStart;
+		     ++existingEntityIndex) {
 			auto &entity = result.entities[existingEntityIndex];
 			newResult.entities.push_back(entity);
 			newResult.entities.back().shiftLeft(existingEntityShiftLeft);
@@ -1761,7 +1815,9 @@ void ParseMarkdown(TextWithEntities &result, bool rich) {
 		auto entityLength = part.innerEnd - part.innerStart;
 		newResult.entities.push_back(EntityInText(part.type, entityStart, entityLength));
 
-		for (; existingEntityIndex < existingEntitiesCount && result.entities[existingEntityIndex].offset() <= part.innerEnd; ++existingEntityIndex) {
+		for (; existingEntityIndex < existingEntitiesCount &&
+		       result.entities[existingEntityIndex].offset() <= part.innerEnd;
+		     ++existingEntityIndex) {
 			auto &entity = result.entities[existingEntityIndex];
 			newResult.entities.push_back(entity);
 			newResult.entities.back().shiftLeft(existingEntityShiftLeft);
@@ -1813,21 +1869,23 @@ void ParseEntities(TextWithEntities &result, qint32 flags, bool rich) {
 		auto mDomain = RegExpDomain().match(result.text, matchOffset);
 		auto mExplicitDomain = RegExpDomainExplicit().match(result.text, matchOffset);
 		auto mHashtag = withHashtags ? RegExpHashtag().match(result.text, matchOffset) : QRegularExpressionMatch();
-		auto mMention = withMentions ? RegExpMention().match(result.text, std::max(mentionSkip, matchOffset)) : QRegularExpressionMatch();
-		auto mBotCommand = withBotCommands ? RegExpBotCommand().match(result.text, matchOffset) : QRegularExpressionMatch();
+		auto mMention = withMentions ? RegExpMention().match(result.text, std::max(mentionSkip, matchOffset)) :
+		                               QRegularExpressionMatch();
+		auto mBotCommand =
+		    withBotCommands ? RegExpBotCommand().match(result.text, matchOffset) : QRegularExpressionMatch();
 
 		EntityInTextType lnkType = EntityInTextUrl;
 		qint32 lnkStart = 0, lnkLength = 0;
 		qint32 domainStart = mDomain.hasMatch() ? mDomain.capturedStart() : INT_MAX,
-			domainEnd = mDomain.hasMatch() ? mDomain.capturedEnd() : INT_MAX,
-			explicitDomainStart = mExplicitDomain.hasMatch() ? mExplicitDomain.capturedStart() : INT_MAX,
-			explicitDomainEnd = mExplicitDomain.hasMatch() ? mExplicitDomain.capturedEnd() : INT_MAX,
-			hashtagStart = mHashtag.hasMatch() ? mHashtag.capturedStart() : INT_MAX,
-			hashtagEnd = mHashtag.hasMatch() ? mHashtag.capturedEnd() : INT_MAX,
-			mentionStart = mMention.hasMatch() ? mMention.capturedStart() : INT_MAX,
-			mentionEnd = mMention.hasMatch() ? mMention.capturedEnd() : INT_MAX,
-			botCommandStart = mBotCommand.hasMatch() ? mBotCommand.capturedStart() : INT_MAX,
-			botCommandEnd = mBotCommand.hasMatch() ? mBotCommand.capturedEnd() : INT_MAX;
+		       domainEnd = mDomain.hasMatch() ? mDomain.capturedEnd() : INT_MAX,
+		       explicitDomainStart = mExplicitDomain.hasMatch() ? mExplicitDomain.capturedStart() : INT_MAX,
+		       explicitDomainEnd = mExplicitDomain.hasMatch() ? mExplicitDomain.capturedEnd() : INT_MAX,
+		       hashtagStart = mHashtag.hasMatch() ? mHashtag.capturedStart() : INT_MAX,
+		       hashtagEnd = mHashtag.hasMatch() ? mHashtag.capturedEnd() : INT_MAX,
+		       mentionStart = mMention.hasMatch() ? mMention.capturedStart() : INT_MAX,
+		       mentionEnd = mMention.hasMatch() ? mMention.capturedEnd() : INT_MAX,
+		       botCommandStart = mBotCommand.hasMatch() ? mBotCommand.capturedStart() : INT_MAX,
+		       botCommandEnd = mBotCommand.hasMatch() ? mBotCommand.capturedEnd() : INT_MAX;
 		if (mHashtag.hasMatch()) {
 			if (!mHashtag.capturedRef(1).isEmpty()) {
 				++hashtagStart;
@@ -1865,7 +1923,8 @@ void ParseEntities(TextWithEntities &result, qint32 flags, bool rich) {
 				--botCommandEnd;
 			}
 		}
-		if (!mDomain.hasMatch() && !mExplicitDomain.hasMatch() && !mHashtag.hasMatch() && !mMention.hasMatch() && !mBotCommand.hasMatch()) {
+		if (!mDomain.hasMatch() && !mExplicitDomain.hasMatch() && !mHashtag.hasMatch() && !mMention.hasMatch() &&
+		    !mBotCommand.hasMatch()) {
 			break;
 		}
 
@@ -1936,7 +1995,7 @@ void ParseEntities(TextWithEntities &result, qint32 flags, bool rich) {
 				}
 				lnkStart = domainStart;
 
-				QStack<const QChar*> parenth;
+				QStack<const QChar *> parenth;
 				const QChar *domainEnd = start + mDomain.capturedEnd(), *p = domainEnd;
 				for (; p < end; ++p) {
 					QChar ch(*p);
@@ -1957,7 +2016,8 @@ void ParseEntities(TextWithEntities &result, qint32 flags, bool rich) {
 					} else if (ch == ')' || ch == ']' || ch == '}' || ch == '>') {
 						if (parenth.isEmpty()) break;
 						const QChar *q = parenth.pop(), open(*q);
-						if ((ch == ')' && open != '(') || (ch == ']' && open != '[') || (ch == '}' && open != '{') || (ch == '>' && open != '<')) {
+						if ((ch == ')' && open != '(') || (ch == ']' && open != '[') || (ch == '}' && open != '{') ||
+						    (ch == '>' && open != '<')) {
 							p = q;
 							break;
 						}
@@ -1972,7 +2032,8 @@ void ParseEntities(TextWithEntities &result, qint32 flags, bool rich) {
 				lnkLength = (p - start) - lnkStart;
 			}
 		}
-		for (; existingEntityIndex < existingEntitiesCount && result.entities[existingEntityIndex].offset() <= lnkStart; ++existingEntityIndex) {
+		for (; existingEntityIndex < existingEntitiesCount && result.entities[existingEntityIndex].offset() <= lnkStart;
+		     ++existingEntityIndex) {
 			auto &entity = result.entities[existingEntityIndex];
 			accumulate_max(existingEntityEnd, entity.offset() + entity.length());
 			newEntities.push_back(entity);
@@ -2229,7 +2290,8 @@ void Trim(TextWithEntities &result) {
 
 namespace Lang {
 
-TextWithEntities ReplaceTag<TextWithEntities>::Call(TextWithEntities &&original, ushort tag, const TextWithEntities &replacement) {
+TextWithEntities ReplaceTag<TextWithEntities>::Call(TextWithEntities &&original, ushort tag,
+                                                    const TextWithEntities &replacement) {
 	auto replacementPosition = FindTagReplacementPosition(original.text, tag);
 	if (replacementPosition < 0) {
 		return std::move(original);
@@ -2244,7 +2306,8 @@ TextWithEntities ReplaceTag<TextWithEntities>::Call(TextWithEntities &&original,
 
 		auto replacementEnd = replacementPosition + replacement.text.size();
 		auto replacementEntity = replacement.entities.cbegin();
-		auto addReplacementEntitiesUntil = [&replacementEntity, &replacement, &result, replacementPosition, replacementEnd](int untilPosition) {
+		auto addReplacementEntitiesUntil = [&replacementEntity, &replacement, &result, replacementPosition,
+		                                    replacementEnd](int untilPosition) {
 			while (replacementEntity != replacement.entities.cend()) {
 				auto newOffset = replacementPosition + replacementEntity->offset();
 				if (newOffset >= untilPosition) {
@@ -2254,7 +2317,8 @@ TextWithEntities ReplaceTag<TextWithEntities>::Call(TextWithEntities &&original,
 				newOffset = snap(newOffset, replacementPosition, replacementEnd);
 				newEnd = snap(newEnd, replacementPosition, replacementEnd);
 				if (auto newLength = newEnd - newOffset) {
-					result.entities.push_back(EntityInText(replacementEntity->type(), newOffset, newLength, replacementEntity->data()));
+					result.entities.push_back(
+					    EntityInText(replacementEntity->type(), newOffset, newLength, replacementEntity->data()));
 				}
 				++replacementEntity;
 			}
diff --git a/Telegram/SourceFiles/ui/text/text_entity.h b/Telegram/SourceFiles/ui/text/text_entity.h
index dad20d6a4..e9340a1fc 100644
--- a/Telegram/SourceFiles/ui/text/text_entity.h
+++ b/Telegram/SourceFiles/ui/text/text_entity.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
 #include <QRegularExpression>
+#include <QString>
 #include <QVector>
 
 #include "scheme.h"
@@ -40,7 +40,7 @@ enum EntityInTextType {
 	EntityInTextBold,
 	EntityInTextItalic,
 	EntityInTextCode, // inline
-	EntityInTextPre,  // block
+	EntityInTextPre, // block
 };
 
 class EntityInText;
@@ -49,11 +49,10 @@ using EntitiesInText = QList<EntityInText>;
 class EntityInText {
 public:
 	EntityInText(EntityInTextType type, int offset, int length, const QString &data = QString())
-		: _type(type)
-		, _offset(offset)
-		, _length(length)
-		, _data(data) {
-	}
+	    : _type(type)
+	    , _offset(offset)
+	    , _length(length)
+	    , _data(data) {}
 
 	EntityInTextType type() const {
 		return _type;
@@ -115,7 +114,6 @@ private:
 	EntityInTextType _type;
 	int _offset, _length;
 	QString _data;
-
 };
 
 struct TextWithEntities {
@@ -178,17 +176,18 @@ QStringList PrepareSearchWords(const QString &query, const QRegularExpression *S
 bool CutPart(TextWithEntities &sending, TextWithEntities &left, int limit);
 
 struct MentionNameFields {
-	MentionNameFields(qint32 userId = 0, quint64 accessHash = 0) : userId(userId), accessHash(accessHash) {
-	}
+	MentionNameFields(qint32 userId = 0, quint64 accessHash = 0)
+	    : userId(userId)
+	    , accessHash(accessHash) {}
 	qint32 userId = 0;
 	quint64 accessHash = 0;
 };
 inline MentionNameFields MentionNameDataToFields(const QString &data) {
 	auto components = data.split('.');
 	if (!components.isEmpty()) {
-		return { components.at(0).toInt(), (components.size() > 1) ? components.at(1).toULongLong() : 0 };
+		return {components.at(0).toInt(), (components.size() > 1) ? components.at(1).toULongLong() : 0};
 	}
-	return MentionNameFields {};
+	return MentionNameFields{};
 }
 
 inline QString MentionNameDataFromFields(const MentionNameFields &fields) {
@@ -204,7 +203,8 @@ enum class ConvertOption {
 	WithLocal,
 	SkipLocal,
 };
-MTPVector<MTPMessageEntity> EntitiesToMTP(const EntitiesInText &entities, ConvertOption option = ConvertOption::WithLocal);
+MTPVector<MTPMessageEntity> EntitiesToMTP(const EntitiesInText &entities,
+                                          ConvertOption option = ConvertOption::WithLocal);
 
 // New entities are added to the ones that are already in result.
 // Changes text if (flags & TextParseMarkdown).
@@ -219,8 +219,10 @@ enum class PrepareTextOption {
 	CheckLinks,
 };
 inline QString PrepareForSending(const QString &text, PrepareTextOption option = PrepareTextOption::IgnoreLinks) {
-	auto result = TextWithEntities { text };
-	auto prepareFlags = (option == PrepareTextOption::CheckLinks) ? (TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands) : 0;
+	auto result = TextWithEntities{text};
+	auto prepareFlags = (option == PrepareTextOption::CheckLinks) ?
+	                        (TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands) :
+	                        0;
 	PrepareForSending(result, prepareFlags);
 	return result.text;
 }
@@ -232,23 +234,18 @@ void ApplyServerCleaning(TextWithEntities &result);
 
 namespace Lang {
 
-template <typename ResultString>
-struct StartReplacements;
+template <typename ResultString> struct StartReplacements;
 
-template <>
-struct StartReplacements<TextWithEntities> {
+template <> struct StartReplacements<TextWithEntities> {
 	static inline TextWithEntities Call(QString &&langString) {
-		return { std::move(langString), EntitiesInText() };
+		return {std::move(langString), EntitiesInText()};
 	}
 };
 
-template <typename ResultString>
-struct ReplaceTag;
+template <typename ResultString> struct ReplaceTag;
 
-template <>
-struct ReplaceTag<TextWithEntities> {
+template <> struct ReplaceTag<TextWithEntities> {
 	static TextWithEntities Call(TextWithEntities &&original, ushort tag, const TextWithEntities &replacement);
-
 };
 
 } // namespace Lang
diff --git a/Telegram/SourceFiles/ui/toast/toast.cpp b/Telegram/SourceFiles/ui/toast/toast.cpp
index cbd7c824f..a2e3a7275 100644
--- a/Telegram/SourceFiles/ui/toast/toast.cpp
+++ b/Telegram/SourceFiles/ui/toast/toast.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/toast/toast.h"
 
+#include "mainwindow.h"
 #include "ui/toast/toast_manager.h"
 #include "ui/toast/toast_widget.h"
-#include "mainwindow.h"
 
-#include <QWidget>
 #include "app.h"
+#include <QWidget>
 
 namespace Ui {
 namespace Toast {
 
 Instance::Instance(const Config &config, QWidget *widgetParent, const Private &)
-: _hideAtMs(getms(true) + config.durationMs) {
+    : _hideAtMs(getms(true) + config.durationMs) {
 	_widget = std::make_unique<internal::Widget>(widgetParent, config);
 	_a_opacity.start([this] { opacityAnimationCallback(); }, 0., 1., st::toastFadeInDuration);
 }
diff --git a/Telegram/SourceFiles/ui/toast/toast.h b/Telegram/SourceFiles/ui/toast/toast.h
index feb4056de..d6bb2fda0 100644
--- a/Telegram/SourceFiles/ui/toast/toast.h
+++ b/Telegram/SourceFiles/ui/toast/toast.h
@@ -19,10 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
-#include <QString>
-#include <QMargins>
 #include "core/utils.h"
 #include "ui/animation.h"
+#include <QMargins>
+#include <QString>
 
 class QWidget;
 
@@ -32,8 +32,8 @@ namespace Ui {
 namespace Toast {
 
 namespace internal {
-	class Manager;
-	class Widget;
+class Manager;
+class Widget;
 } // namespace internal
 
 static constexpr const int DefaultDuration = 1500;
@@ -48,11 +48,9 @@ void Show(const Config &config);
 void Show(const QString &text);
 
 class Instance {
-	struct Private {
-	};
+	struct Private {};
 
 public:
-
 	Instance(const Config &config, QWidget *widgetParent, const Private &);
 	Instance(const Instance &other) = delete;
 	Instance &operator=(const Instance &other) = delete;
@@ -72,7 +70,6 @@ private:
 	friend class internal::Manager;
 	friend void Show(QWidget *parent, const Config &config);
 	std::unique_ptr<internal::Widget> _widget;
-
 };
 
 } // namespace Toast
diff --git a/Telegram/SourceFiles/ui/toast/toast_manager.cpp b/Telegram/SourceFiles/ui/toast/toast_manager.cpp
index 59dfc4f6a..60cb4e598 100644
--- a/Telegram/SourceFiles/ui/toast/toast_manager.cpp
+++ b/Telegram/SourceFiles/ui/toast/toast_manager.cpp
@@ -29,11 +29,12 @@ namespace internal {
 
 namespace {
 
-NeverFreedPointer<QMap<QObject*, Manager*>> _managers;
+NeverFreedPointer<QMap<QObject *, Manager *>> _managers;
 
 } // namespace
 
-Manager::Manager(QWidget *parent) : QObject(parent) {
+Manager::Manager(QWidget *parent)
+    : QObject(parent) {
 	connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(onHideTimeout()));
 }
 
@@ -67,7 +68,7 @@ void Manager::addToast(std::unique_ptr<Instance> &&toast) {
 	Widget *widget = t->_widget.get();
 
 	_toastByWidget.insert(widget, t);
-	connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(onToastWidgetDestroyed(QObject*)));
+	connect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(onToastWidgetDestroyed(QObject *)));
 	if (auto parent = widget->parentWidget()) {
 		auto found = false;
 		for (auto i = _toastParents.begin(); i != _toastParents.cend();) {
@@ -108,7 +109,7 @@ void Manager::onHideTimeout() {
 }
 
 void Manager::onToastWidgetDestroyed(QObject *widget) {
-	auto i = _toastByWidget.find(static_cast<Widget*>(widget));
+	auto i = _toastByWidget.find(static_cast<Widget *>(widget));
 	if (i != _toastByWidget.cend()) {
 		auto toast = i.value();
 		_toastByWidget.erase(i);
diff --git a/Telegram/SourceFiles/ui/toast/toast_manager.h b/Telegram/SourceFiles/ui/toast/toast_manager.h
index 092993594..1f7e33ac3 100644
--- a/Telegram/SourceFiles/ui/toast/toast_manager.h
+++ b/Telegram/SourceFiles/ui/toast/toast_manager.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/toast/toast.h"
 #include "core/single_timer.h"
+#include "ui/toast/toast.h"
 
 namespace Ui {
 namespace Toast {
@@ -55,11 +55,10 @@ private:
 	SingleTimer _hideTimer;
 	TimeMs _nextHide = 0;
 
-	QMultiMap<TimeMs, Instance*> _toastByHideTime;
-	QMap<Widget*, Instance*> _toastByWidget;
-	QList<Instance*> _toasts;
+	QMultiMap<TimeMs, Instance *> _toastByHideTime;
+	QMap<Widget *, Instance *> _toastByWidget;
+	QList<Instance *> _toasts;
 	OrderedSet<QPointer<QWidget>> _toastParents;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/ui/toast/toast_widget.cpp b/Telegram/SourceFiles/ui/toast/toast_widget.cpp
index bc762cfb7..5668a77da 100644
--- a/Telegram/SourceFiles/ui/toast/toast_widget.cpp
+++ b/Telegram/SourceFiles/ui/toast/toast_widget.cpp
@@ -30,13 +30,14 @@ constexpr auto kToastMaxLines = 16;
 
 } // namespace
 
-Widget::Widget(QWidget *parent, const Config &config) : TWidget(parent)
-, _multiline(config.maxWidth > 0)
-, _maxWidth((config.maxWidth > 0) ? config.maxWidth : st::toastMaxWidth)
-, _padding((config.padding.left() > 0) ? config.padding : st::toastPadding)
-, _maxTextWidth(_maxWidth - _padding.left() - _padding.right())
-, _text(_multiline ? _maxTextWidth : QFIXED_MAX) {
-	TextParseOptions toastOptions = { 0, _maxTextWidth, st::toastTextStyle.font->height, Qt::LayoutDirectionAuto };
+Widget::Widget(QWidget *parent, const Config &config)
+    : TWidget(parent)
+    , _multiline(config.maxWidth > 0)
+    , _maxWidth((config.maxWidth > 0) ? config.maxWidth : st::toastMaxWidth)
+    , _padding((config.padding.left() > 0) ? config.padding : st::toastPadding)
+    , _maxTextWidth(_maxWidth - _padding.left() - _padding.right())
+    , _text(_multiline ? _maxTextWidth : QFIXED_MAX) {
+	TextParseOptions toastOptions = {0, _maxTextWidth, st::toastTextStyle.font->height, Qt::LayoutDirectionAuto};
 	if (_multiline) {
 		toastOptions.maxh *= kToastMaxLines;
 	}
@@ -56,7 +57,8 @@ void Widget::onParentResized() {
 	auto maxHeight = kToastMaxLines * st::toastTextStyle.font->height;
 	auto textHeight = _multiline ? std::min(_text.countHeight(_textWidth), maxHeight) : _text.minHeight();
 	auto newHeight = _padding.top() + textHeight + _padding.bottom();
-	setGeometry((parentWidget()->width() - newWidth) / 2, (parentWidget()->height() - newHeight) / 2, newWidth, newHeight);
+	setGeometry((parentWidget()->width() - newWidth) / 2, (parentWidget()->height() - newHeight) / 2, newWidth,
+	            newHeight);
 }
 
 void Widget::setShownLevel(double shownLevel) {
diff --git a/Telegram/SourceFiles/ui/toast/toast_widget.h b/Telegram/SourceFiles/ui/toast/toast_widget.h
index 7c7de078b..9c688392c 100644
--- a/Telegram/SourceFiles/ui/toast/toast_widget.h
+++ b/Telegram/SourceFiles/ui/toast/toast_widget.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
+#include "ui/text/text.h"
 #include "ui/toast/toast.h"
 #include "ui/twidget.h"
-#include "ui/text/text.h"
 
 namespace Ui {
 namespace Toast {
@@ -49,7 +49,6 @@ private:
 	int _maxTextWidth = 0;
 	int _textWidth = 0;
 	Text _text;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
index 2b4c1e270..41e524684 100644
--- a/Telegram/SourceFiles/ui/twidget.cpp
+++ b/Telegram/SourceFiles/ui/twidget.cpp
@@ -18,15 +18,15 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "application.h"
 #include "twidget.h"
-#include "mainwindow.h"
-#include "window/main_window.h"
-#include "messenger.h"
 #include "app.h"
+#include "application.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "window/main_window.h"
 
-#include <QWindow>
 #include <QFontDatabase>
+#include <QWindow>
 
 namespace Fonts {
 namespace {
@@ -121,7 +121,7 @@ QString GetOverride(const QString &familyName) {
 	return familyName;
 }
 
-} // Fonts
+} // namespace Fonts
 
 namespace {
 
@@ -131,7 +131,7 @@ void _sendResizeEvents(QWidget *target) {
 
 	const QObjectList children = target->children();
 	for (int i = 0; i < children.size(); ++i) {
-		QWidget *child = static_cast<QWidget*>(children.at(i));
+		QWidget *child = static_cast<QWidget *>(children.at(i));
 		if (child->isWidgetType() && !child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) {
 			_sendResizeEvents(child);
 		}
@@ -154,8 +154,8 @@ QPixmap myGrab(TWidget *target, QRect rect, QColor bg) {
 	myEnsureResized(target);
 	if (rect.isNull()) rect = target->rect();
 
-    auto result = QPixmap(rect.size() * cIntRetinaFactor());
-    result.setDevicePixelRatio(cRetinaFactor());
+	auto result = QPixmap(rect.size() * cIntRetinaFactor());
+	result.setDevicePixelRatio(cRetinaFactor());
 	if (!target->testAttribute(Qt::WA_OpaquePaintEvent)) {
 		result.fill(bg);
 	}
@@ -189,15 +189,11 @@ QImage myGrabImage(TWidget *target, QRect rect, QColor bg) {
 void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button, const QPoint &globalPoint) {
 	if (auto windowHandle = widget->window()->windowHandle()) {
 		auto localPoint = windowHandle->mapFromGlobal(globalPoint);
-		QMouseEvent ev(type
-			, localPoint
-			, localPoint
-			, globalPoint
-			, button
-			, QGuiApplication::mouseButtons() | button
-			, QGuiApplication::keyboardModifiers()
+		QMouseEvent ev(type, localPoint, localPoint, globalPoint, button, QGuiApplication::mouseButtons() | button,
+		               QGuiApplication::keyboardModifiers()
 #if !defined(OS_MAC_OLD) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-			, Qt::MouseEventSynthesizedByApplication
+		                   ,
+		               Qt::MouseEventSynthesizedByApplication
 #endif
 		);
 		ev.setTimestamp(getms());
diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h
index d086c5f71..c5476b729 100644
--- a/Telegram/SourceFiles/ui/twidget.h
+++ b/Telegram/SourceFiles/ui/twidget.h
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QString>
-#include <QPainter>
-#include <QFontMetrics>
-#include <QWidget>
-#include <QEvent>
-#include <QPointer>
-#include "base/lambda.h"
 #include "base/flags.h"
+#include "base/lambda.h"
 #include "base/object_ptr.h"
-#include "ui/style/style_core.h"
 #include "styles/palette.h"
 #include "styles/style_basic.h"
+#include "ui/style/style_core.h"
+#include <QEvent>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPointer>
+#include <QString>
+#include <QWidget>
 
 
 namespace Fonts {
@@ -39,40 +39,42 @@ namespace Fonts {
 void Start();
 QString GetOverride(const QString &familyName);
 
-} // namespace
+} // namespace Fonts
 
 enum class RectPart {
-	None        = 0,
+	None = 0,
 
-	TopLeft     = (1 << 0),
-	Top         = (1 << 1),
-	TopRight    = (1 << 2),
-	Left        = (1 << 3),
-	Center      = (1 << 4),
-	Right       = (1 << 5),
-	BottomLeft  = (1 << 6),
-	Bottom      = (1 << 7),
+	TopLeft = (1 << 0),
+	Top = (1 << 1),
+	TopRight = (1 << 2),
+	Left = (1 << 3),
+	Center = (1 << 4),
+	Right = (1 << 5),
+	BottomLeft = (1 << 6),
+	Bottom = (1 << 7),
 	BottomRight = (1 << 8),
 
-	FullTop     = TopLeft | Top | TopRight,
+	FullTop = TopLeft | Top | TopRight,
 	NoTopBottom = Left | Center | Right,
-	FullBottom  = BottomLeft | Bottom | BottomRight,
-	NoTop       = NoTopBottom | FullBottom,
-	NoBottom    = FullTop | NoTopBottom,
+	FullBottom = BottomLeft | Bottom | BottomRight,
+	NoTop = NoTopBottom | FullBottom,
+	NoBottom = FullTop | NoTopBottom,
 
-	FullLeft    = TopLeft | Left | BottomLeft,
+	FullLeft = TopLeft | Left | BottomLeft,
 	NoLeftRight = Top | Center | Bottom,
-	FullRight   = TopRight | Right | BottomRight,
-	NoLeft      = NoLeftRight | FullRight,
-	NoRight     = FullLeft | NoLeftRight,
+	FullRight = TopRight | Right | BottomRight,
+	NoLeft = NoLeftRight | FullRight,
+	NoRight = FullLeft | NoLeftRight,
 
 	CornersMask = TopLeft | TopRight | BottomLeft | BottomRight,
-	SidesMask   = Top | Bottom | Left | Right,
+	SidesMask = Top | Bottom | Left | Right,
 
-	Full        = FullTop | NoTop,
+	Full = FullTop | NoTop,
 };
 using RectParts = base::flags<RectPart>;
-inline constexpr auto is_flag_type(RectPart) { return true; };
+inline constexpr auto is_flag_type(RectPart) {
+	return true;
+};
 
 inline bool IsTopCorner(RectPart corner) {
 	return (corner == RectPart::TopLeft) || (corner == RectPart::TopRight);
@@ -92,8 +94,8 @@ inline bool IsRightCorner(RectPart corner) {
 
 class Painter : public QPainter {
 public:
-	explicit Painter(QPaintDevice *device) : QPainter(device) {
-	}
+	explicit Painter(QPaintDevice *device)
+	    : QPainter(device) {}
 
 	void drawTextLeft(int x, int y, int outerw, const QString &text, int textWidth = -1) {
 		QFontMetrics m(fontMetrics());
@@ -154,18 +156,14 @@ public:
 
 private:
 	const style::TextPalette *_textPalette = nullptr;
-
 };
 
 class PainterHighQualityEnabler {
 public:
-	PainterHighQualityEnabler(Painter &p) : _painter(p) {
-		static constexpr QPainter::RenderHint Hints[] = {
-			QPainter::Antialiasing,
-			QPainter::SmoothPixmapTransform,
-			QPainter::TextAntialiasing,
-			QPainter::HighQualityAntialiasing
-		};
+	PainterHighQualityEnabler(Painter &p)
+	    : _painter(p) {
+		static constexpr QPainter::RenderHint Hints[] = {QPainter::Antialiasing, QPainter::SmoothPixmapTransform,
+		                                                 QPainter::TextAntialiasing, QPainter::HighQualityAntialiasing};
 
 		auto hints = _painter.renderHints();
 		for_const (auto hint, Hints) {
@@ -188,13 +186,11 @@ public:
 private:
 	Painter &_painter;
 	QPainter::RenderHints _hints = 0;
-
 };
 
 class TWidget;
 
-template <typename Base>
-class TWidgetHelper : public Base {
+template <typename Base> class TWidgetHelper : public Base {
 public:
 	using Base::Base;
 
@@ -284,49 +280,43 @@ protected:
 	}
 
 	// e - from enterEvent() of child TWidget
-	virtual void leaveToChildEvent(QEvent *e, QWidget *child) {
-	}
+	virtual void leaveToChildEvent(QEvent *e, QWidget *child) {}
 
 	// e - from leaveEvent() of child TWidget
-	virtual void enterFromChildEvent(QEvent *e, QWidget *child) {
-	}
+	virtual void enterFromChildEvent(QEvent *e, QWidget *child) {}
 
 private:
 	TWidget *tparent() {
-		return qobject_cast<TWidget*>(Base::parentWidget());
+		return qobject_cast<TWidget *>(Base::parentWidget());
 	}
 	const TWidget *tparent() const {
-		return qobject_cast<const TWidget*>(Base::parentWidget());
+		return qobject_cast<const TWidget *>(Base::parentWidget());
 	}
 
-	template <typename OtherBase>
-	friend class TWidgetHelper;
-
+	template <typename OtherBase> friend class TWidgetHelper;
 };
 
 class TWidget : public TWidgetHelper<QWidget> {
 	Q_OBJECT
 
 public:
-	TWidget(QWidget *parent = nullptr) : TWidgetHelper<QWidget>(parent) {
-	}
-	virtual void grabStart() {
-	}
-	virtual void grabFinish() {
-	}
+	TWidget(QWidget *parent = nullptr)
+	    : TWidgetHelper<QWidget>(parent) {}
+	virtual void grabStart() {}
+	virtual void grabFinish() {}
 
 	bool inFocusChain() const;
 
 	void hideChildren() {
 		for (auto child : children()) {
-			if (auto widget = qobject_cast<QWidget*>(child)) {
+			if (auto widget = qobject_cast<QWidget *>(child)) {
 				widget->hide();
 			}
 		}
 	}
 	void showChildren() {
 		for (auto child : children()) {
-			if (auto widget = qobject_cast<QWidget*>(child)) {
+			if (auto widget = qobject_cast<QWidget *>(child)) {
 				widget->show();
 			}
 		}
@@ -378,8 +368,7 @@ public:
 	}
 
 	// Updates the area that is visible inside the scroll container.
-	virtual void setVisibleTopBottom(int visibleTop, int visibleBottom) {
-	}
+	virtual void setVisibleTopBottom(int visibleTop, int visibleBottom) {}
 
 signals:
 	// Child widget is responsible for emitting this signal.
@@ -390,16 +379,13 @@ protected:
 	virtual int resizeGetHeight(int newWidth) {
 		return height();
 	}
-
 };
 
-template <typename Widget>
-QPointer<Widget> weak(Widget *object) {
+template <typename Widget> QPointer<Widget> weak(Widget *object) {
 	return QPointer<Widget>(object);
 }
 
-template <typename Widget>
-QPointer<const Widget> weak(const Widget *object) {
+template <typename Widget> QPointer<const Widget> weak(const Widget *object) {
 	return QPointer<const Widget>(object);
 }
 
@@ -409,8 +395,8 @@ QImage myGrabImage(TWidget *target, QRect rect = QRect(), QColor bg = QColor(255
 
 class SingleQueuedInvokation : public QObject {
 public:
-	SingleQueuedInvokation(base::lambda<void()> callback) : _callback(callback) {
-	}
+	SingleQueuedInvokation(base::lambda<void()> callback)
+	    : _callback(callback) {}
 	void call() {
 		if (_pending.testAndSetAcquire(0, 1)) {
 			InvokeQueued(this, [this] {
@@ -423,8 +409,7 @@ public:
 
 private:
 	base::lambda<void()> _callback;
-	QAtomicInt _pending = { 0 };
-
+	QAtomicInt _pending = {0};
 };
 
 void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button, const QPoint &globalPoint);
diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp
index bb5401c30..789b81e3e 100644
--- a/Telegram/SourceFiles/ui/widgets/buttons.cpp
+++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp
@@ -20,17 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/buttons.h"
 
-#include "ui/effects/ripple_animation.h"
-#include "ui/effects/cross_animation.h"
-#include "lang/lang_instance.h"
 #include "app.h"
+#include "lang/lang_instance.h"
+#include "ui/effects/cross_animation.h"
+#include "ui/effects/ripple_animation.h"
 
 namespace Ui {
 
-LinkButton::LinkButton(QWidget *parent, const QString &text, const style::LinkButton &st) : AbstractButton(parent)
-, _text(text)
-, _textWidth(st.font->width(_text))
-, _st(st) {
+LinkButton::LinkButton(QWidget *parent, const QString &text, const style::LinkButton &st)
+    : AbstractButton(parent)
+    , _text(text)
+    , _textWidth(st.font->width(_text))
+    , _st(st) {
 	resize(_textWidth, _st.font->height);
 	setCursor(style::cur_pointer);
 }
@@ -63,9 +64,9 @@ void LinkButton::onStateChanged(State was, StateChangeSource source) {
 	update();
 }
 
-RippleButton::RippleButton(QWidget *parent, const style::RippleAnimation &st) : AbstractButton(parent)
-, _st(st) {
-}
+RippleButton::RippleButton(QWidget *parent, const style::RippleAnimation &st)
+    : AbstractButton(parent)
+    , _st(st) {}
 
 void RippleButton::setForceRippled(bool rippled, SetForceRippledWay way) {
 	if (_forceRippled != rippled) {
@@ -138,9 +139,10 @@ void RippleButton::resetRipples() {
 
 RippleButton::~RippleButton() = default;
 
-FlatButton::FlatButton(QWidget *parent, const QString &text, const style::FlatButton &st) : RippleButton(parent, st.ripple)
-, _text(text)
-, _st(st) {
+FlatButton::FlatButton(QWidget *parent, const QString &text, const style::FlatButton &st)
+    : RippleButton(parent, st.ripple)
+    , _text(text)
+    , _st(st) {
 	if (_st.width < 0) {
 		_width = textWidth() - _st.width;
 	} else if (!_st.width) {
@@ -233,12 +235,11 @@ private:
 
 	base::lambda<void()> _animationCallback;
 	base::lambda<void()> _widthChangedCallback;
-
 };
 
 RoundButton::Numbers::Numbers(const style::RoundButton &st, base::lambda<void()> animationCallback)
-: _st(st)
-, _animationCallback(std::move(animationCallback)) {
+    : _st(st)
+    , _animationCallback(std::move(animationCallback)) {
 	for (auto ch = '0'; ch != '9'; ++ch) {
 		accumulate_max(_digitWidth, _st.font->m.width(ch));
 	}
@@ -353,9 +354,10 @@ void RoundButton::Numbers::paint(Painter &p, int x, int y, int outerWidth) {
 	p.setOpacity(1.);
 }
 
-RoundButton::RoundButton(QWidget *parent, base::lambda<QString()> textFactory, const style::RoundButton &st) : RippleButton(parent, st.ripple)
-, _textFactory(std::move(textFactory))
-, _st(st) {
+RoundButton::RoundButton(QWidget *parent, base::lambda<QString()> textFactory, const style::RoundButton &st)
+    : RippleButton(parent, st.ripple)
+    , _textFactory(std::move(textFactory))
+    , _st(st) {
 	subscribe(Lang::Current().updated(), [this] { refreshText(); });
 	refreshText();
 }
@@ -429,13 +431,15 @@ void RoundButton::resizeToText() {
 	if (_fullWidthOverride < 0) {
 		resize(innerWidth - _fullWidthOverride, _st.height + _st.padding.top() + _st.padding.bottom());
 	} else if (_st.width <= 0) {
-		resize(innerWidth - _st.width + _st.padding.left() + _st.padding.right(), _st.height + _st.padding.top() + _st.padding.bottom());
+		resize(innerWidth - _st.width + _st.padding.left() + _st.padding.right(),
+		       _st.height + _st.padding.top() + _st.padding.bottom());
 	} else {
 		if (_st.width < innerWidth + (_st.height - _st.font->height)) {
 			_text = _st.font->elided(computeFullText(), std::max(_st.width - (_st.height - _st.font->height), 1));
 			_textWidth = _st.font->width(_text);
 		}
-		resize(_st.width + _st.padding.left() + _st.padding.right(), _st.height + _st.padding.top() + _st.padding.bottom());
+		resize(_st.width + _st.padding.left() + _st.padding.right(),
+		       _st.height + _st.padding.top() + _st.padding.bottom());
 	}
 }
 
@@ -499,8 +503,9 @@ QPoint RoundButton::prepareRippleStartPosition() const {
 
 RoundButton::~RoundButton() = default;
 
-IconButton::IconButton(QWidget *parent, const style::IconButton &st) : RippleButton(parent, st.ripple)
-, _st(st) {
+IconButton::IconButton(QWidget *parent, const style::IconButton &st)
+    : RippleButton(parent, st.ripple)
+    , _st(st) {
 	resize(_st.width, _st.height);
 }
 
@@ -519,7 +524,8 @@ void IconButton::paintEvent(QPaintEvent *e) {
 
 	auto ms = getms();
 
-	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), ms, _rippleColorOverride ? &(*_rippleColorOverride)->c : nullptr);
+	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), ms,
+	            _rippleColorOverride ? &(*_rippleColorOverride)->c : nullptr);
 
 	auto down = isDown();
 	auto overIconOpacity = (down || forceRippled()) ? 1. : _a_over.current(getms(), isOver() ? 1. : 0.);
@@ -581,12 +587,13 @@ QImage IconButton::prepareRippleMask() const {
 	return RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
 }
 
-LeftOutlineButton::LeftOutlineButton(QWidget *parent, const QString &text, const style::OutlineButton &st) : RippleButton(parent, st.ripple)
-, _text(text)
-, _fullText(text)
-, _textWidth(st.font->width(_text))
-, _fullTextWidth(_textWidth)
-, _st(st) {
+LeftOutlineButton::LeftOutlineButton(QWidget *parent, const QString &text, const style::OutlineButton &st)
+    : RippleButton(parent, st.ripple)
+    , _text(text)
+    , _fullText(text)
+    , _textWidth(st.font->width(_text))
+    , _fullTextWidth(_textWidth)
+    , _st(st) {
 	resizeToWidth(_textWidth + _st.padding.left() + _st.padding.right());
 
 	setCursor(style::cur_pointer);
@@ -615,18 +622,21 @@ void LeftOutlineButton::paintEvent(QPaintEvent *e) {
 	auto over = isOver();
 	auto down = isDown();
 	if (width() > _st.outlineWidth) {
-		p.fillRect(rtlrect(_st.outlineWidth, 0, width() - _st.outlineWidth, height(), width()), (over || down) ? _st.textBgOver : _st.textBg);
+		p.fillRect(rtlrect(_st.outlineWidth, 0, width() - _st.outlineWidth, height(), width()),
+		           (over || down) ? _st.textBgOver : _st.textBg);
 		paintRipple(p, 0, 0, getms());
-		p.fillRect(rtlrect(0, 0, _st.outlineWidth, height(), width()), (over || down) ? _st.outlineFgOver : _st.outlineFg);
+		p.fillRect(rtlrect(0, 0, _st.outlineWidth, height(), width()),
+		           (over || down) ? _st.outlineFgOver : _st.outlineFg);
 	}
 	p.setFont(_st.font);
 	p.setPen((over || down) ? _st.textFgOver : _st.textFg);
 	p.drawTextLeft(_st.padding.left(), _st.padding.top(), width(), _text, _textWidth);
 }
 
-CrossButton::CrossButton(QWidget *parent, const style::CrossButton &st) : RippleButton(parent, st.ripple)
-, _st(st)
-, _a_loading(animation(this, &CrossButton::step_loading)) {
+CrossButton::CrossButton(QWidget *parent, const style::CrossButton &st)
+    : RippleButton(parent, st.ripple)
+    , _st(st)
+    , _a_loading(animation(this, &CrossButton::step_loading)) {
 	resize(_st.width, _st.height);
 	setCursor(style::cur_pointer);
 	hide();
@@ -677,7 +687,8 @@ void CrossButton::paintEvent(QPaintEvent *e) {
 			loading = ((ms - _loadingStartMs) % _st.loadingPeriod) / double(_st.loadingPeriod);
 		}
 	}
-	CrossAnimation::paint(p, _st.cross, over ? _st.crossFgOver : _st.crossFg, _st.crossPosition.x(), _st.crossPosition.y(), width(), shown, loading);
+	CrossAnimation::paint(p, _st.cross, over ? _st.crossFgOver : _st.crossFg, _st.crossPosition.x(),
+	                      _st.crossPosition.y(), width(), shown, loading);
 }
 
 bool CrossButton::stopLoadingAnimation(TimeMs ms) {
diff --git a/Telegram/SourceFiles/ui/widgets/buttons.h b/Telegram/SourceFiles/ui/widgets/buttons.h
index 4667105c2..74efbd3a4 100644
--- a/Telegram/SourceFiles/ui/widgets/buttons.h
+++ b/Telegram/SourceFiles/ui/widgets/buttons.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/abstract_button.h"
 #include "styles/style_widgets.h"
+#include "ui/abstract_button.h"
 #include "ui/animation.h"
 #include <memory>
 
@@ -46,7 +46,6 @@ private:
 	QString _text;
 	int _textWidth = 0;
 	const style::LinkButton &_st;
-
 };
 
 class RippleButton : public AbstractButton {
@@ -85,7 +84,6 @@ private:
 	const style::RippleAnimation &_st;
 	std::unique_ptr<RippleAnimation> _ripple;
 	bool _forceRippled = false;
-
 };
 
 class FlatButton : public RippleButton {
@@ -107,7 +105,6 @@ private:
 	int _width;
 
 	const style::FlatButton &_st;
-
 };
 
 class RoundButton : public RippleButton, private base::Subscriber {
@@ -163,7 +160,6 @@ private:
 	const style::RoundButton &_st;
 
 	TextTransform _transform = TextTransform::ToUpper;
-
 };
 
 class IconButton : public RippleButton {
@@ -189,12 +185,12 @@ private:
 	const style::color *_rippleColorOverride = nullptr;
 
 	Animation _a_over;
-
 };
 
 class LeftOutlineButton : public RippleButton {
 public:
-	LeftOutlineButton(QWidget *parent, const QString &text, const style::OutlineButton &st = st::defaultLeftOutlineButton);
+	LeftOutlineButton(QWidget *parent, const QString &text,
+	                  const style::OutlineButton &st = st::defaultLeftOutlineButton);
 
 	void setText(const QString &text);
 
@@ -208,7 +204,6 @@ private:
 	int _textWidth, _fullTextWidth;
 
 	const style::OutlineButton &_st;
-
 };
 
 class CrossButton : public RippleButton {
@@ -259,7 +254,6 @@ private:
 	TimeMs _loadingStartMs = 0;
 	TimeMs _loadingStopMs = 0;
 	BasicAnimation _a_loading;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/checkbox.cpp b/Telegram/SourceFiles/ui/widgets/checkbox.cpp
index 03b1cda01..5d3b683df 100644
--- a/Telegram/SourceFiles/ui/widgets/checkbox.cpp
+++ b/Telegram/SourceFiles/ui/widgets/checkbox.cpp
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/checkbox.h"
 
+#include "app.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/ripple_animation.h"
-#include "app.h"
 
 #include <QRect>
 #include <qevent.h>
@@ -31,19 +31,18 @@ namespace Ui {
 namespace {
 
 TextParseOptions _checkboxOptions = {
-	TextParseMultiline, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 } // namespace
 
 AbstractCheckView::AbstractCheckView(int duration, bool checked, base::lambda<void()> updateCallback)
-: _duration(duration)
-, _checked(checked)
-, _updateCallback(std::move(updateCallback)) {
-}
+    : _duration(duration)
+    , _checked(checked)
+    , _updateCallback(std::move(updateCallback)) {}
 
 void AbstractCheckView::setCheckedFast(bool checked) {
 	_checked = checked;
@@ -75,9 +74,9 @@ double AbstractCheckView::currentAnimationValue(TimeMs ms) {
 	return ms ? _toggleAnimation.current(ms, _checked ? 1. : 0.) : _toggleAnimation.current(_checked ? 1. : 0.);
 }
 
-ToggleView::ToggleView(const style::Toggle &st, bool checked, base::lambda<void()> updateCallback) : AbstractCheckView(st.duration, checked, std::move(updateCallback))
-, _st(&st) {
-}
+ToggleView::ToggleView(const style::Toggle &st, bool checked, base::lambda<void()> updateCallback)
+    : AbstractCheckView(st.duration, checked, std::move(updateCallback))
+    , _st(&st) {}
 
 QSize ToggleView::getSize() const {
 	return QSize(2 * _st->border + _st->diameter + _st->width, 2 * _st->border + _st->diameter);
@@ -127,18 +126,18 @@ void ToggleView::paintXV(Painter &p, int left, int top, int outerWidth, double t
 		auto xLeft = left + (_st->diameter - xSize) / 2.;
 		auto xTop = top + (_st->diameter - xSize) / 2.;
 		QPointF pathX[] = {
-			{ xLeft, xTop + stroke },
-			{ xLeft + stroke, xTop },
-			{ xLeft + (xSize / 2.), xTop + (xSize / 2.) - stroke },
-			{ xLeft + xSize - stroke, xTop },
-			{ xLeft + xSize, xTop + stroke },
-			{ xLeft + (xSize / 2.) + stroke, xTop + (xSize / 2.) },
-			{ xLeft + xSize, xTop + xSize - stroke },
-			{ xLeft + xSize - stroke, xTop + xSize },
-			{ xLeft + (xSize / 2.), xTop + (xSize / 2.) + stroke },
-			{ xLeft + stroke, xTop + xSize },
-			{ xLeft, xTop + xSize - stroke },
-			{ xLeft + (xSize / 2.) - stroke, xTop + (xSize / 2.) },
+		    {xLeft, xTop + stroke},
+		    {xLeft + stroke, xTop},
+		    {xLeft + (xSize / 2.), xTop + (xSize / 2.) - stroke},
+		    {xLeft + xSize - stroke, xTop},
+		    {xLeft + xSize, xTop + stroke},
+		    {xLeft + (xSize / 2.) + stroke, xTop + (xSize / 2.)},
+		    {xLeft + xSize, xTop + xSize - stroke},
+		    {xLeft + xSize - stroke, xTop + xSize},
+		    {xLeft + (xSize / 2.), xTop + (xSize / 2.) + stroke},
+		    {xLeft + stroke, xTop + xSize},
+		    {xLeft, xTop + xSize - stroke},
+		    {xLeft + (xSize / 2.) - stroke, xTop + (xSize / 2.)},
 		};
 		for (auto &point : pathX) {
 			point = rtlpoint(point, outerWidth);
@@ -150,18 +149,18 @@ void ToggleView::paintXV(Painter &p, int left, int top, int outerWidth, double t
 			auto vLeft = left + (_st->diameter - fSize) / 2.;
 			auto vTop = 0. + xTop + _st->vshift;
 			QPointF pathV[] = {
-				{ vLeft, vTop + xSize - vSize + stroke },
-				{ vLeft + stroke, vTop + xSize - vSize },
-				{ vLeft + vSize - stroke, vTop + xSize - 2 * stroke },
-				{ vLeft + fSize - stroke, vTop },
-				{ vLeft + fSize, vTop + stroke },
-				{ vLeft + vSize, vTop + xSize - stroke },
-				{ vLeft + vSize, vTop + xSize - stroke },
-				{ vLeft + vSize - stroke, vTop + xSize },
-				{ vLeft + vSize - stroke, vTop + xSize },
-				{ vLeft + vSize - stroke, vTop + xSize },
-				{ vLeft + vSize - 2 * stroke, vTop + xSize - stroke },
-				{ vLeft + vSize - 2 * stroke, vTop + xSize - stroke },
+			    {vLeft, vTop + xSize - vSize + stroke},
+			    {vLeft + stroke, vTop + xSize - vSize},
+			    {vLeft + vSize - stroke, vTop + xSize - 2 * stroke},
+			    {vLeft + fSize - stroke, vTop},
+			    {vLeft + fSize, vTop + stroke},
+			    {vLeft + vSize, vTop + xSize - stroke},
+			    {vLeft + vSize, vTop + xSize - stroke},
+			    {vLeft + vSize - stroke, vTop + xSize},
+			    {vLeft + vSize - stroke, vTop + xSize},
+			    {vLeft + vSize - stroke, vTop + xSize},
+			    {vLeft + vSize - 2 * stroke, vTop + xSize - stroke},
+			    {vLeft + vSize - 2 * stroke, vTop + xSize - stroke},
 			};
 			for (auto &point : pathV) {
 				point = rtlpoint(point, outerWidth);
@@ -180,18 +179,18 @@ void ToggleView::paintXV(Painter &p, int left, int top, int outerWidth, double t
 		auto vLeft = left + (_st->diameter - (_st->xsize + _st->vsize - 2. * stroke)) / 2.;
 		auto vTop = 0. + xTop + _st->vshift;
 		QPointF pathV[] = {
-			{ vLeft, vTop + xSize - vSize + stroke },
-			{ vLeft + stroke, vTop + xSize - vSize },
-			{ vLeft + vSize - stroke, vTop + xSize - 2 * stroke },
-			{ vLeft + fSize - stroke, vTop },
-			{ vLeft + fSize, vTop + stroke },
-			{ vLeft + vSize, vTop + xSize - stroke },
-			{ vLeft + vSize, vTop + xSize - stroke },
-			{ vLeft + vSize - stroke, vTop + xSize },
-			{ vLeft + vSize - stroke, vTop + xSize },
-			{ vLeft + vSize - stroke, vTop + xSize },
-			{ vLeft + vSize - 2 * stroke, vTop + xSize - stroke },
-			{ vLeft + vSize - 2 * stroke, vTop + xSize - stroke },
+		    {vLeft, vTop + xSize - vSize + stroke},
+		    {vLeft + stroke, vTop + xSize - vSize},
+		    {vLeft + vSize - stroke, vTop + xSize - 2 * stroke},
+		    {vLeft + fSize - stroke, vTop},
+		    {vLeft + fSize, vTop + stroke},
+		    {vLeft + vSize, vTop + xSize - stroke},
+		    {vLeft + vSize, vTop + xSize - stroke},
+		    {vLeft + vSize - stroke, vTop + xSize},
+		    {vLeft + vSize - stroke, vTop + xSize},
+		    {vLeft + vSize - stroke, vTop + xSize},
+		    {vLeft + vSize - 2 * stroke, vTop + xSize - stroke},
+		    {vLeft + vSize - 2 * stroke, vTop + xSize - stroke},
 		};
 
 		p.fillPath(anim::path(pathV), brush);
@@ -211,9 +210,9 @@ bool ToggleView::checkRippleStartPosition(QPoint position) const {
 	return QRect(QPoint(0, 0), rippleSize()).contains(position);
 }
 
-CheckView::CheckView(const style::Check &st, bool checked, base::lambda<void()> updateCallback) : AbstractCheckView(st.duration, checked, std::move(updateCallback))
-, _st(&st) {
-}
+CheckView::CheckView(const style::Check &st, bool checked, base::lambda<void()> updateCallback)
+    : AbstractCheckView(st.duration, checked, std::move(updateCallback))
+    , _st(&st) {}
 
 QSize CheckView::getSize() const {
 	return QSize(_st->diameter, _st->diameter);
@@ -232,7 +231,11 @@ void CheckView::paint(Painter &p, int left, int top, int outerWidth, TimeMs ms)
 
 	{
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth), st::buttonRadius - (_st->thickness / 2.), st::buttonRadius - (_st->thickness / 2.));
+		p.drawRoundedRect(rtlrect(QRectF(left, top, _st->diameter, _st->diameter)
+		                              .marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2.,
+		                                                        _st->thickness / 2., _st->thickness / 2.)),
+		                          outerWidth),
+		                  st::buttonRadius - (_st->thickness / 2.), st::buttonRadius - (_st->thickness / 2.));
 	}
 
 	if (toggled > 0) {
@@ -252,9 +255,9 @@ bool CheckView::checkRippleStartPosition(QPoint position) const {
 	return QRect(QPoint(0, 0), rippleSize()).contains(position);
 }
 
-RadioView::RadioView(const style::Radio &st, bool checked, base::lambda<void()> updateCallback) : AbstractCheckView(st.duration, checked, std::move(updateCallback))
-, _st(&st) {
-}
+RadioView::RadioView(const style::Radio &st, bool checked, base::lambda<void()> updateCallback)
+    : AbstractCheckView(st.duration, checked, std::move(updateCallback))
+    , _st(&st) {}
 
 QSize RadioView::getSize() const {
 	return QSize(_st->diameter, _st->diameter);
@@ -272,18 +275,23 @@ void RadioView::paint(Painter &p, int left, int top, int outerWidth, TimeMs ms)
 	pen.setWidth(_st->thickness);
 	p.setPen(pen);
 	p.setBrush(_st->bg);
-	//qint32 skip = std::ceil(_st->thickness / 2.);
-	//p.drawEllipse(_checkRect.marginsRemoved(QMargins(skip, skip, skip, skip)));
-	p.drawEllipse(rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2., _st->thickness / 2.)), outerWidth));
+	// qint32 skip = std::ceil(_st->thickness / 2.);
+	// p.drawEllipse(_checkRect.marginsRemoved(QMargins(skip, skip, skip, skip)));
+	p.drawEllipse(rtlrect(QRectF(left, top, _st->diameter, _st->diameter)
+	                          .marginsRemoved(QMarginsF(_st->thickness / 2., _st->thickness / 2., _st->thickness / 2.,
+	                                                    _st->thickness / 2.)),
+	                      outerWidth));
 
 	if (toggled > 0) {
 		p.setPen(Qt::NoPen);
 		p.setBrush(anim::brush(_st->untoggledFg, _st->toggledFg, toggled));
 
 		auto skip0 = _st->diameter / 2., skip1 = _st->skip / 10., checkSkip = skip0 * (1. - toggled) + skip1 * toggled;
-		p.drawEllipse(rtlrect(QRectF(left, top, _st->diameter, _st->diameter).marginsRemoved(QMarginsF(checkSkip, checkSkip, checkSkip, checkSkip)), outerWidth));
-		//qint32 fskip = std::floor(checkSkip), cskip = std::ceil(checkSkip);
-		//if (2 * fskip < _checkRect.width()) {
+		p.drawEllipse(rtlrect(QRectF(left, top, _st->diameter, _st->diameter)
+		                          .marginsRemoved(QMarginsF(checkSkip, checkSkip, checkSkip, checkSkip)),
+		                      outerWidth));
+		// qint32 fskip = std::floor(checkSkip), cskip = std::ceil(checkSkip);
+		// if (2 * fskip < _checkRect.width()) {
 		//	if (fskip != cskip) {
 		//		p.setOpacity(double(cskip) - checkSkip);
 		//		p.drawEllipse(_checkRect.marginsRemoved(QMargins(fskip, fskip, fskip, fskip)));
@@ -308,16 +316,20 @@ bool RadioView::checkRippleStartPosition(QPoint position) const {
 	return QRect(QPoint(0, 0), rippleSize()).contains(position);
 }
 
-Checkbox::Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st, const style::Check &checkSt) : Checkbox(parent, text, st, std::make_unique<CheckView>(checkSt, checked, [this] { updateCheck(); })) {
-}
+Checkbox::Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st,
+                   const style::Check &checkSt)
+    : Checkbox(parent, text, st, std::make_unique<CheckView>(checkSt, checked, [this] { updateCheck(); })) {}
 
-Checkbox::Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st, const style::Toggle &toggleSt) : Checkbox(parent, text, st, std::make_unique<ToggleView>(toggleSt, checked, [this] { updateCheck(); })) {
-}
+Checkbox::Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st,
+                   const style::Toggle &toggleSt)
+    : Checkbox(parent, text, st, std::make_unique<ToggleView>(toggleSt, checked, [this] { updateCheck(); })) {}
 
-Checkbox::Checkbox(QWidget *parent, const QString &text, const style::Checkbox &st, std::unique_ptr<AbstractCheckView> check) : RippleButton(parent, st.ripple)
-, _st(st)
-, _check(std::move(check))
-, _text(_st.style, text, _checkboxOptions) {
+Checkbox::Checkbox(QWidget *parent, const QString &text, const style::Checkbox &st,
+                   std::unique_ptr<AbstractCheckView> check)
+    : RippleButton(parent, st.ripple)
+    , _st(st)
+    , _check(std::move(check))
+    , _text(_st.style, text, _checkboxOptions) {
 	resizeToText();
 	setCursor(style::cur_pointer);
 }
@@ -338,7 +350,7 @@ void Checkbox::resizeToText() {
 	} else {
 		resizeToWidth(_st.width);
 	}
-	_checkRect = { QPoint(_st.margin.left(), _st.margin.top()), _check->getSize() };
+	_checkRect = {QPoint(_st.margin.left(), _st.margin.top()), _check->getSize()};
 }
 
 void Checkbox::setChecked(bool checked, NotifyAboutChange notify) {
@@ -383,7 +395,8 @@ void Checkbox::paintEvent(QPaintEvent *e) {
 	auto textWidth = std::max(width() - (_checkRect.width() + _st.textPosition.x() + _st.textPosition.x()), 1);
 
 	p.setPen(_st.textFg);
-	_text.drawLeftElided(p, _st.margin.left() + _checkRect.width() + _st.textPosition.x(), _st.margin.top() + _st.textPosition.y(), textWidth, width());
+	_text.drawLeftElided(p, _st.margin.left() + _checkRect.width() + _st.textPosition.x(),
+	                     _st.margin.top() + _st.textPosition.y(), textWidth, width());
 }
 
 QPixmap Checkbox::grabCheckCache() const {
@@ -451,9 +464,13 @@ void RadiobuttonGroup::setValue(int value) {
 	}
 }
 
-Radiobutton::Radiobutton(QWidget *parent, const std::shared_ptr<RadiobuttonGroup> &group, int value, const QString &text, const style::Checkbox &st, const style::Radio &radioSt) : Checkbox(parent, text, st, std::make_unique<RadioView>(radioSt, (group->hasValue() && group->value() == value), [this] { updateCheck(); }))
-, _group(group)
-, _value(value) {
+Radiobutton::Radiobutton(QWidget *parent, const std::shared_ptr<RadiobuttonGroup> &group, int value,
+                         const QString &text, const style::Checkbox &st, const style::Radio &radioSt)
+    : Checkbox(parent, text, st,
+               std::make_unique<RadioView>(radioSt, (group->hasValue() && group->value() == value),
+                                           [this] { updateCheck(); }))
+    , _group(group)
+    , _value(value) {
 	_group->registerButton(this);
 	subscribe(checkbox()->checkedChanged, [this](bool checked) {
 		if (checked) {
diff --git a/Telegram/SourceFiles/ui/widgets/checkbox.h b/Telegram/SourceFiles/ui/widgets/checkbox.h
index fec308994..60aea1ee6 100644
--- a/Telegram/SourceFiles/ui/widgets/checkbox.h
+++ b/Telegram/SourceFiles/ui/widgets/checkbox.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/widgets/buttons.h"
-#include "ui/text/text.h"
 #include "styles/style_widgets.h"
+#include "ui/text/text.h"
+#include "ui/widgets/buttons.h"
 
 namespace Ui {
 
@@ -59,7 +59,6 @@ private:
 	bool _checked = false;
 	base::lambda<void()> _updateCallback;
 	Animation _toggleAnimation;
-
 };
 
 class CheckView : public AbstractCheckView {
@@ -76,8 +75,7 @@ public:
 private:
 	QSize rippleSize() const;
 
-	not_null<const style::Check*> _st;
-
+	not_null<const style::Check *> _st;
 };
 
 class RadioView : public AbstractCheckView {
@@ -94,8 +92,7 @@ public:
 private:
 	QSize rippleSize() const;
 
-	not_null<const style::Radio*> _st;
-
+	not_null<const style::Radio *> _st;
 };
 
 class ToggleView : public AbstractCheckView {
@@ -113,14 +110,15 @@ private:
 	void paintXV(Painter &p, int left, int top, int outerWidth, double toggled, const QBrush &brush);
 	QSize rippleSize() const;
 
-	not_null<const style::Toggle*> _st;
-
+	not_null<const style::Toggle *> _st;
 };
 
 class Checkbox : public RippleButton {
 public:
-	Checkbox(QWidget *parent, const QString &text, bool checked = false, const style::Checkbox &st = st::defaultCheckbox, const style::Check &checkSt = st::defaultCheck);
-	Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st, const style::Toggle &toggleSt);
+	Checkbox(QWidget *parent, const QString &text, bool checked = false,
+	         const style::Checkbox &st = st::defaultCheckbox, const style::Check &checkSt = st::defaultCheck);
+	Checkbox(QWidget *parent, const QString &text, bool checked, const style::Checkbox &st,
+	         const style::Toggle &toggleSt);
 	Checkbox(QWidget *parent, const QString &text, const style::Checkbox &st, std::unique_ptr<AbstractCheckView> check);
 
 	void setText(const QString &text);
@@ -165,7 +163,6 @@ private:
 
 	Text _text;
 	QRect _checkRect;
-
 };
 
 class Radiobutton;
@@ -173,8 +170,9 @@ class Radiobutton;
 class RadiobuttonGroup {
 public:
 	RadiobuttonGroup() = default;
-	RadiobuttonGroup(int value) : _value(value), _hasValue(true) {
-	}
+	RadiobuttonGroup(int value)
+	    : _value(value)
+	    , _hasValue(true) {}
 
 	void setChangedCallback(base::lambda<void(int value)> callback) {
 		_changedCallback = std::move(callback);
@@ -202,13 +200,13 @@ private:
 	int _value = 0;
 	bool _hasValue = false;
 	base::lambda<void(int value)> _changedCallback;
-	std::vector<Radiobutton*> _buttons;
-
+	std::vector<Radiobutton *> _buttons;
 };
 
 class Radiobutton : public Checkbox, private base::Subscriber {
 public:
-	Radiobutton(QWidget *parent, const std::shared_ptr<RadiobuttonGroup> &group, int value, const QString &text, const style::Checkbox &st = st::defaultCheckbox, const style::Radio &radioSt = st::defaultRadio);
+	Radiobutton(QWidget *parent, const std::shared_ptr<RadiobuttonGroup> &group, int value, const QString &text,
+	            const style::Checkbox &st = st::defaultCheckbox, const style::Radio &radioSt = st::defaultRadio);
 	~Radiobutton();
 
 protected:
@@ -231,24 +229,18 @@ private:
 
 	std::shared_ptr<RadiobuttonGroup> _group;
 	int _value = 0;
-
 };
 
-template <typename Enum>
-class Radioenum;
+template <typename Enum> class Radioenum;
 
-template <typename Enum>
-class RadioenumGroup {
+template <typename Enum> class RadioenumGroup {
 public:
 	RadioenumGroup() = default;
-	RadioenumGroup(Enum value) : _group(static_cast<int>(value)) {
-	}
+	RadioenumGroup(Enum value)
+	    : _group(static_cast<int>(value)) {}
 
-	template <typename Callback>
-	void setChangedCallback(Callback &&callback) {
-		_group.setChangedCallback([callback](int value) {
-			callback(static_cast<Enum>(value));
-		});
+	template <typename Callback> void setChangedCallback(Callback &&callback) {
+		_group.setChangedCallback([callback](int value) { callback(static_cast<Enum>(value)); });
 	}
 
 	bool hasValue() const {
@@ -262,20 +254,17 @@ public:
 	}
 
 private:
-	template <typename OtherEnum>
-	friend class Radioenum;
+	template <typename OtherEnum> friend class Radioenum;
 
 	RadiobuttonGroup _group;
-
 };
 
-template <typename Enum>
-class Radioenum : public Radiobutton {
+template <typename Enum> class Radioenum : public Radiobutton {
 public:
-	Radioenum(QWidget *parent, const std::shared_ptr<RadioenumGroup<Enum>> &group, Enum value, const QString &text, const style::Checkbox &st = st::defaultCheckbox)
-		: Radiobutton(parent, std::shared_ptr<RadiobuttonGroup>(group, &group->_group), static_cast<int>(value), text, st) {
-	}
-
+	Radioenum(QWidget *parent, const std::shared_ptr<RadioenumGroup<Enum>> &group, Enum value, const QString &text,
+	          const style::Checkbox &st = st::defaultCheckbox)
+	    : Radiobutton(parent, std::shared_ptr<RadiobuttonGroup>(group, &group->_group), static_cast<int>(value), text,
+	                  st) {}
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
index d84f30689..b233fd0d6 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
@@ -18,11 +18,11 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "core/single_timer.h"
-#include "ui/twidget.h"
-#include "app.h"
-#include "facades.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "app.h"
+#include "core/single_timer.h"
+#include "facades.h"
+#include "ui/twidget.h"
 
 #include <QMouseEvent>
 
@@ -33,7 +33,8 @@ constexpr auto kByWheelFinishedTimeout = 1000;
 
 } // namespace
 
-ContinuousSlider::ContinuousSlider(QWidget *parent) : TWidget(parent) {
+ContinuousSlider::ContinuousSlider(QWidget *parent)
+    : TWidget(parent) {
 	setCursor(style::cur_pointer);
 }
 
@@ -78,9 +79,8 @@ void ContinuousSlider::mouseMoveEvent(QMouseEvent *e) {
 
 double ContinuousSlider::computeValue(const QPoint &pos) const {
 	auto seekRect = myrtlrect(getSeekRect());
-	auto result = isHorizontal() ?
-		(pos.x() - seekRect.x()) / double(seekRect.width()) :
-		(1. - (pos.y() - seekRect.y()) / double(seekRect.height()));
+	auto result = isHorizontal() ? (pos.x() - seekRect.x()) / double(seekRect.width()) :
+	                               (1. - (pos.y() - seekRect.y()) / double(seekRect.height()));
 	return snap(result, 0., 1.);
 }
 
@@ -154,9 +154,9 @@ void ContinuousSlider::setOver(bool over) {
 	_a_over.start([this] { update(); }, from, to, getOverDuration());
 }
 
-FilledSlider::FilledSlider(QWidget *parent, const style::FilledSlider &st) : ContinuousSlider(parent)
-, _st(st) {
-}
+FilledSlider::FilledSlider(QWidget *parent, const style::FilledSlider &st)
+    : ContinuousSlider(parent)
+    , _st(st) {}
 
 QRect FilledSlider::getSeekRect() const {
 	return QRect(0, 0, width(), height());
@@ -184,10 +184,12 @@ void FilledSlider::paintEvent(QPaintEvent *e) {
 	int from = seekRect.x(), mid = std::round(from + value * seekRect.width()), end = from + seekRect.width();
 	if (mid > from) {
 		p.setOpacity(masterOpacity);
-		p.fillRect(from, height() - lineWidthRounded, (mid - from), lineWidthRounded, disabled ? _st.disabledFg : _st.activeFg);
+		p.fillRect(from, height() - lineWidthRounded, (mid - from), lineWidthRounded,
+		           disabled ? _st.disabledFg : _st.activeFg);
 		if (lineWidthPartial > 0.01) {
 			p.setOpacity(masterOpacity * lineWidthPartial);
-			p.fillRect(from, height() - lineWidthRounded - 1, (mid - from), 1, disabled ? _st.disabledFg : _st.activeFg);
+			p.fillRect(from, height() - lineWidthRounded - 1, (mid - from), 1,
+			           disabled ? _st.disabledFg : _st.activeFg);
 		}
 	}
 	if (end > mid && over > 0) {
@@ -200,14 +202,13 @@ void FilledSlider::paintEvent(QPaintEvent *e) {
 	}
 }
 
-MediaSlider::MediaSlider(QWidget *parent, const style::MediaSlider &st) : ContinuousSlider(parent)
-, _st(st) {
-}
+MediaSlider::MediaSlider(QWidget *parent, const style::MediaSlider &st)
+    : ContinuousSlider(parent)
+    , _st(st) {}
 
 QRect MediaSlider::getSeekRect() const {
-	return isHorizontal()
-		? QRect(_st.seekSize.width() / 2, 0, width() - _st.seekSize.width(), height())
-		: QRect(0, _st.seekSize.height() / 2, width(), height() - _st.seekSize.width());
+	return isHorizontal() ? QRect(_st.seekSize.width() / 2, 0, width() - _st.seekSize.width(), height()) :
+	                        QRect(0, _st.seekSize.height() / 2, width(), height() - _st.seekSize.width());
 }
 
 double MediaSlider::getOverDuration() const {
@@ -242,18 +243,16 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 	auto inactiveFg = disabled ? _st.inactiveFgDisabled : anim::brush(_st.inactiveFg, _st.inactiveFgOver, over);
 	if (mid > from) {
 		auto fromClipRect = horizontal ? QRect(0, 0, mid, height()) : QRect(0, 0, width(), mid);
-		auto fromRect = horizontal
-			? QRect(from, (height() - _st.width) / 2, mid + radius - from, _st.width)
-			: QRect((width() - _st.width) / 2, from, _st.width, mid + radius - from);
+		auto fromRect = horizontal ? QRect(from, (height() - _st.width) / 2, mid + radius - from, _st.width) :
+		                             QRect((width() - _st.width) / 2, from, _st.width, mid + radius - from);
 		p.setClipRect(fromClipRect);
 		p.setBrush(horizontal ? activeFg : inactiveFg);
 		p.drawRoundedRect(fromRect, radius, radius);
 	}
 	if (end > mid) {
 		auto endClipRect = horizontal ? QRect(mid, 0, width() - mid, height()) : QRect(0, mid, width(), height() - mid);
-		auto endRect = horizontal
-			? QRect(mid - radius, (height() - _st.width) / 2, end - (mid - radius), _st.width)
-			: QRect((width() - _st.width) / 2, mid - radius, _st.width, end - (mid - radius));
+		auto endRect = horizontal ? QRect(mid - radius, (height() - _st.width) / 2, end - (mid - radius), _st.width) :
+		                            QRect((width() - _st.width) / 2, mid - radius, _st.width, end - (mid - radius));
 		p.setClipRect(endClipRect);
 		p.setBrush(horizontal ? inactiveFg : activeFg);
 		p.drawRoundedRect(endRect, radius, radius);
@@ -261,9 +260,10 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 	auto markerSizeRatio = disabled ? 0. : (_alwaysDisplayMarker ? 1. : over);
 	if (markerSizeRatio > 0) {
 		auto position = std::round(markerFrom + value * markerLength) - (horizontal ? seekRect.x() : seekRect.y());
-		auto seekButton = horizontal
-			? QRect(position, (height() - _st.seekSize.height()) / 2, _st.seekSize.width(), _st.seekSize.height())
-			: QRect((width() - _st.seekSize.width()) / 2, position, _st.seekSize.width(), _st.seekSize.height());
+		auto seekButton =
+		    horizontal ?
+		        QRect(position, (height() - _st.seekSize.height()) / 2, _st.seekSize.width(), _st.seekSize.height()) :
+		        QRect((width() - _st.seekSize.width()) / 2, position, _st.seekSize.width(), _st.seekSize.height());
 		auto size = horizontal ? _st.seekSize.width() : _st.seekSize.height();
 		auto remove = static_cast<int>(((1. - markerSizeRatio) * size) / 2.);
 		if (remove * 2 < size) {
diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
index d9fb48794..523c6cf09 100644
--- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h
@@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "base/lambda.h"
 #include "core/single_timer.h"
 #include "styles/style_widgets.h"
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 namespace Ui {
 
 class ContinuousSlider : public TWidget {
@@ -114,7 +114,6 @@ private:
 	double _downValue = 0.;
 
 	double _fadeOpacity = 1.;
-
 };
 
 class FilledSlider : public ContinuousSlider {
@@ -129,7 +128,6 @@ private:
 	double getOverDuration() const override;
 
 	const style::FilledSlider &_st;
-
 };
 
 class MediaSlider : public ContinuousSlider {
@@ -150,7 +148,6 @@ private:
 
 	const style::MediaSlider &_st;
 	bool _alwaysDisplayMarker = false;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
index 4d0ecd83b..4fd3811f4 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp
@@ -20,15 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/discrete_sliders.h"
 
-#include "ui/effects/ripple_animation.h"
 #include "styles/style_widgets.h"
+#include "ui/effects/ripple_animation.h"
 
 #include <QPainter>
 #include <qevent.h>
 
 namespace Ui {
 
-DiscreteSlider::DiscreteSlider(QWidget *parent) : TWidget(parent) {
+DiscreteSlider::DiscreteSlider(QWidget *parent)
+    : TWidget(parent) {
 	setCursor(style::cur_pointer);
 }
 
@@ -82,9 +83,7 @@ void DiscreteSlider::setSections(const QStringList &labels) {
 	Assert(!labels.isEmpty());
 
 	_sections.clear();
-	for_const (auto &label, labels) {
-		_sections.push_back(Section(label, getLabelFont()));
-	}
+	for_const (auto &label, labels) { _sections.push_back(Section(label, getLabelFont())); }
 	stopAnimation();
 	if (_activeIndex >= _sections.size()) {
 		_activeIndex = 0;
@@ -99,8 +98,7 @@ int DiscreteSlider::getCurrentActiveLeft(TimeMs ms) {
 	return _a_left.current(ms, _sections.isEmpty() ? 0 : _sections[_selected].left);
 }
 
-template <typename Lambda>
-void DiscreteSlider::enumerateSections(Lambda callback) {
+template <typename Lambda> void DiscreteSlider::enumerateSections(Lambda callback) {
 	for (auto &section : _sections) {
 		if (!callback(section)) {
 			return;
@@ -163,12 +161,12 @@ int DiscreteSlider::getIndexFromPosition(QPoint pos) {
 }
 
 DiscreteSlider::Section::Section(const QString &label, const style::font &font)
-: label(label)
-, labelWidth(font->width(label)) {
-}
+    : label(label)
+    , labelWidth(font->width(label)) {}
 
-SettingsSlider::SettingsSlider(QWidget *parent, const style::SettingsSlider &st) : DiscreteSlider(parent)
-, _st(st) {
+SettingsSlider::SettingsSlider(QWidget *parent, const style::SettingsSlider &st)
+    : DiscreteSlider(parent)
+    , _st(st) {
 	setSelectOnPress(_st.ripple.showDuration == 0);
 }
 
@@ -276,7 +274,8 @@ void SettingsSlider::paintEvent(QPaintEvent *e) {
 		}
 		if (myrtlrect(section.left, _st.labelTop, section.width, _st.labelFont->height).intersects(clip)) {
 			p.setPen(anim::pen(_st.labelFg, _st.labelFgActive, active));
-			p.drawTextLeft(section.left + (section.width - section.labelWidth) / 2, _st.labelTop, width(), section.label, section.labelWidth);
+			p.drawTextLeft(section.left + (section.width - section.labelWidth) / 2, _st.labelTop, width(),
+			               section.label, section.labelWidth);
 		}
 		return true;
 	});
diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
index ff5caf913..ea70e9564 100644
--- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
+++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "base/lambda.h"
-#include "ui/animation.h"
 #include "styles/style_widgets.h"
+#include "ui/animation.h"
+#include "ui/twidget.h"
 
 class QMouseEvent;
 class QTimerEvent;
@@ -70,11 +70,9 @@ protected:
 		return _sections.size();
 	}
 
-	template <typename Lambda>
-	void enumerateSections(Lambda callback);
+	template <typename Lambda> void enumerateSections(Lambda callback);
 
-	virtual void startRipple(int sectionIndex) {
-	}
+	virtual void startRipple(int sectionIndex) {}
 
 	void stopAnimation() {
 		_a_left.finish();
@@ -102,7 +100,6 @@ private:
 
 	int _timerId = -1;
 	TimeMs _callbackAfterMs = 0;
-
 };
 
 class SettingsSlider : public DiscreteSlider {
@@ -127,8 +124,6 @@ private:
 
 	const style::SettingsSlider &_st;
 	int _rippleTopRoundRadius = 0;
-
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp
index 0046eb852..9bf3465d7 100644
--- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp
+++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp
@@ -22,8 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 namespace Ui {
 
-DropdownMenu::DropdownMenu(QWidget *parent, const style::DropdownMenu &st) : InnerDropdown(parent, st.wrap)
-, _st(st) {
+DropdownMenu::DropdownMenu(QWidget *parent, const style::DropdownMenu &st)
+    : InnerDropdown(parent, st.wrap)
+    , _st(st) {
 	_menu = setOwnedWidget(object_ptr<Ui::Menu>(this, _st.menu));
 	init();
 }
@@ -44,12 +45,10 @@ void DropdownMenu::init() {
 	InnerDropdown::setHiddenCallback([this] { hideFinish(); });
 
 	_menu->setResizedCallback([this] { resizeToContent(); });
-	_menu->setActivatedCallback([this](QAction *action, int actionTop, TriggeredSource source) {
-		handleActivated(action, actionTop, source);
-	});
-	_menu->setTriggeredCallback([this](QAction *action, int actionTop, TriggeredSource source) {
-		handleTriggered(action, actionTop, source);
-	});
+	_menu->setActivatedCallback(
+	    [this](QAction *action, int actionTop, TriggeredSource source) { handleActivated(action, actionTop, source); });
+	_menu->setTriggeredCallback(
+	    [this](QAction *action, int actionTop, TriggeredSource source) { handleTriggered(action, actionTop, source); });
 	_menu->setKeyPressDelegate([this](int key) { return handleKeyPress(key); });
 	_menu->setMouseMoveDelegate([this](QPoint globalPosition) { handleMouseMove(globalPosition); });
 	_menu->setMousePressDelegate([this](QPoint globalPosition) { handleMousePress(globalPosition); });
@@ -60,11 +59,13 @@ void DropdownMenu::init() {
 	hide();
 }
 
-QAction *DropdownMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
+QAction *DropdownMenu::addAction(const QString &text, const QObject *receiver, const char *member,
+                                 const style::icon *icon, const style::icon *iconOver) {
 	return _menu->addAction(text, receiver, member, icon, iconOver);
 }
 
-QAction *DropdownMenu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon, const style::icon *iconOver) {
+QAction *DropdownMenu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon,
+                                 const style::icon *iconOver) {
 	return _menu->addAction(text, std::move(callback), icon, iconOver);
 }
 
@@ -73,7 +74,7 @@ QAction *DropdownMenu::addSeparator() {
 }
 
 void DropdownMenu::clearActions() {
-	//for (auto submenu : base::take(_submenus)) {
+	// for (auto submenu : base::take(_submenus)) {
 	//	delete submenu;
 	//}
 	return _menu->clearActions();
diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h
index f449913fc..2f4cf7731 100644
--- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h
+++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h
@@ -32,8 +32,10 @@ class DropdownMenu : public InnerDropdown {
 public:
 	DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu);
 
-	QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
-	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, const QObject *receiver, const char *member,
+	                   const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr,
+	                   const style::icon *iconOver = nullptr);
 	QAction *addSeparator();
 	void clearActions();
 
@@ -106,8 +108,8 @@ private:
 	QPointer<Ui::Menu> _menu;
 
 	// Not ready with submenus yet.
-	//using Submenus = QMap<QAction*, SubmenuPointer>;
-	//Submenus _submenus;
+	// using Submenus = QMap<QAction*, SubmenuPointer>;
+	// Submenus _submenus;
 
 	DropdownMenu *_parent = nullptr;
 
@@ -116,7 +118,6 @@ private:
 	bool _deleteOnHide = false;
 	bool _triggering = false;
 	bool _deleteLater = false;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp
index 8524ba32d..6faa3bb58 100644
--- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp
+++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/inner_dropdown.h"
 
+#include "app.h"
 #include "mainwindow.h"
+#include "ui/effects/panel_animation.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
-#include "ui/effects/panel_animation.h"
-#include "app.h"
 
 #include <QWindow>
 
@@ -37,9 +37,10 @@ constexpr int kFadeAlphaMax = 160;
 
 namespace Ui {
 
-InnerDropdown::InnerDropdown(QWidget *parent, const style::InnerDropdown &st) : TWidget(parent)
-, _st(st)
-, _scroll(this, _st.scroll) {
+InnerDropdown::InnerDropdown(QWidget *parent, const style::InnerDropdown &st)
+    : TWidget(parent)
+    , _st(st)
+    , _scroll(this, _st.scroll) {
 	_hideTimer.setSingleShot(true);
 	connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(onHideAnimated()));
 
@@ -71,7 +72,7 @@ void InnerDropdown::setMaxHeight(int newMaxHeight) {
 void InnerDropdown::resizeToContent() {
 	auto newWidth = _st.padding.left() + _st.scrollMargin.left() + _st.scrollMargin.right() + _st.padding.right();
 	auto newHeight = _st.padding.top() + _st.scrollMargin.top() + _st.scrollMargin.bottom() + _st.padding.bottom();
-	if (auto widget = static_cast<Container*>(_scroll->widget())) {
+	if (auto widget = static_cast<Container *>(_scroll->widget())) {
 		widget->resizeToContent();
 		newWidth += widget->width();
 		newHeight += widget->height();
@@ -94,14 +95,14 @@ void InnerDropdown::onWindowActiveChanged() {
 
 void InnerDropdown::resizeEvent(QResizeEvent *e) {
 	_scroll->setGeometry(rect().marginsRemoved(_st.padding).marginsRemoved(_st.scrollMargin));
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (auto widget = static_cast<TWidget *>(_scroll->widget())) {
 		widget->resizeToWidth(_scroll->width());
 		onScroll();
 	}
 }
 
 void InnerDropdown::onScroll() {
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (auto widget = static_cast<TWidget *>(_scroll->widget())) {
 		int visibleTop = _scroll->scrollTop();
 		int visibleBottom = visibleTop + _scroll->height();
 		widget->setVisibleTopBottom(visibleTop, visibleBottom);
@@ -298,7 +299,8 @@ void InnerDropdown::startShowAnimation() {
 
 		_showAnimation = std::make_unique<PanelAnimation>(_st.animation, _origin);
 		auto inner = rect().marginsRemoved(_st.padding);
-		_showAnimation->setFinalImage(std::move(cache), QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(std::move(cache),
+		                              QRect(inner.topLeft() * cIntRetinaFactor(), inner.size() * cIntRetinaFactor()));
 		auto corners = App::cornersMask(ImageRoundRadius::Small);
 		_showAnimation->setCornerMasks(corners[0], corners[1], corners[2], corners[3]);
 		_showAnimation->start();
@@ -316,7 +318,7 @@ QImage InnerDropdown::grabForPanelAnimation() {
 		Painter p(&result);
 		App::roundRect(p, rect().marginsRemoved(_st.padding), _st.bg, ImageRoundRadius::Small);
 		for (auto child : children()) {
-			if (auto widget = qobject_cast<QWidget*>(child)) {
+			if (auto widget = qobject_cast<QWidget *>(child)) {
 				widget->render(&p, widget->pos(), widget->rect(), QWidget::DrawChildren | QWidget::IgnoreMask);
 			}
 		}
@@ -345,7 +347,7 @@ bool InnerDropdown::eventFilter(QObject *obj, QEvent *e) {
 		otherEnter();
 	} else if (e->type() == QEvent::Leave) {
 		otherLeave();
-	} else if (e->type() == QEvent::MouseButtonRelease && static_cast<QMouseEvent*>(e)->button() == Qt::LeftButton) {
+	} else if (e->type() == QEvent::MouseButtonRelease && static_cast<QMouseEvent *>(e)->button() == Qt::LeftButton) {
 		if (isHidden() || _hiding) {
 			otherEnter();
 		} else {
@@ -357,8 +359,9 @@ bool InnerDropdown::eventFilter(QObject *obj, QEvent *e) {
 
 int InnerDropdown::resizeGetHeight(int newWidth) {
 	auto newHeight = _st.padding.top() + _st.scrollMargin.top() + _st.scrollMargin.bottom() + _st.padding.bottom();
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
-		auto containerWidth = newWidth - _st.padding.left() - _st.padding.right() - _st.scrollMargin.left() - _st.scrollMargin.right();
+	if (auto widget = static_cast<TWidget *>(_scroll->widget())) {
+		auto containerWidth =
+		    newWidth - _st.padding.left() - _st.padding.right() - _st.scrollMargin.left() - _st.scrollMargin.right();
 		widget->resizeToWidth(containerWidth);
 		newHeight += widget->height();
 	}
@@ -368,9 +371,10 @@ int InnerDropdown::resizeGetHeight(int newWidth) {
 	return newHeight;
 }
 
-InnerDropdown::Container::Container(QWidget *parent, object_ptr<TWidget> child, const style::InnerDropdown &st) : TWidget(parent)
-, _child(std::move(child))
-, _st(st) {
+InnerDropdown::Container::Container(QWidget *parent, object_ptr<TWidget> child, const style::InnerDropdown &st)
+    : TWidget(parent)
+    , _child(std::move(child))
+    , _st(st) {
 	_child->setParent(this);
 	_child->moveToLeft(_st.scrollPadding.left(), _st.scrollPadding.top());
 }
@@ -382,7 +386,7 @@ void InnerDropdown::Container::setVisibleTopBottom(int visibleTop, int visibleBo
 void InnerDropdown::Container::resizeToContent() {
 	auto newWidth = _st.scrollPadding.left() + _st.scrollPadding.right();
 	auto newHeight = _st.scrollPadding.top() + _st.scrollPadding.bottom();
-	if (auto child = static_cast<TWidget*>(children().front())) {
+	if (auto child = static_cast<TWidget *>(children().front())) {
 		newWidth += child->width();
 		newHeight += child->height();
 	}
diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h
index 9d9727bb4..bb9baa369 100644
--- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h
+++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "styles/style_widgets.h"
-#include "ui/effects/panel_animation.h"
 #include "ui/animation.h"
+#include "ui/effects/panel_animation.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 
@@ -35,16 +35,17 @@ class InnerDropdown : public TWidget {
 public:
 	InnerDropdown(QWidget *parent, const style::InnerDropdown &st = st::defaultInnerDropdown);
 
-	template <typename Widget>
-	QPointer<Widget> setOwnedWidget(object_ptr<Widget> widget) {
+	template <typename Widget> QPointer<Widget> setOwnedWidget(object_ptr<Widget> widget) {
 		auto result = doSetOwnedWidget(std::move(widget));
-		return QPointer<Widget>(static_cast<Widget*>(result.data()));
+		return QPointer<Widget>(static_cast<Widget *>(result.data()));
 	}
 
 	bool overlaps(const QRect &globalRect) {
 		if (isHidden() || _a_show.animating() || _a_opacity.animating()) return false;
 
-		return rect().marginsRemoved(_st.padding).contains(QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size()));
+		return rect()
+		    .marginsRemoved(_st.padding)
+		    .contains(QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size()));
 	}
 
 	void setAutoHiding(bool autoHiding) {
@@ -137,7 +138,6 @@ private:
 	object_ptr<Ui::ScrollArea> _scroll;
 
 	int _maxHeight = 0;
-
 };
 
 class InnerDropdown::Container : public TWidget {
@@ -153,7 +153,6 @@ protected:
 private:
 	object_ptr<TWidget> _child;
 	const style::InnerDropdown &_st;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp
index 02777fa0c..48431c756 100644
--- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp
+++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp
@@ -20,39 +20,38 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/input_fields.h"
 
-#include "ui/widgets/popup_menu.h"
-#include "mainwindow.h"
-#include "ui/countryinput.h"
-#include "window/themes/window_theme.h"
-#include "lang/lang_keys.h"
-#include "numbers.h"
-#include "messenger.h"
 #include "app.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "messenger.h"
+#include "numbers.h"
+#include "ui/countryinput.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/themes/window_theme.h"
 
-#include <QStyle>
-#include <QStack>
-#include <QCommonStyle>
-#include <QGuiApplication>
 #include <QApplication>
 #include <QClipboard>
+#include <QCommonStyle>
+#include <QGuiApplication>
+#include <QStack>
+#include <QStyle>
 
 namespace Ui {
 namespace {
 
-template <typename InputClass>
-class InputStyle : public QCommonStyle {
+template <typename InputClass> class InputStyle : public QCommonStyle {
 public:
 	InputStyle() {
 		setParent(QCoreApplication::instance());
 	}
 
-	void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const {
-	}
+	void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter,
+	                   const QWidget *widget = 0) const {}
 	QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const {
 		switch (r) {
-			case SE_LineEditContents:
-				const InputClass *w = widget ? qobject_cast<const InputClass*>(widget) : 0;
-				return w ? w->getTextRect() : QCommonStyle::subElementRect(r, opt, widget);
+		case SE_LineEditContents:
+			const InputClass *w = widget ? qobject_cast<const InputClass *>(widget) : 0;
+			return w ? w->getTextRect() : QCommonStyle::subElementRect(r, opt, widget);
 			break;
 		}
 		return QCommonStyle::subElementRect(r, opt, widget);
@@ -74,11 +73,9 @@ public:
 
 private:
 	static InputStyle<InputClass> *_instance;
-
 };
 
-template <typename InputClass>
-InputStyle<InputClass> *InputStyle<InputClass>::_instance = nullptr;
+template <typename InputClass> InputStyle<InputClass> *InputStyle<InputClass>::_instance = nullptr;
 
 } // namespace
 
@@ -92,9 +89,7 @@ QByteArray FlatTextarea::serializeTagsList(const TagList &tags) {
 		QDataStream stream(&tagsSerialized, QIODevice::WriteOnly);
 		stream.setVersion(QDataStream::Qt_5_1);
 		stream << qint32(tags.size());
-		for_const (auto &tag, tags) {
-			stream << qint32(tag.offset) << qint32(tag.length) << tag.id;
-		}
+		for_const (auto &tag, tags) { stream << qint32(tag.offset) << qint32(tag.length) << tag.id; }
 	}
 	return tagsSerialized;
 }
@@ -127,7 +122,7 @@ FlatTextarea::TagList FlatTextarea::deserializeTagsList(QByteArray data, int tex
 		if (offset < 0 || length <= 0 || offset + length > textLength) {
 			return result;
 		}
-		result.push_back({ offset, length, id });
+		result.push_back({offset, length, id});
 	}
 	return result;
 }
@@ -136,12 +131,13 @@ QString FlatTextarea::tagsMimeType() {
 	return qsl("application/x-td-field-tags");
 }
 
-FlatTextarea::FlatTextarea(QWidget *parent, const style::FlatTextarea &st, base::lambda<QString()> placeholderFactory, const QString &v, const TagList &tags) : TWidgetHelper<QTextEdit>(parent)
-, _placeholderFactory(std::move(placeholderFactory))
-, _placeholderVisible(!v.length())
-, _lastTextWithTags { v, tags }
-, _st(st) {
-
+FlatTextarea::FlatTextarea(QWidget *parent, const style::FlatTextarea &st, base::lambda<QString()> placeholderFactory,
+                           const QString &v, const TagList &tags)
+    : TWidgetHelper<QTextEdit>(parent)
+    , _placeholderFactory(std::move(placeholderFactory))
+    , _placeholderVisible(!v.length())
+    , _lastTextWithTags{v, tags}
+    , _st(st) {
 	setCursor(style::cur_text);
 	setAcceptRichText(false);
 	resize(_st.width, _st.font->height);
@@ -274,8 +270,9 @@ void FlatTextarea::onTouchTimer() {
 }
 
 bool FlatTextarea::viewportEvent(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return QTextEdit::viewportEvent(e);
@@ -287,39 +284,40 @@ bool FlatTextarea::viewportEvent(QEvent *e) {
 void FlatTextarea::touchEvent(QTouchEvent *e) {
 	switch (e->type()) {
 	case QEvent::TouchBegin:
-	if (_touchPress || e->touchPoints().isEmpty()) return;
-	_touchTimer.start(QApplication::startDragTime());
-	_touchPress = true;
-	_touchMove = _touchRightButton = false;
-	_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
-	break;
+		if (_touchPress || e->touchPoints().isEmpty()) return;
+		_touchTimer.start(QApplication::startDragTime());
+		_touchPress = true;
+		_touchMove = _touchRightButton = false;
+		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
+		break;
 
 	case QEvent::TouchUpdate:
-	if (!_touchPress || e->touchPoints().isEmpty()) return;
-	if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
-		_touchMove = true;
-	}
-	break;
+		if (!_touchPress || e->touchPoints().isEmpty()) return;
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
+			_touchMove = true;
+		}
+		break;
 
 	case QEvent::TouchEnd:
-	if (!_touchPress) return;
-	if (!_touchMove && window()) {
-		Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton);
-		QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart));
+		if (!_touchPress) return;
+		if (!_touchMove && window()) {
+			Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton);
+			QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart));
 
-		if (_touchRightButton) {
-			QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart);
-			contextMenuEvent(&contextEvent);
+			if (_touchRightButton) {
+				QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart);
+				contextMenuEvent(&contextEvent);
+			}
 		}
-	}
-	_touchTimer.stop();
-	_touchPress = _touchMove = _touchRightButton = false;
-	break;
+		_touchTimer.stop();
+		_touchPress = _touchMove = _touchRightButton = false;
+		break;
 
 	case QEvent::TouchCancel:
-	_touchPress = false;
-	_touchTimer.stop();
-	break;
+		_touchPress = false;
+		_touchTimer.stop();
+		break;
 	}
 }
 
@@ -348,9 +346,13 @@ void FlatTextarea::paintEvent(QPaintEvent *e) {
 		p.setPen(anim::pen(_st.phColor, _st.phFocusColor, _a_placeholderFocused.current(ms, _focused ? 1. : 0.)));
 		if (_st.phAlign == style::al_topleft && _placeholderAfterSymbols > 0) {
 			int skipWidth = placeholderSkipWidth();
-			p.drawText(_st.textMrg.left() - _fakeMargin + placeholderLeft + skipWidth, _st.textMrg.top() - _fakeMargin - st::lineWidth + _st.font->ascent, _placeholder);
+			p.drawText(_st.textMrg.left() - _fakeMargin + placeholderLeft + skipWidth,
+			           _st.textMrg.top() - _fakeMargin - st::lineWidth + _st.font->ascent, _placeholder);
 		} else {
-			QRect phRect(_st.textMrg.left() - _fakeMargin + _st.phPos.x() + placeholderLeft, _st.textMrg.top() - _fakeMargin + _st.phPos.y(), width() - _st.textMrg.left() - _st.textMrg.right(), height() - _st.textMrg.top() - _st.textMrg.bottom());
+			QRect phRect(_st.textMrg.left() - _fakeMargin + _st.phPos.x() + placeholderLeft,
+			             _st.textMrg.top() - _fakeMargin + _st.phPos.y(),
+			             width() - _st.textMrg.left() - _st.textMrg.right(),
+			             height() - _st.textMrg.top() - _st.textMrg.bottom());
 			p.drawText(phRect, _placeholder, QTextOption(_st.phAlign));
 		}
 		p.restore();
@@ -405,7 +407,7 @@ EmojiPtr FlatTextarea::getSingleEmoji() const {
 
 	if (!text.isEmpty()) {
 		auto format = fragment.charFormat();
-		auto imageName = static_cast<QTextImageFormat*>(&format)->name();
+		auto imageName = static_cast<QTextImageFormat *>(&format)->name();
 		return Ui::Emoji::FromUrl(imageName);
 	}
 	return nullptr;
@@ -495,10 +497,12 @@ QString FlatTextarea::getMentionHashtagBotCommandPart(bool &start) const {
 		QString t(fr.text());
 		for (int i = pos - p; i > 0; --i) {
 			if (t.at(i - 1) == '@') {
-				if ((pos - p - i < 1 || t.at(i).isLetter()) && (i < 2 || !(t.at(i - 2).isLetterOrNumber() || t.at(i - 2) == '_'))) {
+				if ((pos - p - i < 1 || t.at(i).isLetter()) &&
+				    (i < 2 || !(t.at(i - 2).isLetterOrNumber() || t.at(i - 2) == '_'))) {
 					start = (i == 1) && (p == 0);
 					return t.mid(i - 1, pos - p - i + 1);
-				} else if ((pos - p - i < 1 || t.at(i).isLetter()) && i > 2 && (t.at(i - 2).isLetterOrNumber() || t.at(i - 2) == '_') && !mentionInCommand) {
+				} else if ((pos - p - i < 1 || t.at(i).isLetter()) && i > 2 &&
+				           (t.at(i - 2).isLetterOrNumber() || t.at(i - 2) == '_') && !mentionInCommand) {
 					mentionInCommand = true;
 					--i;
 					continue;
@@ -547,8 +551,10 @@ void FlatTextarea::insertTag(const QString &text, QString tagId) {
 		for (int i = pos - fragmentPosition; i > 0; --i) {
 			auto previousChar = fragmentText.at(i - 1);
 			if (previousChar == '@' || previousChar == '#' || previousChar == '/') {
-				if ((i == pos - fragmentPosition || (previousChar == '/' ? fragmentText.at(i).isLetterOrNumber() : fragmentText.at(i).isLetter()) || previousChar == '#') &&
-					(i < 2 || !(fragmentText.at(i - 2).isLetterOrNumber() || fragmentText.at(i - 2) == '_'))) {
+				if ((i == pos - fragmentPosition ||
+				     (previousChar == '/' ? fragmentText.at(i).isLetterOrNumber() : fragmentText.at(i).isLetter()) ||
+				     previousChar == '#') &&
+				    (i < 2 || !(fragmentText.at(i - 2).isLetterOrNumber() || fragmentText.at(i - 2) == '_'))) {
 					cursor.setPosition(fragmentPosition + i - 1);
 					int till = fragmentPosition + i;
 					for (; (till < fragmentEnd && till < pos); ++till) {
@@ -562,7 +568,10 @@ void FlatTextarea::insertTag(const QString &text, QString tagId) {
 					}
 					cursor.setPosition(till, QTextCursor::KeepAnchor);
 					break;
-				} else if ((i == pos - fragmentPosition || fragmentText.at(i).isLetter()) && fragmentText.at(i - 1) == '@' && i > 2 && (fragmentText.at(i - 2).isLetterOrNumber() || fragmentText.at(i - 2) == '_') && !mentionInCommand) {
+				} else if ((i == pos - fragmentPosition || fragmentText.at(i).isLetter()) &&
+				           fragmentText.at(i - 1) == '@' && i > 2 &&
+				           (fragmentText.at(i - 2).isLetterOrNumber() || fragmentText.at(i - 2) == '_') &&
+				           !mentionInCommand) {
 					mentionInCommand = true;
 					--i;
 					continue;
@@ -582,7 +591,7 @@ void FlatTextarea::insertTag(const QString &text, QString tagId) {
 		cursor.insertText(text + ' ', format);
 	} else {
 		_insertedTags.clear();
-		_insertedTags.push_back({ 0, text.size(), tagId });
+		_insertedTags.push_back({0, text.size(), tagId});
 		_insertedTagsAreFromMime = false;
 		cursor.insertText(text + ' ');
 		_insertedTags.clear();
@@ -621,7 +630,7 @@ void FlatTextarea::getSingleEmojiFragment(QString &text, QTextFragment &fragment
 				t = t.mid(0, end - p);
 			}
 			if (f.isImageFormat() && !t.isEmpty() && t.at(0).unicode() == QChar::ObjectReplacementCharacter) {
-				auto imageName = static_cast<QTextImageFormat*>(&f)->name();
+				auto imageName = static_cast<QTextImageFormat *>(&f)->name();
 				if (Ui::Emoji::FromUrl(imageName)) {
 					fragment = fr;
 					text = t;
@@ -653,8 +662,8 @@ namespace {
 
 class TagAccumulator {
 public:
-	TagAccumulator(FlatTextarea::TagList *tags) : _tags(tags) {
-	}
+	TagAccumulator(FlatTextarea::TagList *tags)
+	    : _tags(tags) {}
 
 	bool changed() const {
 		return _changed;
@@ -670,18 +679,17 @@ public:
 			bool tagChanged = true;
 			if (_currentTag < _tags->size()) {
 				auto &alreadyTag = _tags->at(_currentTag);
-				if (alreadyTag.offset == _currentStart &&
-					alreadyTag.length == currentPosition - _currentStart &&
-					alreadyTag.id == _currentTagId.midRef(0, randomPartPosition)) {
+				if (alreadyTag.offset == _currentStart && alreadyTag.length == currentPosition - _currentStart &&
+				    alreadyTag.id == _currentTagId.midRef(0, randomPartPosition)) {
 					tagChanged = false;
 				}
 			}
 			if (tagChanged) {
 				_changed = true;
 				TextWithTags::Tag tag = {
-					_currentStart,
-					currentPosition - _currentStart,
-					_currentTagId.mid(0, randomPartPosition),
+				    _currentStart,
+				    currentPosition - _currentStart,
+				    _currentTagId.mid(0, randomPartPosition),
 				};
 				if (_currentTag < _tags->size()) {
 					(*_tags)[_currentTag] = tag;
@@ -709,7 +717,6 @@ private:
 	int _currentTag = 0;
 	int _currentStart = 0;
 	QString _currentTagId;
-
 };
 
 } // namespace
@@ -783,7 +790,7 @@ QString FlatTextarea::getTextPart(int start, int end, TagList *outTagsList, bool
 				} break;
 				case QChar::ObjectReplacementCharacter: {
 					if (emojiText.isEmpty() && f.isImageFormat()) {
-						auto imageName = static_cast<QTextImageFormat*>(&f)->name();
+						auto imageName = static_cast<QTextImageFormat *>(&f)->name();
 						if (auto emoji = Ui::Emoji::FromUrl(imageName)) {
 							emojiText = emoji->text();
 						}
@@ -869,7 +876,7 @@ void FlatTextarea::parseLinks() { // some code is duplicated in text.cpp!
 			continue;
 		}
 
-		QStack<const QChar*> parenth;
+		QStack<const QChar *> parenth;
 		const QChar *domainEnd = start + m.capturedEnd(), *p = domainEnd;
 		for (; p < end; ++p) {
 			QChar ch(*p);
@@ -890,7 +897,8 @@ void FlatTextarea::parseLinks() { // some code is duplicated in text.cpp!
 			} else if (ch == ')' || ch == ']' || ch == '}' || ch == '>') {
 				if (parenth.isEmpty()) break;
 				const QChar *q = parenth.pop(), open(*q);
-				if ((ch == ')' && open != '(') || (ch == ']' && open != '[') || (ch == '}' && open != '{') || (ch == '>' && open != '<')) {
+				if ((ch == ')' && open != '(') || (ch == ']' && open != '[') || (ch == '}' && open != '{') ||
+				    (ch == '>' && open != '<')) {
 					p = q;
 					break;
 				}
@@ -902,7 +910,7 @@ void FlatTextarea::parseLinks() { // some code is duplicated in text.cpp!
 				continue;
 			}
 		}
-		newLinks.push_back({ domainOffset - 1, static_cast<int>(p - start - domainOffset + 2) });
+		newLinks.push_back({domainOffset - 1, static_cast<int>(p - start - domainOffset + 2)});
 		offset = matchOffset = p - start;
 	}
 
@@ -916,9 +924,7 @@ QStringList FlatTextarea::linksList() const {
 	QStringList result;
 	if (!_links.isEmpty()) {
 		QString text(toPlainText());
-		for_const (auto &link, _links) {
-			result.push_back(text.mid(link.start + 1, link.length - 2));
-		}
+		for_const (auto &link, _links) { result.push_back(text.mid(link.start + 1, link.length - 2)); }
 	}
 	return result;
 }
@@ -998,7 +1004,8 @@ void removeTags(style::color textFg, QTextDocument *document, int from, int end)
 }
 
 // Returns the position of the first inserted tag or "changedEnd" value if none found.
-int processInsertedTags(style::color textFg, QTextDocument *document, int changedPosition, int changedEnd, const FlatTextarea::TagList &tags, FlatTextarea::TagMimeProcessor *processor) {
+int processInsertedTags(style::color textFg, QTextDocument *document, int changedPosition, int changedEnd,
+                        const FlatTextarea::TagList &tags, FlatTextarea::TagMimeProcessor *processor) {
 	int firstTagStart = changedEnd;
 	int applyNoTagFrom = changedEnd;
 	for_const (auto &tag, tags) {
@@ -1095,8 +1102,8 @@ void FlatTextarea::processFormatting(int insertPosition, int insertEnd) {
 
 	// Apply inserted tags.
 	auto insertedTagsProcessor = _insertedTagsAreFromMime ? _tagMimeProcessor.get() : nullptr;
-	int breakTagOnNotLetterTill = processInsertedTags(_st.textColor, doc, insertPosition, insertEnd,
-		_insertedTags, insertedTagsProcessor);
+	int breakTagOnNotLetterTill =
+	    processInsertedTags(_st.textColor, doc, insertPosition, insertEnd, _insertedTags, insertedTagsProcessor);
 	using ActionType = FormattingAction::Type;
 	while (true) {
 		FormattingAction action;
@@ -1334,7 +1341,8 @@ void FlatTextarea::setPlaceholder(base::lambda<QString()> placeholderFactory, in
 void FlatTextarea::refreshPlaceholder() {
 	auto skipWidth = placeholderSkipWidth();
 	auto placeholderText = _placeholderFactory ? _placeholderFactory() : QString();
-	_placeholder = _st.font->elided(placeholderText, width() - _st.textMrg.left() - _st.textMrg.right() - _st.phPos.x() - 1 - skipWidth);
+	_placeholder = _st.font->elided(placeholderText,
+	                                width() - _st.textMrg.left() - _st.textMrg.right() - _st.phPos.x() - 1 - skipWidth);
 	update();
 }
 
@@ -1343,7 +1351,8 @@ void FlatTextarea::updatePlaceholder() {
 	auto placeholderVisible = (textSize <= _placeholderAfterSymbols);
 	if (_placeholderVisible != placeholderVisible) {
 		_placeholderVisible = placeholderVisible;
-		_a_placeholderVisible.start([this] { update(); }, _placeholderVisible ? 0. : 1., _placeholderVisible ? 1. : 0., _st.phDuration);
+		_a_placeholderVisible.start([this] { update(); }, _placeholderVisible ? 0. : 1., _placeholderVisible ? 1. : 0.,
+		                            _st.phDuration);
 	}
 }
 
@@ -1372,7 +1381,9 @@ void FlatTextarea::setSubmitSettings(SubmitSettings settings) {
 
 void FlatTextarea::keyPressEvent(QKeyEvent *e) {
 	bool shift = e->modifiers().testFlag(Qt::ShiftModifier);
-	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier);
+	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) &&
+	               e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) &&
+	               !e->modifiers().testFlag(Qt::AltModifier);
 	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier);
 	bool enterSubmit = (ctrl && shift);
 	if (ctrl && _submitSettings != SubmitSettings::None && _submitSettings != SubmitSettings::Enter) {
@@ -1425,10 +1436,13 @@ void FlatTextarea::keyPressEvent(QKeyEvent *e) {
 		if (tc == textCursor()) {
 			bool check = false;
 			if (e->key() == Qt::Key_PageUp || e->key() == Qt::Key_Up) {
-				tc.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				tc.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ?
+				                                        QTextCursor::KeepAnchor :
+				                                        QTextCursor::MoveAnchor);
 				check = true;
 			} else if (e->key() == Qt::Key_PageDown || e->key() == Qt::Key_Down) {
-				tc.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				tc.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor :
+				                                                                               QTextCursor::MoveAnchor);
 				check = true;
 			}
 			if (check) {
@@ -1469,12 +1483,14 @@ void FlatTextarea::contextMenuEvent(QContextMenuEvent *e) {
 	}
 }
 
-FlatInput::FlatInput(QWidget *parent, const style::FlatInput &st, base::lambda<QString()> placeholderFactory, const QString &v) : TWidgetHelper<QLineEdit>(v, parent)
-, _oldtext(v)
-, _placeholderFactory(std::move(placeholderFactory))
-, _placeholderVisible(!v.length())
-, _st(st)
-, _textMrg(_st.textMrg) {
+FlatInput::FlatInput(QWidget *parent, const style::FlatInput &st, base::lambda<QString()> placeholderFactory,
+                     const QString &v)
+    : TWidgetHelper<QLineEdit>(v, parent)
+    , _oldtext(v)
+    , _placeholderFactory(std::move(placeholderFactory))
+    , _placeholderVisible(!v.length())
+    , _st(st)
+    , _textMrg(_st.textMrg) {
 	setCursor(style::cur_text);
 	resize(_st.width, _st.height);
 
@@ -1519,8 +1535,9 @@ void FlatInput::onTouchTimer() {
 }
 
 bool FlatInput::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return QLineEdit::event(e);
@@ -1541,7 +1558,8 @@ void FlatInput::touchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchUpdate:
 		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
 		break;
@@ -1590,7 +1608,10 @@ void FlatInput::paintEvent(QPaintEvent *e) {
 	p.setBrush(anim::brush(_st.bgColor, _st.bgActive, placeholderFocused));
 	{
 		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::buttonRadius - (_st.borderWidth / 2.), st::buttonRadius - (_st.borderWidth / 2.));
+		p.drawRoundedRect(QRectF(0, 0, width(), height())
+		                      .marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2.,
+		                                                _st.borderWidth / 2., _st.borderWidth / 2.)),
+		                  st::buttonRadius - (_st.borderWidth / 2.), st::buttonRadius - (_st.borderWidth / 2.));
 	}
 
 	if (!_st.icon.empty()) {
@@ -1679,7 +1700,8 @@ void FlatInput::updatePlaceholder() {
 	auto placeholderVisible = !hasText;
 	if (_placeholderVisible != placeholderVisible) {
 		_placeholderVisible = placeholderVisible;
-		_a_placeholderVisible.start([this] { update(); }, _placeholderVisible ? 0. : 1., _placeholderVisible ? 1. : 0., _st.phDuration);
+		_a_placeholderVisible.start([this] { update(); }, _placeholderVisible ? 0. : 1., _placeholderVisible ? 1. : 0.,
+		                            _st.phDuration);
 	}
 }
 
@@ -1693,11 +1715,11 @@ void FlatInput::inputMethodEvent(QInputMethodEvent *e) {
 }
 
 QRect FlatInput::placeholderRect() const {
-	return QRect(_textMrg.left() + _st.phPos.x(), _textMrg.top() + _st.phPos.y(), width() - _textMrg.left() - _textMrg.right(), height() - _textMrg.top() - _textMrg.bottom());
+	return QRect(_textMrg.left() + _st.phPos.x(), _textMrg.top() + _st.phPos.y(),
+	             width() - _textMrg.left() - _textMrg.right(), height() - _textMrg.top() - _textMrg.bottom());
 }
 
-void FlatInput::correctValue(const QString &was, QString &now) {
-}
+void FlatInput::correctValue(const QString &was, QString &now) {}
 
 void FlatInput::phPrepare(Painter &p, double placeholderFocused) {
 	p.setFont(_st.font);
@@ -1708,7 +1730,8 @@ void FlatInput::keyPressEvent(QKeyEvent *e) {
 	QString wasText(_oldtext);
 
 	bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier);
-	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier), ctrlGood = true;
+	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier),
+	     ctrlGood = true;
 	if (_customUpDown && (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down)) {
 		e->ignore();
 	} else {
@@ -1752,11 +1775,13 @@ void FlatInput::onTextChange(const QString &text) {
 	if (App::wnd()) App::wnd()->updateGlobalMenu();
 }
 
-InputArea::InputArea(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : TWidget(parent)
-, _st(st)
-, _inner(this)
-, _oldtext(val)
-, _placeholderFactory(std::move(placeholderFactory)) {
+InputArea::InputArea(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                     const QString &val)
+    : TWidget(parent)
+    , _st(st)
+    , _inner(this)
+    , _oldtext(val)
+    , _placeholderFactory(std::move(placeholderFactory)) {
 	_inner->setAcceptRichText(false);
 	resize(_st.width, _st.heightMin);
 
@@ -1788,7 +1813,8 @@ InputArea::InputArea(QWidget *parent, const style::InputField &st, base::lambda<
 	_touchTimer.setSingleShot(true);
 	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
 
-	connect(_inner->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
+	connect(_inner->document(), SIGNAL(contentsChange(int, int, int)), this,
+	        SLOT(onDocumentContentsChange(int, int, int)));
 	connect(_inner->document(), SIGNAL(contentsChanged()), this, SLOT(onDocumentContentsChanged()));
 	connect(_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
 	connect(_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool)));
@@ -1844,14 +1870,15 @@ void InputArea::checkContentHeight() {
 	}
 }
 
-InputArea::Inner::Inner(InputArea *parent) : QTextEdit(parent) {
-}
+InputArea::Inner::Inner(InputArea *parent)
+    : QTextEdit(parent) {}
 
 bool InputArea::Inner::viewportEvent(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
-			qobject_cast<InputArea*>(parentWidget())->touchEvent(ev);
+			qobject_cast<InputArea *>(parentWidget())->touchEvent(ev);
 			return QTextEdit::viewportEvent(e);
 		}
 	}
@@ -1870,7 +1897,8 @@ void InputArea::touchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchUpdate:
 		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
 		break;
@@ -2098,7 +2126,7 @@ QString InputArea::getText(qint32 start, qint32 end) const {
 				} break;
 				case QChar::ObjectReplacementCharacter: {
 					if (emojiText.isEmpty() && f.isImageFormat()) {
-						auto imageName = static_cast<QTextImageFormat*>(&f)->name();
+						auto imageName = static_cast<QTextImageFormat *>(&f)->name();
 						if (auto emoji = Ui::Emoji::FromUrl(imageName)) {
 							emojiText = emoji->text();
 						}
@@ -2368,7 +2396,8 @@ void InputArea::startPlaceholderAnimation() {
 	auto placeholderShifted = (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
 	if (_placeholderShifted != placeholderShifted) {
 		_placeholderShifted = placeholderShifted;
-		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0., _st.duration);
+		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0.,
+		                            _st.duration);
 	}
 }
 
@@ -2392,11 +2421,16 @@ void InputArea::setCtrlEnterSubmit(CtrlEnterSubmit ctrlEnterSubmit) {
 
 void InputArea::Inner::keyPressEvent(QKeyEvent *e) {
 	bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier);
-	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier);
+	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) &&
+	               e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) &&
+	               !e->modifiers().testFlag(Qt::AltModifier);
 	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier);
-	bool ctrlGood = (ctrl && shift) ||
-		(ctrl && (f()->_ctrlEnterSubmit == CtrlEnterSubmit::CtrlEnter || f()->_ctrlEnterSubmit == CtrlEnterSubmit::Both)) ||
-		(!ctrl && !shift && (f()->_ctrlEnterSubmit == CtrlEnterSubmit::Enter || f()->_ctrlEnterSubmit == CtrlEnterSubmit::Both));
+	bool ctrlGood =
+	    (ctrl && shift) ||
+	    (ctrl &&
+	     (f()->_ctrlEnterSubmit == CtrlEnterSubmit::CtrlEnter || f()->_ctrlEnterSubmit == CtrlEnterSubmit::Both)) ||
+	    (!ctrl && !shift &&
+	     (f()->_ctrlEnterSubmit == CtrlEnterSubmit::Enter || f()->_ctrlEnterSubmit == CtrlEnterSubmit::Both));
 	bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return);
 
 	if (macmeta && e->key() == Qt::Key_Backspace) {
@@ -2438,10 +2472,13 @@ void InputArea::Inner::keyPressEvent(QKeyEvent *e) {
 		if (tc == textCursor()) {
 			bool check = false;
 			if (e->key() == Qt::Key_PageUp || e->key() == Qt::Key_Up) {
-				tc.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				tc.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ?
+				                                        QTextCursor::KeepAnchor :
+				                                        QTextCursor::MoveAnchor);
 				check = true;
 			} else if (e->key() == Qt::Key_PageDown || e->key() == Qt::Key_Down) {
-				tc.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				tc.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor :
+				                                                                               QTextCursor::MoveAnchor);
 				check = true;
 			}
 			if (check) {
@@ -2471,7 +2508,8 @@ void InputArea::resizeEvent(QResizeEvent *e) {
 
 void InputArea::refreshPlaceholder() {
 	auto placeholderText = _placeholderFactory ? _placeholderFactory() : QString();
-	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() -
+	                      _st.placeholderMargins.right() - 1;
 	if (_st.placeholderScale > 0.) {
 		auto placeholderFont = _st.placeholderFont->f;
 		placeholderFont.setStyleStrategy(QFont::PreferMatch);
@@ -2507,11 +2545,13 @@ void InputArea::setErrorShown(bool error) {
 	}
 }
 
-InputField::InputField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : TWidget(parent)
-, _st(st)
-, _inner(this)
-, _oldtext(val)
-, _placeholderFactory(std::move(placeholderFactory)) {
+InputField::InputField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                       const QString &val)
+    : TWidget(parent)
+    , _st(st)
+    , _inner(this)
+    , _oldtext(val)
+    , _placeholderFactory(std::move(placeholderFactory)) {
 	_inner->setAcceptRichText(false);
 	resize(_st.width, _st.heightMin);
 
@@ -2548,7 +2588,8 @@ InputField::InputField(QWidget *parent, const style::InputField &st, base::lambd
 	_touchTimer.setSingleShot(true);
 	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
 
-	connect(_inner->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
+	connect(_inner->document(), SIGNAL(contentsChange(int, int, int)), this,
+	        SLOT(onDocumentContentsChange(int, int, int)));
 	connect(_inner->document(), SIGNAL(contentsChanged()), this, SLOT(onDocumentContentsChanged()));
 	connect(_inner, SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
 	connect(_inner, SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool)));
@@ -2575,14 +2616,15 @@ void InputField::onTouchTimer() {
 	_touchRightButton = true;
 }
 
-InputField::Inner::Inner(InputField *parent) : QTextEdit(parent) {
-}
+InputField::Inner::Inner(InputField *parent)
+    : QTextEdit(parent) {}
 
 bool InputField::Inner::viewportEvent(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
-			qobject_cast<InputField*>(parentWidget())->touchEvent(ev);
+			qobject_cast<InputField *>(parentWidget())->touchEvent(ev);
 			return QTextEdit::viewportEvent(e);
 		}
 	}
@@ -2601,7 +2643,8 @@ void InputField::touchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchUpdate:
 		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
 		break;
@@ -2752,10 +2795,12 @@ void InputField::setFocused(bool focused) {
 }
 
 void InputField::startPlaceholderAnimation() {
-	auto placeholderShifted = _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
+	auto placeholderShifted =
+	    _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
 	if (_placeholderShifted != placeholderShifted) {
 		_placeholderShifted = placeholderShifted;
-		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0., _st.duration);
+		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0.,
+		                            _st.duration);
 	}
 }
 
@@ -2839,7 +2884,7 @@ QString InputField::getText(qint32 start, qint32 end) const {
 				} break;
 				case QChar::ObjectReplacementCharacter: {
 					if (emojiText.isEmpty() && f.isImageFormat()) {
-						auto imageName = static_cast<QTextImageFormat*>(&f)->name();
+						auto imageName = static_cast<QTextImageFormat *>(&f)->name();
 						if (auto emoji = Ui::Emoji::FromUrl(imageName)) {
 							emojiText = emoji->text();
 						}
@@ -2937,7 +2982,10 @@ void InputField::processDocumentContentsChange(int position, int charsAdded) {
 				const QChar *ch = t.constData(), *e = ch + t.size();
 				for (; ch != e; ++ch, ++fp) {
 					// QTextBeginningOfFrame // QTextEndOfFrame
-					newlineFound = (ch->unicode() == 0xfdd0 || ch->unicode() == 0xfdd1 || ch->unicode() == QChar::ParagraphSeparator || ch->unicode() == QChar::LineSeparator || ch->unicode() == '\n' || ch->unicode() == '\r');
+					newlineFound =
+					    (ch->unicode() == 0xfdd0 || ch->unicode() == 0xfdd1 ||
+					     ch->unicode() == QChar::ParagraphSeparator || ch->unicode() == QChar::LineSeparator ||
+					     ch->unicode() == '\n' || ch->unicode() == '\r');
 					if (newlineFound) {
 						if (replacePosition >= 0) {
 							newlineFound = false; // replace tilde char format first
@@ -3157,8 +3205,11 @@ void InputField::customUpDown(bool custom) {
 
 void InputField::Inner::keyPressEvent(QKeyEvent *e) {
 	bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier);
-	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier);
-	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier), ctrlGood = true;
+	bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) &&
+	               e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) &&
+	               !e->modifiers().testFlag(Qt::AltModifier);
+	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier),
+	     ctrlGood = true;
 	bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return);
 
 	if (macmeta && e->key() == Qt::Key_Backspace) {
@@ -3202,11 +3253,15 @@ void InputField::Inner::keyPressEvent(QKeyEvent *e) {
 			bool check = false;
 			if (e->key() == Qt::Key_PageUp || e->key() == Qt::Key_Up) {
 				oldCursorPosition = currentCursor.position();
-				currentCursor.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				currentCursor.movePosition(QTextCursor::Start, e->modifiers().testFlag(Qt::ShiftModifier) ?
+				                                                   QTextCursor::KeepAnchor :
+				                                                   QTextCursor::MoveAnchor);
 				check = true;
 			} else if (e->key() == Qt::Key_PageDown || e->key() == Qt::Key_Down) {
 				oldCursorPosition = currentCursor.position();
-				currentCursor.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
+				currentCursor.movePosition(QTextCursor::End, e->modifiers().testFlag(Qt::ShiftModifier) ?
+				                                                 QTextCursor::KeepAnchor :
+				                                                 QTextCursor::MoveAnchor);
 				check = true;
 			} else if (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right || e->key() == Qt::Key_Backspace) {
 				e->ignore();
@@ -3237,7 +3292,8 @@ void InputField::resizeEvent(QResizeEvent *e) {
 
 void InputField::refreshPlaceholder() {
 	auto placeholderText = _placeholderFactory ? _placeholderFactory() : QString();
-	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() -
+	                      _st.placeholderMargins.right() - 1;
 	if (_st.placeholderScale > 0.) {
 		auto placeholderFont = _st.placeholderFont->f;
 		placeholderFont.setStyleStrategy(QFont::PreferMatch);
@@ -3273,10 +3329,12 @@ void InputField::setErrorShown(bool error) {
 	}
 }
 
-MaskedInputField::MaskedInputField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : TWidgetHelper<QLineEdit>(val, parent)
-, _st(st)
-, _oldtext(val)
-, _placeholderFactory(std::move(placeholderFactory)) {
+MaskedInputField::MaskedInputField(QWidget *parent, const style::InputField &st,
+                                   base::lambda<QString()> placeholderFactory, const QString &val)
+    : TWidgetHelper<QLineEdit>(val, parent)
+    , _st(st)
+    , _oldtext(val)
+    , _placeholderFactory(std::move(placeholderFactory)) {
 	resize(_st.width, _st.heightMin);
 
 	setFont(_st.font);
@@ -3294,10 +3352,10 @@ MaskedInputField::MaskedInputField(QWidget *parent, const style::InputField &st,
 
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
-	connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChange(const QString&)));
-	connect(this, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onCursorPositionChanged(int,int)));
+	connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(onTextChange(const QString &)));
+	connect(this, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(onCursorPositionChanged(int, int)));
 
-	connect(this, SIGNAL(textEdited(const QString&)), this, SLOT(onTextEdited()));
+	connect(this, SIGNAL(textEdited(const QString &)), this, SLOT(onTextEdited()));
 	if (App::wnd()) connect(this, SIGNAL(selectionChanged()), App::wnd(), SLOT(updateGlobalMenu()));
 
 	setStyle(InputStyle<MaskedInputField>::instance());
@@ -3352,8 +3410,9 @@ void MaskedInputField::onTouchTimer() {
 }
 
 bool MaskedInputField::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return QLineEdit::event(e);
@@ -3374,7 +3433,8 @@ void MaskedInputField::touchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchUpdate:
 		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >=
+		                       QApplication::startDragDistance()) {
 			_touchMove = true;
 		}
 		break;
@@ -3529,7 +3589,8 @@ void MaskedInputField::resizeEvent(QResizeEvent *e) {
 
 void MaskedInputField::refreshPlaceholder() {
 	auto placeholderText = _placeholderFactory ? _placeholderFactory() : QString();
-	auto availableWidth = width() - _textMargins.left() - _textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	auto availableWidth = width() - _textMargins.left() - _textMargins.right() - _st.placeholderMargins.left() -
+	                      _st.placeholderMargins.right() - 1;
 	if (_st.placeholderScale > 0.) {
 		auto placeholderFont = _st.placeholderFont->f;
 		placeholderFont.setStyleStrategy(QFont::PreferMatch);
@@ -3605,10 +3666,12 @@ void MaskedInputField::setPlaceholderHidden(bool forcePlaceholderHidden) {
 }
 
 void MaskedInputField::startPlaceholderAnimation() {
-	auto placeholderShifted = _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
+	auto placeholderShifted =
+	    _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
 	if (_placeholderShifted != placeholderShifted) {
 		_placeholderShifted = placeholderShifted;
-		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0., _st.duration);
+		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0.,
+		                            _st.duration);
 	}
 }
 
@@ -3626,7 +3689,8 @@ void MaskedInputField::keyPressEvent(QKeyEvent *e) {
 	qint32 wasCursor(_oldcursor);
 
 	bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier);
-	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier), ctrlGood = true;
+	bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier),
+	     ctrlGood = true;
 	if (_customUpDown && (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down)) {
 		e->ignore();
 	} else {
@@ -3680,9 +3744,9 @@ void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
 	_oldcursor = position;
 }
 
-CountryCodeInput::CountryCodeInput(QWidget *parent, const style::InputField &st) : MaskedInputField(parent, st)
-, _nosignal(false) {
-}
+CountryCodeInput::CountryCodeInput(QWidget *parent, const style::InputField &st)
+    : MaskedInputField(parent, st)
+    , _nosignal(false) {}
 
 void CountryCodeInput::startErasing(QKeyEvent *e) {
 	setFocus();
@@ -3740,8 +3804,8 @@ void CountryCodeInput::correctValue(const QString &was, qint32 wasCursor, QStrin
 	}
 }
 
-PhonePartInput::PhonePartInput(QWidget *parent, const style::InputField &st) : MaskedInputField(parent, st/*, lang(lng_phone_ph)*/) {
-}
+PhonePartInput::PhonePartInput(QWidget *parent, const style::InputField &st)
+    : MaskedInputField(parent, st /*, lang(lng_phone_ph)*/) {}
 
 void PhonePartInput::paintAdditionalPlaceholder(Painter &p, TimeMs ms) {
 	if (!_pattern.isEmpty()) {
@@ -3866,11 +3930,15 @@ void PhonePartInput::onChooseCode(const QString &code) {
 	startPlaceholderAnimation();
 }
 
-PasswordInput::PasswordInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
+PasswordInput::PasswordInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                             const QString &val)
+    : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
 	setEchoMode(QLineEdit::Password);
 }
 
-PortInput::PortInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
+PortInput::PortInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                     const QString &val)
+    : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
 	if (!val.toInt() || val.toInt() > 65535) {
 		setText(QString());
 	}
@@ -3897,14 +3965,17 @@ void PortInput::correctValue(const QString &was, qint32 wasCursor, QString &now,
 	setCorrectedText(now, nowCursor, newText, newPos);
 }
 
-UsernameInput::UsernameInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val, bool isLink) : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
+UsernameInput::UsernameInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                             const QString &val, bool isLink)
+    : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
 	setLinkPlaceholder(isLink ? Messenger::Instance().createInternalLink(QString()) : QString());
 }
 
 void UsernameInput::setLinkPlaceholder(const QString &placeholder) {
 	_linkPlaceholder = placeholder;
 	if (!_linkPlaceholder.isEmpty()) {
-		setTextMargins(style::margins(_st.textMargins.left() + _st.font->width(_linkPlaceholder), _st.textMargins.top(), _st.textMargins.right(), _st.textMargins.bottom()));
+		setTextMargins(style::margins(_st.textMargins.left() + _st.font->width(_linkPlaceholder), _st.textMargins.top(),
+		                              _st.textMargins.right(), _st.textMargins.bottom()));
 		setPlaceholderHidden(true);
 	}
 }
@@ -3913,7 +3984,9 @@ void UsernameInput::paintAdditionalPlaceholder(Painter &p, TimeMs ms) {
 	if (!_linkPlaceholder.isEmpty()) {
 		p.setFont(_st.font);
 		p.setPen(_st.placeholderFg);
-		p.drawText(QRect(_st.textMargins.left(), _st.textMargins.top(), width(), height() - _st.textMargins.top() - _st.textMargins.bottom()), _linkPlaceholder, style::al_topleft);
+		p.drawText(QRect(_st.textMargins.left(), _st.textMargins.top(), width(),
+		                 height() - _st.textMargins.top() - _st.textMargins.bottom()),
+		           _linkPlaceholder, style::al_topleft);
 	}
 }
 
@@ -3938,7 +4011,9 @@ void UsernameInput::correctValue(const QString &was, qint32 wasCursor, QString &
 	setCorrectedText(now, nowCursor, now.mid(from, len), newPos);
 }
 
-PhoneInput::PhoneInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val) : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
+PhoneInput::PhoneInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+                       const QString &val)
+    : MaskedInputField(parent, st, std::move(placeholderFactory), val) {
 	QString phone(val);
 	if (phone.isEmpty()) {
 		clearText();
@@ -4011,7 +4086,8 @@ void PhoneInput::correctValue(const QString &was, qint32 wasCursor, QString &now
 	}
 
 	QString newText;
-	int oldPos(nowCursor), newPos(-1), oldLen(now.length()), digitCount = std::min(digits.size(), MaxPhoneCodeLength + MaxPhoneTailLength);
+	int oldPos(nowCursor), newPos(-1), oldLen(now.length()),
+	    digitCount = std::min(digits.size(), MaxPhoneCodeLength + MaxPhoneTailLength);
 
 	bool inPart = !_pattern.isEmpty(), plusFound = false;
 	int curPart = 0, leftInPart = inPart ? _pattern.at(curPart) : 0;
diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.h b/Telegram/SourceFiles/ui/widgets/input_fields.h
index 2e893fc09..73c8ab1b6 100644
--- a/Telegram/SourceFiles/ui/widgets/input_fields.h
+++ b/Telegram/SourceFiles/ui/widgets/input_fields.h
@@ -20,20 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QTextEdit>
-#include <QTouchEvent>
-#include <QTextFragment>
 #include <QLineEdit>
+#include <QTextEdit>
+#include <QTextFragment>
+#include <QTouchEvent>
 
 #include "base/lambda.h"
-#include "styles/style_widgets.h"
 #include "history/history.h"
+#include "styles/style_widgets.h"
 #include "ui/twidget.h"
 class UserData;
 
 namespace Ui {
 
-static UserData * const LookingUpInlineBot = SharedMemoryLocation<UserData, 0>();
+static UserData *const LookingUpInlineBot = SharedMemoryLocation<UserData, 0>();
 
 class FlatTextarea : public TWidgetHelper<QTextEdit>, private base::Subscriber {
 	Q_OBJECT
@@ -45,7 +45,9 @@ public:
 	static TagList deserializeTagsList(QByteArray data, int textLength);
 	static QString tagsMimeType();
 
-	FlatTextarea(QWidget *parent, const style::FlatTextarea &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString(), const TagList &tags = TagList());
+	FlatTextarea(QWidget *parent, const style::FlatTextarea &st,
+	             base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString(),
+	             const TagList &tags = TagList());
 
 	void setMaxLength(int maxLength);
 	void setMinHeight(int minHeight);
@@ -100,11 +102,7 @@ public:
 		return _lastTextWithTags.text.isEmpty();
 	}
 
-	enum UndoHistoryAction {
-		AddToUndoHistory,
-		MergeWithUndoHistory,
-		ClearUndoHistory
-	};
+	enum UndoHistoryAction { AddToUndoHistory, MergeWithUndoHistory, ClearUndoHistory };
 	void setTextWithTags(const TextWithTags &textWithTags, UndoHistoryAction undoHistoryAction = AddToUndoHistory);
 
 	// If you need to make some preparations of tags before putting them to QMimeData
@@ -113,8 +111,7 @@ public:
 	public:
 		virtual QString mimeTagFromTag(const QString &tagId) = 0;
 		virtual QString tagFromMimeTag(const QString &mimeTag) = 0;
-		virtual ~TagMimeProcessor() {
-		}
+		virtual ~TagMimeProcessor() {}
 	};
 	void setTagMimeProcessor(std::unique_ptr<TagMimeProcessor> &&processor);
 
@@ -148,8 +145,7 @@ protected:
 	void dropEvent(QDropEvent *e) override;
 	void contextMenuEvent(QContextMenuEvent *e) override;
 
-	virtual void correctValue(const QString &was, QString &now, TagList &nowTags) {
-	}
+	virtual void correctValue(const QString &was, QString &now, TagList &nowTags) {}
 
 	void insertEmoji(EmojiPtr emoji, QTextCursor c);
 
@@ -244,7 +240,8 @@ class FlatInput : public TWidgetHelper<QLineEdit>, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	FlatInput(QWidget *parent, const style::FlatInput &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
+	FlatInput(QWidget *parent, const style::FlatInput &st,
+	          base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
 
 	void updatePlaceholder();
 	void setPlaceholder(base::lambda<QString()> placeholderFactory);
@@ -327,7 +324,8 @@ class InputArea : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	InputArea(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
+	InputArea(QWidget *parent, const style::InputField &st,
+	          base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
 
 	void showError();
 
@@ -409,10 +407,10 @@ protected:
 
 	void insertEmoji(EmojiPtr emoji, QTextCursor c);
 	TWidget *tparent() {
-		return qobject_cast<TWidget*>(parentWidget());
+		return qobject_cast<TWidget *>(parentWidget());
 	}
 	const TWidget *tparent() const {
-		return qobject_cast<const TWidget*>(parentWidget());
+		return qobject_cast<const TWidget *>(parentWidget());
 	}
 
 	void touchEvent(QTouchEvent *e);
@@ -440,10 +438,9 @@ private:
 
 	private:
 		InputArea *f() const {
-			return static_cast<InputArea*>(parentWidget());
+			return static_cast<InputArea *>(parentWidget());
 		}
 		friend class InputArea;
-
 	};
 	friend class Inner;
 
@@ -499,14 +496,14 @@ private:
 	QPoint _touchStart;
 
 	bool _correcting = false;
-
 };
 
 class InputField : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	InputField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
+	InputField(QWidget *parent, const style::InputField &st,
+	           base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
 
 	void setMaxLength(int maxLength) {
 		_maxLength = maxLength;
@@ -598,10 +595,10 @@ protected:
 
 	void insertEmoji(EmojiPtr emoji, QTextCursor c);
 	TWidget *tparent() {
-		return qobject_cast<TWidget*>(parentWidget());
+		return qobject_cast<TWidget *>(parentWidget());
 	}
 	const TWidget *tparent() const {
-		return qobject_cast<const TWidget*>(parentWidget());
+		return qobject_cast<const TWidget *>(parentWidget());
 	}
 
 	void touchEvent(QTouchEvent *e);
@@ -629,10 +626,9 @@ private:
 
 	private:
 		InputField *f() const {
-			return static_cast<InputField*>(parentWidget());
+			return static_cast<InputField *>(parentWidget());
 		}
 		friend class InputField;
-
 	};
 	friend class Inner;
 
@@ -690,7 +686,9 @@ class MaskedInputField : public TWidgetHelper<QLineEdit>, private base::Subscrib
 	Q_OBJECT
 
 public:
-	MaskedInputField(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
+	MaskedInputField(QWidget *parent, const style::InputField &st,
+	                 base::lambda<QString()> placeholderFactory = base::lambda<QString()>(),
+	                 const QString &val = QString());
 
 	void showError();
 
@@ -757,12 +755,10 @@ protected:
 	void contextMenuEvent(QContextMenuEvent *e) override;
 	void inputMethodEvent(QInputMethodEvent *e) override;
 
-	virtual void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) {
-	}
+	virtual void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) {}
 	void setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos);
 
-	virtual void paintAdditionalPlaceholder(Painter &p, TimeMs ms) {
-	}
+	virtual void paintAdditionalPlaceholder(Painter &p, TimeMs ms) {}
 
 	style::font phFont() {
 		return _st.font;
@@ -838,7 +834,6 @@ protected:
 
 private:
 	bool _nosignal;
-
 };
 
 class PhonePartInput : public MaskedInputField {
@@ -863,27 +858,28 @@ protected:
 private:
 	QVector<int> _pattern;
 	QString _additionalPlaceholder;
-
 };
 
 class PasswordInput : public MaskedInputField {
 public:
-	PasswordInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>(), const QString &val = QString());
-
+	PasswordInput(QWidget *parent, const style::InputField &st,
+	              base::lambda<QString()> placeholderFactory = base::lambda<QString()>(),
+	              const QString &val = QString());
 };
 
 class PortInput : public MaskedInputField {
 public:
-	PortInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val);
+	PortInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+	          const QString &val);
 
 protected:
 	void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) override;
-
 };
 
 class UsernameInput : public MaskedInputField {
 public:
-	UsernameInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val, bool isLink);
+	UsernameInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+	              const QString &val, bool isLink);
 
 	void setLinkPlaceholder(const QString &placeholder);
 
@@ -893,12 +889,12 @@ protected:
 
 private:
 	QString _linkPlaceholder;
-
 };
 
 class PhoneInput : public MaskedInputField {
 public:
-	PhoneInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory, const QString &val);
+	PhoneInput(QWidget *parent, const style::InputField &st, base::lambda<QString()> placeholderFactory,
+	           const QString &val);
 
 	void clearText();
 
@@ -911,7 +907,6 @@ protected:
 private:
 	QVector<int> _pattern;
 	QString _additionalPlaceholder;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp
index 8cce3cea9..83a580f2f 100644
--- a/Telegram/SourceFiles/ui/widgets/labels.cpp
+++ b/Telegram/SourceFiles/ui/widgets/labels.cpp
@@ -20,37 +20,38 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/labels.h"
 
-#include "ui/widgets/popup_menu.h"
-#include "mainwindow.h"
-#include "lang/lang_keys.h"
 #include "app.h"
 #include "facades.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "ui/widgets/popup_menu.h"
 
-#include <QDrag>
 #include <QApplication>
 #include <QClipboard>
+#include <QDrag>
 
 namespace Ui {
 namespace {
 
 TextParseOptions _labelOptions = {
-	TextParseMultiline, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 TextParseOptions _labelMarkedOptions = {
-	TextParseMultiline | TextParseRichText | TextParseLinks | TextParseHashtags | TextParseMentions | TextParseBotCommands | TextParseMarkdown, // flags
-	0, // maxw
-	0, // maxh
-	Qt::LayoutDirectionAuto, // dir
+    TextParseMultiline | TextParseRichText | TextParseLinks | TextParseHashtags | TextParseMentions |
+        TextParseBotCommands | TextParseMarkdown, // flags
+    0, // maxw
+    0, // maxh
+    Qt::LayoutDirectionAuto, // dir
 };
 
 } // namespace
 
-CrossFadeAnimation::CrossFadeAnimation(style::color bg) : _bg(bg) {
-}
+CrossFadeAnimation::CrossFadeAnimation(style::color bg)
+    : _bg(bg) {}
 
 void CrossFadeAnimation::addLine(Part was, Part now) {
 	_lines.push_back(Line(std::move(was), std::move(now)));
@@ -59,12 +60,11 @@ void CrossFadeAnimation::addLine(Part was, Part now) {
 void CrossFadeAnimation::paintFrame(Painter &p, double positionReady, double alphaWas, double alphaNow) {
 	if (_lines.isEmpty()) return;
 
-	for_const (auto &line, _lines) {
-		paintLine(p, line, positionReady, alphaWas, alphaNow);
-	}
+	for_const (auto &line, _lines) { paintLine(p, line, positionReady, alphaWas, alphaNow); }
 }
 
-void CrossFadeAnimation::paintLine(Painter &p, const Line &line, double positionReady, double alphaWas, double alphaNow) {
+void CrossFadeAnimation::paintLine(Painter &p, const Line &line, double positionReady, double alphaWas,
+                                   double alphaNow) {
 	auto &snapshotWas = line.was.snapshot;
 	auto &snapshotNow = line.now.snapshot;
 	if (snapshotWas.isNull() && snapshotNow.isNull()) {
@@ -90,7 +90,8 @@ void CrossFadeAnimation::paintLine(Painter &p, const Line &line, double position
 		}
 	}
 	if (widthDelta > 0) {
-		p.fillRect(left + (snapshotWas.width() / cIntRetinaFactor()), topNow, widthDelta, snapshotNow.height() / cIntRetinaFactor(), _bg);
+		p.fillRect(left + (snapshotWas.width() / cIntRetinaFactor()), topNow, widthDelta,
+		           snapshotNow.height() / cIntRetinaFactor(), _bg);
 	}
 
 	p.setOpacity(alphaNow);
@@ -101,12 +102,14 @@ void CrossFadeAnimation::paintLine(Painter &p, const Line &line, double position
 		}
 	}
 	if (widthDelta < 0) {
-		p.fillRect(left + (snapshotNow.width() / cIntRetinaFactor()), topWas, -widthDelta, snapshotWas.height() / cIntRetinaFactor(), _bg);
+		p.fillRect(left + (snapshotNow.width() / cIntRetinaFactor()), topWas, -widthDelta,
+		           snapshotWas.height() / cIntRetinaFactor(), _bg);
 	}
 }
 
-LabelSimple::LabelSimple(QWidget *parent, const style::LabelSimple &st, const QString &value) : TWidget(parent)
-, _st(st) {
+LabelSimple::LabelSimple(QWidget *parent, const style::LabelSimple &st, const QString &value)
+    : TWidget(parent)
+    , _st(st) {
 	setText(value);
 }
 
@@ -143,17 +146,19 @@ void LabelSimple::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(0, 0, width(), _text, _textWidth);
 }
 
-FlatLabel::FlatLabel(QWidget *parent, const style::FlatLabel &st) : TWidget(parent)
-, _text(st.width ? st.width : QFIXED_MAX)
-, _st(st)
-, _contextCopyText(lang(lng_context_copy_text)) {
+FlatLabel::FlatLabel(QWidget *parent, const style::FlatLabel &st)
+    : TWidget(parent)
+    , _text(st.width ? st.width : QFIXED_MAX)
+    , _st(st)
+    , _contextCopyText(lang(lng_context_copy_text)) {
 	init();
 }
 
-FlatLabel::FlatLabel(QWidget *parent, const QString &text, InitType initType, const style::FlatLabel &st) : TWidget(parent)
-, _text(st.width ? st.width : QFIXED_MAX)
-, _st(st)
-, _contextCopyText(lang(lng_context_copy_text)) {
+FlatLabel::FlatLabel(QWidget *parent, const QString &text, InitType initType, const style::FlatLabel &st)
+    : TWidget(parent)
+    , _text(st.width ? st.width : QFIXED_MAX)
+    , _st(st)
+    , _contextCopyText(lang(lng_context_copy_text)) {
 	if (initType == InitType::Rich) {
 		setRichText(text);
 	} else {
@@ -223,7 +228,8 @@ int FlatLabel::naturalWidth() const {
 }
 
 int FlatLabel::countTextWidth() const {
-	return _allowedWidth ? (_allowedWidth - _st.margin.left() - _st.margin.right()) : (_st.width ? _st.width : _text.maxWidth());
+	return _allowedWidth ? (_allowedWidth - _st.margin.left() - _st.margin.right()) :
+	                       (_st.width ? _st.width : _text.maxWidth());
 }
 
 int FlatLabel::countTextHeight(int textWidth) {
@@ -279,10 +285,11 @@ Text::StateResult FlatLabel::dragActionStart(const QPoint &p, Qt::MouseButton bu
 		return state;
 	}
 
-	if (_trippleClickTimer.isActive() && (_lastMousePos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
+	if (_trippleClickTimer.isActive() &&
+	    (_lastMousePos - _trippleClickPoint).manhattanLength() < QApplication::startDragDistance()) {
 		if (state.uponSymbol) {
-			_selection = { state.symbol, state.symbol };
-			_savedSelection = { 0, 0 };
+			_selection = {state.symbol, state.symbol};
+			_savedSelection = {0, 0};
 			_dragSymbol = state.symbol;
 			_dragAction = Selecting;
 			_selectionType = TextSelectType::Paragraphs;
@@ -304,8 +311,8 @@ Text::StateResult FlatLabel::dragActionStart(const QPoint &p, Qt::MouseButton bu
 			_dragAction = PrepareDrag; // start text drag
 		} else if (!_dragWasInactive) {
 			if (state.afterSymbol) ++_dragSymbol;
-			_selection = { _dragSymbol, _dragSymbol };
-			_savedSelection = { 0, 0 };
+			_selection = {_dragSymbol, _dragSymbol};
+			_savedSelection = {0, 0};
 			_dragAction = Selecting;
 			update();
 		}
@@ -321,8 +328,8 @@ Text::StateResult FlatLabel::dragActionFinish(const QPoint &p, Qt::MouseButton b
 	if (_dragAction == Dragging) {
 		activated.clear();
 	} else if (_dragAction == PrepareDrag) {
-		_selection = { 0, 0 };
-		_savedSelection = { 0, 0 };
+		_selection = {0, 0};
+		_savedSelection = {0, 0};
 		update();
 	}
 	_dragAction = NoDrag;
@@ -336,7 +343,8 @@ Text::StateResult FlatLabel::dragActionFinish(const QPoint &p, Qt::MouseButton b
 
 #if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
 	if (!_selection.empty()) {
-		QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode), QClipboard::Selection);
+		QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode),
+		                                   QClipboard::Selection);
 	}
 #endif // Q_OS_LINUX32 || Q_OS_LINUX64
 
@@ -358,8 +366,8 @@ void FlatLabel::mouseDoubleClickEvent(QMouseEvent *e) {
 			_selectionType = _doubleClickSelectsParagraph ? TextSelectType::Paragraphs : TextSelectType::Words;
 			if (_dragAction == NoDrag) {
 				_dragAction = Selecting;
-				_selection = { state.symbol, state.symbol };
-				_savedSelection = { 0, 0 };
+				_selection = {state.symbol, state.symbol};
+				_savedSelection = {0, 0};
 			}
 			mouseMoveEvent(e);
 
@@ -383,7 +391,7 @@ void FlatLabel::focusOutEvent(QFocusEvent *e) {
 		if (_contextMenu) {
 			_savedSelection = _selection;
 		}
-		_selection = { 0, 0 };
+		_selection = {0, 0};
 		update();
 	}
 }
@@ -391,7 +399,7 @@ void FlatLabel::focusOutEvent(QFocusEvent *e) {
 void FlatLabel::focusInEvent(QFocusEvent *e) {
 	if (!_savedSelection.empty()) {
 		_selection = _savedSelection;
-		_savedSelection = { 0, 0 };
+		_savedSelection = {0, 0};
 		update();
 	}
 }
@@ -407,7 +415,8 @@ void FlatLabel::keyPressEvent(QKeyEvent *e) {
 	} else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) {
 		auto selection = _selection.empty() ? (_contextMenu ? _savedSelection : _selection) : _selection;
 		if (!selection.empty()) {
-			QApplication::clipboard()->setText(_text.originalText(selection, _contextExpandLinksMode), QClipboard::FindBuffer);
+			QApplication::clipboard()->setText(_text.originalText(selection, _contextExpandLinksMode),
+			                                   QClipboard::FindBuffer);
 		}
 #endif // Q_OS_MAC
 	}
@@ -420,8 +429,9 @@ void FlatLabel::contextMenuEvent(QContextMenuEvent *e) {
 }
 
 bool FlatLabel::event(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return true;
@@ -448,41 +458,41 @@ void FlatLabel::touchEvent(QTouchEvent *e) {
 
 	switch (e->type()) {
 	case QEvent::TouchBegin:
-	if (_contextMenu) {
-		e->accept();
-		return; // ignore mouse press, that was hiding context menu
-	}
-	if (_touchInProgress) return;
-	if (e->touchPoints().isEmpty()) return;
+		if (_contextMenu) {
+			e->accept();
+			return; // ignore mouse press, that was hiding context menu
+		}
+		if (_touchInProgress) return;
+		if (e->touchPoints().isEmpty()) return;
 
-	_touchInProgress = true;
-	_touchSelectTimer.start(QApplication::startDragTime());
-	_touchSelect = false;
-	_touchStart = _touchPrevPos = _touchPos;
-	break;
+		_touchInProgress = true;
+		_touchSelectTimer.start(QApplication::startDragTime());
+		_touchSelect = false;
+		_touchStart = _touchPrevPos = _touchPos;
+		break;
 
 	case QEvent::TouchUpdate:
-	if (!_touchInProgress) return;
-	if (_touchSelect) {
-		_lastMousePos = _touchPos;
-		dragActionUpdate();
-	}
-	break;
+		if (!_touchInProgress) return;
+		if (_touchSelect) {
+			_lastMousePos = _touchPos;
+			dragActionUpdate();
+		}
+		break;
 
 	case QEvent::TouchEnd:
-	if (!_touchInProgress) return;
-	_touchInProgress = false;
-	if (_touchSelect) {
-		dragActionFinish(_touchPos, Qt::RightButton);
-		QContextMenuEvent contextMenu(QContextMenuEvent::Mouse, mapFromGlobal(_touchPos), _touchPos);
-		showContextMenu(&contextMenu, ContextMenuReason::FromTouch);
-	} else { // one short tap -- like mouse click
-		dragActionStart(_touchPos, Qt::LeftButton);
-		dragActionFinish(_touchPos, Qt::LeftButton);
-	}
-	_touchSelectTimer.stop();
-	_touchSelect = false;
-	break;
+		if (!_touchInProgress) return;
+		_touchInProgress = false;
+		if (_touchSelect) {
+			dragActionFinish(_touchPos, Qt::RightButton);
+			QContextMenuEvent contextMenu(QContextMenuEvent::Mouse, mapFromGlobal(_touchPos), _touchPos);
+			showContextMenu(&contextMenu, ContextMenuReason::FromTouch);
+		} else { // one short tap -- like mouse click
+			dragActionStart(_touchPos, Qt::LeftButton);
+			dragActionFinish(_touchPos, Qt::LeftButton);
+		}
+		_touchSelectTimer.stop();
+		_touchSelect = false;
+		break;
 	}
 }
 
@@ -518,7 +528,8 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
 		_contextMenu->addAction(_contextCopyText, this, SLOT(onCopyContextText()))->setEnabled(true);
 	}
 
-	QString linkCopyToClipboardText = _contextMenuClickHandler ? _contextMenuClickHandler->copyToClipboardContextItemText() : QString();
+	QString linkCopyToClipboardText =
+	    _contextMenuClickHandler ? _contextMenuClickHandler->copyToClipboardContextItemText() : QString();
 	if (!linkCopyToClipboardText.isEmpty()) {
 		_contextMenu->addAction(linkCopyToClipboardText, this, SLOT(onCopyContextUrl()))->setEnabled(true);
 	}
@@ -527,7 +538,7 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
 		delete _contextMenu;
 		_contextMenu = nullptr;
 	} else {
-		connect(_contextMenu, SIGNAL(destroyed(QObject*)), this, SLOT(onContextMenuDestroy(QObject*)));
+		connect(_contextMenu, SIGNAL(destroyed(QObject *)), this, SLOT(onContextMenuDestroy(QObject *)));
 		_contextMenu->popup(e->globalPos());
 		e->accept();
 	}
@@ -541,7 +552,7 @@ void FlatLabel::onCopySelectedText() {
 }
 
 void FlatLabel::onCopyContextText() {
-	QApplication::clipboard()->setText(_text.originalText({ 0, 0xFFFF }, _contextExpandLinksMode));
+	QApplication::clipboard()->setText(_text.originalText({0, 0xFFFF}, _contextExpandLinksMode));
 }
 
 void FlatLabel::onCopyContextUrl() {
@@ -599,7 +610,8 @@ void FlatLabel::clickHandlerPressedChanged(const ClickHandlerPtr &action, bool a
 	update();
 }
 
-std::unique_ptr<CrossFadeAnimation> FlatLabel::CrossFade(FlatLabel *from, FlatLabel *to, style::color bg, QPoint fromPosition, QPoint toPosition) {
+std::unique_ptr<CrossFadeAnimation> FlatLabel::CrossFade(FlatLabel *from, FlatLabel *to, style::color bg,
+                                                         QPoint fromPosition, QPoint toPosition) {
 	auto result = std::make_unique<CrossFadeAnimation>(bg);
 
 	struct Data {
@@ -646,7 +658,9 @@ std::unique_ptr<CrossFadeAnimation> FlatLabel::CrossFade(FlatLabel *from, FlatLa
 		} else if (label->_st.align & Qt::AlignRight) {
 			left += (fullWidth - lineWidth);
 		}
-		auto snapshotRect = data.full.rect().intersected(QRect(left * cIntRetinaFactor(), top * cIntRetinaFactor(), lineWidth * cIntRetinaFactor(), label->_st.style.font->height * cIntRetinaFactor()));
+		auto snapshotRect = data.full.rect().intersected(QRect(left * cIntRetinaFactor(), top * cIntRetinaFactor(),
+		                                                       lineWidth * cIntRetinaFactor(),
+		                                                       label->_st.style.font->height * cIntRetinaFactor()));
 		if (!snapshotRect.isEmpty()) {
 			result.snapshot = App::pixmapFromImageInPlace(data.full.copy(snapshotRect));
 			result.snapshot.setDevicePixelRatio(cRetinaFactor());
@@ -696,10 +710,11 @@ void FlatLabel::updateHover(const Text::StateResult &state) {
 			if (state.afterSymbol && _selectionType == TextSelectType::Letters) {
 				++second;
 			}
-			auto selection = _text.adjustSelection({ std::min(second, _dragSymbol), std::max(second, _dragSymbol) }, _selectionType);
+			auto selection =
+			    _text.adjustSelection({std::min(second, _dragSymbol), std::max(second, _dragSymbol)}, _selectionType);
 			if (_selection != selection) {
 				_selection = selection;
-				_savedSelection = { 0, 0 };
+				_savedSelection = {0, 0};
 				setFocus();
 				update();
 			}
@@ -781,9 +796,11 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 	if (renderElided) {
 		auto lineHeight = std::max(_st.style.lineHeight, _st.style.font->height);
 		auto lines = _st.maxHeight ? std::max(_st.maxHeight / lineHeight, 1) : ((height() / lineHeight) + 2);
-		_text.drawElided(p, _st.margin.left(), _st.margin.top(), textWidth, lines, _st.align, e->rect().y(), e->rect().bottom(), 0, _breakEverywhere, selection);
+		_text.drawElided(p, _st.margin.left(), _st.margin.top(), textWidth, lines, _st.align, e->rect().y(),
+		                 e->rect().bottom(), 0, _breakEverywhere, selection);
 	} else {
-		_text.draw(p, _st.margin.left(), _st.margin.top(), textWidth, _st.align, e->rect().y(), e->rect().bottom(), selection);
+		_text.draw(p, _st.margin.left(), _st.margin.top(), textWidth, _st.align, e->rect().y(), e->rect().bottom(),
+		           selection);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/widgets/labels.h b/Telegram/SourceFiles/ui/widgets/labels.h
index 2e25486cd..facb1b13b 100644
--- a/Telegram/SourceFiles/ui/widgets/labels.h
+++ b/Telegram/SourceFiles/ui/widgets/labels.h
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QTouchEvent>
+#include "core/click_handler.h"
 #include "styles/style_widgets.h"
-#include "ui/twidget.h"
 #include "ui/animation.h"
 #include "ui/text/text.h"
 #include "ui/text/text_entity.h"
-#include "core/click_handler.h"
+#include "ui/twidget.h"
+#include <QTouchEvent>
 
 namespace Ui {
 
@@ -51,8 +51,9 @@ public:
 
 private:
 	struct Line {
-		Line(Part was, Part now) : was(std::move(was)), now(std::move(now)) {
-		}
+		Line(Part was, Part now)
+		    : was(std::move(was))
+		    , now(std::move(now)) {}
 		Part was;
 		Part now;
 	};
@@ -60,12 +61,12 @@ private:
 
 	style::color _bg;
 	QList<Line> _lines;
-
 };
 
 class LabelSimple : public TWidget {
 public:
-	LabelSimple(QWidget *parent, const style::LabelSimple &st = st::defaultLabelSimple, const QString &value = QString());
+	LabelSimple(QWidget *parent, const style::LabelSimple &st = st::defaultLabelSimple,
+	            const QString &value = QString());
 
 	// This method also resizes the label.
 	void setText(const QString &newText, bool *outTextChanged = nullptr);
@@ -81,7 +82,6 @@ private:
 	int _textWidth;
 
 	const style::LabelSimple &_st;
-
 };
 
 class FlatLabel : public TWidget, public ClickHandlerHost {
@@ -94,7 +94,8 @@ public:
 		Simple,
 		Rich,
 	};
-	FlatLabel(QWidget *parent, const QString &text, InitType initType, const style::FlatLabel &st = st::defaultFlatLabel);
+	FlatLabel(QWidget *parent, const QString &text, InitType initType,
+	          const style::FlatLabel &st = st::defaultFlatLabel);
 
 	void setOpacity(double o);
 
@@ -111,14 +112,15 @@ public:
 
 	void setLink(quint16 lnkIndex, const ClickHandlerPtr &lnk);
 
-	using ClickHandlerHook = base::lambda<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
+	using ClickHandlerHook = base::lambda<bool(const ClickHandlerPtr &, Qt::MouseButton)>;
 	void setClickHandlerHook(ClickHandlerHook &&hook);
 
 	// ClickHandlerHost interface
 	void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;
 	void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override;
 
-	static std::unique_ptr<CrossFadeAnimation> CrossFade(FlatLabel *from, FlatLabel *to, style::color bg, QPoint fromPosition = QPoint(), QPoint toPosition = QPoint());
+	static std::unique_ptr<CrossFadeAnimation> CrossFade(FlatLabel *from, FlatLabel *to, style::color bg,
+	                                                     QPoint fromPosition = QPoint(), QPoint toPosition = QPoint());
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -210,7 +212,6 @@ private:
 	bool _touchInProgress = false;
 	QPoint _touchStart, _touchPrevPos, _touchPos;
 	QTimer _touchSelectTimer;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/menu.cpp b/Telegram/SourceFiles/ui/widgets/menu.cpp
index f3314b3ad..9c8d2eded 100644
--- a/Telegram/SourceFiles/ui/widgets/menu.cpp
+++ b/Telegram/SourceFiles/ui/widgets/menu.cpp
@@ -20,25 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/effects/ripple_animation.h"
 #include "ui/widgets/checkbox.h"
 
-#include <qevent.h>
 #include <QAction>
+#include <qevent.h>
 
 namespace Ui {
 
 Menu::ActionData::~ActionData() = default;
 
-Menu::Menu(QWidget *parent, const style::Menu &st) : TWidget(parent)
-, _st(st)
-, _itemHeight(_st.itemPadding.top() + _st.itemFont->height + _st.itemPadding.bottom())
-, _separatorHeight(_st.separatorPadding.top() + _st.separatorWidth + _st.separatorPadding.bottom()) {
+Menu::Menu(QWidget *parent, const style::Menu &st)
+    : TWidget(parent)
+    , _st(st)
+    , _itemHeight(_st.itemPadding.top() + _st.itemFont->height + _st.itemPadding.bottom())
+    , _separatorHeight(_st.separatorPadding.top() + _st.separatorWidth + _st.separatorPadding.bottom()) {
 	init();
 }
 
-Menu::Menu(QWidget *parent, QMenu *menu, const style::Menu &st) : TWidget(parent)
-, _st(st)
-, _wappedMenu(menu)
-, _itemHeight(_st.itemPadding.top() + _st.itemFont->height + _st.itemPadding.bottom())
-, _separatorHeight(_st.separatorPadding.top() + _st.separatorWidth + _st.separatorPadding.bottom()) {
+Menu::Menu(QWidget *parent, QMenu *menu, const style::Menu &st)
+    : TWidget(parent)
+    , _st(st)
+    , _wappedMenu(menu)
+    , _itemHeight(_st.itemPadding.top() + _st.itemFont->height + _st.itemPadding.bottom())
+    , _separatorHeight(_st.separatorPadding.top() + _st.separatorWidth + _st.separatorPadding.bottom()) {
 	init();
 
 	_wappedMenu->setParent(this);
@@ -56,13 +58,15 @@ void Menu::init() {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 }
 
-QAction *Menu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
+QAction *Menu::addAction(const QString &text, const QObject *receiver, const char *member, const style::icon *icon,
+                         const style::icon *iconOver) {
 	auto action = addAction(new QAction(text, this), icon, iconOver);
 	connect(action, SIGNAL(triggered(bool)), receiver, member, Qt::QueuedConnection);
 	return action;
 }
 
-QAction *Menu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon, const style::icon *iconOver) {
+QAction *Menu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon,
+                         const style::icon *iconOver) {
 	auto action = addAction(new QAction(text, this), icon, iconOver);
 	connect(action, &QAction::triggered, action, std::move(callback), Qt::QueuedConnection);
 	return action;
@@ -212,7 +216,9 @@ void Menu::paintEvent(QPaintEvent *e) {
 		if (clip.top() < top) {
 			if (action->isSeparator()) {
 				p.fillRect(0, 0, width(), actionHeight, _st.itemBg);
-				p.fillRect(_st.separatorPadding.left(), _st.separatorPadding.top(), width() - _st.separatorPadding.left() - _st.separatorPadding.right(), _st.separatorWidth, _st.separatorFg);
+				p.fillRect(_st.separatorPadding.left(), _st.separatorPadding.top(),
+				           width() - _st.separatorPadding.left() - _st.separatorPadding.right(), _st.separatorWidth,
+				           _st.separatorFg);
 			} else {
 				auto enabled = action->isEnabled();
 				auto selected = ((i == _selected || i == _pressed) && enabled);
@@ -229,13 +235,16 @@ void Menu::paintEvent(QPaintEvent *e) {
 				p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
 				p.drawTextLeft(_st.itemPadding.left(), _st.itemPadding.top(), width(), data.text);
 				if (data.hasSubmenu) {
-					_st.arrow.paint(p, width() - _st.itemPadding.right() - _st.arrow.width(), (_itemHeight - _st.arrow.height()) / 2, width());
+					_st.arrow.paint(p, width() - _st.itemPadding.right() - _st.arrow.width(),
+					                (_itemHeight - _st.arrow.height()) / 2, width());
 				} else if (!data.shortcut.isEmpty()) {
-					p.setPen(selected ? _st.itemFgShortcutOver : (enabled ? _st.itemFgShortcut : _st.itemFgShortcutDisabled));
+					p.setPen(selected ? _st.itemFgShortcutOver :
+					                    (enabled ? _st.itemFgShortcut : _st.itemFgShortcutDisabled));
 					p.drawTextRight(_st.itemPadding.right(), _st.itemPadding.top(), width(), data.shortcut);
 				} else if (data.toggle) {
 					auto toggleSize = data.toggle->getSize();
-					data.toggle->paint(p, width() - _st.itemPadding.right() - toggleSize.width() + _st.itemToggleShift, (_itemHeight - toggleSize.height()) / 2, width(), ms);
+					data.toggle->paint(p, width() - _st.itemPadding.right() - toggleSize.width() + _st.itemToggleShift,
+					                   (_itemHeight - toggleSize.height()) / 2, width(), ms);
 				}
 			}
 		}
@@ -251,7 +260,10 @@ void Menu::updateSelected(QPoint globalPosition) {
 	while (top <= p.y() && ++selected < _actions.size()) {
 		top += _actions[selected]->isSeparator() ? _separatorHeight : _itemHeight;
 	}
-	setSelected((selected >= 0 && selected < _actions.size() && _actions[selected]->isEnabled() && !_actions[selected]->isSeparator()) ? selected : -1);
+	setSelected((selected >= 0 && selected < _actions.size() && _actions[selected]->isEnabled() &&
+	             !_actions[selected]->isSeparator()) ?
+	                selected :
+	                -1);
 }
 
 void Menu::itemPressed(TriggeredSource source) {
@@ -263,9 +275,8 @@ void Menu::itemPressed(TriggeredSource source) {
 		if (source == TriggeredSource::Mouse) {
 			if (!_actionsData[_pressed].ripple) {
 				auto mask = RippleAnimation::rectMask(QSize(width(), _itemHeight));
-				_actionsData[_pressed].ripple = std::make_unique<RippleAnimation>(_st.ripple, std::move(mask), [this, selected = _pressed] {
-					updateItem(selected);
-				});
+				_actionsData[_pressed].ripple = std::make_unique<RippleAnimation>(
+				    _st.ripple, std::move(mask), [this, selected = _pressed] { updateItem(selected); });
 			}
 			_actionsData[_pressed].ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(0, itemTop(_pressed)));
 		} else {
diff --git a/Telegram/SourceFiles/ui/widgets/menu.h b/Telegram/SourceFiles/ui/widgets/menu.h
index e56634a8e..df1bfec4b 100644
--- a/Telegram/SourceFiles/ui/widgets/menu.h
+++ b/Telegram/SourceFiles/ui/widgets/menu.h
@@ -23,10 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "base/lambda.h"
 #include "styles/style_widgets.h"
 
-#include <QMenu>
-#include <QList>
-#include <qevent.h>
 #include "ui/twidget.h"
+#include <QList>
+#include <QMenu>
+#include <qevent.h>
 
 namespace Ui {
 
@@ -40,8 +40,10 @@ public:
 	Menu(QWidget *parent, const style::Menu &st = st::defaultMenu);
 	Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu);
 
-	QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
-	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, const QObject *receiver, const char *member,
+	                   const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr,
+	                   const style::icon *iconOver = nullptr);
 	QAction *addSeparator();
 	void clearActions();
 	void finishAnimations();
@@ -58,7 +60,7 @@ public:
 	void setShowSource(TriggeredSource source);
 	void setForceWidth(int forceWidth);
 
-	using Actions = QList<QAction*>;
+	using Actions = QList<QAction *>;
 	Actions &actions();
 
 	void setResizedCallback(base::lambda<void()> callback) {
@@ -161,7 +163,6 @@ private:
 	int _selected = -1;
 	int _pressed = -1;
 	bool _childShown = false;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index f328f82b0..21b3cf215 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/multi_select.h"
 
+#include "app.h"
+#include "lang/lang_keys.h"
+#include "layout.h"
 #include "styles/style_widgets.h"
+#include "ui/effects/cross_animation.h"
+#include "ui/twidget.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/effects/cross_animation.h"
-#include "lang/lang_keys.h"
-#include "ui/twidget.h"
-#include "layout.h"
-#include "app.h"
 
 namespace Ui {
 namespace {
@@ -37,11 +37,12 @@ constexpr int kWideScale = 3;
 
 } // namespace
 
-MultiSelect::Item::Item(const style::MultiSelectItem &st, quint64 id, const QString &text, style::color color, PaintRoundImage &&paintRoundImage)
-: _st(st)
-, _id(id)
-, _color(color)
-, _paintRoundImage(std::move(paintRoundImage)) {
+MultiSelect::Item::Item(const style::MultiSelectItem &st, quint64 id, const QString &text, style::color color,
+                        PaintRoundImage &&paintRoundImage)
+    : _st(st)
+    , _id(id)
+    , _color(color)
+    , _paintRoundImage(std::move(paintRoundImage)) {
 	setText(text);
 }
 
@@ -184,9 +185,11 @@ void MultiSelect::Item::setPosition(int x, int y, int outerWidth, int maxVisible
 				auto copy = SlideAnimation(_updateCallback, _x, x, _y, _st.duration);
 				_copies.push_back(std::move(copy));
 			} else {
-				auto copyHiding = SlideAnimation(_updateCallback, _x, (y > _y) ? rightHidden : leftHidden, _y, _st.duration);
+				auto copyHiding =
+				    SlideAnimation(_updateCallback, _x, (y > _y) ? rightHidden : leftHidden, _y, _st.duration);
 				_copies.push_back(std::move(copyHiding));
-				auto copyShowing = SlideAnimation(_updateCallback, (y > _y) ? leftHidden : rightHidden, x, y, _st.duration);
+				auto copyShowing =
+				    SlideAnimation(_updateCallback, (y > _y) ? leftHidden : rightHidden, x, y, _st.duration);
 				_copies.push_back(std::move(copyShowing));
 			}
 		} else if (!found) {
@@ -225,7 +228,7 @@ void MultiSelect::Item::prepareCache() {
 	data.setDevicePixelRatio(cRetinaFactor());
 	{
 		Painter p(&data);
-		paintOnce(p, _width * (kWideScale - 1) / 2, _st.height  * (kWideScale - 1) / 2, cacheWidth, getms());
+		paintOnce(p, _width * (kWideScale - 1) / 2, _st.height * (kWideScale - 1) / 2, cacheWidth, getms());
 	}
 	_cache = App::pixmapFromImageInPlace(std::move(data));
 }
@@ -246,12 +249,13 @@ void MultiSelect::Item::setOver(bool over) {
 	}
 }
 
-MultiSelect::MultiSelect(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholderFactory) : TWidget(parent)
-, _st(st)
-, _scroll(this, _st.scroll) {
-	_inner = _scroll->setOwnedWidget(object_ptr<Inner>(this, st, std::move(placeholderFactory), [this](int activeTop, int activeBottom) {
-		scrollTo(activeTop, activeBottom);
-	}));
+MultiSelect::MultiSelect(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholderFactory)
+    : TWidget(parent)
+    , _st(st)
+    , _scroll(this, _st.scroll) {
+	_inner = _scroll->setOwnedWidget(
+	    object_ptr<Inner>(this, st, std::move(placeholderFactory),
+	                      [this](int activeTop, int activeBottom) { scrollTo(activeTop, activeBottom); }));
 	_scroll->installEventFilter(this);
 	_inner->setResizedCallback([this](int innerHeightDelta) {
 		auto newHeight = resizeGetHeight(width());
@@ -322,12 +326,14 @@ QString MultiSelect::getQuery() const {
 	return _inner->getQuery();
 }
 
-void MultiSelect::addItem(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage, AddItemWay way) {
+void MultiSelect::addItem(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage,
+                          AddItemWay way) {
 	addItemInBunch(itemId, text, color, std::move(paintRoundImage));
 	_inner->finishItemsBunch(way);
 }
 
-void MultiSelect::addItemInBunch(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage) {
+void MultiSelect::addItemInBunch(quint64 itemId, const QString &text, style::color color,
+                                 PaintRoundImage paintRoundImage) {
 	_inner->addItemInBunch(std::make_unique<Item>(_st.item, itemId, text, color, std::move(paintRoundImage)));
 }
 
@@ -364,11 +370,13 @@ int MultiSelect::resizeGetHeight(int newWidth) {
 	return newHeight;
 }
 
-MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholder, ScrollCallback callback) : TWidget(parent)
-, _st(st)
-, _scrollCallback(std::move(callback))
-, _field(this, _st.field, std::move(placeholder))
-, _cancel(this, _st.fieldCancel) {
+MultiSelect::Inner::Inner(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholder,
+                          ScrollCallback callback)
+    : TWidget(parent)
+    , _st(st)
+    , _scrollCallback(std::move(callback))
+    , _field(this, _st.field, std::move(placeholder))
+    , _cancel(this, _st.fieldCancel) {
 	_field->customUpDown(true);
 	connect(_field, SIGNAL(focused()), this, SLOT(onFieldFocused()));
 	connect(_field, SIGNAL(changed()), this, SLOT(onQueryChanged()));
@@ -431,9 +439,9 @@ void MultiSelect::Inner::updateFieldGeometry() {
 void MultiSelect::Inner::updateHasAnyItems(bool hasAnyItems) {
 	_field->setPlaceholderHidden(hasAnyItems);
 	updateCursor();
-	_iconOpacity.start([this] {
-		rtlupdate(_st.padding.left(), _st.padding.top(), _st.fieldIcon.width(), _st.fieldIcon.height());
-	}, hasAnyItems ? 1. : 0., hasAnyItems ? 0. : 1., _st.item.duration);
+	_iconOpacity.start(
+	    [this] { rtlupdate(_st.padding.left(), _st.padding.top(), _st.fieldIcon.width(), _st.fieldIcon.height()); },
+	    hasAnyItems ? 1. : 0., hasAnyItems ? 0. : 1., _st.item.duration);
 }
 
 void MultiSelect::Inner::updateCursor() {
@@ -456,7 +464,8 @@ void MultiSelect::Inner::setActiveItem(int active, ChangeActiveWay skipSetFocus)
 		setInnerFocus();
 	}
 	if (_scrollCallback) {
-		auto rect = (_active >= 0) ? _items[_active]->rect() : _field->geometry().translated(-_st.padding.left(), -_st.padding.top());
+		auto rect = (_active >= 0) ? _items[_active]->rect() :
+		                             _field->geometry().translated(-_st.padding.left(), -_st.padding.top());
 		_scrollCallback(rect.y(), rect.y() + rect.height() + _st.padding.top() + _st.padding.bottom());
 	}
 	update();
@@ -540,10 +549,10 @@ void MultiSelect::Inner::paintEvent(QPaintEvent *e) {
 
 QMargins MultiSelect::Inner::itemPaintMargins() const {
 	return {
-		std::max(_st.itemSkip, _st.padding.left()),
-		_st.itemSkip,
-		std::max(_st.itemSkip, _st.padding.right()),
-		_st.itemSkip,
+	    std::max(_st.itemSkip, _st.padding.left()),
+	    _st.itemSkip,
+	    std::max(_st.itemSkip, _st.padding.right()),
+	    _st.itemSkip,
 	};
 }
 
@@ -770,9 +779,7 @@ int MultiSelect::Inner::getItemsCount() const {
 QVector<quint64> MultiSelect::Inner::getItems() const {
 	auto result = QVector<quint64>();
 	result.reserve(_items.size());
-	for_const (auto &item, _items) {
-		result.push_back(item->id());
-	}
+	for_const (auto &item, _items) { result.push_back(item->id()); }
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.h b/Telegram/SourceFiles/ui/widgets/multi_select.h
index 85e9de970..2e95b6856 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.h
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.h
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "styles/style_widgets.h"
 #include "base/lambda.h"
 #include "base/object_ptr.h"
+#include "styles/style_widgets.h"
 #include "ui/twidget.h"
 
-#include <QPointer>
 #include "ui/animation.h"
 #include "ui/text/text.h"
+#include <QPointer>
 
 class QPaintEvent;
 class QMouseEvent;
@@ -41,7 +41,8 @@ class ScrollArea;
 
 class MultiSelect : public TWidget {
 public:
-	MultiSelect(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholderFactory = base::lambda<QString()>());
+	MultiSelect(QWidget *parent, const style::MultiSelect &st,
+	            base::lambda<QString()> placeholderFactory = base::lambda<QString()>());
 
 	QString getQuery() const;
 	void setInnerFocus();
@@ -56,7 +57,8 @@ public:
 		SkipAnimation,
 	};
 	using PaintRoundImage = base::lambda<void(Painter &p, int x, int y, int outerWidth, int size)>;
-	void addItem(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage, AddItemWay way = AddItemWay::Default);
+	void addItem(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage,
+	             AddItemWay way = AddItemWay::Default);
 	void addItemInBunch(quint64 itemId, const QString &text, style::color color, PaintRoundImage paintRoundImage);
 	void finishItemsBunch();
 	void setItemText(quint64 itemId, const QString &text);
@@ -86,7 +88,6 @@ private:
 
 	base::lambda<void()> _resizedCallback;
 	base::lambda<void(const QString &query)> _queryChangedCallback;
-
 };
 
 // This class is hold in header because it requires Qt preprocessing.
@@ -95,7 +96,8 @@ class MultiSelect::Inner : public TWidget {
 
 public:
 	using ScrollCallback = base::lambda<void(int activeTop, int activeBottom)>;
-	Inner(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholderFactory, ScrollCallback callback);
+	Inner(QWidget *parent, const style::MultiSelect &st, base::lambda<QString()> placeholderFactory,
+	      ScrollCallback callback);
 
 	QString getQuery() const;
 	bool setInnerFocus();
@@ -185,13 +187,13 @@ private:
 	base::lambda<void(bool ctrlShiftEnter)> _submittedCallback;
 	base::lambda<void(quint64 itemId)> _itemRemovedCallback;
 	base::lambda<void(int heightDelta)> _resizedCallback;
-
 };
 
 
 class MultiSelect::Item {
 public:
-	Item(const style::MultiSelectItem &st, quint64 id, const QString &text, style::color color, PaintRoundImage &&paintRoundImage);
+	Item(const style::MultiSelectItem &st, quint64 id, const QString &text, style::color color,
+	     PaintRoundImage &&paintRoundImage);
 
 	quint64 id() const {
 		return _id;
@@ -244,9 +246,9 @@ private:
 	quint64 _id;
 	struct SlideAnimation {
 		SlideAnimation(base::lambda<void()> updateCallback, int fromX, int toX, int y, double duration)
-			: fromX(fromX)
-			, toX(toX)
-			, y(y) {
+		    : fromX(fromX)
+		    , toX(toX)
+		    , y(y) {
 			x.start(updateCallback, fromX, toX, duration);
 		}
 		Animation x;
@@ -268,7 +270,6 @@ private:
 	PaintRoundImage _paintRoundImage;
 	base::lambda<void()> _updateCallback;
 	bool _hiding = false;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
index 04e7a2171..2ebf7f069 100644
--- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
+++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
@@ -17,27 +17,29 @@
  */
 #include "ui/widgets/popup_menu.h"
 
-#include "ui/widgets/shadow.h"
-#include "platform/platform_specific.h"
-#include "application.h"
-#include "mainwindow.h"
-#include "lang/lang_keys.h"
 #include "app.h"
+#include "application.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "platform/platform_specific.h"
 #include "ui/effects/panel_animation.h"
+#include "ui/widgets/shadow.h"
 
 #include <QWindow>
 
 namespace Ui {
 
-PopupMenu::PopupMenu(QWidget*, const style::PopupMenu &st) : TWidget(nullptr)
-, _st(st)
-, _menu(this, _st.menu) {
+PopupMenu::PopupMenu(QWidget *, const style::PopupMenu &st)
+    : TWidget(nullptr)
+    , _st(st)
+    , _menu(this, _st.menu) {
 	init();
 }
 
-PopupMenu::PopupMenu(QWidget*, QMenu *menu, const style::PopupMenu &st) : TWidget(nullptr)
-, _st(st)
-, _menu(this, menu, _st.menu) {
+PopupMenu::PopupMenu(QWidget *, QMenu *menu, const style::PopupMenu &st)
+    : TWidget(nullptr)
+    , _st(st)
+    , _menu(this, menu, _st.menu) {
 	init();
 
 	for (auto action : actions()) {
@@ -50,12 +52,10 @@ PopupMenu::PopupMenu(QWidget*, QMenu *menu, const style::PopupMenu &st) : TWidge
 
 void PopupMenu::init() {
 	_menu->setResizedCallback([this] { handleMenuResize(); });
-	_menu->setActivatedCallback([this](QAction *action, int actionTop, TriggeredSource source) {
-		handleActivated(action, actionTop, source);
-	});
-	_menu->setTriggeredCallback([this](QAction *action, int actionTop, TriggeredSource source) {
-		handleTriggered(action, actionTop, source);
-	});
+	_menu->setActivatedCallback(
+	    [this](QAction *action, int actionTop, TriggeredSource source) { handleActivated(action, actionTop, source); });
+	_menu->setTriggeredCallback(
+	    [this](QAction *action, int actionTop, TriggeredSource source) { handleTriggered(action, actionTop, source); });
 	_menu->setKeyPressDelegate([this](int key) { return handleKeyPress(key); });
 	_menu->setMouseMoveDelegate([this](QPoint globalPosition) { handleMouseMove(globalPosition); });
 	_menu->setMousePressDelegate([this](QPoint globalPosition) { handleMousePress(globalPosition); });
@@ -63,7 +63,8 @@ void PopupMenu::init() {
 
 	handleCompositingUpdate();
 
-	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::BypassWindowManagerHint | Qt::Popup | Qt::NoDropShadowWindowHint);
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::BypassWindowManagerHint | Qt::Popup |
+	               Qt::NoDropShadowWindowHint);
 	setMouseTracking(true);
 
 	hide();
@@ -73,23 +74,28 @@ void PopupMenu::init() {
 }
 
 void PopupMenu::handleCompositingUpdate() {
-	_padding = _useTransparency ? _st.shadow.extend : style::margins(st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth);
+	_padding = _useTransparency ? _st.shadow.extend :
+	                              style::margins(st::lineWidth, st::lineWidth, st::lineWidth, st::lineWidth);
 	_menu->moveToLeft(_padding.left() + _st.scrollPadding.left(), _padding.top() + _st.scrollPadding.top());
 	handleMenuResize();
 }
 
 void PopupMenu::handleMenuResize() {
-	auto newWidth = _padding.left() + _st.scrollPadding.left() + _menu->width() + _st.scrollPadding.right() + _padding.right();
-	auto newHeight = _padding.top() + _st.scrollPadding.top() + _menu->height() + _st.scrollPadding.bottom() + _padding.bottom();
+	auto newWidth =
+	    _padding.left() + _st.scrollPadding.left() + _menu->width() + _st.scrollPadding.right() + _padding.right();
+	auto newHeight =
+	    _padding.top() + _st.scrollPadding.top() + _menu->height() + _st.scrollPadding.bottom() + _padding.bottom();
 	resize(newWidth, newHeight);
 	_inner = rect().marginsRemoved(_padding);
 }
 
-QAction *PopupMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
+QAction *PopupMenu::addAction(const QString &text, const QObject *receiver, const char *member, const style::icon *icon,
+                              const style::icon *iconOver) {
 	return _menu->addAction(text, receiver, member, icon, iconOver);
 }
 
-QAction *PopupMenu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon, const style::icon *iconOver) {
+QAction *PopupMenu::addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon,
+                              const style::icon *iconOver) {
 	return _menu->addAction(text, std::move(callback), icon, iconOver);
 }
 
@@ -141,7 +147,8 @@ void PopupMenu::paintBg(Painter &p) {
 	} else {
 		p.fillRect(0, 0, width() - _padding.right(), _padding.top(), _st.shadow.fallback);
 		p.fillRect(width() - _padding.right(), 0, _padding.right(), height() - _padding.bottom(), _st.shadow.fallback);
-		p.fillRect(_padding.left(), height() - _padding.bottom(), width() - _padding.left(), _padding.bottom(), _st.shadow.fallback);
+		p.fillRect(_padding.left(), height() - _padding.bottom(), width() - _padding.left(), _padding.bottom(),
+		           _st.shadow.fallback);
 		p.fillRect(0, _padding.top(), _padding.left(), height() - _padding.top(), _st.shadow.fallback);
 		p.fillRect(_inner, _st.menu.itemBg);
 	}
@@ -363,7 +370,8 @@ void PopupMenu::startShowAnimation() {
 		_a_opacity = base::take(opacityAnimation);
 
 		_showAnimation = std::make_unique<PanelAnimation>(_st.animation, _origin);
-		_showAnimation->setFinalImage(std::move(cache), QRect(_inner.topLeft() * cIntRetinaFactor(), _inner.size() * cIntRetinaFactor()));
+		_showAnimation->setFinalImage(std::move(cache),
+		                              QRect(_inner.topLeft() * cIntRetinaFactor(), _inner.size() * cIntRetinaFactor()));
 		if (_useTransparency) {
 			auto corners = App::cornersMask(ImageRoundRadius::Small);
 			_showAnimation->setCornerMasks(corners[0], corners[1], corners[2], corners[3]);
@@ -405,7 +413,7 @@ QImage PopupMenu::grabForPanelAnimation() {
 			p.fillRect(_inner, _st.menu.itemBg);
 		}
 		for (auto child : children()) {
-			if (auto widget = qobject_cast<QWidget*>(child)) {
+			if (auto widget = qobject_cast<QWidget *>(child)) {
 				widget->render(&p, widget->pos(), widget->rect(), QWidget::DrawChildren | QWidget::IgnoreMask);
 			}
 		}
@@ -432,7 +440,8 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 	handleCompositingUpdate();
 	if (rtl()) {
 		if (w.x() - width() < r.x() - _padding.left()) {
-			if (_parent && w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= r.x() + r.width()) {
+			if (_parent && w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <=
+			                   r.x() + r.width()) {
 				w.setX(w.x() + _parent->width() - _padding.left() - _padding.right());
 			} else {
 				w.setX(r.x() - _padding.left());
@@ -442,8 +451,10 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 		}
 	} else {
 		if (w.x() + width() - _padding.right() > r.x() + r.width()) {
-			if (_parent && w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= r.x() - _padding.left()) {
-				w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() + _padding.right());
+			if (_parent && w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >=
+			                   r.x() - _padding.left()) {
+				w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() +
+				       _padding.right());
 			} else {
 				w.setX(p.x() - width() + _padding.right());
 			}
@@ -455,7 +466,8 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 			w.setY(r.y() + r.height() - height() + _padding.bottom());
 		} else {
 			w.setY(p.y() - height() + _padding.bottom());
-			origin = (origin == PanelAnimation::Origin::TopRight) ? PanelAnimation::Origin::BottomRight : PanelAnimation::Origin::BottomLeft;
+			origin = (origin == PanelAnimation::Origin::TopRight) ? PanelAnimation::Origin::BottomRight :
+			                                                        PanelAnimation::Origin::BottomLeft;
 		}
 	}
 	if (w.x() < r.x()) {
diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.h b/Telegram/SourceFiles/ui/widgets/popup_menu.h
index c426690c9..c17e645c8 100644
--- a/Telegram/SourceFiles/ui/widgets/popup_menu.h
+++ b/Telegram/SourceFiles/ui/widgets/popup_menu.h
@@ -17,22 +17,24 @@
  */
 #pragma once
 
-#include "styles/style_widgets.h"
-#include "ui/widgets/menu.h"
-#include "ui/effects/panel_animation.h"
-#include "ui/animation.h"
-#include "qevent.h"
 #include "base/lambda.h"
+#include "qevent.h"
+#include "styles/style_widgets.h"
+#include "ui/animation.h"
+#include "ui/effects/panel_animation.h"
+#include "ui/widgets/menu.h"
 
 namespace Ui {
 
 class PopupMenu : public TWidget {
 public:
-	PopupMenu(QWidget*, const style::PopupMenu &st = st::defaultPopupMenu);
-	PopupMenu(QWidget*, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
+	PopupMenu(QWidget *, const style::PopupMenu &st = st::defaultPopupMenu);
+	PopupMenu(QWidget *, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
 
-	QAction *addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
-	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, const QObject *receiver, const char *member,
+	                   const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
+	QAction *addAction(const QString &text, base::lambda<void()> callback, const style::icon *icon = nullptr,
+	                   const style::icon *iconOver = nullptr);
 	QAction *addSeparator();
 	void clearActions();
 
@@ -114,7 +116,7 @@ private:
 
 	object_ptr<Ui::Menu> _menu;
 
-	using Submenus = QMap<QAction*, SubmenuPointer>;
+	using Submenus = QMap<QAction *, SubmenuPointer>;
 	Submenus _submenus;
 
 	PopupMenu *_parent = nullptr;
@@ -138,7 +140,6 @@ private:
 	bool _deleteLater = false;
 
 	base::lambda<void()> _destroyedCallback;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp
index 28471bf80..0ee249b10 100644
--- a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp
+++ b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp
@@ -20,16 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "ui/widgets/scroll_area.h"
 
-#include <QPoint>
-#include <QWindow>
-#include <QScrollBar>
 #include <QApplication>
+#include <QPoint>
+#include <QScrollBar>
+#include <QWindow>
 
 namespace Ui {
 
 // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
 
-ScrollShadow::ScrollShadow(ScrollArea *parent, const style::ScrollArea *st) : QWidget(parent), _st(st) {
+ScrollShadow::ScrollShadow(ScrollArea *parent, const style::ScrollArea *st)
+    : QWidget(parent)
+    , _st(st) {
 	setVisible(false);
 	Assert(_st != nullptr);
 	Assert(_st->shColor.v() != nullptr);
@@ -44,12 +46,13 @@ void ScrollShadow::changeVisibility(bool shown) {
 	setVisible(shown);
 }
 
-ScrollBar::ScrollBar(ScrollArea *parent, bool vert, const style::ScrollArea *st) : TWidget(parent)
-, _st(st)
-, _vertical(vert)
-, _hiding(_st->hiding != 0)
-, _connected(vert ? parent->verticalScrollBar() : parent->horizontalScrollBar())
-, _scrollMax(_connected->maximum()) {
+ScrollBar::ScrollBar(ScrollArea *parent, bool vert, const style::ScrollArea *st)
+    : TWidget(parent)
+    , _st(st)
+    , _vertical(vert)
+    , _hiding(_st->hiding != 0)
+    , _connected(vert ? parent->verticalScrollBar() : parent->horizontalScrollBar())
+    , _scrollMax(_connected->maximum()) {
 	recountSize();
 
 	_hideTimer.setSingleShot(true);
@@ -62,7 +65,10 @@ ScrollBar::ScrollBar(ScrollArea *parent, bool vert, const style::ScrollArea *st)
 }
 
 void ScrollBar::recountSize() {
-	setGeometry(_vertical ? QRect(rtl() ? 0 : (area()->width() - _st->width), _st->deltat, _st->width, area()->height() - _st->deltat - _st->deltab) : QRect(_st->deltat, area()->height() - _st->width, area()->width() - _st->deltat - _st->deltab, _st->width));
+	setGeometry(_vertical ? QRect(rtl() ? 0 : (area()->width() - _st->width), _st->deltat, _st->width,
+	                              area()->height() - _st->deltat - _st->deltab) :
+	                        QRect(_st->deltat, area()->height() - _st->width,
+	                              area()->width() - _st->deltat - _st->deltab, _st->width));
 }
 
 void ScrollBar::onValueChanged() {
@@ -115,7 +121,8 @@ void ScrollBar::updateBar(bool force) {
 		update();
 	}
 	if (_vertical) {
-		bool newTopSh = (_st->topsh < 0) || (area()->scrollTop() > _st->topsh), newBottomSh = (_st->bottomsh < 0) || (area()->scrollTop() < area()->scrollTopMax() - _st->bottomsh);
+		bool newTopSh = (_st->topsh < 0) || (area()->scrollTop() > _st->topsh),
+		     newBottomSh = (_st->bottomsh < 0) || (area()->scrollTop() < area()->scrollTopMax() - _st->bottomsh);
 		if (newTopSh != _topSh || force) emit topShadowVisibility(_topSh = newTopSh);
 		if (newBottomSh != _bottomSh || force) emit bottomShadowVisibility(_bottomSh = newBottomSh);
 	}
@@ -130,7 +137,7 @@ void ScrollBar::onHideTimer() {
 }
 
 ScrollArea *ScrollBar::area() {
-	return static_cast<ScrollArea*>(parentWidget());
+	return static_cast<ScrollArea *>(parentWidget());
 }
 
 void ScrollBar::setOver(bool over) {
@@ -198,7 +205,8 @@ void ScrollBar::paintEvent(QPaintEvent *e) {
 	if (_st->round) {
 		PainterHighQualityEnabler hq(p);
 		p.setBrush(bg);
-		p.drawRoundedRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), _st->round, _st->round);
+		p.drawRoundedRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), _st->round,
+		                  _st->round);
 		p.setBrush(bar);
 		p.drawRoundedRect(_bar, _st->round, _st->round);
 	} else {
@@ -241,7 +249,9 @@ void ScrollBar::mouseMoveEvent(QMouseEvent *e) {
 		int delta = 0, barDelta = _vertical ? (area()->height() - _bar.height()) : (area()->width() - _bar.width());
 		if (barDelta > 0) {
 			QPoint d = (e->globalPos() - _dragStart);
-			delta = qint32((_vertical ? (d.y() * qint64(area()->scrollTopMax())) : (d.x() * qint64(area()->scrollLeftMax()))) / barDelta);
+			delta = qint32(
+			    (_vertical ? (d.y() * qint64(area()->scrollTopMax())) : (d.x() * qint64(area()->scrollLeftMax()))) /
+			    barDelta);
 		}
 		_connected->setValue(_startFrom + delta);
 	}
@@ -258,7 +268,8 @@ void ScrollBar::mousePressEvent(QMouseEvent *e) {
 		qint32 val = _vertical ? e->pos().y() : e->pos().x(), div = _vertical ? height() : width();
 		val = (val <= _st->deltat) ? 0 : (val - _st->deltat);
 		div = (div <= _st->deltat + _st->deltab) ? 1 : (div - _st->deltat - _st->deltab);
-		_startFrom = _vertical ? qint32((val * qint64(area()->scrollTopMax())) / div) : ((val * qint64(area()->scrollLeftMax())) / div);
+		_startFrom = _vertical ? qint32((val * qint64(area()->scrollTopMax())) / div) :
+		                         ((val * qint64(area()->scrollLeftMax())) / div);
 		_connected->setValue(_startFrom);
 		setOverBar(true);
 	}
@@ -315,7 +326,7 @@ void SplittedWidget::update(const QRegion &r) {
 
 void SplittedWidgetOther::paintEvent(QPaintEvent *e) {
 	Painter p(this);
-	auto s = static_cast<SplittedWidget*>(static_cast<ScrollArea*>(parentWidget())->widget());
+	auto s = static_cast<SplittedWidget *>(static_cast<ScrollArea *>(parentWidget())->widget());
 	if (rtl()) {
 		s->paintRegion(p, e->region(), true);
 	} else {
@@ -324,13 +335,14 @@ void SplittedWidgetOther::paintEvent(QPaintEvent *e) {
 	}
 }
 
-ScrollArea::ScrollArea(QWidget *parent, const style::ScrollArea &st, bool handleTouch) : TWidgetHelper<QScrollArea>(parent)
-, _st(st)
-, _horizontalBar(this, false, &_st)
-, _verticalBar(this, true, &_st)
-, _topShadow(this, &_st)
-, _bottomShadow(this, &_st)
-, _touchEnabled(handleTouch) {
+ScrollArea::ScrollArea(QWidget *parent, const style::ScrollArea &st, bool handleTouch)
+    : TWidgetHelper<QScrollArea>(parent)
+    , _st(st)
+    , _horizontalBar(this, false, &_st)
+    , _verticalBar(this, true, &_st)
+    , _topShadow(this, &_st)
+    , _bottomShadow(this, &_st)
+    , _touchEnabled(handleTouch) {
 	setLayoutDirection(cLangDir());
 	setFocusPolicy(Qt::NoFocus);
 
@@ -434,7 +446,8 @@ void ScrollArea::onTouchTimer() {
 
 void ScrollArea::onTouchScrollTimer() {
 	auto nowTime = getms();
-	if (_touchScrollState == TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
+	if (_touchScrollState == TouchScrollState::Acceleration && _touchWaitingAcceleration &&
+	    (nowTime - _touchAccelerationTime) > 40) {
 		_touchScrollState = TouchScrollState::Manual;
 		touchResetSpeed();
 	} else if (_touchScrollState == TouchScrollState::Auto || _touchScrollState == TouchScrollState::Acceleration) {
@@ -468,8 +481,9 @@ void ScrollArea::touchUpdateSpeed() {
 			if (_touchScrollState == TouchScrollState::Auto) {
 				const int oldSpeedY = _touchSpeed.y();
 				const int oldSpeedX = _touchSpeed.x();
-				if ((oldSpeedY <= 0 && newSpeedY <= 0) || ((oldSpeedY >= 0 && newSpeedY >= 0)
-					&& (oldSpeedX <= 0 && newSpeedX <= 0)) || (oldSpeedX >= 0 && newSpeedX >= 0)) {
+				if ((oldSpeedY <= 0 && newSpeedY <= 0) ||
+				    ((oldSpeedY >= 0 && newSpeedY >= 0) && (oldSpeedX <= 0 && newSpeedX <= 0)) ||
+				    (oldSpeedX >= 0 && newSpeedX >= 0)) {
 					_touchSpeed.setY(snap((oldSpeedY + (newSpeedY / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 					_touchSpeed.setX(snap((oldSpeedX + (newSpeedX / 4)), -MaxScrollAccelerated, +MaxScrollAccelerated));
 				} else {
@@ -478,8 +492,10 @@ void ScrollArea::touchUpdateSpeed() {
 			} else {
 				// we average the speed to avoid strange effects with the last delta
 				if (!_touchSpeed.isNull()) {
-					_touchSpeed.setX(snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
-					_touchSpeed.setY(snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setX(
+					    snap((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
+					_touchSpeed.setY(
+					    snap((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -MaxScrollFlick, +MaxScrollFlick));
 				} else {
 					_touchSpeed = QPoint(newSpeedX, newSpeedY);
 				}
@@ -499,8 +515,9 @@ void ScrollArea::touchResetSpeed() {
 
 bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
 	bool res = QScrollArea::eventFilter(obj, e);
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) {
 			if (obj == widget()) {
 				touchEvent(ev);
@@ -512,8 +529,9 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
 }
 
 bool ScrollArea::viewportEvent(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
+	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd ||
+	    e->type() == QEvent::TouchCancel) {
+		QTouchEvent *ev = static_cast<QTouchEvent *>(e);
 		if (_touchEnabled && ev->device()->type() == QTouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return true;
@@ -594,7 +612,8 @@ void ScrollArea::touchEvent(QTouchEvent *e) {
 			if (_touchRightButton) {
 				auto windowHandle = window()->windowHandle();
 				auto localPoint = windowHandle->mapFromGlobal(_touchStart);
-				QContextMenuEvent ev(QContextMenuEvent::Mouse, localPoint, _touchStart, QGuiApplication::keyboardModifiers());
+				QContextMenuEvent ev(QContextMenuEvent::Mouse, localPoint, _touchStart,
+				                     QGuiApplication::keyboardModifiers());
 				ev.setTimestamp(getms());
 				QGuiApplication::sendEvent(windowHandle, &ev);
 			}
@@ -647,7 +666,7 @@ void ScrollArea::resizeEvent(QResizeEvent *e) {
 	_verticalBar->recountSize();
 	_topShadow->setGeometry(QRect(0, 0, width(), qAbs(_st.topsh)));
 	_bottomShadow->setGeometry(QRect(0, height() - qAbs(_st.bottomsh), width(), qAbs(_st.bottomsh)));
-	if (SplittedWidget *w = qobject_cast<SplittedWidget*>(widget())) {
+	if (SplittedWidget *w = qobject_cast<SplittedWidget *>(widget())) {
 		w->resize(width() - w->otherWidth(), w->height());
 		if (!rtl()) {
 			_other->move(w->width(), w->y());
@@ -664,8 +683,8 @@ void ScrollArea::moveEvent(QMoveEvent *e) {
 void ScrollArea::keyPressEvent(QKeyEvent *e) {
 	if ((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) && e->modifiers().testFlag(Qt::AltModifier)) {
 		e->ignore();
-	} else if(e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
-		((QObject*)widget())->event(e);
+	} else if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
+		((QObject *)widget())->event(e);
 	} else {
 		QScrollArea::keyPressEvent(e);
 	}
@@ -715,7 +734,7 @@ void ScrollArea::scrollToY(int toTop, int toBottom) {
 }
 
 void ScrollArea::doSetOwnedWidget(object_ptr<TWidget> w) {
-	auto splitted = qobject_cast<SplittedWidget*>(w.data());
+	auto splitted = qobject_cast<SplittedWidget *>(w.data());
 	if (widget() && _touchEnabled) {
 		widget()->removeEventFilter(this);
 		if (!_widgetAcceptsTouch) widget()->setAttribute(Qt::WA_AcceptTouchEvents, false);
@@ -741,10 +760,11 @@ void ScrollArea::doSetOwnedWidget(object_ptr<TWidget> w) {
 		}
 		if (splitted) {
 			splitted->setOtherWidth(_verticalBar->width());
-			_widget->setGeometry(rtl() ? splitted->otherWidth() : 0, 0, width() - splitted->otherWidth(), _widget->height());
+			_widget->setGeometry(rtl() ? splitted->otherWidth() : 0, 0, width() - splitted->otherWidth(),
+			                     _widget->height());
 			connect(splitted, SIGNAL(resizeOther()), this, SLOT(onResizeOther()));
-			connect(splitted, SIGNAL(updateOther(const QRect&)), this, SLOT(onUpdateOther(const QRect&)));
-			connect(splitted, SIGNAL(updateOther(const QRegion&)), this, SLOT(onUpdateOther(const QRegion&)));
+			connect(splitted, SIGNAL(updateOther(const QRect &)), this, SLOT(onUpdateOther(const QRect &)));
+			connect(splitted, SIGNAL(updateOther(const QRegion &)), this, SLOT(onUpdateOther(const QRegion &)));
 			onResizeOther();
 			splitted->update();
 		}
@@ -776,8 +796,7 @@ void ScrollArea::onVerticalScroll() {
 	_other->move(_other->x(), widget()->y());
 }
 
-void ScrollArea::rangeChanged(int oldMax, int newMax, bool vertical) {
-}
+void ScrollArea::rangeChanged(int oldMax, int newMax, bool vertical) {}
 
 void ScrollArea::updateBars() {
 	_horizontalBar->update();
@@ -786,8 +805,8 @@ void ScrollArea::updateBars() {
 
 bool ScrollArea::focusNextPrevChild(bool next) {
 	if (QWidget::focusNextPrevChild(next)) {
-//		if (QWidget *fw = focusWidget())
-//			ensureWidgetVisible(fw);
+		//		if (QWidget *fw = focusWidget())
+		//			ensureWidgetVisible(fw);
 		return true;
 	}
 	return false;
diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.h b/Telegram/SourceFiles/ui/widgets/scroll_area.h
index 8f0753424..65bb3226e 100644
--- a/Telegram/SourceFiles/ui/widgets/scroll_area.h
+++ b/Telegram/SourceFiles/ui/widgets/scroll_area.h
@@ -20,14 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QWidget>
 #include <QScrollArea>
 #include <QTimer>
 #include <QTouchEvent>
+#include <QWidget>
 
+#include "styles/style_widgets.h"
 #include "ui/animation.h"
 #include "ui/twidget.h"
-#include "styles/style_widgets.h"
 
 namespace Ui {
 
@@ -43,7 +43,6 @@ class ScrollShadow : public QWidget {
 	Q_OBJECT
 
 public:
-
 	ScrollShadow(ScrollArea *parent, const style::ScrollArea *st);
 
 	void paintEvent(QPaintEvent *e);
@@ -53,9 +52,7 @@ public slots:
 	void changeVisibility(bool shown);
 
 private:
-
 	const style::ScrollArea *_st;
-
 };
 
 class ScrollBar : public TWidget {
@@ -123,7 +120,8 @@ class SplittedWidget : public TWidget {
 	Q_OBJECT
 
 public:
-	SplittedWidget(QWidget *parent) : TWidget(parent) {
+	SplittedWidget(QWidget *parent)
+	    : TWidget(parent) {
 		setAttribute(Qt::WA_OpaquePaintEvent);
 	}
 	void setHeight(qint32 newHeight) {
@@ -133,8 +131,8 @@ public:
 	void update(int x, int y, int w, int h) {
 		update(QRect(x, y, w, h));
 	}
-	void update(const QRect&);
-	void update(const QRegion&);
+	void update(const QRect &);
+	void update(const QRegion &);
 	void rtlupdate(const QRect &r) {
 		update(myrtlrect(r));
 	}
@@ -149,8 +147,8 @@ public slots:
 
 signals:
 	void resizeOther();
-	void updateOther(const QRect&);
-	void updateOther(const QRegion&);
+	void updateOther(const QRect &);
+	void updateOther(const QRegion &);
 
 protected:
 	void paintEvent(QPaintEvent *e) override; // paintEvent done through paintRegion
@@ -173,7 +171,6 @@ private:
 	}
 	friend class ScrollArea;
 	friend class SplittedWidgetOther;
-
 };
 
 class SplittedWidgetOther;
@@ -190,14 +187,12 @@ public:
 	int scrollLeft() const;
 	int scrollTop() const;
 
-	template <typename Widget>
-	QPointer<Widget> setOwnedWidget(object_ptr<Widget> widget) {
+	template <typename Widget> QPointer<Widget> setOwnedWidget(object_ptr<Widget> widget) {
 		auto result = QPointer<Widget>(widget);
 		doSetOwnedWidget(std::move(widget));
 		return result;
 	}
-	template <typename Widget>
-	object_ptr<Widget> takeWidget() {
+	template <typename Widget> object_ptr<Widget> takeWidget() {
 		return static_object_cast<Widget>(doTakeWidget());
 	}
 
@@ -231,8 +226,8 @@ public slots:
 	void onTouchScrollTimer();
 
 	void onResizeOther();
-	void onUpdateOther(const QRect&);
-	void onUpdateOther(const QRegion&);
+	void onUpdateOther(const QRect &);
+	void onUpdateOther(const QRegion &);
 	void onVerticalScroll();
 
 signals:
@@ -286,21 +281,20 @@ private:
 	bool _widgetAcceptsTouch = false;
 
 	friend class SplittedWidgetOther;
-	object_ptr<SplittedWidgetOther> _other = { nullptr };
-
-	object_ptr<TWidget> _widget = { nullptr };
+	object_ptr<SplittedWidgetOther> _other = {nullptr};
 
+	object_ptr<TWidget> _widget = {nullptr};
 };
 
 class SplittedWidgetOther : public TWidget {
 public:
-	SplittedWidgetOther(ScrollArea *parent) : TWidget(parent) {
+	SplittedWidgetOther(ScrollArea *parent)
+	    : TWidget(parent) {
 		setAttribute(Qt::WA_OpaquePaintEvent);
 	}
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/shadow.cpp b/Telegram/SourceFiles/ui/widgets/shadow.cpp
index 005422791..35255dbe9 100644
--- a/Telegram/SourceFiles/ui/widgets/shadow.cpp
+++ b/Telegram/SourceFiles/ui/widgets/shadow.cpp
@@ -35,7 +35,8 @@ void Shadow::paint(Painter &p, const QRect &box, int outerWidth, const style::Sh
 			from += st.topLeft.height() - st.extend.top();
 		}
 		if (bottom && !st.bottomLeft.empty()) {
-			st.bottomLeft.paint(p, box.x() - st.extend.left(), box.y() + box.height() + st.extend.bottom() - st.bottomLeft.height(), outerWidth);
+			st.bottomLeft.paint(p, box.x() - st.extend.left(),
+			                    box.y() + box.height() + st.extend.bottom() - st.bottomLeft.height(), outerWidth);
 			to -= st.bottomLeft.height() - st.extend.bottom();
 		}
 		if (to > from && !st.left.empty()) {
@@ -46,15 +47,18 @@ void Shadow::paint(Painter &p, const QRect &box, int outerWidth, const style::Sh
 		auto from = box.y();
 		auto to = from + box.height();
 		if (top && !st.topRight.empty()) {
-			st.topRight.paint(p, box.x() + box.width() + st.extend.right() - st.topRight.width(), box.y() - st.extend.top(), outerWidth);
+			st.topRight.paint(p, box.x() + box.width() + st.extend.right() - st.topRight.width(),
+			                  box.y() - st.extend.top(), outerWidth);
 			from += st.topRight.height() - st.extend.top();
 		}
 		if (bottom && !st.bottomRight.empty()) {
-			st.bottomRight.paint(p, box.x() + box.width() + st.extend.right() - st.bottomRight.width(), box.y() + box.height() + st.extend.bottom() - st.bottomRight.height(), outerWidth);
+			st.bottomRight.paint(p, box.x() + box.width() + st.extend.right() - st.bottomRight.width(),
+			                     box.y() + box.height() + st.extend.bottom() - st.bottomRight.height(), outerWidth);
 			to -= st.bottomRight.height() - st.extend.bottom();
 		}
 		if (to > from && !st.right.empty()) {
-			st.right.fill(p, rtlrect(box.x() + box.width() + st.extend.right() - st.right.width(), from, st.right.width(), to - from, outerWidth));
+			st.right.fill(p, rtlrect(box.x() + box.width() + st.extend.right() - st.right.width(), from,
+			                         st.right.width(), to - from, outerWidth));
 		}
 	}
 	if (top && !st.top.empty()) {
@@ -72,7 +76,8 @@ void Shadow::paint(Painter &p, const QRect &box, int outerWidth, const style::Sh
 		if (left && !st.bottomLeft.empty()) from += st.bottomLeft.width() - st.extend.left();
 		if (right && !st.bottomRight.empty()) to -= st.bottomRight.width() - st.extend.right();
 		if (to > from) {
-			st.bottom.fill(p, rtlrect(from, box.y() + box.height() + st.extend.bottom() - st.bottom.height(), to - from, st.bottom.height(), outerWidth));
+			st.bottom.fill(p, rtlrect(from, box.y() + box.height() + st.extend.bottom() - st.bottom.height(), to - from,
+			                          st.bottom.height(), outerWidth));
 		}
 	}
 }
@@ -81,12 +86,10 @@ QPixmap Shadow::grab(TWidget *target, const style::Shadow &shadow, RectParts sid
 	myEnsureResized(target);
 	auto rect = target->rect();
 	auto extend = QMargins(
-		(sides & RectPart::Left) ? shadow.extend.left() : 0,
-		(sides & RectPart::Top) ? shadow.extend.top() : 0,
-		(sides & RectPart::Right) ? shadow.extend.right() : 0,
-		(sides & RectPart::Bottom) ? shadow.extend.bottom() : 0
-	);
-	auto full = QRect(0, 0, extend.left() + rect.width() + extend.right(), extend.top() + rect.height() + extend.bottom());
+	    (sides & RectPart::Left) ? shadow.extend.left() : 0, (sides & RectPart::Top) ? shadow.extend.top() : 0,
+	    (sides & RectPart::Right) ? shadow.extend.right() : 0, (sides & RectPart::Bottom) ? shadow.extend.bottom() : 0);
+	auto full =
+	    QRect(0, 0, extend.left() + rect.width() + extend.right(), extend.top() + rect.height() + extend.bottom());
 	auto result = QPixmap(full.size() * cIntRetinaFactor());
 	result.setDevicePixelRatio(cRetinaFactor());
 	result.fill(Qt::transparent);
diff --git a/Telegram/SourceFiles/ui/widgets/shadow.h b/Telegram/SourceFiles/ui/widgets/shadow.h
index 4d1499437..beb33d2ff 100644
--- a/Telegram/SourceFiles/ui/widgets/shadow.h
+++ b/Telegram/SourceFiles/ui/widgets/shadow.h
@@ -17,16 +17,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QPaintEvent>
 #include "styles/style_widgets.h"
 #include "ui/twidget.h"
+#include <QPaintEvent>
 
 namespace Ui {
 
 class PlainShadow : public TWidget {
 public:
-	PlainShadow(QWidget *parent, style::color color) : TWidget(parent), _color(color) {
-	}
+	PlainShadow(QWidget *parent, style::color color)
+	    : TWidget(parent)
+	    , _color(color) {}
 
 protected:
 	void paintEvent(QPaintEvent *e) override {
@@ -35,19 +36,21 @@ protected:
 
 private:
 	style::color _color;
-
 };
 
 class Shadow : public TWidget {
 public:
-	Shadow(QWidget *parent, const style::Shadow &st, RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom) : TWidget(parent)
-	, _st(st)
-	, _sides(sides) {
-	}
+	Shadow(QWidget *parent, const style::Shadow &st,
+	       RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom)
+	    : TWidget(parent)
+	    , _st(st)
+	    , _sides(sides) {}
 
-	static void paint(Painter &p, const QRect &box, int outerWidth, const style::Shadow &st, RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom);
+	static void paint(Painter &p, const QRect &box, int outerWidth, const style::Shadow &st,
+	                  RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom);
 
-	static QPixmap grab(TWidget *target, const style::Shadow &shadow, RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom);
+	static QPixmap grab(TWidget *target, const style::Shadow &shadow,
+	                    RectParts sides = RectPart::Left | RectPart::Top | RectPart::Right | RectPart::Bottom);
 
 protected:
 	void paintEvent(QPaintEvent *e) override {
@@ -58,7 +61,6 @@ protected:
 private:
 	const style::Shadow &_st;
 	RectParts _sides;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.cpp b/Telegram/SourceFiles/ui/widgets/tooltip.cpp
index 0415adc9b..260c26df6 100644
--- a/Telegram/SourceFiles/ui/widgets/tooltip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/tooltip.cpp
@@ -18,11 +18,11 @@
 #include "ui/widgets/tooltip.h"
 
 #include "mainwindow.h"
-#include "styles/style_widgets.h"
 #include "platform/platform_specific.h"
+#include "styles/style_widgets.h"
 
-#include <QDesktopWidget>
 #include <QApplication>
+#include <QDesktopWidget>
 #include <QWindow>
 
 #include "app.h"
@@ -49,10 +49,12 @@ AbstractTooltipShower::~AbstractTooltipShower() {
 	}
 }
 
-Tooltip::Tooltip() : TWidget(nullptr) {
+Tooltip::Tooltip()
+    : TWidget(nullptr) {
 	TooltipInstance = this;
 
-	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint | Qt::ToolTip);
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint |
+	               Qt::ToolTip);
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
 
@@ -171,12 +173,15 @@ void Tooltip::paintEvent(QPaintEvent *e) {
 		p.fillRect(QRect(0, 0, width(), st::lineWidth), _st->textBorder);
 		p.fillRect(QRect(0, height() - st::lineWidth, width(), st::lineWidth), _st->textBorder);
 		p.fillRect(QRect(0, st::lineWidth, st::lineWidth, height() - 2 * st::lineWidth), _st->textBorder);
-		p.fillRect(QRect(width() - st::lineWidth, st::lineWidth, st::lineWidth, height() - 2 * st::lineWidth), _st->textBorder);
+		p.fillRect(QRect(width() - st::lineWidth, st::lineWidth, st::lineWidth, height() - 2 * st::lineWidth),
+		           _st->textBorder);
 	}
-	qint32 lines = std::floor((height() - 2 * st::lineWidth - _st->textPadding.top() - _st->textPadding.bottom()) / _st->textStyle.font->height);
+	qint32 lines = std::floor((height() - 2 * st::lineWidth - _st->textPadding.top() - _st->textPadding.bottom()) /
+	                          _st->textStyle.font->height);
 
 	p.setPen(_st->textFg);
-	_text.drawElided(p, st::lineWidth + _st->textPadding.left(), st::lineWidth + _st->textPadding.top(), width() - 2 * st::lineWidth - _st->textPadding.left() - _st->textPadding.right(), lines);
+	_text.drawElided(p, st::lineWidth + _st->textPadding.left(), st::lineWidth + _st->textPadding.top(),
+	                 width() - 2 * st::lineWidth - _st->textPadding.left() - _st->textPadding.right(), lines);
 }
 
 void Tooltip::hideEvent(QHideEvent *e) {
@@ -207,9 +212,10 @@ void Tooltip::Hide() {
 	}
 }
 
-ImportantTooltip::ImportantTooltip(QWidget *parent, object_ptr<TWidget> content, const style::ImportantTooltip &st) : TWidget(parent)
-, _st(st)
-, _content(std::move(content)) {
+ImportantTooltip::ImportantTooltip(QWidget *parent, object_ptr<TWidget> content, const style::ImportantTooltip &st)
+    : TWidget(parent)
+    , _st(st)
+    , _content(std::move(content)) {
 	_content->setParent(this);
 	_hideTimer.setCallback([this] { toggleAnimated(false); });
 	hide();
@@ -260,7 +266,8 @@ void ImportantTooltip::countApproachSide(RectParts preferSide) {
 	if ((allowedAbove && allowedBelow) || (!allowedAbove && !allowedBelow)) {
 		_side = preferSide;
 	} else {
-		_side = (allowedAbove ? RectPart::Top : RectPart::Bottom) | (preferSide & (RectPart::Left | RectPart::Center | RectPart::Right));
+		_side = (allowedAbove ? RectPart::Top : RectPart::Bottom) |
+		        (preferSide & (RectPart::Left | RectPart::Center | RectPart::Right));
 	}
 	if (_useTransparency) {
 		auto arrow = QImage(QSize(_st.arrow * 2, _st.arrow) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
@@ -298,7 +305,8 @@ void ImportantTooltip::toggleAnimated(bool visible) {
 			return;
 		}
 		hideChildren();
-		_visibleAnimation.start([this] { animationCallback(); }, _visible ? 0. : 1., _visible ? 1. : 0., _st.duration, anim::easeOutCirc);
+		_visibleAnimation.start([this] { animationCallback(); }, _visible ? 0. : 1., _visible ? 1. : 0., _st.duration,
+		                        anim::easeOutCirc);
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.h b/Telegram/SourceFiles/ui/widgets/tooltip.h
index 49d570405..b0b2324ff 100644
--- a/Telegram/SourceFiles/ui/widgets/tooltip.h
+++ b/Telegram/SourceFiles/ui/widgets/tooltip.h
@@ -18,9 +18,9 @@
 #pragma once
 
 #include "base/timer.h"
-#include "ui/twidget.h"
-#include "ui/text/text.h"
 #include "ui/animation.h"
+#include "ui/text/text.h"
+#include "ui/twidget.h"
 
 namespace style {
 struct Tooltip;
@@ -36,7 +36,6 @@ public:
 	virtual bool tooltipWindowActive() const;
 	virtual const style::Tooltip *tooltipSt() const;
 	virtual ~AbstractTooltipShower();
-
 };
 
 class Tooltip : public TWidget {
@@ -75,7 +74,6 @@ private:
 	base::Timer _hideByLeaveTimer;
 	bool _isEventFilter = false;
 	bool _useTransparency = true;
-
 };
 
 class ImportantTooltip : public TWidget {
@@ -117,7 +115,6 @@ private:
 	base::lambda<void()> _hiddenCallback;
 	bool _useTransparency = true;
 	QPixmap _cache;
-
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 37337c920..daba15d97 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -20,23 +20,23 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/main_window.h"
 
-#include "storage/localstorage.h"
-#include "styles/style_window.h"
-#include "platform/platform_window_title.h"
-#include "window/themes/window_theme.h"
-#include "window/window_controller.h"
+#include "app.h"
+#include "mainwindow.h"
 #include "mediaview.h"
 #include "messenger.h"
-#include "mainwindow.h"
-#include "app.h"
+#include "platform/platform_window_title.h"
+#include "storage/localstorage.h"
+#include "styles/style_window.h"
+#include "window/themes/window_theme.h"
+#include "window/window_controller.h"
 
-#include <QDrag>
-#include <QList>
-#include <QWindow>
-#include <QScreen>
-#include <QDesktopWidget>
-#include <QGuiApplication>
 #include <QApplication>
+#include <QDesktopWidget>
+#include <QDrag>
+#include <QGuiApplication>
+#include <QList>
+#include <QScreen>
+#include <QWindow>
 
 namespace Window {
 
@@ -66,11 +66,12 @@ QIcon CreateIcon() {
 	return result;
 }
 
-MainWindow::MainWindow() : QWidget()
-, _positionUpdatedTimer(this)
-, _body(this)
-, _icon(CreateIcon())
-, _titleText(str_const_toString(AppName)) {
+MainWindow::MainWindow()
+    : QWidget()
+    , _positionUpdatedTimer(this)
+    , _body(this)
+    , _icon(CreateIcon())
+    , _titleText(str_const_toString(AppName)) {
 	subscribe(Theme::Background(), [this](const Theme::BackgroundUpdate &data) {
 		if (data.paletteChanged()) {
 			if (_title) {
@@ -148,7 +149,8 @@ void MainWindow::init() {
 	updateWindowIcon();
 
 	connect(windowHandle(), &QWindow::activeChanged, this, [this] { handleActiveChanged(); }, Qt::QueuedConnection);
-	connect(windowHandle(), &QWindow::windowStateChanged, this, [this](Qt::WindowState state) { handleStateChanged(state); });
+	connect(windowHandle(), &QWindow::windowStateChanged, this,
+	        [this](Qt::WindowState state) { handleStateChanged(state); });
 
 	_positionUpdatedTimer->setSingleShot(true);
 	connect(_positionUpdatedTimer, SIGNAL(timeout()), this, SLOT(savePositionByTimer()));
@@ -177,9 +179,7 @@ void MainWindow::handleActiveChanged() {
 	if (isActiveWindow()) {
 		Messenger::Instance().checkMediaViewActivation();
 	}
-	App::CallDelayed(1, this, [this] {
-		updateTrayMenu();
-	});
+	App::CallDelayed(1, this, [this] { updateTrayMenu(); });
 }
 
 void MainWindow::updatePalette() {
@@ -203,16 +203,27 @@ void MainWindow::initSize() {
 	setMinimumHeight((_title ? _title->height() : 0) + st::windowMinHeight);
 
 	auto position = cWindowPos();
-	DEBUG_LOG(("Window Pos: Initializing first %1, %2, %3, %4 (maximized %5)").arg(position.x).arg(position.y).arg(position.w).arg(position.h).arg(Logs::b(position.maximized)));
+	DEBUG_LOG(("Window Pos: Initializing first %1, %2, %3, %4 (maximized %5)")
+	              .arg(position.x)
+	              .arg(position.y)
+	              .arg(position.w)
+	              .arg(position.h)
+	              .arg(Logs::b(position.maximized)));
 
 	auto avail = QDesktopWidget().availableGeometry();
 	bool maximized = false;
-	auto geom = QRect(avail.x() + (avail.width() - st::windowDefaultWidth) / 2, avail.y() + (avail.height() - st::windowDefaultHeight) / 2, st::windowDefaultWidth, st::windowDefaultHeight);
+	auto geom = QRect(avail.x() + (avail.width() - st::windowDefaultWidth) / 2,
+	                  avail.y() + (avail.height() - st::windowDefaultHeight) / 2, st::windowDefaultWidth,
+	                  st::windowDefaultHeight);
 	if (position.w && position.h) {
 		for (auto screen : QGuiApplication::screens()) {
 			if (position.moncrc == screenNameChecksum(screen->name())) {
 				auto screenGeometry = screen->geometry();
-				DEBUG_LOG(("Window Pos: Screen found, screen geometry: %1, %2, %3, %4").arg(screenGeometry.x()).arg(screenGeometry.y()).arg(screenGeometry.width()).arg(screenGeometry.height()));
+				DEBUG_LOG(("Window Pos: Screen found, screen geometry: %1, %2, %3, %4")
+				              .arg(screenGeometry.x())
+				              .arg(screenGeometry.y())
+				              .arg(screenGeometry.width())
+				              .arg(screenGeometry.height()));
 
 				auto w = screenGeometry.width(), h = screenGeometry.height();
 				if (w >= st::windowMinWidth && h >= st::windowMinHeight) {
@@ -223,8 +234,12 @@ void MainWindow::initSize() {
 					position.x += screenGeometry.x();
 					position.y += screenGeometry.y();
 					if (position.x + st::windowMinWidth <= screenGeometry.x() + screenGeometry.width() &&
-						position.y + st::windowMinHeight <= screenGeometry.y() + screenGeometry.height()) {
-						DEBUG_LOG(("Window Pos: Resulting geometry is %1, %2, %3, %4").arg(position.x).arg(position.y).arg(position.w).arg(position.h));
+					    position.y + st::windowMinHeight <= screenGeometry.y() + screenGeometry.height()) {
+						DEBUG_LOG(("Window Pos: Resulting geometry is %1, %2, %3, %4")
+						              .arg(position.x)
+						              .arg(position.y)
+						              .arg(position.w)
+						              .arg(position.h));
 						geom = QRect(position.x, position.y, position.w, position.h);
 					}
 				}
@@ -233,7 +248,8 @@ void MainWindow::initSize() {
 		}
 		maximized = position.maximized;
 	}
-	DEBUG_LOG(("Window Pos: Setting first %1, %2, %3, %4").arg(geom.x()).arg(geom.y()).arg(geom.width()).arg(geom.height()));
+	DEBUG_LOG(
+	    ("Window Pos: Setting first %1, %2, %3, %4").arg(geom.x()).arg(geom.y()).arg(geom.width()).arg(geom.height()));
 	setGeometry(geom);
 }
 
@@ -307,7 +323,12 @@ void MainWindow::savePosition(Qt::WindowState state) {
 		realPosition.maximized = 0;
 		realPosition.moncrc = 0;
 	}
-	DEBUG_LOG(("Window Pos: Saving position: %1, %2, %3, %4 (maximized %5)").arg(realPosition.x).arg(realPosition.y).arg(realPosition.w).arg(realPosition.h).arg(Logs::b(realPosition.maximized)));
+	DEBUG_LOG(("Window Pos: Saving position: %1, %2, %3, %4 (maximized %5)")
+	              .arg(realPosition.x)
+	              .arg(realPosition.y)
+	              .arg(realPosition.w)
+	              .arg(realPosition.h)
+	              .arg(Logs::b(realPosition.maximized)));
 
 	auto centerX = realPosition.x + realPosition.w / 2;
 	auto centerY = realPosition.y + realPosition.h / 2;
@@ -323,20 +344,26 @@ void MainWindow::savePosition(Qt::WindowState state) {
 	}
 	if (chosen) {
 		auto screenGeometry = chosen->geometry();
-		DEBUG_LOG(("Window Pos: Screen found, geometry: %1, %2, %3, %4").arg(screenGeometry.x()).arg(screenGeometry.y()).arg(screenGeometry.width()).arg(screenGeometry.height()));
+		DEBUG_LOG(("Window Pos: Screen found, geometry: %1, %2, %3, %4")
+		              .arg(screenGeometry.x())
+		              .arg(screenGeometry.y())
+		              .arg(screenGeometry.width())
+		              .arg(screenGeometry.height()));
 		realPosition.x -= screenGeometry.x();
 		realPosition.y -= screenGeometry.y();
 		realPosition.moncrc = screenNameChecksum(chosen->name());
 	}
 
 	if (realPosition.w >= st::windowMinWidth && realPosition.h >= st::windowMinHeight) {
-		if (realPosition.x != savedPosition.x
-			|| realPosition.y != savedPosition.y
-			|| realPosition.w != savedPosition.w
-			|| realPosition.h != savedPosition.h
-			|| realPosition.moncrc != savedPosition.moncrc
-			|| realPosition.maximized != savedPosition.maximized) {
-			DEBUG_LOG(("Window Pos: Writing: %1, %2, %3, %4 (maximized %5)").arg(realPosition.x).arg(realPosition.y).arg(realPosition.w).arg(realPosition.h).arg(Logs::b(realPosition.maximized)));
+		if (realPosition.x != savedPosition.x || realPosition.y != savedPosition.y ||
+		    realPosition.w != savedPosition.w || realPosition.h != savedPosition.h ||
+		    realPosition.moncrc != savedPosition.moncrc || realPosition.maximized != savedPosition.maximized) {
+			DEBUG_LOG(("Window Pos: Writing: %1, %2, %3, %4 (maximized %5)")
+			              .arg(realPosition.x)
+			              .arg(realPosition.y)
+			              .arg(realPosition.w)
+			              .arg(realPosition.h)
+			              .arg(Logs::b(realPosition.maximized)));
 			cSetWindowPos(realPosition);
 			Local::writeSettings();
 		}
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index 3c6c3785b..56851e4dd 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QIcon>
-#include <QTimer>
-#include <QMimeData>
-#include "window/window_title.h"
 #include "base/timer.h"
+#include "window/window_title.h"
+#include <QIcon>
+#include <QMimeData>
+#include <QTimer>
 
 class MediaView;
 class TWidget;
@@ -83,8 +83,7 @@ public:
 	bool canExtendWidthBy(int addToWidth);
 	void tryToExtendWidthBy(int addToWidth);
 
-	virtual void updateTrayMenu(bool force = false) {
-	}
+	virtual void updateTrayMenu(bool force = false) {}
 
 	virtual ~MainWindow();
 
@@ -113,42 +112,33 @@ protected:
 	void handleStateChanged(Qt::WindowState state);
 	void handleActiveChanged();
 
-	virtual void initHook() {
-	}
+	virtual void initHook() {}
 
-	virtual void updateIsActiveHook() {
-	}
+	virtual void updateIsActiveHook() {}
 
 	void clearWidgets();
-	virtual void clearWidgetsHook() {
-	}
+	virtual void clearWidgetsHook() {}
 
 	virtual void updateWindowIcon();
 
-	virtual void stateChangedHook(Qt::WindowState state) {
-	}
+	virtual void stateChangedHook(Qt::WindowState state) {}
 
-	virtual void titleVisibilityChangedHook() {
-	}
+	virtual void titleVisibilityChangedHook() {}
 
-	virtual void unreadCounterChangedHook() {
-	}
+	virtual void unreadCounterChangedHook() {}
 
 	virtual void closeWithoutDestroy() {
 		hide();
 	}
 
-	virtual void updateGlobalMenuHook() {
-	}
+	virtual void updateGlobalMenuHook() {}
 
 	virtual bool hasTrayIcon() const {
 		return false;
 	}
-	virtual void showTrayTooltip() {
-	}
+	virtual void showTrayTooltip() {}
 
-	virtual void workmodeUpdated(DBIWorkMode mode) {
-	}
+	virtual void workmodeUpdated(DBIWorkMode mode) {}
 
 	virtual void updateControlsGeometry();
 
@@ -175,9 +165,9 @@ private:
 	bool _positionInited = false;
 
 	std::unique_ptr<Window::Controller> _controller;
-	object_ptr<TitleWidget> _title = { nullptr };
+	object_ptr<TitleWidget> _title = {nullptr};
 	object_ptr<TWidget> _body;
-	object_ptr<TWidget> _rightColumn = { nullptr };
+	object_ptr<TWidget> _rightColumn = {nullptr};
 
 	QIcon _icon;
 	QString _titleText;
@@ -189,7 +179,6 @@ private:
 
 	base::Observable<void> _dragFinished;
 	base::Observable<void> _widgetGrabbed;
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index a44df89c3..b25bd45a9 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -20,26 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/notifications_manager.h"
 
+#include "apiwrap.h"
+#include "app.h"
+#include "auth_session.h"
+#include "lang/lang_keys.h"
+#include "mainwidget.h"
+#include "mainwindow.h"
+#include "media/media_audio.h"
+#include "media/media_audio_track.h"
 #include "platform/platform_notifications_manager.h"
 #include "window/notifications_manager_default.h"
-#include "media/media_audio_track.h"
-#include "media/media_audio.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
-#include "apiwrap.h"
-#include "auth_session.h"
-#include "app.h"
 
 namespace Window {
 namespace Notifications {
 
-System::System(AuthSession *session) : _authSession(session) {
+System::System(AuthSession *session)
+    : _authSession(session) {
 	createManager();
 
-	_waitTimer.setTimeoutHandler([this] {
-		showNext();
-	});
+	_waitTimer.setTimeoutHandler([this] { showNext(); });
 
 	subscribe(settingsChanged(), [this](ChangeType type) {
 		if (type == ChangeType::DesktopEnabled) {
@@ -100,7 +99,8 @@ void System::schedule(History *history, HistoryItem *item) {
 
 	int delay = item->Has<HistoryMessageForwarded>() ? 500 : 100, t = unixtime();
 	auto ms = getms(true);
-	bool isOnline = App::main()->lastWasOnline(), otherNotOld = ((cOtherOnline() * 1000LL) + Global::OnlineCloudTimeout() > t * 1000LL);
+	bool isOnline = App::main()->lastWasOnline(),
+	     otherNotOld = ((cOtherOnline() * 1000LL) + Global::OnlineCloudTimeout() > t * 1000LL);
 	bool otherLaterThanMe = (cOtherOnline() * 1000LL + (ms - App::main()->lastSetOnline()) > t * 1000LL);
 	if (!isOnline && otherNotOld && otherLaterThanMe) {
 		delay = Global::NotifyCloudDelay();
@@ -217,8 +217,10 @@ void System::showNext() {
 	qint32 now = unixtime();
 	for (auto i = _whenAlerts.begin(); i != _whenAlerts.end();) {
 		while (!i.value().isEmpty() && i.value().begin().key() <= ms) {
-			NotifySettingsPtr n = i.key()->peer->notify, f = i.value().begin().value() ? i.value().begin().value()->notify : UnknownNotifySettings;
-			while (!i.value().isEmpty() && i.value().begin().key() <= ms + 500) { // not more than one sound in 500ms from one peer - grouping
+			NotifySettingsPtr n = i.key()->peer->notify,
+			                  f = i.value().begin().value() ? i.value().begin().value()->notify : UnknownNotifySettings;
+			while (!i.value().isEmpty() &&
+			       i.value().begin().key() <= ms + 500) { // not more than one sound in 500ms from one peer - grouping
 				i.value().erase(i.value().begin());
 			}
 			if (n == EmptyNotifySettings || (n != UnknownNotifySettings && n->mute <= now)) {
@@ -298,7 +300,8 @@ void System::showNext() {
 				_waitTimer.start(next - ms);
 				break;
 			} else {
-				auto forwardedItem = notifyItem->Has<HistoryMessageForwarded>() ? notifyItem : nullptr; // forwarded notify grouping
+				auto forwardedItem =
+				    notifyItem->Has<HistoryMessageForwarded>() ? notifyItem : nullptr; // forwarded notify grouping
 				auto forwardedCount = 1;
 
 				auto ms = getms(true);
@@ -307,7 +310,7 @@ void System::showNext() {
 				if (j == _whenMaps.cend()) {
 					history->clearNotifications();
 				} else {
-					auto nextNotify = (HistoryItem*)nullptr;
+					auto nextNotify = (HistoryItem *)nullptr;
 					do {
 						history->skipNotification();
 						if (!history->hasNotification()) {
@@ -327,7 +330,9 @@ void System::showNext() {
 						if (nextNotify) {
 							if (forwardedItem) {
 								auto nextForwarded = nextNotify->Has<HistoryMessageForwarded>() ? nextNotify : nullptr;
-								if (nextForwarded && forwardedItem->author() == nextForwarded->author() && qAbs(qint64(nextForwarded->date.toTime_t()) - qint64(forwardedItem->date.toTime_t())) < 2) {
+								if (nextForwarded && forwardedItem->author() == nextForwarded->author() &&
+								    qAbs(qint64(nextForwarded->date.toTime_t()) -
+								         qint64(forwardedItem->date.toTime_t())) < 2) {
 									forwardedItem = nextForwarded;
 									++forwardedCount;
 								} else {
@@ -411,7 +416,7 @@ void Manager::notificationReplied(PeerId peerId, MsgId msgId, const QString &rep
 
 	MainWidget::MessageToSend message;
 	message.history = history;
-	message.textWithTags = { reply, TextWithTags::Tags() };
+	message.textWithTags = {reply, TextWithTags::Tags()};
 	message.replyTo = (msgId > 0 && !history->peer->isUser()) ? msgId : 0;
 	message.silent = false;
 	message.clearDraft = false;
@@ -425,9 +430,12 @@ void NativeManager::doShowNotification(HistoryItem *item, int forwardedCount) {
 
 	QString title = options.hideNameAndPhoto ? str_const_toString(AppName) : item->history()->peer->name;
 	QString subtitle = options.hideNameAndPhoto ? QString() : item->notificationHeader();
-	QString text = options.hideMessageText ? lang(lng_notification_preview) : (forwardedCount < 2 ? item->notificationText() : lng_forward_messages(lt_count, forwardedCount));
+	QString text = options.hideMessageText ?
+	                   lang(lng_notification_preview) :
+	                   (forwardedCount < 2 ? item->notificationText() : lng_forward_messages(lt_count, forwardedCount));
 
-	doShowNativeNotification(item->history()->peer, item->id, title, subtitle, text, options.hideNameAndPhoto, options.hideReplyButton);
+	doShowNativeNotification(item->history()->peer, item->id, title, subtitle, text, options.hideNameAndPhoto,
+	                         options.hideReplyButton);
 }
 
 System::~System() = default;
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index ed380e268..71f816322 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <type_traits>
 #include "base/observer.h"
-#include "structs.h"
 #include "core/single_timer.h"
+#include "structs.h"
+#include <type_traits>
 
 class AuthSession;
 class History;
@@ -59,9 +59,7 @@ enum class ChangeType {
 
 namespace base {
 
-template <>
-struct custom_is_fast_copy_type<Window::Notifications::ChangeType> : public std::true_type {
-};
+template <> struct custom_is_fast_copy_type<Window::Notifications::ChangeType> : public std::true_type {};
 
 } // namespace base
 
@@ -100,37 +98,35 @@ private:
 
 	AuthSession *_authSession = nullptr;
 
-	QMap<History*, QMap<MsgId, TimeMs>> _whenMaps;
+	QMap<History *, QMap<MsgId, TimeMs>> _whenMaps;
 
 	struct Waiter {
 		Waiter(MsgId msg, TimeMs when, PeerData *notifyByFrom)
-			: msg(msg)
-			, when(when)
-			, notifyByFrom(notifyByFrom) {
-		}
+		    : msg(msg)
+		    , when(when)
+		    , notifyByFrom(notifyByFrom) {}
 		MsgId msg;
 		TimeMs when;
 		PeerData *notifyByFrom;
 	};
-	using Waiters = QMap<History*, Waiter>;
+	using Waiters = QMap<History *, Waiter>;
 	Waiters _waiters;
 	Waiters _settingWaiters;
 	SingleTimer _waitTimer;
 
-	QMap<History*, QMap<TimeMs, PeerData*>> _whenAlerts;
+	QMap<History *, QMap<TimeMs, PeerData *>> _whenAlerts;
 
 	std::unique_ptr<Manager> _manager;
 
 	base::Observable<ChangeType> _settingsChanged;
 
 	std::unique_ptr<Media::Audio::Track> _soundTrack;
-
 };
 
 class Manager {
 public:
-	Manager(System *system) : _system(system) {
-	}
+	Manager(System *system)
+	    : _system(system) {}
 
 	void showNotification(HistoryItem *item, int forwardedCount) {
 		doShowNotification(item, forwardedCount);
@@ -174,14 +170,11 @@ protected:
 	virtual void doClearAllFast() = 0;
 	virtual void doClearFromItem(HistoryItem *item) = 0;
 	virtual void doClearFromHistory(History *history) = 0;
-	virtual void onBeforeNotificationActivated(PeerId peerId, MsgId msgId) {
-	}
-	virtual void onAfterNotificationActivated(PeerId peerId, MsgId msgId) {
-	}
+	virtual void onBeforeNotificationActivated(PeerId peerId, MsgId msgId) {}
+	virtual void onAfterNotificationActivated(PeerId peerId, MsgId msgId) {}
 
 private:
 	System *_system = nullptr;
-
 };
 
 class NativeManager : public Manager {
@@ -194,12 +187,11 @@ protected:
 	void doClearAll() override {
 		doClearAllFast();
 	}
-	void doClearFromItem(HistoryItem *item) override {
-	}
+	void doClearFromItem(HistoryItem *item) override {}
 	void doShowNotification(HistoryItem *item, int forwardedCount) override;
 
-	virtual void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle, const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) = 0;
-
+	virtual void doShowNativeNotification(PeerData *peer, MsgId msgId, const QString &title, const QString &subtitle,
+	                                      const QString &msg, bool hideNameAndPhoto, bool hideReplyButton) = 0;
 };
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 5e584fff2..9a851949a 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -20,25 +20,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/notifications_manager_default.h"
 
-#include "config.h"
-#include "platform/platform_notifications_manager.h"
+#include "app.h"
 #include "application.h"
-#include "messenger.h"
+#include "auth_session.h"
+#include "config.h"
+#include "dialogs/dialogs_layout.h"
+#include "facades.h"
 #include "lang/lang_keys.h"
+#include "messenger.h"
+#include "platform/platform_notifications_manager.h"
+#include "platform/platform_specific.h"
+#include "settings/settings_info_widget.h"
+#include "storage/file_download.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_window.h"
+#include "ui/animation.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
-#include "dialogs/dialogs_layout.h"
 #include "window/themes/window_theme.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_boxes.h"
-#include "styles/style_window.h"
-#include "storage/file_download.h"
-#include "auth_session.h"
-#include "platform/platform_specific.h"
-#include "app.h"
-#include "settings/settings_info_widget.h"
-#include "facades.h"
-#include "ui/animation.h"
 
 namespace Window {
 namespace Notifications {
@@ -69,21 +69,19 @@ std::unique_ptr<Manager> Create(System *system) {
 	return std::make_unique<Manager>(system);
 }
 
-Manager::Manager(System *system) : Notifications::Manager(system) {
+Manager::Manager(System *system)
+    : Notifications::Manager(system) {
 	subscribe(system->authSession()->downloader().taskFinished(), [this] {
-		for_const (auto &notification, _notifications) {
-			notification->updatePeerPhoto();
-		}
-	});
-	subscribe(system->settingsChanged(), [this](ChangeType change) {
-		settingsChanged(change);
+		for_const (auto &notification, _notifications) { notification->updatePeerPhoto(); }
 	});
+	subscribe(system->settingsChanged(), [this](ChangeType change) { settingsChanged(change); });
 	_inputCheckTimer.setTimeoutHandler([this] { checkLastInput(); });
 }
 
 QPixmap Manager::hiddenUserpicPlaceholder() const {
 	if (_hiddenUserpicPlaceholder.isNull()) {
-		_hiddenUserpicPlaceholder = App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaled(st::notifyPhotoSize, st::notifyPhotoSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+		_hiddenUserpicPlaceholder = App::pixmapFromImageInPlace(Messenger::Instance().logoNoMargin().scaled(
+		    st::notifyPhotoSize, st::notifyPhotoSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 		_hiddenUserpicPlaceholder.setDevicePixelRatio(cRetinaFactor());
 	}
 	return _hiddenUserpicPlaceholder;
@@ -102,9 +100,7 @@ void Manager::settingsChanged(ChangeType change) {
 	if (change == ChangeType::Corner) {
 		auto startPosition = notificationStartPosition();
 		auto shiftDirection = notificationShiftDirection();
-		for_const (auto &notification, _notifications) {
-			notification->updatePosition(startPosition, shiftDirection);
-		}
+		for_const (auto &notification, _notifications) { notification->updatePosition(startPosition, shiftDirection); }
 		if (_hideAll) {
 			_hideAll->updatePosition(startPosition, shiftDirection);
 		}
@@ -124,14 +120,13 @@ void Manager::settingsChanged(ChangeType change) {
 		}
 	} else if (change == ChangeType::DemoIsShown) {
 		auto demoIsShown = Global::NotificationsDemoIsShown();
-		_demoMasterOpacity.start([this] { demoMasterOpacityCallback(); }, demoIsShown ? 1. : 0., demoIsShown ? 0. : 1., st::notifyFastAnim);
+		_demoMasterOpacity.start([this] { demoMasterOpacityCallback(); }, demoIsShown ? 1. : 0., demoIsShown ? 0. : 1.,
+		                         st::notifyFastAnim);
 	}
 }
 
 void Manager::demoMasterOpacityCallback() {
-	for_const (auto &notification, _notifications) {
-		notification->updateOpacity();
-	}
+	for_const (auto &notification, _notifications) { notification->updateOpacity(); }
 	if (_hideAll) {
 		_hideAll->updateOpacity();
 	}
@@ -172,9 +167,7 @@ void Manager::startAllHiding() {
 }
 
 void Manager::stopAllHiding() {
-	for_const (auto &notification, _notifications) {
-		notification->stopHiding();
-	}
+	for_const (auto &notification, _notifications) { notification->stopHiding(); }
 	if (_hideAll) {
 		_hideAll->stopHiding();
 	}
@@ -205,14 +198,9 @@ void Manager::showNextFromQueue() {
 		auto queued = _queuedNotifications.front();
 		_queuedNotifications.pop_front();
 
-		auto notification = std::make_unique<Notification>(
-			this,
-			queued.history,
-			queued.peer,
-			queued.author,
-			queued.item,
-			queued.forwardedCount,
-			startPosition, startShift, shiftDirection);
+		auto notification =
+		    std::make_unique<Notification>(this, queued.history, queued.peer, queued.author, queued.item,
+		                                   queued.forwardedCount, startPosition, startShift, shiftDirection);
 		_notifications.push_back(std::move(notification));
 		--count;
 	} while (count > 0 && !_queuedNotifications.empty());
@@ -240,7 +228,8 @@ void Manager::moveWidgets() {
 	if (count > 1 || !_queuedNotifications.empty()) {
 		auto deltaY = st::notifyHideAllHeight + st::notifyDeltaY;
 		if (!_hideAll) {
-			_hideAll = std::make_unique<HideAllButton>(this, notificationStartPosition(), lastShiftCurrent, notificationShiftDirection());
+			_hideAll = std::make_unique<HideAllButton>(this, notificationStartPosition(), lastShiftCurrent,
+			                                           notificationShiftDirection());
 		}
 		_hideAll->changeShift(lastShift);
 		_hideAll->stopHiding();
@@ -254,9 +243,8 @@ void Manager::changeNotificationHeight(Notification *notification, int newHeight
 	if (!deltaHeight) return;
 
 	notification->addToHeight(deltaHeight);
-	auto it = std::find_if(_notifications.cbegin(), _notifications.cend(), [notification](auto &item) {
-		return (item.get() == notification);
-	});
+	auto it = std::find_if(_notifications.cbegin(), _notifications.cend(),
+	                       [notification](auto &item) { return (item.get() == notification); });
 	if (it != _notifications.cend()) {
 		for (auto i = _notifications.cbegin(); i != it; ++i) {
 			auto &notification = *i;
@@ -283,9 +271,8 @@ void Manager::removeWidget(internal::Widget *remove) {
 	if (remove == _hideAll.get()) {
 		_hideAll.reset();
 	} else if (remove) {
-		auto it = std::find_if(_notifications.cbegin(), _notifications.cend(), [remove](auto &item) {
-			return item.get() == remove;
-		});
+		auto it = std::find_if(_notifications.cbegin(), _notifications.cend(),
+		                       [remove](auto &item) { return item.get() == remove; });
 		if (it != _notifications.cend()) {
 			_notifications.erase(it);
 			_positionsOutdated = true;
@@ -301,9 +288,7 @@ void Manager::doShowNotification(HistoryItem *item, int forwardedCount) {
 
 void Manager::doClearAll() {
 	_queuedNotifications.clear();
-	for_const (auto &notification, _notifications) {
-		notification->unlinkHistory();
-	}
+	for_const (auto &notification, _notifications) { notification->unlinkHistory(); }
 	showNextFromQueue();
 }
 
@@ -330,9 +315,9 @@ void Manager::doClearFromHistory(History *history) {
 }
 
 void Manager::doClearFromItem(HistoryItem *item) {
-	_queuedNotifications.erase(std::remove_if(_queuedNotifications.begin(), _queuedNotifications.end(), [item](auto &queued) {
-		return (queued.item == item);
-	}), _queuedNotifications.cend());
+	_queuedNotifications.erase(std::remove_if(_queuedNotifications.begin(), _queuedNotifications.end(),
+	                                          [item](auto &queued) { return (queued.item == item); }),
+	                           _queuedNotifications.cend());
 
 	auto showNext = false;
 	for_const (auto &notification, _notifications) {
@@ -347,9 +332,7 @@ void Manager::doClearFromItem(HistoryItem *item) {
 }
 
 void Manager::doUpdateAll() {
-	for_const (auto &notification, _notifications) {
-		notification->updateNotifyDisplay();
-	}
+	for_const (auto &notification, _notifications) { notification->updateNotifyDisplay(); }
 }
 
 Manager::~Manager() {
@@ -358,15 +341,17 @@ Manager::~Manager() {
 
 namespace internal {
 
-Widget::Widget(Manager *manager, QPoint startPosition, int shift, Direction shiftDirection) : TWidget(nullptr)
-, _manager(manager)
-, _startPosition(startPosition)
-, _direction(shiftDirection)
-, a_shift(shift)
-, _a_shift(animation(this, &Widget::step_shift)) {
+Widget::Widget(Manager *manager, QPoint startPosition, int shift, Direction shiftDirection)
+    : TWidget(nullptr)
+    , _manager(manager)
+    , _startPosition(startPosition)
+    , _direction(shiftDirection)
+    , a_shift(shift)
+    , _a_shift(animation(this, &Widget::step_shift)) {
 	setWindowOpacity(0.);
 
-	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint | Qt::NoDropShadowWindowHint | Qt::Tool);
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint |
+	               Qt::NoDropShadowWindowHint | Qt::Tool);
 	setAttribute(Qt::WA_MacAlwaysShowToolWindow);
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
@@ -381,9 +366,7 @@ void Widget::destroyDelayed() {
 	_deleted = true;
 
 	// Ubuntu has a lag if a fully transparent widget is destroyed immediately.
-	App::CallDelayed(1000, this, [this] {
-		manager()->removeWidget(this);
-	});
+	App::CallDelayed(1000, this, [this] { manager()->removeWidget(this); });
 }
 
 void Widget::opacityAnimationCallback() {
@@ -468,7 +451,8 @@ QPoint Widget::computePosition(int height) const {
 	return QPoint(_startPosition.x(), _startPosition.y() + realShift);
 }
 
-Background::Background(QWidget *parent) : TWidget(parent) {
+Background::Background(QWidget *parent)
+    : TWidget(parent) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 }
 
@@ -478,20 +462,23 @@ void Background::paintEvent(QPaintEvent *e) {
 	p.fillRect(rect(), st::notificationBg);
 	p.fillRect(0, 0, st::notifyBorderWidth, height(), st::notifyBorder);
 	p.fillRect(width() - st::notifyBorderWidth, 0, st::notifyBorderWidth, height(), st::notifyBorder);
-	p.fillRect(st::notifyBorderWidth, height() - st::notifyBorderWidth, width() - 2 * st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder);
+	p.fillRect(st::notifyBorderWidth, height() - st::notifyBorderWidth, width() - 2 * st::notifyBorderWidth,
+	           st::notifyBorderWidth, st::notifyBorder);
 }
 
-Notification::Notification(Manager *manager, History *history, PeerData *peer, PeerData *author, HistoryItem *msg, int forwardedCount, QPoint startPosition, int shift, Direction shiftDirection) : Widget(manager, startPosition, shift, shiftDirection)
-, _history(history)
-, _peer(peer)
-, _author(author)
-, _item(msg)
-, _forwardedCount(forwardedCount)
+Notification::Notification(Manager *manager, History *history, PeerData *peer, PeerData *author, HistoryItem *msg,
+                           int forwardedCount, QPoint startPosition, int shift, Direction shiftDirection)
+    : Widget(manager, startPosition, shift, shiftDirection)
+    , _history(history)
+    , _peer(peer)
+    , _author(author)
+    , _item(msg)
+    , _forwardedCount(forwardedCount)
 #ifdef Q_OS_WIN
-, _started(GetTickCount())
+    , _started(GetTickCount())
 #endif // Q_OS_WIN
-, _close(this, st::notifyClose)
-, _reply(this, langFactory(lng_notification_reply), st::defaultBoxButton) {
+    , _close(this, st::notifyClose)
+    , _reply(this, langFactory(lng_notification_reply), st::defaultBoxButton) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	auto position = computePosition(st::notifyMinHeight);
@@ -503,16 +490,12 @@ Notification::Notification(Manager *manager, History *history, PeerData *peer, P
 	_hideTimer.setSingleShot(true);
 	connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(onHideByTimer()));
 
-	_close->setClickedCallback([this] {
-		unlinkHistoryInManager();
-	});
+	_close->setClickedCallback([this] { unlinkHistoryInManager(); });
 	_close->setAcceptBoth(true);
 	_close->moveToRight(st::notifyClosePos.x(), st::notifyClosePos.y());
 	_close->show();
 
-	_reply->setClickedCallback([this] {
-		showReplyField();
-	});
+	_reply->setClickedCallback([this] { showReplyField(); });
 	_replyPadding = st::notifyMinHeight - st::notifyPhotoPos.y() - st::notifyPhotoSize;
 	updateReplyGeometry();
 	_reply->hide();
@@ -550,13 +533,15 @@ void Notification::prepareActionsCache() {
 	auto replyRight = _replyPadding - st::notifyBorderWidth;
 	auto actionsCacheWidth = _reply->width() + replyRight + fadeWidth;
 	auto actionsCacheHeight = height() - actionsTop - st::notifyBorderWidth;
-	auto actionsCacheImg = QImage(QSize(actionsCacheWidth, actionsCacheHeight) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto actionsCacheImg =
+	    QImage(QSize(actionsCacheWidth, actionsCacheHeight) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
 	actionsCacheImg.setDevicePixelRatio(cRetinaFactor());
 	actionsCacheImg.fill(Qt::transparent);
 	{
 		Painter p(&actionsCacheImg);
 		st::notifyFadeRight.fill(p, rtlrect(0, 0, fadeWidth, actionsCacheHeight, actionsCacheWidth));
-		p.fillRect(rtlrect(fadeWidth, 0, actionsCacheWidth - fadeWidth, actionsCacheHeight, actionsCacheWidth), st::notificationBg);
+		p.fillRect(rtlrect(fadeWidth, 0, actionsCacheWidth - fadeWidth, actionsCacheHeight, actionsCacheWidth),
+		           st::notificationBg);
 		p.drawPixmapRight(replyRight, _reply->y() - actionsTop, actionsCacheWidth, replyCache);
 	}
 	_buttonsCache = App::pixmapFromImageInPlace(std::move(actionsCacheImg));
@@ -643,19 +628,23 @@ void Notification::updateNotifyDisplay() {
 		Painter p(&img);
 		p.fillRect(0, 0, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder);
 		p.fillRect(w - st::notifyBorderWidth, 0, st::notifyBorderWidth, h - st::notifyBorderWidth, st::notifyBorder);
-		p.fillRect(st::notifyBorderWidth, h - st::notifyBorderWidth, w - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorder);
+		p.fillRect(st::notifyBorderWidth, h - st::notifyBorderWidth, w - st::notifyBorderWidth, st::notifyBorderWidth,
+		           st::notifyBorder);
 		p.fillRect(0, st::notifyBorderWidth, st::notifyBorderWidth, h - st::notifyBorderWidth, st::notifyBorder);
 
 		if (!options.hideNameAndPhoto) {
 			_history->peer->loadUserpic(true, true);
-			_history->peer->paintUserpicLeft(p, st::notifyPhotoPos.x(), st::notifyPhotoPos.y(), width(), st::notifyPhotoSize);
+			_history->peer->paintUserpicLeft(p, st::notifyPhotoPos.x(), st::notifyPhotoPos.y(), width(),
+			                                 st::notifyPhotoSize);
 		} else {
 			p.drawPixmap(st::notifyPhotoPos.x(), st::notifyPhotoPos.y(), manager()->hiddenUserpicPlaceholder());
 		}
 
-		qint32 itemWidth = w - st::notifyPhotoPos.x() - st::notifyPhotoSize - st::notifyTextLeft - st::notifyClosePos.x() - st::notifyClose.width;
+		qint32 itemWidth = w - st::notifyPhotoPos.x() - st::notifyPhotoSize - st::notifyTextLeft -
+		                   st::notifyClosePos.x() - st::notifyClose.width;
 
-		QRect rectForName(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyTextTop, itemWidth, st::msgNameFont->height);
+		QRect rectForName(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyTextTop,
+		                  itemWidth, st::msgNameFont->height);
 		if (!options.hideNameAndPhoto) {
 			if (auto chatTypeIcon = Dialogs::Layout::ChatTypeIcon(_history->peer, false, false)) {
 				chatTypeIcon->paint(p, rectForName.topLeft(), w);
@@ -666,17 +655,12 @@ void Notification::updateNotifyDisplay() {
 		if (!options.hideMessageText) {
 			const HistoryItem *textCachedFor = 0;
 			Text itemTextCache(itemWidth);
-			QRect r(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyItemTop + st::msgNameFont->height, itemWidth, 2 * st::dialogsTextFont->height);
+			QRect r(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft,
+			        st::notifyItemTop + st::msgNameFont->height, itemWidth, 2 * st::dialogsTextFont->height);
 			if (_item) {
 				auto active = false, selected = false;
-				_item->drawInDialog(
-					p,
-					r,
-					active,
-					selected,
-					HistoryItem::DrawInDialog::Normal,
-					textCachedFor,
-					itemTextCache);
+				_item->drawInDialog(p, r, active, selected, HistoryItem::DrawInDialog::Normal, textCachedFor,
+				                    itemTextCache);
 			} else if (_forwardedCount > 1) {
 				p.setFont(st::dialogsTextFont);
 				if (_author) {
@@ -686,13 +670,15 @@ void Notification::updateNotifyDisplay() {
 					r.setTop(r.top() + st::dialogsTextFont->height);
 				}
 				p.setPen(st::dialogsTextFg);
-				p.drawText(r.left(), r.top() + st::dialogsTextFont->ascent, lng_forward_messages(lt_count, _forwardedCount));
+				p.drawText(r.left(), r.top() + st::dialogsTextFont->ascent,
+				           lng_forward_messages(lt_count, _forwardedCount));
 			}
 		} else {
 			static QString notifyText = st::dialogsTextFont->elided(lang(lng_notification_preview), itemWidth);
 			p.setFont(st::dialogsTextFont);
 			p.setPen(st::dialogsTextFgService);
-			p.drawText(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft, st::notifyItemTop + st::msgNameFont->height + st::dialogsTextFont->ascent, notifyText);
+			p.drawText(st::notifyPhotoPos.x() + st::notifyPhotoSize + st::notifyTextLeft,
+			           st::notifyItemTop + st::msgNameFont->height + st::dialogsTextFont->ascent, notifyText);
 		}
 
 		p.setPen(st::dialogsNameFg);
@@ -747,7 +733,8 @@ void Notification::unlinkHistoryInManager() {
 void Notification::toggleActionButtons(bool visible) {
 	if (_actionsVisible != visible) {
 		_actionsVisible = visible;
-		a_actionsOpacity.start([this] { actionsOpacityCallback(); }, _actionsVisible ? 0. : 1., _actionsVisible ? 1. : 0., st::notifyActionsDuration);
+		a_actionsOpacity.start([this] { actionsOpacityCallback(); }, _actionsVisible ? 0. : 1.,
+		                       _actionsVisible ? 1. : 0., st::notifyActionsDuration);
 		_reply->clearState();
 		_reply->hide();
 	}
@@ -849,7 +836,7 @@ void Notification::mousePressEvent(QMouseEvent *e) {
 
 bool Notification::eventFilter(QObject *o, QEvent *e) {
 	if (e->type() == QEvent::MouseButtonPress) {
-		if (auto receiver = qobject_cast<QWidget*>(o)) {
+		if (auto receiver = qobject_cast<QWidget *>(o)) {
 			if (isAncestorOf(receiver)) {
 				activateWindow();
 			}
@@ -868,7 +855,8 @@ void Notification::onHideByTimer() {
 	startHiding();
 }
 
-HideAllButton::HideAllButton(Manager *manager, QPoint startPosition, int shift, Direction shiftDirection) : Widget(manager, startPosition, shift, shiftDirection) {
+HideAllButton::HideAllButton(Manager *manager, QPoint startPosition, int shift, Direction shiftDirection)
+    : Widget(manager, startPosition, shift, shiftDirection) {
 	setCursor(style::cur_pointer);
 
 	auto position = computePosition(st::notifyHideAllHeight);
@@ -926,7 +914,8 @@ void HideAllButton::paintEvent(QPaintEvent *e) {
 	p.fillRect(0, 0, width(), st::notifyBorderWidth, st::notifyBorder);
 	p.fillRect(0, height() - st::notifyBorderWidth, width(), st::notifyBorderWidth, st::notifyBorder);
 	p.fillRect(0, st::notifyBorderWidth, st::notifyBorderWidth, height() - 2 * st::notifyBorderWidth, st::notifyBorder);
-	p.fillRect(width() - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorderWidth, height() - 2 * st::notifyBorderWidth, st::notifyBorder);
+	p.fillRect(width() - st::notifyBorderWidth, st::notifyBorderWidth, st::notifyBorderWidth,
+	           height() - 2 * st::notifyBorderWidth, st::notifyBorder);
 
 	p.setFont(st::defaultLinkButton.font);
 	p.setPen(_mouseOver ? st::lightButtonFgOver : st::lightButtonFg);
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h
index 6606d9011..cc2e4e7ab 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.h
+++ b/Telegram/SourceFiles/window/notifications_manager_default.h
@@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "base/observer.h"
-#include "window/notifications_manager.h"
 #include "core/single_timer.h"
 #include "history/history_item.h"
 #include "structs.h"
 #include "ui/animation.h"
+#include "window/notifications_manager.h"
 
 class History;
 
@@ -51,11 +51,8 @@ class Manager : public Notifications::Manager, private base::Subscriber {
 public:
 	Manager(System *system);
 
-	template <typename Method>
-	void enumerateNotifications(Method method) {
-		for_const (auto &notification, _notifications) {
-			method(notification);
-		}
+	template <typename Method> void enumerateNotifications(Method method) {
+		for_const (auto &notification, _notifications) { method(notification); }
 	}
 
 	~Manager();
@@ -102,12 +99,11 @@ private:
 
 	struct QueuedNotification {
 		QueuedNotification(HistoryItem *item, int forwardedCount)
-		: history(item->history())
-		, peer(history->peer)
-		, author((item->hasFromName() && !item->isPost()) ? item->author() : nullptr)
-		, item((forwardedCount > 1) ? nullptr : item)
-		, forwardedCount(forwardedCount) {
-		}
+		    : history(item->history())
+		    , peer(history->peer)
+		    , author((item->hasFromName() && !item->isPost()) ? item->author() : nullptr)
+		    , item((forwardedCount > 1) ? nullptr : item)
+		    , forwardedCount(forwardedCount) {}
 
 		History *history;
 		PeerData *peer;
@@ -120,7 +116,6 @@ private:
 	Animation _demoMasterOpacity;
 
 	mutable QPixmap _hiddenUserpicPlaceholder;
-
 };
 
 namespace internal {
@@ -176,7 +171,6 @@ private:
 	Direction _direction;
 	anim::value a_shift;
 	BasicAnimation _a_shift;
-
 };
 
 class Background : public TWidget {
@@ -185,14 +179,14 @@ public:
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
-
 };
 
 class Notification : public Widget {
 	Q_OBJECT
 
 public:
-	Notification(Manager *manager, History *history, PeerData *peer, PeerData *author, HistoryItem *item, int forwardedCount, QPoint startPosition, int shift, Direction shiftDirection);
+	Notification(Manager *manager, History *history, PeerData *peer, PeerData *author, HistoryItem *item,
+	             int forwardedCount, QPoint startPosition, int shift, Direction shiftDirection);
 
 	void startHiding();
 	void stopHiding();
@@ -257,9 +251,9 @@ private:
 	int _forwardedCount;
 	object_ptr<Ui::IconButton> _close;
 	object_ptr<Ui::RoundButton> _reply;
-	object_ptr<Background> _background = { nullptr };
-	object_ptr<Ui::InputArea> _replyArea = { nullptr };
-	object_ptr<Ui::IconButton> _replySend = { nullptr };
+	object_ptr<Background> _background = {nullptr};
+	object_ptr<Ui::InputArea> _replyArea = {nullptr};
+	object_ptr<Ui::IconButton> _replySend = {nullptr};
 	bool _waitingForInput = true;
 
 	QTimer _hideTimer;
@@ -267,7 +261,6 @@ private:
 	int _replyPadding = 0;
 
 	bool _userpicLoaded = false;
-
 };
 
 class HideAllButton : public Widget {
@@ -288,7 +281,6 @@ protected:
 private:
 	bool _mouseOver = false;
 	bool _mouseDown = false;
-
 };
 
 } // namespace internal
diff --git a/Telegram/SourceFiles/window/notifications_utilities.cpp b/Telegram/SourceFiles/window/notifications_utilities.cpp
index f34cfb69d..4a4ec8ff3 100644
--- a/Telegram/SourceFiles/window/notifications_utilities.cpp
+++ b/Telegram/SourceFiles/window/notifications_utilities.cpp
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/notifications_utilities.h"
 
-#include "platform/platform_specific.h"
 #include "messenger.h"
+#include "platform/platform_specific.h"
 #include "styles/style_window.h"
 
 namespace Window {
@@ -33,7 +33,8 @@ constexpr int kNotifyDeletePhotoAfterMs = 60000;
 
 } // namespace
 
-CachedUserpics::CachedUserpics(Type type) : _type(type) {
+CachedUserpics::CachedUserpics(Type type)
+    : _type(type) {
 	connect(&_clearTimer, SIGNAL(timeout()), this, SLOT(onClear()));
 	QDir().mkpath(cWorkingDir() + qsl("tdata/temp"));
 }
@@ -113,12 +114,10 @@ void CachedUserpics::onClear() {
 CachedUserpics::~CachedUserpics() {
 	if (_someSavedFlag) {
 		TimeMs result = 0;
-		for_const (auto &item, _images) {
-			QFile(item.path).remove();
-		}
+		for_const (auto &item, _images) { QFile(item.path).remove(); }
 
-// This works about 1200ms on Windows for a folder with one image O_o
-//		psDeleteDir(cWorkingDir() + qsl("tdata/temp"));
+		// This works about 1200ms on Windows for a folder with one image O_o
+		//		psDeleteDir(cWorkingDir() + qsl("tdata/temp"));
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/notifications_utilities.h b/Telegram/SourceFiles/window/notifications_utilities.h
index 90253ff76..9c126f7cf 100644
--- a/Telegram/SourceFiles/window/notifications_utilities.h
+++ b/Telegram/SourceFiles/window/notifications_utilities.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/notifications_manager.h"
 #include "core/single_timer.h"
+#include "window/notifications_manager.h"
 
 namespace Window {
 namespace Notifications {
@@ -56,8 +56,7 @@ private:
 	Images _images;
 	bool _someSavedFlag = false;
 	SingleTimer _clearTimer;
-
 };
 
-} // namesapce Notifications
+} // namespace Notifications
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/player_wrap_widget.cpp b/Telegram/SourceFiles/window/player_wrap_widget.cpp
index 0b574e7ae..d50db6d00 100644
--- a/Telegram/SourceFiles/window/player_wrap_widget.cpp
+++ b/Telegram/SourceFiles/window/player_wrap_widget.cpp
@@ -20,15 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/player_wrap_widget.h"
 
-#include "ui/widgets/shadow.h"
 #include "facades.h"
+#include "ui/widgets/shadow.h"
 
 namespace Window {
 
-PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda<void()> updateCallback) : Parent(parent
-	, object_ptr<Media::Player::Widget>(parent)
-	, style::margins(0, 0, 0, 0)
-	, std::move(updateCallback)) {
+PlayerWrapWidget::PlayerWrapWidget(QWidget *parent, base::lambda<void()> updateCallback)
+    : Parent(parent, object_ptr<Media::Player::Widget>(parent), style::margins(0, 0, 0, 0), std::move(updateCallback)) {
 }
 
 void PlayerWrapWidget::resizeEvent(QResizeEvent *e) {
diff --git a/Telegram/SourceFiles/window/player_wrap_widget.h b/Telegram/SourceFiles/window/player_wrap_widget.h
index 4c0cd841d..b47954e77 100644
--- a/Telegram/SourceFiles/window/player_wrap_widget.h
+++ b/Telegram/SourceFiles/window/player_wrap_widget.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ui/effects/widget_slide_wrap.h"
 #include "media/player/media_player_widget.h"
+#include "ui/effects/widget_slide_wrap.h"
 
 namespace Ui {
 class PlainShadow;
@@ -33,7 +33,6 @@ protected:
 
 private:
 	void updateShadowGeometry();
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/section_memento.h b/Telegram/SourceFiles/window/section_memento.h
index c2879695b..ad51af078 100644
--- a/Telegram/SourceFiles/window/section_memento.h
+++ b/Telegram/SourceFiles/window/section_memento.h
@@ -29,10 +29,9 @@ class SectionWidget;
 
 class SectionMemento {
 public:
-	virtual object_ptr<Window::SectionWidget> createWidget(QWidget *parent, gsl::not_null<Window::Controller*> controller, const QRect &geometry) = 0;
-	virtual ~SectionMemento() {
-	}
-
+	virtual object_ptr<Window::SectionWidget>
+	createWidget(QWidget *parent, gsl::not_null<Window::Controller *> controller, const QRect &geometry) = 0;
+	virtual ~SectionMemento() {}
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index d7b229679..e7105d9de 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -21,17 +21,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/section_widget.h"
 
 #include "application.h"
+#include "facades.h"
 #include "ui/twidget.h"
 #include "window_slide_animation.h"
-#include "facades.h"
 
 #include <QEvent>
 #include <QPaintEvent>
 
 namespace Window {
 
-SectionWidget::SectionWidget(QWidget *parent, not_null<Window::Controller*> controller) : AbstractSectionWidget(parent, controller) {
-}
+SectionWidget::SectionWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : AbstractSectionWidget(parent, controller) {}
 
 void SectionWidget::setGeometryWithTopMoved(const QRect &newGeometry, int topDelta) {
 	_topDelta = topDelta;
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 1c70aea69..7192db033 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -36,8 +36,9 @@ enum class Column {
 
 class AbstractSectionWidget : public TWidget, protected base::Subscriber {
 public:
-	AbstractSectionWidget(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent), _controller(controller) {
-	}
+	AbstractSectionWidget(QWidget *parent, not_null<Window::Controller *> controller)
+	    : TWidget(parent)
+	    , _controller(controller) {}
 
 	// Float player interface.
 	virtual bool wheelEventFromFloatPlayer(QEvent *e, Window::Column myColumn, Window::Column playerColumn) {
@@ -48,13 +49,12 @@ public:
 	}
 
 protected:
-	not_null<Window::Controller*> controller() const {
+	not_null<Window::Controller *> controller() const {
 		return _controller;
 	}
 
 private:
-	not_null<Window::Controller*> _controller;
-
+	not_null<Window::Controller *> _controller;
 };
 
 class SectionMemento;
@@ -71,7 +71,7 @@ struct SectionSlideParams {
 
 class SectionWidget : public AbstractSectionWidget {
 public:
-	SectionWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	SectionWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	virtual PeerData *peerForDialogs() const {
 		return nullptr;
@@ -100,7 +100,7 @@ public:
 	//
 	// If this method returns false it is not supposed to modify the memento.
 	// If this method returns true it may modify the memento ("take" heavy items).
-	virtual bool showInternal(not_null<SectionMemento*> memento) = 0;
+	virtual bool showInternal(not_null<SectionMemento *> memento) = 0;
 
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
@@ -125,12 +125,10 @@ protected:
 	}
 
 	// Called after the hideChildren() call in showAnimated().
-	virtual void showAnimatedHook() {
-	}
+	virtual void showAnimatedHook() {}
 
 	// Called after the showChildren() call in showFinished().
-	virtual void showFinishedHook() {
-	}
+	virtual void showFinishedHook() {}
 
 	virtual void doSetInnerFocus() {
 		setFocus();
@@ -147,7 +145,6 @@ private:
 
 	// Saving here topDelta in resizeWithTopMoved() to get it passed to resizeEvent().
 	int _topDelta = 0;
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 5727677fb..307da73b5 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/themes/window_theme.h"
 
-#include "mainwidget.h"
-#include "storage/localstorage.h"
 #include "base/parse_helper.h"
 #include "base/zlib_help.h"
-#include "styles/style_widgets.h"
-#include "styles/style_history.h"
 #include "boxes/background_box.h"
+#include "mainwidget.h"
+#include "storage/localstorage.h"
+#include "styles/style_history.h"
+#include "styles/style_widgets.h"
 
 #include <QBuffer>
 #include <QImageReader>
@@ -97,8 +97,8 @@ inline uchar readHexUchar(char char1, char char2, bool &error) {
 }
 
 bool readNameAndValue(const char *&from, const char *end, QLatin1String *outName, QLatin1String *outValue) {
-	using base::parse::skipWhitespaces;
 	using base::parse::readName;
+	using base::parse::skipWhitespaces;
 
 	if (!skipWhitespaces(from, end)) return true;
 
@@ -112,7 +112,8 @@ bool readNameAndValue(const char *&from, const char *end, QLatin1String *outName
 		return false;
 	}
 	if (*from != ':') {
-		LOG(("Theme Error: Expected ':' between each name and value in the color scheme (while reading key '%1')").arg(*outName));
+		LOG(("Theme Error: Expected ':' between each name and value in the color scheme (while reading key '%1')")
+		        .arg(*outName));
 		return false;
 	}
 	if (!skipWhitespaces(++from, end)) {
@@ -123,7 +124,9 @@ bool readNameAndValue(const char *&from, const char *end, QLatin1String *outName
 	if (*from == '#') ++from;
 
 	if (readName(from, end).size() == 0) {
-		LOG(("Theme Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme (while reading key '%1')").arg(*outName));
+		LOG(("Theme Error: Expected a color value in #rrggbb or #rrggbbaa format in the color scheme (while reading "
+		     "key '%1')")
+		        .arg(*outName));
 		return false;
 	}
 	*outValue = QLatin1String(valueStart, from - valueStart);
@@ -156,7 +159,10 @@ SetResult setColorSchemeValue(QLatin1String name, QLatin1String value, Instance
 		auto b = readHexUchar(data[5], data[6], error);
 		auto a = (size == 9) ? readHexUchar(data[7], data[8], error) : uchar(255);
 		if (error) {
-			LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously defined key in the color scheme)").arg(name).arg(value));
+			LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a "
+			     "previously defined key in the color scheme)")
+			        .arg(name)
+			        .arg(value));
 			return SetResult::Ok;
 		} else if (out) {
 			result = out->palette.setColor(name, r, g, b, a);
@@ -175,10 +181,15 @@ SetResult setColorSchemeValue(QLatin1String name, QLatin1String value, Instance
 	} else if (result == style::palette::SetResult::KeyNotFound) {
 		return SetResult::NotFound;
 	} else if (result == style::palette::SetResult::ValueNotFound) {
-		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously defined key in the color scheme)").arg(name).arg(value));
+		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously "
+		     "defined key in the color scheme)")
+		        .arg(name)
+		        .arg(value));
 		return SetResult::Ok;
 	} else if (result == style::palette::SetResult::Duplicate) {
-		LOG(("Theme Warning: Color value appears more than once in the color scheme (while applying '%1: %2')").arg(name).arg(value));
+		LOG(("Theme Warning: Color value appears more than once in the color scheme (while applying '%1: %2')")
+		        .arg(name)
+		        .arg(value));
 		return SetResult::Ok;
 	} else {
 		LOG(("Theme Error: Unexpected internal error."));
@@ -279,16 +290,19 @@ bool loadTheme(const QByteArray &content, Cached &cache, Instance *out = nullptr
 	cache = Cached();
 	zlib::FileToRead file(content);
 
-	unz_global_info globalInfo = { 0 };
+	unz_global_info globalInfo = {0};
 	file.getGlobalInfo(&globalInfo);
 	if (file.error() == UNZ_OK) {
-		auto schemeContent = file.readFileContent("colors.tdesktop-theme", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
+		auto schemeContent =
+		    file.readFileContent("colors.tdesktop-theme", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
 		if (file.error() == UNZ_END_OF_LIST_OF_FILE) {
 			file.clearError();
-			schemeContent = file.readFileContent("colors.tdesktop-palette", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
+			schemeContent =
+			    file.readFileContent("colors.tdesktop-palette", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
 		}
 		if (file.error() != UNZ_OK) {
-			LOG(("Theme Error: could not read 'colors.tdesktop-theme' or 'colors.tdesktop-palette' in the theme file."));
+			LOG((
+			    "Theme Error: could not read 'colors.tdesktop-theme' or 'colors.tdesktop-palette' in the theme file."));
 			return false;
 		}
 		if (!loadColorScheme(schemeContent, out)) {
@@ -334,7 +348,8 @@ bool loadTheme(const QByteArray &content, Cached &cache, Instance *out = nullptr
 }
 
 QImage prepareBackgroundImage(QImage &&image) {
-	if (image.format() != QImage::Format_ARGB32 && image.format() != QImage::Format_ARGB32_Premultiplied && image.format() != QImage::Format_RGB32) {
+	if (image.format() != QImage::Format_ARGB32 && image.format() != QImage::Format_ARGB32_Premultiplied &&
+	    image.format() != QImage::Format_RGB32) {
 		image = std::move(image).convertToFormat(QImage::Format_RGB32);
 	}
 	image.setDevicePixelRatio(cRetinaFactor());
@@ -350,8 +365,8 @@ void adjustColor(style::color color, double hue, double saturation) {
 void adjustColorsUsingBackground(const QImage &img) {
 	Assert(img.format() == QImage::Format_ARGB32_Premultiplied);
 
-	quint64 components[3] = { 0 };
-	quint64 componentsScroll[3] = { 0 };
+	quint64 components[3] = {0};
+	quint64 componentsScroll[3] = {0};
 	auto w = img.width();
 	auto h = img.height();
 	auto size = w * h;
@@ -410,9 +425,8 @@ void ChatBackground::setImage(qint32 id, QImage &&image) {
 	if (_id == kThemeBackground) {
 		_tile = _themeTile;
 		setPreparedImage(QImage(_themeImage));
-	} else if (_id == internal::kTestingThemeBackground
-		|| _id == internal::kTestingDefaultBackground
-		|| _id == internal::kTestingEditorBackground) {
+	} else if (_id == internal::kTestingThemeBackground || _id == internal::kTestingDefaultBackground ||
+	           _id == internal::kTestingEditorBackground) {
 		if (_id == internal::kTestingDefaultBackground || image.isNull()) {
 			image.load(qsl(":/gui/art/bg.jpg"));
 			_id = internal::kTestingDefaultBackground;
@@ -514,8 +528,7 @@ bool ChatBackground::tile() const {
 }
 
 bool ChatBackground::tileForSave() const {
-	if (_id == internal::kTestingThemeBackground ||
-		_id == internal::kTestingDefaultBackground) {
+	if (_id == internal::kTestingThemeBackground || _id == internal::kTestingDefaultBackground) {
 		return _tileForRevert;
 	}
 	return tile();
@@ -567,9 +580,8 @@ void ChatBackground::saveForRevert() {
 
 void ChatBackground::setTestingTheme(Instance &&theme, ChangeMode mode) {
 	style::main_palette::apply(theme.palette);
-	auto switchToThemeBackground = (mode == ChangeMode::SwitchToThemeBackground && !theme.background.isNull())
-		|| (_id == kThemeBackground)
-		|| (_id == kDefaultBackground && !Local::hasTheme());
+	auto switchToThemeBackground = (mode == ChangeMode::SwitchToThemeBackground && !theme.background.isNull()) ||
+	                               (_id == kThemeBackground) || (_id == kDefaultBackground && !Local::hasTheme());
 	if (AreTestingTheme() && IsPaletteTestingPath(instance->applying.path)) {
 		// Grab current background image if it is not already custom
 		if (_id != kCustomBackground) {
@@ -628,9 +640,8 @@ void ChatBackground::writeNewBackgroundSettings() {
 }
 
 void ChatBackground::revert() {
-	if (_id == internal::kTestingThemeBackground
-		|| _id == internal::kTestingDefaultBackground
-		|| _id == internal::kTestingEditorBackground) {
+	if (_id == internal::kTestingThemeBackground || _id == internal::kTestingDefaultBackground ||
+	    _id == internal::kTestingEditorBackground) {
 		setTile(_tileForRevert);
 		setImage(_idForRevert, std::move(_imageForRevert));
 	} else {
@@ -691,7 +702,8 @@ void SwitchNightTheme(bool enabled) {
 		if (instance->applying.paletteForRevert.isEmpty()) {
 			instance->applying.paletteForRevert = style::main_palette::save();
 		}
-		Background()->setTestingTheme(std::move(preview->instance), ChatBackground::ChangeMode::LeaveCurrentCustomBackground);
+		Background()->setTestingTheme(std::move(preview->instance),
+		                              ChatBackground::ChangeMode::LeaveCurrentCustomBackground);
 	} else {
 		Window::Theme::ApplyDefault();
 	}
@@ -777,7 +789,7 @@ bool LoadFromFile(const QString &path, Instance *out, QByteArray *outContent) {
 		return false;
 	}
 
-	return loadTheme(*outContent,  out->cached, out);
+	return loadTheme(*outContent, out->cached, out);
 }
 
 bool IsPaletteTestingPath(const QString &path) {
@@ -796,7 +808,8 @@ void ComputeBackgroundRects(QRect wholeFill, QSize imageSize, QRect &to, QRect &
 		} else if ((imageSize.width() % 2) != (takewidth % 2)) {
 			++takewidth;
 		}
-		to = QRect(int((wholeFill.width() - takewidth * pxsize) / 2.), 0, std::ceil(takewidth * pxsize), wholeFill.height());
+		to = QRect(int((wholeFill.width() - takewidth * pxsize) / 2.), 0, std::ceil(takewidth * pxsize),
+		           wholeFill.height());
 		from = QRect((imageSize.width() - takewidth) / 2, 0, takewidth, imageSize.height());
 	} else {
 		double pxsize = wholeFill.width() / double(imageSize.width());
@@ -806,7 +819,8 @@ void ComputeBackgroundRects(QRect wholeFill, QSize imageSize, QRect &to, QRect &
 		} else if ((imageSize.height() % 2) != (takeheight % 2)) {
 			++takeheight;
 		}
-		to = QRect(0, int((wholeFill.height() - takeheight * pxsize) / 2.), wholeFill.width(), std::ceil(takeheight * pxsize));
+		to = QRect(0, int((wholeFill.height() - takeheight * pxsize) / 2.), wholeFill.width(),
+		           std::ceil(takeheight * pxsize));
 		from = QRect(0, (imageSize.height() - takeheight) / 2, imageSize.width(), takeheight);
 	}
 }
@@ -816,16 +830,19 @@ bool CopyColorsToPalette(const QString &path, const QByteArray &themeContent) {
 
 	zlib::FileToRead file(themeContent);
 
-	unz_global_info globalInfo = { 0 };
+	unz_global_info globalInfo = {0};
 	file.getGlobalInfo(&globalInfo);
 	if (file.error() == UNZ_OK) {
 		paletteContent = file.readFileContent("colors.tdesktop-theme", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
 		if (file.error() == UNZ_END_OF_LIST_OF_FILE) {
 			file.clearError();
-			paletteContent = file.readFileContent("colors.tdesktop-palette", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
+			paletteContent =
+			    file.readFileContent("colors.tdesktop-palette", zlib::kCaseInsensitive, kThemeSchemeSizeLimit);
 		}
 		if (file.error() != UNZ_OK) {
-			LOG(("Theme Error: could not read 'colors.tdesktop-theme' or 'colors.tdesktop-palette' in the theme file, while copying to '%1'.").arg(path));
+			LOG(("Theme Error: could not read 'colors.tdesktop-theme' or 'colors.tdesktop-palette' in the theme file, "
+			     "while copying to '%1'.")
+			        .arg(path));
 			return false;
 		}
 	}
@@ -843,7 +860,8 @@ bool CopyColorsToPalette(const QString &path, const QByteArray &themeContent) {
 	return true;
 }
 
-bool ReadPaletteValues(const QByteArray &content, base::lambda<bool(QLatin1String name, QLatin1String value)> callback) {
+bool ReadPaletteValues(const QByteArray &content,
+                       base::lambda<bool(QLatin1String name, QLatin1String value)> callback) {
 	if (content.size() > kThemeSchemeSizeLimit) {
 		LOG(("Theme Error: color scheme file too large (should be less than 1 MB, got %2)").arg(content.size()));
 		return false;
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index 2b5729a47..c01cf97e6 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -19,10 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
-#include "base/observer.h"
 #include "QImage"
-#include "styles/palette.h"
 #include "QPixmap"
+#include "base/observer.h"
+#include "styles/palette.h"
 
 namespace Window {
 namespace Theme {
@@ -87,8 +87,9 @@ struct BackgroundUpdate {
 		ApplyingTheme,
 	};
 
-	BackgroundUpdate(Type type, bool tiled) : type(type), tiled(tiled) {
-	}
+	BackgroundUpdate(Type type, bool tiled)
+	    : type(type)
+	    , tiled(tiled) {}
 	bool paletteChanged() const {
 		return (type == Type::TestingTheme || type == Type::RevertingTheme);
 	}
@@ -143,7 +144,6 @@ private:
 	qint32 _idForRevert = internal::kUninitializedBackground;
 	QImage _imageForRevert;
 	bool _tileForRevert = false;
-
 };
 
 ChatBackground *Background();
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index 9c79f47ae..b2b94c960 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -20,27 +20,27 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/themes/window_theme_editor.h"
 
-#include "window/themes/window_theme.h"
-#include "window/themes/window_theme_editor_block.h"
-#include "mainwindow.h"
-#include "storage/localstorage.h"
-#include "boxes/confirm_box.h"
-#include "styles/style_window.h"
-#include "styles/style_settings.h"
-#include "styles/style_dialogs.h"
-#include "styles/style_boxes.h"
-#include "ui/widgets/scroll_area.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/multi_select.h"
 #include "base/parse_helper.h"
 #include "base/task_queue.h"
 #include "base/zlib_help.h"
-#include "ui/toast/toast.h"
-#include "core/file_utilities.h"
+#include "boxes/confirm_box.h"
 #include "boxes/edit_color_box.h"
+#include "core/file_utilities.h"
 #include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "storage/localstorage.h"
+#include "styles/style_boxes.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_settings.h"
+#include "styles/style_window.h"
+#include "ui/toast/toast.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/multi_select.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
+#include "window/themes/window_theme.h"
+#include "window/themes/window_theme_editor_block.h"
 
 #include "app.h"
 #include "facades.h"
@@ -52,14 +52,15 @@ namespace Theme {
 namespace {
 
 struct ReadColorResult {
-	ReadColorResult(QColor color, bool error = false) : color(color), error(error) {
-	}
+	ReadColorResult(QColor color, bool error = false)
+	    : color(color)
+	    , error(error) {}
 	QColor color;
 	bool error = false;
 };
 
 ReadColorResult colorError(const QString &name) {
-	return { QColor(), true };
+	return {QColor(), true};
 }
 
 ReadColorResult readColor(const QString &name, const char *data, int size) {
@@ -88,7 +89,7 @@ ReadColorResult readColor(const QString &name, const char *data, int size) {
 	if (r < 0 || g < 0 || b < 0 || a < 0) {
 		return colorError(name);
 	}
-	return { QColor(r, g, b, a) };
+	return {QColor(r, g, b, a)};
 }
 
 bool skipComment(const char *&data, const char *end) {
@@ -264,12 +265,12 @@ private:
 	object_ptr<EditorBlock> _newRows;
 
 	bool _applyingUpdate = false;
-
 };
 
 class ThemeExportBox : public BoxContent {
 public:
-	ThemeExportBox(QWidget*, const QByteArray &paletteContent, const QImage &background, const QByteArray &backgroundContent, bool tileBackground);
+	ThemeExportBox(QWidget *, const QByteArray &paletteContent, const QImage &background,
+	               const QByteArray &backgroundContent, bool tileBackground);
 
 protected:
 	void prepare() override;
@@ -292,17 +293,15 @@ private:
 
 	object_ptr<Ui::LinkButton> _chooseFromFile;
 	object_ptr<Ui::Checkbox> _tileBackground;
-
 };
 
-Editor::Inner::Inner(QWidget *parent, const QString &path) : TWidget(parent)
-, _path(path)
-, _existingRows(this, EditorBlock::Type::Existing, &_context)
-, _newRows(this, EditorBlock::Type::New, &_context) {
+Editor::Inner::Inner(QWidget *parent, const QString &path)
+    : TWidget(parent)
+    , _path(path)
+    , _existingRows(this, EditorBlock::Type::Existing, &_context)
+    , _newRows(this, EditorBlock::Type::New, &_context) {
 	resize(st::windowMinWidth, st::windowMinHeight);
-	subscribe(_context.resized, [this] {
-		resizeToWidth(width());
-	});
+	subscribe(_context.resized, [this] { resizeToWidth(width()); });
 	subscribe(_context.pending, [this](const EditorBlock::Context::EditionData &data) {
 		applyEditing(data.name, data.copyOf, data.value);
 	});
@@ -323,9 +322,8 @@ Editor::Inner::Inner(QWidget *parent, const QString &path) : TWidget(parent)
 
 		if (update.type == BackgroundUpdate::Type::TestingTheme) {
 			Revert();
-			App::CallDelayed(st::slideDuration, this, [] {
-				Ui::show(Box<InformBox>(lang(lng_theme_editor_cant_change_theme)));
-			});
+			App::CallDelayed(st::slideDuration, this,
+			                 [] { Ui::show(Box<InformBox>(lang(lng_theme_editor_cant_change_theme))); });
 		}
 	});
 }
@@ -396,11 +394,9 @@ void Editor::Inner::selectSkip(int direction) {
 }
 
 void Editor::Inner::selectSkipPage(int delta, int direction) {
-	auto defaultRowHeight = st::themeEditorMargin.top()
-		+ st::themeEditorSampleSize.height()
-		+ st::themeEditorDescriptionSkip
-		+ st::defaultTextStyle.font->height
-		+ st::themeEditorMargin.bottom();
+	auto defaultRowHeight = st::themeEditorMargin.top() + st::themeEditorSampleSize.height() +
+	                        st::themeEditorDescriptionSkip + st::defaultTextStyle.font->height +
+	                        st::themeEditorMargin.bottom();
 	for (auto i = 0, count = ceilclamp(delta, defaultRowHeight, 1, delta); i != count; ++i) {
 		selectSkip(direction);
 	}
@@ -412,7 +408,9 @@ void Editor::Inner::paintEvent(QPaintEvent *e) {
 	p.setFont(st::settingsFixedBarFont);
 	p.setPen(st::windowFg);
 	if (!_newRows->isHidden()) {
-		p.drawTextLeft(st::themeEditorMargin.left(), _existingRows->y() + _existingRows->height() + st::settingsFixedBarTextPosition.y(), width(), lang(lng_theme_editor_new_keys));
+		p.drawTextLeft(st::themeEditorMargin.left(),
+		               _existingRows->y() + _existingRows->height() + st::settingsFixedBarTextPosition.y(), width(),
+		               lang(lng_theme_editor_new_keys));
 	}
 }
 
@@ -443,7 +441,7 @@ bool Editor::Inner::readData() {
 				auto result = readColor(name, row.value.data() + 1, row.value.size() - 1);
 				Assert(!result.error);
 				_newRows->feed(name, result.color);
-				//if (!_newRows->feedFallbackName(name, str_const_toString(row.fallback))) {
+				// if (!_newRows->feedFallbackName(name, str_const_toString(row.fallback))) {
 				//	Unexpected("Row for fallback not found");
 				//}
 			} else {
@@ -477,9 +475,8 @@ bool Editor::Inner::readExistingRows() {
 	}
 	f.close();
 
-	return ReadPaletteValues(_paletteContent, [this](QLatin1String name, QLatin1String value) {
-		return feedExistingRow(name, value);
-	});
+	return ReadPaletteValues(_paletteContent,
+	                         [this](QLatin1String name, QLatin1String value) { return feedExistingRow(name, value); });
 }
 
 bool Editor::Inner::feedExistingRow(const QString &name, QLatin1String value) {
@@ -490,7 +487,10 @@ bool Editor::Inner::feedExistingRow(const QString &name, QLatin1String value) {
 	}
 	auto result = readColor(name, data + 1, size - 1);
 	if (result.error) {
-		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously defined key in the color scheme)").arg(name).arg(value));
+		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously "
+		     "defined key in the color scheme)")
+		        .arg(name)
+		        .arg(value));
 	} else {
 		_existingRows->feed(name, result.color);
 	}
@@ -526,7 +526,9 @@ void Editor::Inner::applyEditing(const QString &name, const QString &copyOf, QCo
 	auto plainValue = (copyOf.isEmpty() ? colorString(value) : copyOf).toLatin1();
 	auto newContent = replaceValueInContent(_paletteContent, plainName, plainValue);
 	if (newContent == "error") {
-		LOG(("Theme Error: could not replace '%1: %2' in content").arg(name).arg(copyOf.isEmpty() ? colorString(value) : copyOf));
+		LOG(("Theme Error: could not replace '%1: %2' in content")
+		        .arg(name)
+		        .arg(copyOf.isEmpty() ? colorString(value) : copyOf));
 		error();
 		return;
 	}
@@ -571,16 +573,19 @@ void writeDefaultPalette(const QString &path) {
 
 	auto rows = style::main_palette::data();
 	for_const (auto &row, rows) {
-		stream << bytesToUtf8(row.name) << ": " << bytesToUtf8(row.value) << "; // " << bytesToUtf8(row.description).replace('\n', ' ').replace('\r', ' ') << "\n";
+		stream << bytesToUtf8(row.name) << ": " << bytesToUtf8(row.value) << "; // "
+		       << bytesToUtf8(row.description).replace('\n', ' ').replace('\r', ' ') << "\n";
 	}
 }
 
-ThemeExportBox::ThemeExportBox(QWidget*, const QByteArray &paletteContent, const QImage &background, const QByteArray &backgroundContent, bool tileBackground) : BoxContent()
-, _paletteContent(paletteContent)
-, _background(background)
-, _backgroundContent(backgroundContent)
-, _chooseFromFile(this, lang(lng_settings_bg_from_file), st::boxLinkButton)
-, _tileBackground(this, lang(lng_settings_bg_tile), tileBackground, st::defaultBoxCheckbox) {
+ThemeExportBox::ThemeExportBox(QWidget *, const QByteArray &paletteContent, const QImage &background,
+                               const QByteArray &backgroundContent, bool tileBackground)
+    : BoxContent()
+    , _paletteContent(paletteContent)
+    , _background(background)
+    , _backgroundContent(backgroundContent)
+    , _chooseFromFile(this, lang(lng_settings_bg_from_file), st::boxLinkButton)
+    , _tileBackground(this, lang(lng_settings_bg_tile), tileBackground, st::defaultBoxCheckbox) {
 	_imageText = lng_theme_editor_saved_to_jpg(lt_size, formatSizeText(_backgroundContent.size()));
 	_chooseFromFile->setClickedCallback([this] { chooseBackgroundFromFile(); });
 }
@@ -591,7 +596,8 @@ void ThemeExportBox::prepare() {
 	addButton(langFactory(lng_theme_editor_export), [this] { exportTheme(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
 
-	auto height = st::settingsSmallSkip + st::settingsBackgroundSize + st::settingsSmallSkip + _tileBackground->height();
+	auto height =
+	    st::settingsSmallSkip + st::settingsBackgroundSize + st::settingsSmallSkip + _tileBackground->height();
 
 	setDimensions(st::boxWideWidth, height);
 
@@ -615,7 +621,8 @@ void ThemeExportBox::paintEvent(QPaintEvent *e) {
 void ThemeExportBox::resizeEvent(QResizeEvent *e) {
 	auto linkLeft = st::boxPadding.left() + st::settingsBackgroundSize + st::settingsSmallSkip;
 	_chooseFromFile->moveToLeft(linkLeft, st::settingsSmallSkip + st::boxTextFont->height + st::settingsSmallSkip);
-	_tileBackground->moveToLeft(st::boxPadding.left(), st::settingsSmallSkip + st::settingsBackgroundSize + 2 * st::settingsSmallSkip);
+	_tileBackground->moveToLeft(st::boxPadding.left(),
+	                            st::settingsSmallSkip + st::settingsBackgroundSize + 2 * st::settingsSmallSkip);
 }
 
 void ThemeExportBox::updateThumbnail() {
@@ -639,29 +646,31 @@ void ThemeExportBox::updateThumbnail() {
 }
 
 void ThemeExportBox::chooseBackgroundFromFile() {
-	FileDialog::GetOpenPath(lang(lng_theme_editor_choose_image), "Image files (*.jpeg *.jpg *.png)", base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
-		auto content = result.remoteContent;
-		if (!result.paths.isEmpty()) {
-			QFile f(result.paths.front());
-			if (f.open(QIODevice::ReadOnly)) {
-				content = f.readAll();
-				f.close();
-			}
-		}
-		if (!content.isEmpty()) {
-			auto format = QByteArray();
-			auto image = App::readImage(content, &format);
-			if (!image.isNull() && (format == "jpeg" || format == "jpg" || format == "png")) {
-				_background = image;
-				_backgroundContent = content;
-				_isPng = (format == "png");
-				auto sizeText = formatSizeText(_backgroundContent.size());
-				_imageText = _isPng ? lng_theme_editor_read_from_png(lt_size, sizeText) : lng_theme_editor_read_from_jpg(lt_size, sizeText);
-				_tileBackground->setChecked(false);
-				updateThumbnail();
-			}
-		}
-	}));
+	FileDialog::GetOpenPath(lang(lng_theme_editor_choose_image), "Image files (*.jpeg *.jpg *.png)",
+	                        base::lambda_guarded(this, [this](const FileDialog::OpenResult &result) {
+		                        auto content = result.remoteContent;
+		                        if (!result.paths.isEmpty()) {
+			                        QFile f(result.paths.front());
+			                        if (f.open(QIODevice::ReadOnly)) {
+				                        content = f.readAll();
+				                        f.close();
+			                        }
+		                        }
+		                        if (!content.isEmpty()) {
+			                        auto format = QByteArray();
+			                        auto image = App::readImage(content, &format);
+			                        if (!image.isNull() && (format == "jpeg" || format == "jpg" || format == "png")) {
+				                        _background = image;
+				                        _backgroundContent = content;
+				                        _isPng = (format == "png");
+				                        auto sizeText = formatSizeText(_backgroundContent.size());
+				                        _imageText = _isPng ? lng_theme_editor_read_from_png(lt_size, sizeText) :
+				                                              lng_theme_editor_read_from_jpg(lt_size, sizeText);
+				                        _tileBackground->setChecked(false);
+				                        updateThumbnail();
+			                        }
+		                        }
+	                        }));
 }
 
 void ThemeExportBox::exportTheme() {
@@ -669,51 +678,54 @@ void ThemeExportBox::exportTheme() {
 		auto caption = lang(lng_theme_editor_choose_name);
 		auto filter = "Themes (*.tdesktop-theme)";
 		auto name = "awesome.tdesktop-theme";
-		FileDialog::GetWritePath(caption, filter, name, base::lambda_guarded(this, [this](const QString &path) {
-			zlib::FileToWrite zip;
+		FileDialog::GetWritePath(
+		    caption, filter, name, base::lambda_guarded(this, [this](const QString &path) {
+			    zlib::FileToWrite zip;
 
-			zip_fileinfo zfi = { { 0, 0, 0, 0, 0, 0 }, 0, 0, 0 };
-			auto background = std::string(_tileBackground->checked() ? "tiled" : "background") + (_isPng ? ".png" : ".jpg");
-			zip.openNewFile(background.c_str(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
-			zip.writeInFile(_backgroundContent.constData(), _backgroundContent.size());
-			zip.closeFile();
-			auto scheme = "colors.tdesktop-theme";
-			zip.openNewFile(scheme, &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
-			zip.writeInFile(_paletteContent.constData(), _paletteContent.size());
-			zip.closeFile();
-			zip.close();
+			    zip_fileinfo zfi = {{0, 0, 0, 0, 0, 0}, 0, 0, 0};
+			    auto background =
+			        std::string(_tileBackground->checked() ? "tiled" : "background") + (_isPng ? ".png" : ".jpg");
+			    zip.openNewFile(background.c_str(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED,
+			                    Z_DEFAULT_COMPRESSION);
+			    zip.writeInFile(_backgroundContent.constData(), _backgroundContent.size());
+			    zip.closeFile();
+			    auto scheme = "colors.tdesktop-theme";
+			    zip.openNewFile(scheme, &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, Z_DEFAULT_COMPRESSION);
+			    zip.writeInFile(_paletteContent.constData(), _paletteContent.size());
+			    zip.closeFile();
+			    zip.close();
 
-			if (zip.error() != ZIP_OK) {
-				LOG(("Theme Error: could not export zip-ed theme, status: %1").arg(zip.error()));
-				Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
-				return;
-			}
-			auto result = zip.result();
+			    if (zip.error() != ZIP_OK) {
+				    LOG(("Theme Error: could not export zip-ed theme, status: %1").arg(zip.error()));
+				    Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
+				    return;
+			    }
+			    auto result = zip.result();
 
-			QFile f(path);
-			if (!f.open(QIODevice::WriteOnly)) {
-				LOG(("Theme Error: could not open zip-ed theme file '%1' for writing").arg(path));
-				Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
-				return;
-			}
-			if (f.write(result) != result.size()) {
-				LOG(("Theme Error: could not write zip-ed theme to file '%1'").arg(path));
-				Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
-				return;
-			}
-			Ui::hideLayer();
-			Ui::Toast::Show(lang(lng_theme_editor_done));
-		}));
+			    QFile f(path);
+			    if (!f.open(QIODevice::WriteOnly)) {
+				    LOG(("Theme Error: could not open zip-ed theme file '%1' for writing").arg(path));
+				    Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
+				    return;
+			    }
+			    if (f.write(result) != result.size()) {
+				    LOG(("Theme Error: could not write zip-ed theme to file '%1'").arg(path));
+				    Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
+				    return;
+			    }
+			    Ui::hideLayer();
+			    Ui::Toast::Show(lang(lng_theme_editor_done));
+		    }));
 	});
 }
 
-Editor::Editor(QWidget*, const QString &path)
-: _scroll(this, st::settingsScroll)
-, _close(this, st::contactsMultiSelect.fieldCancel)
-, _select(this, st::contactsMultiSelect, langFactory(lng_country_ph))
-, _leftShadow(this)
-, _topShadow(this)
-, _export(this, lang(lng_theme_editor_export_button).toUpper(), st::dialogsUpdateButton) {
+Editor::Editor(QWidget *, const QString &path)
+    : _scroll(this, st::settingsScroll)
+    , _close(this, st::contactsMultiSelect.fieldCancel)
+    , _select(this, st::contactsMultiSelect, langFactory(lng_country_ph))
+    , _leftShadow(this)
+    , _topShadow(this)
+    , _export(this, lang(lng_theme_editor_export_button).toUpper(), st::dialogsUpdateButton) {
 	_inner = _scroll->setOwnedWidget(object_ptr<Inner>(this, path));
 
 	_export->setClickedCallback(_inner->exportCallback());
@@ -725,17 +737,17 @@ Editor::Editor(QWidget*, const QString &path)
 		// We should not destroy it while iterating in subscribers.
 		base::TaskQueue::Main().Put(base::lambda_guarded(this, [this] { closeEditor(); }));
 	});
-	_inner->setFocusCallback([this] {
-		App::CallDelayed(2 * st::boxDuration, this, [this] { _select->setInnerFocus(); });
-	});
-	_inner->setScrollCallback([this](int top, int bottom) {
-		_scroll->scrollToY(top, bottom);
-	});
+	_inner->setFocusCallback(
+	    [this] { App::CallDelayed(2 * st::boxDuration, this, [this] { _select->setInnerFocus(); }); });
+	_inner->setScrollCallback([this](int top, int bottom) { _scroll->scrollToY(top, bottom); });
 	_close->setClickedCallback([this] { closeEditor(); });
 	_close->showFast();
 
 	_select->resizeToWidth(st::windowMinWidth);
-	_select->setQueryChangedCallback([this](const QString &query) { _inner->filterRows(query); _scroll->scrollToY(0); });
+	_select->setQueryChangedCallback([this](const QString &query) {
+		_inner->filterRows(query);
+		_scroll->scrollToY(0);
+	});
 	_select->setSubmittedCallback([this](bool) { _inner->chooseRow(); });
 
 	_inner->prepare();
@@ -803,19 +815,20 @@ void Editor::paintEvent(QPaintEvent *e) {
 void Editor::Start() {
 	auto palettePath = Local::themePaletteAbsolutePath();
 	if (palettePath.isEmpty()) {
-		FileDialog::GetWritePath(lang(lng_theme_editor_save_palette), "Palette (*.tdesktop-palette)", "colors.tdesktop-palette", [](const QString &path) {
-			if (!Local::copyThemeColorsToPalette(path)) {
-				writeDefaultPalette(path);
-			}
-			if (!Apply(path)) {
-				Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
-				return;
-			}
-			KeepApplied();
-			if (auto window = App::wnd()) {
-				window->showRightColumn(Box<Editor>(path));
-			}
-		});
+		FileDialog::GetWritePath(lang(lng_theme_editor_save_palette), "Palette (*.tdesktop-palette)",
+		                         "colors.tdesktop-palette", [](const QString &path) {
+			                         if (!Local::copyThemeColorsToPalette(path)) {
+				                         writeDefaultPalette(path);
+			                         }
+			                         if (!Apply(path)) {
+				                         Ui::show(Box<InformBox>(lang(lng_theme_editor_error)));
+				                         return;
+			                         }
+			                         KeepApplied();
+			                         if (auto window = App::wnd()) {
+				                         window->showRightColumn(Box<Editor>(path));
+			                         }
+		                         });
 	} else if (auto window = App::wnd()) {
 		window->showRightColumn(Box<Editor>(palettePath));
 	}
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.h b/Telegram/SourceFiles/window/themes/window_theme_editor.h
index 5ccc3c92a..eb9da4a36 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.h
@@ -48,7 +48,7 @@ class Editor : public TWidget {
 	Q_OBJECT
 
 public:
-	Editor(QWidget*, const QString &path);
+	Editor(QWidget *, const QString &path);
 
 	static void Start();
 
@@ -70,7 +70,6 @@ private:
 	object_ptr<BoxLayerTitleShadow> _leftShadow;
 	object_ptr<BoxLayerTitleShadow> _topShadow;
 	object_ptr<Ui::FlatButton> _export;
-
 };
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
index 2bde2444f..7d13fbf28 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
@@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/themes/window_theme_editor_block.h"
 
+#include "boxes/edit_color_box.h"
+#include "facades.h"
+#include "lang/lang_keys.h"
 #include "styles/style_window.h"
 #include "ui/effects/ripple_animation.h"
-#include "boxes/edit_color_box.h"
-#include "lang/lang_keys.h"
-#include "facades.h"
 
 #include <QColor>
 #include <QString>
@@ -118,7 +118,7 @@ private:
 	QString _copyOf;
 	QColor _value;
 	QString _valueString;
-	Text _description = { st::windowMinWidth / 2 };
+	Text _description = {st::windowMinWidth / 2};
 
 	OrderedSet<QString> _searchWords;
 	OrderedSet<QChar> _searchStartChars;
@@ -127,12 +127,11 @@ private:
 	int _height = 0;
 
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
-
 };
 
 EditorBlock::Row::Row(const QString &name, const QString &copyOf, QColor value)
-: _name(name)
-, _copyOf(copyOf) {
+    : _name(name)
+    , _copyOf(copyOf) {
 	setValue(value);
 }
 
@@ -168,7 +167,8 @@ void EditorBlock::Row::fillValueString() {
 void EditorBlock::Row::fillSearchIndex() {
 	_searchWords.clear();
 	_searchStartChars.clear();
-	auto toIndex = _name + ' ' + _copyOf + ' ' + TextUtilities::RemoveAccents(_description.originalText()) + ' ' + _valueString;
+	auto toIndex =
+	    _name + ' ' + _copyOf + ' ' + TextUtilities::RemoveAccents(_description.originalText()) + ' ' + _valueString;
 	auto words = toIndex.toLower().split(SearchSplitter, QString::SkipEmptyParts);
 	for_const (auto &word, words) {
 		_searchWords.insert(word);
@@ -176,10 +176,11 @@ void EditorBlock::Row::fillSearchIndex() {
 	}
 }
 
-EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context) : TWidget(parent)
-, _type(type)
-, _context(context)
-, _transparent(style::transparentPlaceholderBrush()) {
+EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context)
+    : TWidget(parent)
+    , _type(type)
+    , _context(context)
+    , _transparent(style::transparentPlaceholderBrush()) {
 	setMouseTracking(true);
 	subscribe(_context->updated, [this] {
 		if (_mouseSelection) {
@@ -203,14 +204,13 @@ EditorBlock::EditorBlock(QWidget *parent, Type type, Context *context) : TWidget
 			row->setCopyOf(copyOf);
 			addToSearch(*row);
 
-			_context->changed.notify({ QStringList(name), value }, true);
+			_context->changed.notify({QStringList(name), value}, true);
 			_context->resized.notify();
-			_context->pending.notify({ name, copyOf, value }, true);
+			_context->pending.notify({name, copyOf, value}, true);
 		});
 	} else {
-		subscribe(_context->changed, [this](const Context::ChangeData &data) {
-			checkCopiesChanged(0, data.names, data.value);
-		});
+		subscribe(_context->changed,
+		          [this](const Context::ChangeData &data) { checkCopiesChanged(0, data.names, data.value); });
 	}
 }
 
@@ -235,7 +235,10 @@ bool EditorBlock::feedCopy(const QString &name, const QString &copyOf) {
 		}
 		addRow(name, copyOf, row->value());
 	} else {
-		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously defined key in the color scheme)").arg(name).arg(copyOf));
+		LOG(("Theme Warning: Skipping value '%1: %2' (expected a color value in #rrggbb or #rrggbbaa or a previously "
+		     "defined key in the color scheme)")
+		        .arg(name)
+		        .arg(copyOf));
 	}
 	return true;
 }
@@ -265,9 +268,7 @@ void EditorBlock::addToSearch(const Row &row) {
 	if (!query.isEmpty()) resetSearch();
 
 	auto index = findRowIndex(&row);
-	for_const (auto ch, row.searchStartChars()) {
-		_searchIndex[ch].insert(index);
-	}
+	for_const (auto ch, row.searchStartChars()) { _searchIndex[ch].insert(index); }
 
 	if (!query.isEmpty()) searchByQuery(query);
 }
@@ -310,12 +311,8 @@ void EditorBlock::activateRow(const Row &row) {
 	} else {
 		_editing = findRowIndex(&row);
 		if (auto box = Ui::show(Box<EditColorBox>(row.name(), row.value()))) {
-			box->setSaveCallback(base::lambda_guarded(this, [this](QColor value) {
-				saveEditing(value);
-			}));
-			box->setCancelCallback(base::lambda_guarded(this, [this] {
-				cancelEditing();
-			}));
+			box->setSaveCallback(base::lambda_guarded(this, [this](QColor value) { saveEditing(value); }));
+			box->setCancelCallback(base::lambda_guarded(this, [this] { cancelEditing(); }));
 			_context->box = box;
 			_context->name = row.name();
 			_context->updated.notify();
@@ -408,8 +405,7 @@ bool EditorBlock::feedDescription(const QString &name, const QString &descriptio
 	return false;
 }
 
-template <typename Callback>
-void EditorBlock::enumerateRows(Callback callback) {
+template <typename Callback> void EditorBlock::enumerateRows(Callback callback) {
 	if (isSearch()) {
 		for_const (auto index, _searchResults) {
 			if (!callback(_data[index])) {
@@ -425,8 +421,7 @@ void EditorBlock::enumerateRows(Callback callback) {
 	}
 }
 
-template <typename Callback>
-void EditorBlock::enumerateRows(Callback callback) const {
+template <typename Callback> void EditorBlock::enumerateRows(Callback callback) const {
 	if (isSearch()) {
 		for_const (auto index, _searchResults) {
 			if (!callback(_data[index])) {
@@ -442,8 +437,7 @@ void EditorBlock::enumerateRows(Callback callback) const {
 	}
 }
 
-template <typename Callback>
-void EditorBlock::enumerateRowsFrom(int top, Callback callback) {
+template <typename Callback> void EditorBlock::enumerateRowsFrom(int top, Callback callback) {
 	auto started = false;
 	auto index = 0;
 	enumerateRows([top, callback, &started, &index](Row &row) {
@@ -458,8 +452,7 @@ void EditorBlock::enumerateRowsFrom(int top, Callback callback) {
 	});
 }
 
-template <typename Callback>
-void EditorBlock::enumerateRowsFrom(int top, Callback callback) const {
+template <typename Callback> void EditorBlock::enumerateRowsFrom(int top, Callback callback) const {
 	auto started = false;
 	enumerateRows([top, callback, &started](const Row &row) {
 		if (!started) {
@@ -512,11 +505,12 @@ void EditorBlock::mouseReleaseEvent(QMouseEvent *e) {
 		if (_context->box) {
 			chooseRow();
 		} else if (_selected >= 0) {
-			App::CallDelayed(st::defaultRippleAnimation.hideDuration, this, [this, index = findRowIndex(&rowAtIndex(_selected))] {
-				if (index >= 0 && index < _data.size()) {
-					activateRow(_data[index]);
-				}
-			});
+			App::CallDelayed(st::defaultRippleAnimation.hideDuration, this,
+			                 [this, index = findRowIndex(&rowAtIndex(_selected))] {
+				                 if (index >= 0 && index < _data.size()) {
+					                 activateRow(_data[index]);
+				                 }
+			                 });
 		}
 	}
 }
@@ -538,7 +532,7 @@ void EditorBlock::saveEditing(QColor value) {
 
 		removeRow(name, false);
 
-		_context->appended.notify({ name, possibleCopyOf, color, description }, true);
+		_context->appended.notify({name, possibleCopyOf, color, description}, true);
 	} else if (_type == Type::Existing) {
 		removeFromSearch(row);
 
@@ -558,7 +552,7 @@ void EditorBlock::saveEditing(QColor value) {
 
 		if (valueChanged || copyOfChanged) {
 			checkCopiesChanged(_editing + 1, QStringList(name), value);
-			_context->pending.notify({ name, copyOf, value }, true);
+			_context->pending.notify({name, copyOf, value}, true);
 		}
 	}
 	cancelEditing();
@@ -575,7 +569,7 @@ void EditorBlock::checkCopiesChanged(int startIndex, QStringList names, QColor v
 		}
 	}
 	if (_type == Type::Existing) {
-		_context->changed.notify({ names, value }, true);
+		_context->changed.notify({names, value}, true);
 	}
 }
 
@@ -596,9 +590,8 @@ void EditorBlock::cancelEditing() {
 
 bool EditorBlock::checkCopyOf(int index, const QString &possibleCopyOf) {
 	auto copyOfIndex = findRowIndex(possibleCopyOf);
-	return (copyOfIndex >= 0
-		&& index > copyOfIndex
-		&& _data[copyOfIndex].value().toRgb() == _data[index].value().toRgb());
+	return (copyOfIndex >= 0 && index > copyOfIndex &&
+	        _data[copyOfIndex].value().toRgb() == _data[index].value().toRgb());
 }
 
 void EditorBlock::mouseMoveEvent(QMouseEvent *e) {
@@ -663,7 +656,8 @@ void EditorBlock::paintRow(Painter &p, int index, const Row &row, TimeMs ms) {
 		}
 	}
 
-	auto sample = QRect(width() - st::themeEditorMargin.right() - st::themeEditorSampleSize.width(), rowTop, st::themeEditorSampleSize.width(), st::themeEditorSampleSize.height());
+	auto sample = QRect(width() - st::themeEditorMargin.right() - st::themeEditorSampleSize.width(), rowTop,
+	                    st::themeEditorSampleSize.width(), st::themeEditorSampleSize.height());
 	Ui::Shadow::paint(p, sample, width(), st::defaultRoundShadow);
 	if (row.value().alpha() != 255) {
 		p.fillRect(myrtlrect(sample), _transparent);
@@ -675,12 +669,14 @@ void EditorBlock::paintRow(Painter &p, int index, const Row &row, TimeMs ms) {
 
 	p.setFont(st::themeEditorNameFont);
 	p.setPen(active ? st::dialogsNameFgActive : selected ? st::dialogsNameFgOver : st::dialogsNameFg);
-	p.drawTextLeft(st::themeEditorMargin.left(), rowTop, width(), st::themeEditorNameFont->elided(row.name(), nameWidth));
+	p.drawTextLeft(st::themeEditorMargin.left(), rowTop, width(),
+	               st::themeEditorNameFont->elided(row.name(), nameWidth));
 
 	if (!row.copyOf().isEmpty()) {
 		auto copyTop = rowTop + st::themeEditorNameFont->height;
 		p.setFont(st::themeEditorCopyNameFont);
-		p.drawTextLeft(st::themeEditorMargin.left(), copyTop, width(), st::themeEditorCopyNameFont->elided("= " + row.copyOf(), nameWidth));
+		p.drawTextLeft(st::themeEditorMargin.left(), copyTop, width(),
+		               st::themeEditorCopyNameFont->elided("= " + row.copyOf(), nameWidth));
 	}
 
 	if (!row.descriptionText().isEmpty()) {
@@ -729,9 +725,9 @@ void EditorBlock::addRowRipple(int index) {
 	auto ripple = row.ripple();
 	if (!ripple) {
 		auto mask = Ui::RippleAnimation::rectMask(QSize(width(), row.height()));
-		ripple = row.setRipple(std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation, std::move(mask), [this, index = findRowIndex(&row)] {
-			updateRow(_data[index]);
-		}));
+		ripple = row.setRipple(
+		    std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation, std::move(mask),
+		                                          [this, index = findRowIndex(&row)] { updateRow(_data[index]); }));
 	}
 	auto origin = mapFromGlobal(QCursor::pos()) - QPoint(0, row.top());
 	ripple->add(origin);
@@ -749,7 +745,7 @@ void EditorBlock::updateRow(const Row &row) {
 }
 
 void EditorBlock::addRow(const QString &name, const QString &copyOf, QColor value) {
-	_data.push_back({ name, copyOf, value });
+	_data.push_back({name, copyOf, value});
 	_indices.insert(name, _data.size() - 1);
 	addToSearch(_data.back());
 }
@@ -762,7 +758,8 @@ EditorBlock::Row &EditorBlock::rowAtIndex(int index) {
 }
 
 int EditorBlock::findRowIndex(const QString &name) const {
-	return _indices.value(name, -1);;
+	return _indices.value(name, -1);
+	;
 }
 
 EditorBlock::Row *EditorBlock::findRow(const QString &name) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
index 33310432a..ca97a5f20 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "base/observer.h"
+#include "ui/twidget.h"
 
 class EditColorBox;
 
@@ -106,17 +106,13 @@ private:
 	void addToSearch(const Row &row);
 	void removeFromSearch(const Row &row);
 
-	template <typename Callback>
-	void enumerateRows(Callback callback);
+	template <typename Callback> void enumerateRows(Callback callback);
 
-	template <typename Callback>
-	void enumerateRows(Callback callback) const;
+	template <typename Callback> void enumerateRows(Callback callback) const;
 
-	template <typename Callback>
-	void enumerateRowsFrom(int top, Callback callback);
+	template <typename Callback> void enumerateRowsFrom(int top, Callback callback);
 
-	template <typename Callback>
-	void enumerateRowsFrom(int top, Callback callback) const;
+	template <typename Callback> void enumerateRowsFrom(int top, Callback callback) const;
 
 	Row &rowAtIndex(int index);
 	int findRowIndex(const QString &name) const;
@@ -167,7 +163,6 @@ private:
 	bool _mouseSelection = false;
 
 	QBrush _transparent;
-
 };
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 295489150..a1b108bd6 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -20,18 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/themes/window_theme_preview.h"
 
-#include "window/themes/window_theme.h"
+#include "app.h"
 #include "lang/lang_keys.h"
+#include "layout.h"
 #include "platform/platform_window_title.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_history.h"
+#include "styles/style_mediaview.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
-#include "styles/style_mediaview.h"
-#include "styles/style_history.h"
-#include "styles/style_dialogs.h"
 #include "ui/emoji_config.h"
 #include "ui/text/text.h"
-#include "layout.h"
-#include "app.h"
+#include "window/themes/window_theme.h"
 
 namespace Window {
 namespace Theme {
@@ -101,19 +101,11 @@ public:
 	QPixmap generate();
 
 private:
-	enum class Status {
-		None,
-		Sent,
-		Received
-	};
+	enum class Status { None, Sent, Received };
 	struct Row {
 		Text name;
 		QString letters;
-		enum class Type {
-			User,
-			Group,
-			Channel
-		};
+		enum class Type { User, Group, Channel };
 		Type type = Type::User;
 		int peerIndex = 0;
 		int unreadCounter = 0;
@@ -133,15 +125,15 @@ private:
 		QString date;
 		bool attached = false;
 		bool tail = true;
-		Text text = { st::msgMinWidth };
+		Text text = {st::msgMinWidth};
 		QVector<int> waveform;
 		int waveactive = 0;
 		QString wavestatus;
 		QImage photo;
 		int photoWidth = 0;
 		int photoHeight = 0;
-		Text replyName = { st::msgMinWidth };
-		Text replyText = { st::msgMinWidth };
+		Text replyName = {st::msgMinWidth};
+		Text replyText = {st::msgMinWidth};
 	};
 
 	void prepare();
@@ -198,18 +190,22 @@ private:
 	std::vector<Bubble> _bubbles;
 
 	style::TextPalette _textPalette;
-
 };
 
 void Generator::prepare() {
-	_rect = QRect(0, 0, st::themePreviewMargin.left() + st::themePreviewSize.width() + st::themePreviewMargin.right(), st::themePreviewMargin.top() + st::themePreviewSize.height() + st::themePreviewMargin.bottom());
+	_rect = QRect(0, 0, st::themePreviewMargin.left() + st::themePreviewSize.width() + st::themePreviewMargin.right(),
+	              st::themePreviewMargin.top() + st::themePreviewSize.height() + st::themePreviewMargin.bottom());
 	_inner = _rect.marginsRemoved(st::themePreviewMargin);
 	_body = _inner.marginsRemoved(QMargins(0, Platform::PreviewTitleHeight(), 0, 0));
 	_dialogs = QRect(_body.x(), _body.y(), st::themePreviewDialogsWidth, _body.height());
-	_dialogsList = _dialogs.marginsRemoved(QMargins(0, st::dialogsFilterPadding.y() + st::dialogsMenuToggle.height + st::dialogsFilterPadding.y(), 0, st::dialogsPadding.y()));
+	_dialogsList = _dialogs.marginsRemoved(
+	    QMargins(0, st::dialogsFilterPadding.y() + st::dialogsMenuToggle.height + st::dialogsFilterPadding.y(), 0,
+	             st::dialogsPadding.y()));
 	_topBar = QRect(_dialogs.x() + _dialogs.width(), _dialogs.y(), _body.width() - _dialogs.width(), st::topBarHeight);
-	_composeArea = QRect(_topBar.x(), _body.y() + _body.height() - st::historySendSize.height(), _topBar.width(), st::historySendSize.height());
-	_history = QRect(_topBar.x(), _topBar.y() + _topBar.height(), _topBar.width(), _body.height() - _topBar.height() - _composeArea.height());
+	_composeArea = QRect(_topBar.x(), _body.y() + _body.height() - st::historySendSize.height(), _topBar.width(),
+	                     st::historySendSize.height());
+	_history = QRect(_topBar.x(), _topBar.y() + _topBar.height(), _topBar.width(),
+	                 _body.height() - _topBar.height() - _composeArea.height());
 
 	generateData();
 }
@@ -271,7 +267,8 @@ int Generator::computeInfoWidth(Status status, QString date) {
 void Generator::addTextBubble(QString text, QString date, Status status) {
 	Bubble bubble;
 	auto skipBlock = computeSkipBlock(status, date);
-	bubble.text.setRichText(st::messageTextStyle, text + textcmdSkipBlock(skipBlock.width(), skipBlock.height()), _historyTextOptions);
+	bubble.text.setRichText(st::messageTextStyle, text + textcmdSkipBlock(skipBlock.width(), skipBlock.height()),
+	                        _historyTextOptions);
 
 	auto width = _history.width() - st::msgMargin.left() - st::msgMargin.right();
 	accumulate_min(width, st::msgPadding.left() + bubble.text.maxWidth() + st::msgPadding.right());
@@ -295,7 +292,8 @@ void Generator::addPhotoBubble(QString image, QString caption, QString date, Sta
 	bubble.photoWidth = convertScale(bubble.photo.width() / 2);
 	bubble.photoHeight = convertScale(bubble.photo.height() / 2);
 	auto skipBlock = computeSkipBlock(status, date);
-	bubble.text.setRichText(st::messageTextStyle, caption + textcmdSkipBlock(skipBlock.width(), skipBlock.height()), _historyTextOptions);
+	bubble.text.setRichText(st::messageTextStyle, caption + textcmdSkipBlock(skipBlock.width(), skipBlock.height()),
+	                        _historyTextOptions);
 
 	auto width = _history.width() - st::msgMargin.left() - st::msgMargin.right();
 	accumulate_min(width, bubble.photoWidth);
@@ -310,7 +308,8 @@ void Generator::addPhotoBubble(QString image, QString caption, QString date, Sta
 
 void Generator::generateData() {
 	_rows.reserve(9);
-	addRow("Eva Summer", 0, "11:00", "Reminds me of a Chinese proverb: the best time to plant a tree was 20 years ago.");
+	addRow("Eva Summer", 0, "11:00",
+	       "Reminds me of a Chinese proverb: the best time to plant a tree was 20 years ago.");
 	_rows.back().active = true;
 	_rows.back().pinned = true;
 	addRow("Alexandra Smith", 7, "10:00", "This is amazing!");
@@ -333,30 +332,39 @@ void Generator::generateData() {
 	_topBarStatusActive = true;
 
 	addPhotoBubble(":/gui/art/sunrise.jpg", "Nearly missed this sunrise", "7:00", Status::None);
-	int wavedata[] = { 0, 0, 0, 0, 27, 31, 4, 1, 0, 0, 23, 30, 18, 9, 7, 19, 4, 2, 2, 2, 0, 0, 15, 15, 15, 15, 3, 15, 19, 3, 2, 0, 0, 0, 0, 0, 3, 12, 16, 6, 4, 6, 14, 12, 2, 12, 12, 11, 3, 0, 7, 5, 7, 4, 7, 5, 2, 4, 0, 9, 5, 7, 6, 2, 2, 0, 0 };
+	int wavedata[] = {0,  0,  0,  0, 27, 31, 4, 1, 0, 0, 23, 30, 18, 9, 7,  19, 4, 2, 2, 2,  0,  0, 15,
+	                  15, 15, 15, 3, 15, 19, 3, 2, 0, 0, 0,  0,  0,  3, 12, 16, 6, 4, 6, 14, 12, 2, 12,
+	                  12, 11, 3,  0, 7,  5,  7, 4, 7, 5, 2,  4,  0,  9, 5,  7,  6, 2, 2, 0,  0};
 	auto waveform = QVector<int>(base::array_size(wavedata));
 	memcpy(waveform.data(), wavedata, sizeof(wavedata));
 	addAudioBubble(waveform, 33, "0:07", "8:00", Status::None);
 	_bubbles.back().outbg = true;
 	_bubbles.back().status = Status::Received;
 	addDateBubble("December 26");
-	addTextBubble("Twenty years from now you will be more disappointed by the things that you didn't do than by the ones you did do, so throw off the bowlines, sail away from safe harbor, catch the trade winds in your sails.", "10:00", Status::Received);
+	addTextBubble(
+	    "Twenty years from now you will be more disappointed by the things that you didn't do than by the ones you did "
+	    "do, so throw off the bowlines, sail away from safe harbor, catch the trade winds in your sails.",
+	    "10:00", Status::Received);
 	_bubbles.back().tail = false;
 	_bubbles.back().outbg = true;
-	addTextBubble("Mark Twain said that " + QString() + QChar(9757) + QChar(55356) + QChar(57339), "10:00", Status::Received);
+	addTextBubble("Mark Twain said that " + QString() + QChar(9757) + QChar(55356) + QChar(57339), "10:00",
+	              Status::Received);
 	_bubbles.back().outbg = true;
 	_bubbles.back().attached = true;
 	_bubbles.back().tail = true;
-	addTextBubble("Reminds me of a Chinese proverb: the best time to plant a tree was 20 years ago. The second best time is now.", "11:00", Status::None);
+	addTextBubble(
+	    "Reminds me of a Chinese proverb: the best time to plant a tree was 20 years ago. The second best time is now.",
+	    "11:00", Status::None);
 	_bubbles.back().replyName.setText(st::msgNameStyle, "Alex Cassio", _textNameOptions);
-	_bubbles.back().replyText.setText(st::messageTextStyle, "Mark Twain said that " + QString() + QChar(9757) + QChar(55356) + QChar(57339), _textDlgOptions);
+	_bubbles.back().replyText.setText(st::messageTextStyle,
+	                                  "Mark Twain said that " + QString() + QChar(9757) + QChar(55356) + QChar(57339),
+	                                  _textDlgOptions);
 }
 
 Generator::Generator(const Instance &theme, const CurrentData &current)
-: _theme(theme)
-, _palette(_theme.palette)
-, _current(current) {
-}
+    : _theme(theme)
+    , _palette(_theme.palette)
+    , _current(current) {}
 
 QPixmap Generator::generate() {
 	prepare();
@@ -455,13 +463,19 @@ void Generator::paintTopBar() {
 	_p->fillRect(_topBar, st::topBarBg[_palette]);
 
 	auto right = st::topBarMenuToggle.width;
-	st::topBarMenuToggle.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarMenuToggle.iconPosition.x(), _topBar.y() + st::topBarMenuToggle.iconPosition.y(), _rect.width());
+	st::topBarMenuToggle.icon[_palette].paint(
+	    *_p, _topBar.x() + _topBar.width() - right + st::topBarMenuToggle.iconPosition.x(),
+	    _topBar.y() + st::topBarMenuToggle.iconPosition.y(), _rect.width());
 	right += st::topBarSearch.width;
-	st::topBarSearch.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarSearch.iconPosition.x(), _topBar.y() + st::topBarSearch.iconPosition.y(), _rect.width());
+	st::topBarSearch.icon[_palette].paint(*_p,
+	                                      _topBar.x() + _topBar.width() - right + st::topBarSearch.iconPosition.x(),
+	                                      _topBar.y() + st::topBarSearch.iconPosition.y(), _rect.width());
 	right += st::topBarCallSkip + st::topBarCall.width;
-	st::topBarCall.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarCall.iconPosition.x(), _topBar.y() + st::topBarCall.iconPosition.y(), _rect.width());
+	st::topBarCall.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarCall.iconPosition.x(),
+	                                    _topBar.y() + st::topBarCall.iconPosition.y(), _rect.width());
 
-	auto decreaseWidth = st::topBarCall.width + st::topBarCallSkip + st::topBarSearch.width + st::topBarMenuToggle.width;
+	auto decreaseWidth =
+	    st::topBarCall.width + st::topBarCallSkip + st::topBarSearch.width + st::topBarMenuToggle.width;
 	auto nameleft = _topBar.x() + st::topBarArrowPadding.right();
 	auto nametop = _topBar.y() + st::topBarArrowPadding.top();
 	auto statustop = _topBar.y() + st::topBarHeight - st::topBarArrowPadding.bottom() - st::dialogsTextFont->height;
@@ -478,14 +492,19 @@ void Generator::paintComposeArea() {
 	_p->fillRect(_composeArea, st::historyReplyBg[_palette]);
 
 	auto controlsTop = _composeArea.y() + _composeArea.height() - st::historySendSize.height();
-	st::historyAttach.icon[_palette].paint(*_p, _composeArea.x() + st::historyAttach.iconPosition.x(), controlsTop + st::historyAttach.iconPosition.y(), _rect.width());
+	st::historyAttach.icon[_palette].paint(*_p, _composeArea.x() + st::historyAttach.iconPosition.x(),
+	                                       controlsTop + st::historyAttach.iconPosition.y(), _rect.width());
 	auto right = st::historySendRight + st::historySendSize.width();
-	st::historyRecordVoice[_palette].paintInCenter(*_p, QRect(_composeArea.x() + _composeArea.width() - right, controlsTop, st::historySendSize.width(), st::historySendSize.height()));
+	st::historyRecordVoice[_palette].paintInCenter(*_p,
+	                                               QRect(_composeArea.x() + _composeArea.width() - right, controlsTop,
+	                                                     st::historySendSize.width(), st::historySendSize.height()));
 
 	right += st::historyAttachEmoji.width;
 	auto attachEmojiLeft = _composeArea.x() + _composeArea.width() - right;
-	_p->fillRect(attachEmojiLeft, controlsTop, st::historyAttachEmoji.width, st::historyAttachEmoji.height, st::historyComposeAreaBg[_palette]);
-	st::historyAttachEmoji.icon[_palette].paint(*_p, attachEmojiLeft + st::historyAttachEmoji.iconPosition.x(), controlsTop + st::historyAttachEmoji.iconPosition.y(), _rect.width());
+	_p->fillRect(attachEmojiLeft, controlsTop, st::historyAttachEmoji.width, st::historyAttachEmoji.height,
+	             st::historyComposeAreaBg[_palette]);
+	st::historyAttachEmoji.icon[_palette].paint(*_p, attachEmojiLeft + st::historyAttachEmoji.iconPosition.x(),
+	                                            controlsTop + st::historyAttachEmoji.iconPosition.y(), _rect.width());
 
 	auto pen = st::historyEmojiCircleFg[_palette]->p;
 	pen.setWidth(st::historyEmojiCircleLine);
@@ -494,7 +513,9 @@ void Generator::paintComposeArea() {
 	_p->setBrush(Qt::NoBrush);
 
 	PainterHighQualityEnabler hq(*_p);
-	auto inner = QRect(QPoint(attachEmojiLeft + (st::historyAttachEmoji.width - st::historyEmojiCircle.width()) / 2, controlsTop + st::historyEmojiCircleTop), st::historyEmojiCircle);
+	auto inner = QRect(QPoint(attachEmojiLeft + (st::historyAttachEmoji.width - st::historyEmojiCircle.width()) / 2,
+	                          controlsTop + st::historyEmojiCircleTop),
+	                   st::historyEmojiCircle);
 	_p->drawEllipse(inner);
 
 	auto fakeMargin = 0;
@@ -505,8 +526,10 @@ void Generator::paintComposeArea() {
 	}
 
 	auto fieldLeft = _composeArea.x() + st::historyAttach.width + fakeMargin;
-	auto fieldTop = _composeArea.y() + _composeArea.height() - st::historyAttach.height + st::historySendPadding + fakeMargin;
-	auto fieldWidth = _composeArea.width() - st::historyAttach.width - st::historySendSize.width() - st::historySendRight - st::historyAttachEmoji.width - 2 * fakeMargin;
+	auto fieldTop =
+	    _composeArea.y() + _composeArea.height() - st::historyAttach.height + st::historySendPadding + fakeMargin;
+	auto fieldWidth = _composeArea.width() - st::historyAttach.width - st::historySendSize.width() -
+	                  st::historySendRight - st::historyAttachEmoji.width - 2 * fakeMargin;
 	auto fieldHeight = st::historySendSize.height() - 2 * st::historySendPadding - 2 * fakeMargin;
 	auto field = QRect(fieldLeft, fieldTop, fieldWidth, fieldHeight);
 	_p->fillRect(field, st::historyComposeField.bgColor[_palette]);
@@ -516,7 +539,11 @@ void Generator::paintComposeArea() {
 	_p->setFont(st::historyComposeField.font);
 	_p->setPen(st::historyComposeField.phColor[_palette]);
 
-	auto phRect = QRect(field.x() + st::historyComposeField.textMrg.left() - fakeMargin + st::historyComposeField.phPos.x(), field.y() + st::historyComposeField.textMrg.top() - fakeMargin + st::historyComposeField.phPos.y(), field.width() - st::historyComposeField.textMrg.left() - st::historyComposeField.textMrg.right(), field.height() - st::historyComposeField.textMrg.top() - st::historyComposeField.textMrg.bottom());
+	auto phRect =
+	    QRect(field.x() + st::historyComposeField.textMrg.left() - fakeMargin + st::historyComposeField.phPos.x(),
+	          field.y() + st::historyComposeField.textMrg.top() - fakeMargin + st::historyComposeField.phPos.y(),
+	          field.width() - st::historyComposeField.textMrg.left() - st::historyComposeField.textMrg.right(),
+	          field.height() - st::historyComposeField.textMrg.top() - st::historyComposeField.textMrg.bottom());
 	_p->drawText(phRect, lang(lng_message_ph), QTextOption(st::historyComposeField.phAlign));
 
 	_p->restore();
@@ -526,9 +553,12 @@ void Generator::paintComposeArea() {
 void Generator::paintDialogs() {
 	_p->fillRect(_dialogs, st::dialogsBg[_palette]);
 
-	st::dialogsMenuToggle.icon[_palette].paint(*_p, _dialogs.x() + st::dialogsFilterPadding.x() + st::dialogsMenuToggle.iconPosition.x(), _dialogs.y() + st::dialogsFilterPadding.y() + st::dialogsMenuToggle.iconPosition.y(), _rect.width());
+	st::dialogsMenuToggle.icon[_palette].paint(
+	    *_p, _dialogs.x() + st::dialogsFilterPadding.x() + st::dialogsMenuToggle.iconPosition.x(),
+	    _dialogs.y() + st::dialogsFilterPadding.y() + st::dialogsMenuToggle.iconPosition.y(), _rect.width());
 
-	auto filterLeft = _dialogs.x() + st::dialogsFilterPadding.x() + st::dialogsMenuToggle.width + st::dialogsFilterPadding.x();
+	auto filterLeft =
+	    _dialogs.x() + st::dialogsFilterPadding.x() + st::dialogsMenuToggle.width + st::dialogsFilterPadding.x();
 	auto filterRight = st::dialogsFilterSkip + st::dialogsFilterPadding.x();
 	auto filterWidth = _dialogs.x() + _dialogs.width() - filterLeft - filterRight;
 	auto filterAreaHeight = st::dialogsFilterPadding.y() + st::dialogsMenuToggle.height + st::dialogsFilterPadding.y();
@@ -541,7 +571,11 @@ void Generator::paintDialogs() {
 	_p->setBrush(st::dialogsFilter.bgColor[_palette]);
 	{
 		PainterHighQualityEnabler hq(*_p);
-		_p->drawRoundedRect(QRectF(filter).marginsRemoved(QMarginsF(st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2.)), st::buttonRadius - (st::dialogsFilter.borderWidth / 2.), st::buttonRadius - (st::dialogsFilter.borderWidth / 2.));
+		_p->drawRoundedRect(QRectF(filter).marginsRemoved(
+		                        QMarginsF(st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2.,
+		                                  st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2.)),
+		                    st::buttonRadius - (st::dialogsFilter.borderWidth / 2.),
+		                    st::buttonRadius - (st::dialogsFilter.borderWidth / 2.));
 	}
 
 	if (!st::dialogsFilter.icon.empty()) {
@@ -550,7 +584,11 @@ void Generator::paintDialogs() {
 
 	_p->save();
 	_p->setClipRect(filter);
-	auto phRect = QRect(filter.x() + st::dialogsFilter.textMrg.left() + st::dialogsFilter.phPos.x(), filter.y() + st::dialogsFilter.textMrg.top() + st::dialogsFilter.phPos.y(), filter.width() - st::dialogsFilter.textMrg.left() - st::dialogsFilter.textMrg.right(), filter.height() - st::dialogsFilter.textMrg.top() - st::dialogsFilter.textMrg.bottom());;
+	auto phRect = QRect(filter.x() + st::dialogsFilter.textMrg.left() + st::dialogsFilter.phPos.x(),
+	                    filter.y() + st::dialogsFilter.textMrg.top() + st::dialogsFilter.phPos.y(),
+	                    filter.width() - st::dialogsFilter.textMrg.left() - st::dialogsFilter.textMrg.right(),
+	                    filter.height() - st::dialogsFilter.textMrg.top() - st::dialogsFilter.textMrg.bottom());
+	;
 	_p->setFont(st::dialogsFilter.font);
 	_p->setPen(st::dialogsFilter.phColor[_palette]);
 	_p->drawText(phRect, lang(lng_dlg_filter), QTextOption(st::dialogsFilter.phAlign));
@@ -582,13 +620,16 @@ void Generator::paintRow(const Row &row) {
 
 	auto nameleft = x + st::dialogsPadding.x() + st::dialogsPhotoSize + st::dialogsPhotoPadding;
 	auto namewidth = x + fullWidth - nameleft - st::dialogsPadding.x();
-	auto rectForName = QRect(nameleft, y + st::dialogsPadding.y() + st::dialogsNameTop, namewidth, st::msgNameFont->height);
+	auto rectForName =
+	    QRect(nameleft, y + st::dialogsPadding.y() + st::dialogsNameTop, namewidth, st::msgNameFont->height);
 
 	auto chatTypeIcon = ([&row]() -> const style::icon * {
 		if (row.type == Row::Type::Group) {
-			return &(row.active ? st::dialogsChatIconActive : (row.selected ? st::dialogsChatIconOver : st::dialogsChatIcon));
+			return &(row.active ? st::dialogsChatIconActive :
+			                      (row.selected ? st::dialogsChatIconOver : st::dialogsChatIcon));
 		} else if (row.type == Row::Type::Channel) {
-			return &(row.active ? st::dialogsChannelIconActive : (row.selected ? st::dialogsChannelIconOver : st::dialogsChannelIcon));
+			return &(row.active ? st::dialogsChannelIconActive :
+			                      (row.selected ? st::dialogsChannelIconOver : st::dialogsChannelIcon));
 		}
 		return nullptr;
 	})();
@@ -602,15 +643,18 @@ void Generator::paintRow(const Row &row) {
 	auto dateWidth = st::dialogsDateFont->width(row.date);
 	rectForName.setWidth(rectForName.width() - dateWidth - st::dialogsDateSkip);
 	_p->setFont(st::dialogsDateFont);
-	_p->setPen(row.active ? st::dialogsDateFgActive[_palette] : (row.selected ? st::dialogsDateFgOver[_palette] : st::dialogsDateFg[_palette]));
-	_p->drawText(rectForName.left() + rectForName.width() + st::dialogsDateSkip, rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, row.date);
+	_p->setPen(row.active ? st::dialogsDateFgActive[_palette] :
+	                        (row.selected ? st::dialogsDateFgOver[_palette] : st::dialogsDateFg[_palette]));
+	_p->drawText(rectForName.left() + rectForName.width() + st::dialogsDateSkip,
+	             rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, row.date);
 
 	auto availableWidth = namewidth;
 	if (row.unreadCounter) {
 		auto counter = QString::number(row.unreadCounter);
 		auto mutedCounter = row.muted;
 		auto unreadRight = x + fullWidth - st::dialogsPadding.x();
-		auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent - (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
+		auto unreadTop = texttop + st::dialogsTextFont->ascent - st::dialogsUnreadFont->ascent -
+		                 (st::dialogsUnreadHeight - st::dialogsUnreadFont->height) / 2;
 
 		auto unreadWidth = st::dialogsUnreadFont->width(counter);
 		auto unreadRectWidth = unreadWidth + 2 * st::dialogsUnreadPadding;
@@ -621,41 +665,45 @@ void Generator::paintRow(const Row &row) {
 		auto unreadRectTop = unreadTop;
 		availableWidth -= unreadRectWidth + st::dialogsUnreadPadding;
 
-		style::color bg[] = {
-			st::dialogsUnreadBg,
-			st::dialogsUnreadBgOver,
-			st::dialogsUnreadBgActive,
-			st::dialogsUnreadBgMuted,
-			st::dialogsUnreadBgMutedOver,
-			st::dialogsUnreadBgMutedActive
-		};
+		style::color bg[] = {st::dialogsUnreadBg,      st::dialogsUnreadBgOver,      st::dialogsUnreadBgActive,
+		                     st::dialogsUnreadBgMuted, st::dialogsUnreadBgMutedOver, st::dialogsUnreadBgMutedActive};
 
 		auto index = (row.active ? 2 : row.selected ? 1 : 0) + (row.muted ? 3 : 0);
 		_p->setPen(Qt::NoPen);
 		_p->setBrush(bg[index][_palette]);
-		_p->drawRoundedRect(QRectF(unreadRectLeft, unreadRectTop, unreadRectWidth, unreadRectHeight), unreadRectHeight / 2., unreadRectHeight / 2.);
+		_p->drawRoundedRect(QRectF(unreadRectLeft, unreadRectTop, unreadRectWidth, unreadRectHeight),
+		                    unreadRectHeight / 2., unreadRectHeight / 2.);
 
 		auto textTop = (unreadRectHeight - st::dialogsUnreadFont->height) / 2;
 		_p->setFont(st::dialogsUnreadFont);
-		_p->setPen(row.active ? st::dialogsUnreadFgActive[_palette] : (row.selected ? st::dialogsUnreadFgOver[_palette] : st::dialogsUnreadFg[_palette]));
-		_p->drawText(unreadRectLeft + (unreadRectWidth - unreadWidth) / 2, unreadRectTop + textTop + st::dialogsUnreadFont->ascent, counter);
+		_p->setPen(row.active ? st::dialogsUnreadFgActive[_palette] :
+		                        (row.selected ? st::dialogsUnreadFgOver[_palette] : st::dialogsUnreadFg[_palette]));
+		_p->drawText(unreadRectLeft + (unreadRectWidth - unreadWidth) / 2,
+		             unreadRectTop + textTop + st::dialogsUnreadFont->ascent, counter);
 	} else if (row.pinned) {
-		auto icon = (row.active ? st::dialogsPinnedIconActive[_palette] : (row.selected ? st::dialogsPinnedIconOver[_palette] : st::dialogsPinnedIcon[_palette]));
+		auto icon =
+		    (row.active ? st::dialogsPinnedIconActive[_palette] :
+		                  (row.selected ? st::dialogsPinnedIconOver[_palette] : st::dialogsPinnedIcon[_palette]));
 		icon.paint(*_p, x + fullWidth - st::dialogsPadding.x() - icon.width(), texttop, fullWidth);
 		availableWidth -= icon.width() + st::dialogsUnreadPadding;
 	}
 	auto textRect = QRect(nameleft, texttop, availableWidth, st::dialogsTextFont->height);
-	setTextPalette(row.active ? st::dialogsTextPaletteActive : (row.selected ? st::dialogsTextPaletteOver : st::dialogsTextPalette));
+	setTextPalette(row.active ? st::dialogsTextPaletteActive :
+	                            (row.selected ? st::dialogsTextPaletteOver : st::dialogsTextPalette));
 	_p->setFont(st::dialogsTextFont);
-	_p->setPen(row.active ? st::dialogsTextFgActive[_palette] : (row.selected ? st::dialogsTextFgOver[_palette] : st::dialogsTextFg[_palette]));
-	row.text.drawElided(*_p, textRect.left(), textRect.top(), textRect.width(), textRect.height() / st::dialogsTextFont->height);
+	_p->setPen(row.active ? st::dialogsTextFgActive[_palette] :
+	                        (row.selected ? st::dialogsTextFgOver[_palette] : st::dialogsTextFg[_palette]));
+	row.text.drawElided(*_p, textRect.left(), textRect.top(), textRect.width(),
+	                    textRect.height() / st::dialogsTextFont->height);
 	restoreTextPalette();
 
-	auto sendStateIcon = ([&row]() -> const style::icon* {
+	auto sendStateIcon = ([&row]() -> const style::icon * {
 		if (row.status == Status::Sent) {
-			return &(row.active ? st::dialogsSentIconActive : (row.selected ? st::dialogsSentIconOver : st::dialogsSentIcon));
+			return &(row.active ? st::dialogsSentIconActive :
+			                      (row.selected ? st::dialogsSentIconOver : st::dialogsSentIcon));
 		} else if (row.status == Status::Received) {
-			return &(row.active ? st::dialogsReceivedIconActive : (row.selected ? st::dialogsReceivedIconOver : st::dialogsReceivedIcon));
+			return &(row.active ? st::dialogsReceivedIconActive :
+			                      (row.selected ? st::dialogsReceivedIconOver : st::dialogsReceivedIcon));
 		}
 		return nullptr;
 	})();
@@ -663,7 +711,8 @@ void Generator::paintRow(const Row &row) {
 		rectForName.setWidth(rectForName.width() - st::dialogsSendStateSkip);
 		(*sendStateIcon)[_palette].paint(*_p, rectForName.topLeft() + QPoint(rectForName.width(), 0), fullWidth);
 	}
-	_p->setPen(row.active ? st::dialogsNameFgActive[_palette] : (row.selected ? st::dialogsNameFgOver[_palette] : st::dialogsNameFg[_palette]));
+	_p->setPen(row.active ? st::dialogsNameFgActive[_palette] :
+	                        (row.selected ? st::dialogsNameFgOver[_palette] : st::dialogsNameFg[_palette]));
 	row.name.drawElided(*_p, rectForName.left(), rectForName.top(), rectForName.width());
 }
 
@@ -693,33 +742,48 @@ void Generator::paintBubble(const Bubble &bubble) {
 	auto tailclip = st::historyMessageRadius + 1;
 	if (bubble.tail) {
 		if (bubble.outbg) {
-			_p->setClipRegion(QRegion(_history) - QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip, tailclip + st::historyMessageRadius, tailclip + st::historyMessageRadius));
+			_p->setClipRegion(QRegion(_history) -
+			                  QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip,
+			                        tailclip + st::historyMessageRadius, tailclip + st::historyMessageRadius));
 		} else {
-			_p->setClipRegion(QRegion(_history) - QRect(x - st::historyMessageRadius, bubbleTop + bubbleHeight - tailclip, tailclip + st::historyMessageRadius, tailclip + st::historyMessageRadius));
+			_p->setClipRegion(QRegion(_history) -
+			                  QRect(x - st::historyMessageRadius, bubbleTop + bubbleHeight - tailclip,
+			                        tailclip + st::historyMessageRadius, tailclip + st::historyMessageRadius));
 		}
 	}
 	auto sh = bubble.outbg ? st::msgOutShadow[_palette] : st::msgInShadow[_palette];
 	_p->setBrush(sh);
-	_p->drawRoundedRect(x, bubbleTop + st::msgShadow, bubble.width, bubbleHeight, st::historyMessageRadius, st::historyMessageRadius);
+	_p->drawRoundedRect(x, bubbleTop + st::msgShadow, bubble.width, bubbleHeight, st::historyMessageRadius,
+	                    st::historyMessageRadius);
 	auto bg = bubble.outbg ? st::msgOutBg[_palette] : st::msgInBg[_palette];
 	_p->setBrush(bg);
 	_p->drawRoundedRect(x, bubbleTop, bubble.width, bubbleHeight, st::historyMessageRadius, st::historyMessageRadius);
 	if (bubble.tail) {
 		_p->setClipRect(_history);
 		if (bubble.outbg) {
-			_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip, tailclip, tailclip), bg);
-			_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight, tailclip + st::historyBubbleTailOutRight.width(), st::msgShadow), sh);
-			st::historyBubbleTailOutRight[_palette].paint(*_p, x + bubble.width, bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(), _rect.width());
+			_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight - tailclip, tailclip, tailclip),
+			             bg);
+			_p->fillRect(QRect(x + bubble.width - tailclip, bubbleTop + bubbleHeight,
+			                   tailclip + st::historyBubbleTailOutRight.width(), st::msgShadow),
+			             sh);
+			st::historyBubbleTailOutRight[_palette].paint(
+			    *_p, x + bubble.width, bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(),
+			    _rect.width());
 		} else {
 			_p->fillRect(QRect(x, bubbleTop + bubbleHeight - tailclip, tailclip, tailclip), bg);
-			_p->fillRect(QRect(x - st::historyBubbleTailInLeft.width(), bubbleTop + bubbleHeight, tailclip + st::historyBubbleTailInLeft.width(), st::msgShadow), sh);
-			st::historyBubbleTailInLeft[_palette].paint(*_p, x - st::historyBubbleTailInLeft.width(), bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(), _rect.width());
+			_p->fillRect(QRect(x - st::historyBubbleTailInLeft.width(), bubbleTop + bubbleHeight,
+			                   tailclip + st::historyBubbleTailInLeft.width(), st::msgShadow),
+			             sh);
+			st::historyBubbleTailInLeft[_palette].paint(
+			    *_p, x - st::historyBubbleTailInLeft.width(),
+			    bubbleTop + bubbleHeight - st::historyBubbleTailOutRight.height(), _rect.width());
 		}
 	}
 
 	auto trect = QRect(x, y, bubble.width, bubble.height);
 	if (isPhoto) {
-		trect = trect.marginsRemoved(QMargins(st::msgPadding.left(), st::mediaCaptionSkip, st::msgPadding.right(), st::msgPadding.bottom()));
+		trect = trect.marginsRemoved(
+		    QMargins(st::msgPadding.left(), st::mediaCaptionSkip, st::msgPadding.right(), st::msgPadding.bottom()));
 	} else {
 		trect = trect.marginsRemoved(st::msgPadding);
 	}
@@ -727,14 +791,19 @@ void Generator::paintBubble(const Bubble &bubble) {
 		auto h = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
 
 		auto bar = (bubble.outbg ? st::msgOutReplyBarColor[_palette] : st::msgInReplyBarColor[_palette]);
-		auto rbar = rtlrect(trect.x() + st::msgReplyBarPos.x(), trect.y() + st::msgReplyPadding.top() + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height(), _rect.width());
+		auto rbar =
+		    rtlrect(trect.x() + st::msgReplyBarPos.x(), trect.y() + st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
+		            st::msgReplyBarSize.width(), st::msgReplyBarSize.height(), _rect.width());
 		_p->fillRect(rbar, bar);
 
 		_p->setPen(bubble.outbg ? st::msgOutServiceFg[_palette] : st::msgInServiceFg[_palette]);
-		bubble.replyName.drawLeftElided(*_p, trect.x() + st::msgReplyBarSkip, trect.y() + st::msgReplyPadding.top(), bubble.width - st::msgReplyBarSkip, _rect.width());
+		bubble.replyName.drawLeftElided(*_p, trect.x() + st::msgReplyBarSkip, trect.y() + st::msgReplyPadding.top(),
+		                                bubble.width - st::msgReplyBarSkip, _rect.width());
 
 		_p->setPen(bubble.outbg ? st::historyTextOutFg[_palette] : st::historyTextInFg[_palette]);
-		bubble.replyText.drawLeftElided(*_p, trect.x() + st::msgReplyBarSkip, trect.y() + st::msgReplyPadding.top() + st::msgServiceNameFont->height, bubble.width - st::msgReplyBarSkip, _rect.width());
+		bubble.replyText.drawLeftElided(*_p, trect.x() + st::msgReplyBarSkip,
+		                                trect.y() + st::msgReplyPadding.top() + st::msgServiceNameFont->height,
+		                                bubble.width - st::msgReplyBarSkip, _rect.width());
 
 		trect.setY(trect.y() + h);
 	}
@@ -751,15 +820,14 @@ void Generator::paintBubble(const Bubble &bubble) {
 		auto statustop = y + st::msgFileStatusTop;
 		auto bottom = y + st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
 
-		auto inner = rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, _rect.width());
+		auto inner = rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize,
+		                     st::msgFileSize, _rect.width());
 		_p->setPen(Qt::NoPen);
 		_p->setBrush(bubble.outbg ? st::msgFileOutBg[_palette] : st::msgFileInBg[_palette]);
 
 		_p->drawEllipse(inner);
 
-		auto icon = ([&bubble] {
-			return &(bubble.outbg ? st::historyFileOutPlay : st::historyFileInPlay);
-		})();
+		auto icon = ([&bubble] { return &(bubble.outbg ? st::historyFileOutPlay : st::historyFileInPlay); })();
 		(*icon)[_palette].paintInCenter(*_p, inner);
 
 		auto namewidth = x + bubble.width - nameleft - nameright;
@@ -779,9 +847,11 @@ void Generator::paintBubble(const Bubble &bubble) {
 			qint32 bar_value = ((max_value * max_delta) + ((norm_value + 1) / 2)) / (norm_value + 1);
 
 			if (i >= bubble.waveactive) {
-				_p->fillRect(nameleft + bar_x, wave_bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, inactive);
+				_p->fillRect(nameleft + bar_x, wave_bottom - bar_value, st::msgWaveformBar,
+				             st::msgWaveformMin + bar_value, inactive);
 			} else {
-				_p->fillRect(nameleft + bar_x, wave_bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, active);
+				_p->fillRect(nameleft + bar_x, wave_bottom - bar_value, st::msgWaveformBar,
+				             st::msgWaveformMin + bar_value, active);
 			}
 			bar_x += st::msgWaveformBar + st::msgWaveformSkip;
 		}
@@ -816,7 +886,9 @@ void Generator::paintBubble(const Bubble &bubble) {
 	_historyBottom = y - (bubble.attached ? st::msgMarginTopAttached : st::msgMargin.top());
 
 	if (isPhoto) {
-		auto image = bubble.photo.scaled(bubble.photoWidth * cIntRetinaFactor(), bubble.photoHeight * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+		auto image =
+		    bubble.photo.scaled(bubble.photoWidth * cIntRetinaFactor(), bubble.photoHeight * cIntRetinaFactor(),
+		                        Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 		image.setDevicePixelRatio(cRetinaFactor());
 		_p->drawImage(x, y - bubble.photoHeight, image);
 		_historyBottom -= bubble.photoHeight;
@@ -835,24 +907,20 @@ void Generator::paintService(QString text) {
 	_p->drawRoundedRect(bubbleLeft, bubbleTop, bubbleWidth, bubbleHeight, radius, radius);
 	_p->setPen(st::msgServiceFg[_palette]);
 	_p->setFont(st::msgServiceFont);
-	_p->drawText(bubbleLeft + st::msgServicePadding.left(), bubbleTop + st::msgServicePadding.top() + st::msgServiceFont->ascent, text);
+	_p->drawText(bubbleLeft + st::msgServicePadding.left(),
+	             bubbleTop + st::msgServicePadding.top() + st::msgServiceFont->ascent, text);
 	_historyBottom = bubbleTop - st::msgServiceMargin.top();
 }
 
 void Generator::paintUserpic(int x, int y, Row::Type type, int index, QString letters) {
 	style::color colors[] = {
-		st::historyPeer1UserpicBg,
-		st::historyPeer2UserpicBg,
-		st::historyPeer3UserpicBg,
-		st::historyPeer4UserpicBg,
-		st::historyPeer5UserpicBg,
-		st::historyPeer6UserpicBg,
-		st::historyPeer7UserpicBg,
-		st::historyPeer8UserpicBg,
+	    st::historyPeer1UserpicBg, st::historyPeer2UserpicBg, st::historyPeer3UserpicBg, st::historyPeer4UserpicBg,
+	    st::historyPeer5UserpicBg, st::historyPeer6UserpicBg, st::historyPeer7UserpicBg, st::historyPeer8UserpicBg,
 	};
 	auto color = colors[index % base::array_size(colors)];
 
-	auto image = QImage(st::dialogsPhotoSize * cIntRetinaFactor(), st::dialogsPhotoSize * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
+	auto image = QImage(st::dialogsPhotoSize * cIntRetinaFactor(), st::dialogsPhotoSize * cIntRetinaFactor(),
+	                    QImage::Format_ARGB32_Premultiplied);
 	image.setDevicePixelRatio(cRetinaFactor());
 	image.fill(color[_palette]->c);
 	{
@@ -871,8 +939,10 @@ void Generator::paintUserpic(int x, int y, Row::Type type, int index, QString le
 }
 
 void Generator::paintHistoryShadows() {
-	_p->fillRect(_history.x() + st::lineWidth, _history.y(), _history.width() - st::lineWidth, st::lineWidth, st::shadowFg[_palette]);
-	_p->fillRect(_history.x() + st::lineWidth, _history.y() + _history.height() - st::lineWidth, _history.width() - st::lineWidth, st::lineWidth, st::shadowFg[_palette]);
+	_p->fillRect(_history.x() + st::lineWidth, _history.y(), _history.width() - st::lineWidth, st::lineWidth,
+	             st::shadowFg[_palette]);
+	_p->fillRect(_history.x() + st::lineWidth, _history.y() + _history.height() - st::lineWidth,
+	             _history.width() - st::lineWidth, st::lineWidth, st::shadowFg[_palette]);
 	_p->fillRect(_history.x(), _body.y(), st::lineWidth, _body.height(), st::shadowFg[_palette]);
 }
 
@@ -912,12 +982,19 @@ void DefaultPreviewWindowTitle(Painter &p, const style::palette &palette, QRect
 	p.fillRect(titleRect, QColor(0, 0, 0));
 	p.fillRect(titleRect, st::titleBgActive[palette]);
 	auto right = st::titleButtonClose.width;
-	st::titleButtonClose.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonClose.iconPosition.x(), titleRect.y() + st::titleButtonClose.iconPosition.y(), outerWidth);
+	st::titleButtonClose.icon[palette].paint(
+	    p, titleRect.x() + titleRect.width() - right + st::titleButtonClose.iconPosition.x(),
+	    titleRect.y() + st::titleButtonClose.iconPosition.y(), outerWidth);
 	right += st::titleButtonMaximize.width;
-	st::titleButtonMaximize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonMaximize.iconPosition.x(), titleRect.y() + st::titleButtonMaximize.iconPosition.y(), outerWidth);
+	st::titleButtonMaximize.icon[palette].paint(
+	    p, titleRect.x() + titleRect.width() - right + st::titleButtonMaximize.iconPosition.x(),
+	    titleRect.y() + st::titleButtonMaximize.iconPosition.y(), outerWidth);
 	right += st::titleButtonMinimize.width;
-	st::titleButtonMinimize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonMinimize.iconPosition.x(), titleRect.y() + st::titleButtonMinimize.iconPosition.y(), outerWidth);
-	p.fillRect(titleRect.x(), titleRect.y() + titleRect.height() - st::lineWidth, titleRect.width(), st::lineWidth, st::titleShadow[palette]);
+	st::titleButtonMinimize.icon[palette].paint(
+	    p, titleRect.x() + titleRect.width() - right + st::titleButtonMinimize.iconPosition.x(),
+	    titleRect.y() + st::titleButtonMinimize.iconPosition.y(), outerWidth);
+	p.fillRect(titleRect.x(), titleRect.y() + titleRect.height() - st::lineWidth, titleRect.width(), st::lineWidth,
+	           st::titleShadow[palette]);
 }
 
 void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRect body, int outerWidth) {
@@ -930,7 +1007,7 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
 	}
 	auto maxSize = 0;
 	auto currentInt = static_cast<quint32>(0);
-	auto lastLineInts = reinterpret_cast<const quint32*>(mask.constBits() + (mask.height() - 1) * mask.bytesPerLine());
+	auto lastLineInts = reinterpret_cast<const quint32 *>(mask.constBits() + (mask.height() - 1) * mask.bytesPerLine());
 	for (auto end = lastLineInts + mask.width(); lastLineInts != end; ++lastLineInts) {
 		if (*lastLineInts < currentInt) {
 			break;
@@ -970,10 +1047,20 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
 	p.drawImage(inner.x() + inner.width() + right - width, inner.y() - top, topRight);
 	p.drawImage(inner.x() + inner.width() + right - width, inner.y() + inner.height() + bottom - height, bottomRight);
 	p.drawImage(inner.x() - left, inner.y() + inner.height() + bottom - height, bottomLeft);
-	p.drawImage(QRect(inner.x() - left, inner.y() - top + height, left, top + inner.height() + bottom - 2 * height), topLeft, QRect(0, topLeft.height() - cIntRetinaFactor(), left * cIntRetinaFactor(), cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() - left + width, inner.y() - top, left + inner.width() + right - 2 * width, top), topLeft, QRect(topLeft.width() - cIntRetinaFactor(), 0, cIntRetinaFactor(), top * cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() + inner.width(), inner.y() - top + height, right, top + inner.height() + bottom - 2 * height), topRight, QRect(topRight.width() - right * cIntRetinaFactor(), topRight.height() - cIntRetinaFactor(), right * cIntRetinaFactor(), cIntRetinaFactor()));
-	p.drawImage(QRect(inner.x() - left + width, inner.y() + inner.height(), left + inner.width() + right - 2 * width, bottom), bottomRight, QRect(0, bottomRight.height() - bottom * cIntRetinaFactor(), cIntRetinaFactor(), bottom * cIntRetinaFactor()));
+	p.drawImage(QRect(inner.x() - left, inner.y() - top + height, left, top + inner.height() + bottom - 2 * height),
+	            topLeft,
+	            QRect(0, topLeft.height() - cIntRetinaFactor(), left * cIntRetinaFactor(), cIntRetinaFactor()));
+	p.drawImage(QRect(inner.x() - left + width, inner.y() - top, left + inner.width() + right - 2 * width, top),
+	            topLeft, QRect(topLeft.width() - cIntRetinaFactor(), 0, cIntRetinaFactor(), top * cIntRetinaFactor()));
+	p.drawImage(
+	    QRect(inner.x() + inner.width(), inner.y() - top + height, right, top + inner.height() + bottom - 2 * height),
+	    topRight,
+	    QRect(topRight.width() - right * cIntRetinaFactor(), topRight.height() - cIntRetinaFactor(),
+	          right * cIntRetinaFactor(), cIntRetinaFactor()));
+	p.drawImage(
+	    QRect(inner.x() - left + width, inner.y() + inner.height(), left + inner.width() + right - 2 * width, bottom),
+	    bottomRight,
+	    QRect(0, bottomRight.height() - bottom * cIntRetinaFactor(), cIntRetinaFactor(), bottom * cIntRetinaFactor()));
 }
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.h b/Telegram/SourceFiles/window/themes/window_theme_preview.h
index ece147d47..d3c81f363 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "window/themes/window_theme.h"
 #include "QPixmap"
+#include "window/themes/window_theme.h"
 
 namespace Window {
 namespace Theme {
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
index 4d56d4818..9e6e4b930 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
@@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/themes/window_theme_warning.h"
 
+#include "app.h"
+#include "lang/lang_keys.h"
 #include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "window/themes/window_theme.h"
-#include "lang/lang_keys.h"
-#include "app.h"
 
 namespace Window {
 namespace Theme {
@@ -35,10 +35,11 @@ constexpr int kWaitBeforeRevertMs = 15999;
 
 } // namespace
 
-WarningWidget::WarningWidget(QWidget *parent) : TWidget(parent)
-, _secondsLeft(kWaitBeforeRevertMs / 1000)
-, _keepChanges(this, langFactory(lng_theme_keep_changes), st::defaultBoxButton)
-, _revert(this, langFactory(lng_theme_revert), st::defaultBoxButton) {
+WarningWidget::WarningWidget(QWidget *parent)
+    : TWidget(parent)
+    , _secondsLeft(kWaitBeforeRevertMs / 1000)
+    , _keepChanges(this, langFactory(lng_theme_keep_changes), st::defaultBoxButton)
+    , _revert(this, langFactory(lng_theme_revert), st::defaultBoxButton) {
 	_keepChanges->setClickedCallback([] { Window::Theme::KeepApplied(); });
 	_revert->setClickedCallback([] { Window::Theme::Revert(); });
 	_timer.setTimeoutHandler([this] { handleTimer(); });
@@ -76,7 +77,8 @@ void WarningWidget::paintEvent(QPaintEvent *e) {
 
 	p.setFont(st::boxTitleFont);
 	p.setPen(st::boxTitleFg);
-	p.drawTextLeft(_inner.x() + st::boxTitlePosition.x(), _inner.y() + st::boxTitlePosition.y(), width(), lang(lng_theme_sure_keep));
+	p.drawTextLeft(_inner.x() + st::boxTitlePosition.x(), _inner.y() + st::boxTitlePosition.y(), width(),
+	               lang(lng_theme_sure_keep));
 
 	p.setFont(st::boxTextFont);
 	p.setPen(st::boxTextFg);
@@ -84,7 +86,8 @@ void WarningWidget::paintEvent(QPaintEvent *e) {
 }
 
 void WarningWidget::resizeEvent(QResizeEvent *e) {
-	_inner = QRect((width() - st::themeWarningWidth) / 2, (height() - st::themeWarningHeight) / 2, st::themeWarningWidth, st::themeWarningHeight);
+	_inner = QRect((width() - st::themeWarningWidth) / 2, (height() - st::themeWarningHeight) / 2,
+	               st::themeWarningWidth, st::themeWarningHeight);
 	_outer = _inner.marginsAdded(st::boxRoundShadow.extend);
 	updateControlsGeometry();
 	update();
@@ -92,7 +95,8 @@ void WarningWidget::resizeEvent(QResizeEvent *e) {
 
 void WarningWidget::updateControlsGeometry() {
 	auto left = _inner.x() + _inner.width() - st::boxButtonPadding.right() - _keepChanges->width();
-	_keepChanges->moveToLeft(left, _inner.y() + _inner.height() - st::boxButtonPadding.bottom() - _keepChanges->height());
+	_keepChanges->moveToLeft(left,
+	                         _inner.y() + _inner.height() - st::boxButtonPadding.bottom() - _keepChanges->height());
 	_revert->moveToLeft(left - st::boxButtonPadding.left() - _revert->width(), _keepChanges->y());
 }
 
@@ -141,15 +145,17 @@ void WarningWidget::startAnimation(bool hiding) {
 		_cache = myGrab(this, _outer);
 	}
 	hideChildren();
-	_animation.start([this] {
-		update();
-		if (_hiding) {
-			hide();
-			if (_hiddenCallback) {
-				_hiddenCallback();
-			}
-		}
-	}, _hiding ? 1. : 0., _hiding ? 0. : 1., st::boxDuration);
+	_animation.start(
+	    [this] {
+		    update();
+		    if (_hiding) {
+			    hide();
+			    if (_hiddenCallback) {
+				    _hiddenCallback();
+			    }
+		    }
+	    },
+	    _hiding ? 1. : 0., _hiding ? 0. : 1., st::boxDuration);
 }
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.h b/Telegram/SourceFiles/window/themes/window_theme_warning.h
index 0be4c310f..c85ebed87 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.h
@@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/single_timer.h"
 #include "ui/twidget.h"
 
-#include <QPixmap>
 #include "ui/animation.h"
+#include <QPixmap>
 
 namespace Ui {
 class RoundButton;
@@ -73,7 +73,6 @@ private:
 	object_ptr<Ui::RoundButton> _revert;
 
 	base::lambda<void()> _hiddenCallback;
-
 };
 
 } // namespace Theme
diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp
index 11d10b9f2..105f771df 100644
--- a/Telegram/SourceFiles/window/top_bar_widget.cpp
+++ b/Telegram/SourceFiles/window/top_bar_widget.cpp
@@ -20,33 +20,34 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/top_bar_widget.h"
 
-#include "styles/style_window.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
+#include "calls/calls_instance.h"
+#include "dialogs/dialogs_layout.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
+#include "observer_peer.h"
 #include "shortcuts.h"
-#include "lang/lang_keys.h"
+#include "styles/style_window.h"
 #include "ui/special_buttons.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/dropdown_menu.h"
-#include "dialogs/dialogs_layout.h"
 #include "window/window_controller.h"
-#include "calls/calls_instance.h"
-#include "observer_peer.h"
 
 namespace Window {
 
-TopBarWidget::TopBarWidget(QWidget *parent, not_null<Window::Controller*> controller) : TWidget(parent)
-, _controller(controller)
-, _clearSelection(this, langFactory(lng_selected_clear), st::topBarClearButton)
-, _forward(this, langFactory(lng_selected_forward), st::defaultActiveButton)
-, _delete(this, langFactory(lng_selected_delete), st::defaultActiveButton)
-, _info(this, nullptr, st::topBarInfoButton)
-, _mediaType(this, langFactory(lng_media_type), st::topBarButton)
-, _call(this, st::topBarCall)
-, _search(this, st::topBarSearch)
-, _menuToggle(this, st::topBarMenuToggle) {
+TopBarWidget::TopBarWidget(QWidget *parent, not_null<Window::Controller *> controller)
+    : TWidget(parent)
+    , _controller(controller)
+    , _clearSelection(this, langFactory(lng_selected_clear), st::topBarClearButton)
+    , _forward(this, langFactory(lng_selected_forward), st::defaultActiveButton)
+    , _delete(this, langFactory(lng_selected_delete), st::defaultActiveButton)
+    , _info(this, nullptr, st::topBarInfoButton)
+    , _mediaType(this, langFactory(lng_media_type), st::topBarButton)
+    , _call(this, st::topBarCall)
+    , _search(this, st::topBarSearch)
+    , _menuToggle(this, st::topBarMenuToggle) {
 	subscribe(Lang::Current().updated(), [this] { refreshLang(); });
 
 	_forward->setClickedCallback([this] { onForwardSelection(); });
@@ -75,16 +76,18 @@ TopBarWidget::TopBarWidget(QWidget *parent, not_null<Window::Controller*> contro
 			rtlupdate(0, 0, st::titleUnreadCounterRight, st::titleUnreadCounterTop);
 		});
 	}
-	subscribe(App::histories().sendActionAnimationUpdated(), [this](const Histories::SendActionAnimationUpdate &update) {
-		if (App::main() && update.history->peer == App::main()->historyPeer()) {
-			rtlupdate(0, 0, width(), height());
-		}
-	});
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserHasCalls, [this](const Notify::PeerUpdate &update) {
-		if (update.peer->isUser()) {
-			updateControlsVisibility();
-		}
-	}));
+	subscribe(App::histories().sendActionAnimationUpdated(),
+	          [this](const Histories::SendActionAnimationUpdate &update) {
+		          if (App::main() && update.history->peer == App::main()->historyPeer()) {
+			          rtlupdate(0, 0, width(), height());
+		          }
+	          });
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserHasCalls,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer->isUser()) {
+			                                                            updateControlsVisibility();
+		                                                            }
+	                                                            }));
 	subscribe(Global::RefPhoneCallsEnabledChanged(), [this] { updateControlsVisibility(); });
 
 	setCursor(style::cur_pointer);
@@ -153,10 +156,13 @@ void TopBarWidget::showMenu() {
 					}
 				}));
 				_menuToggle->installEventFilter(_menu);
-				App::main()->fillPeerMenu(peer, [this](const QString &text, base::lambda<void()> callback) {
-					return _menu->addAction(text, std::move(callback));
-				}, false);
-				_menu->moveToRight((parentWidget()->width() - width()) + st::topBarMenuPosition.x(), st::topBarMenuPosition.y());
+				App::main()->fillPeerMenu(peer,
+				                          [this](const QString &text, base::lambda<void()> callback) {
+					                          return _menu->addAction(text, std::move(callback));
+				                          },
+				                          false);
+				_menu->moveToRight((parentWidget()->width() - width()) + st::topBarMenuPosition.x(),
+				                   st::topBarMenuPosition.y());
 				_menu->showAnimated(Ui::PanelAnimation::Origin::TopRight);
 			}
 		}
@@ -166,17 +172,11 @@ void TopBarWidget::showMenu() {
 bool TopBarWidget::eventFilter(QObject *obj, QEvent *e) {
 	if (obj == _membersShowArea) {
 		switch (e->type()) {
-		case QEvent::MouseButtonPress:
-			mousePressEvent(static_cast<QMouseEvent*>(e));
-			return true;
+		case QEvent::MouseButtonPress: mousePressEvent(static_cast<QMouseEvent *>(e)); return true;
 
-		case QEvent::Enter:
-			App::main()->setMembersShowAreaActive(true);
-			break;
+		case QEvent::Enter: App::main()->setMembersShowAreaActive(true); break;
 
-		case QEvent::Leave:
-			App::main()->setMembersShowAreaActive(false);
-			break;
+		case QEvent::Leave: App::main()->setMembersShowAreaActive(false); break;
 		}
 	}
 	return TWidget::eventFilter(obj, e);
@@ -400,7 +400,8 @@ void TopBarWidget::showSelected(SelectedState state) {
 		setCursor(hasSelected ? style::cur_default : style::cur_pointer);
 
 		updateMembersShowArea();
-		_selectedShown.start([this] { selectedShowCallback(); }, hasSelected ? 0. : 1., hasSelected ? 1. : 0., st::topBarSlideDuration, anim::easeOutCirc);
+		_selectedShown.start([this] { selectedShowCallback(); }, hasSelected ? 0. : 1., hasSelected ? 1. : 0.,
+		                     st::topBarSlideDuration, anim::easeOutCirc);
 	} else {
 		updateControlsGeometry();
 	}
diff --git a/Telegram/SourceFiles/window/top_bar_widget.h b/Telegram/SourceFiles/window/top_bar_widget.h
index 074ee5728..7e3bae8d0 100644
--- a/Telegram/SourceFiles/window/top_bar_widget.h
+++ b/Telegram/SourceFiles/window/top_bar_widget.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 
 namespace Ui {
 class PeerAvatarButton;
@@ -38,7 +38,7 @@ class TopBarWidget : public TWidget, private base::Subscriber {
 	Q_OBJECT
 
 public:
-	TopBarWidget(QWidget *parent, not_null<Window::Controller*> controller);
+	TopBarWidget(QWidget *parent, not_null<Window::Controller *> controller);
 
 	struct SelectedState {
 		bool textSelected = false;
@@ -81,7 +81,7 @@ private:
 	void updateAdaptiveLayout();
 	int countSelectedButtonsTop(double selectedShown);
 
-	not_null<Window::Controller*> _controller;
+	not_null<Window::Controller *> _controller;
 
 	PeerData *_searchInPeer = nullptr;
 	int _selectedCount = 0;
@@ -99,12 +99,11 @@ private:
 	object_ptr<Ui::IconButton> _call;
 	object_ptr<Ui::IconButton> _search;
 	object_ptr<Ui::IconButton> _menuToggle;
-	object_ptr<Ui::DropdownMenu> _menu = { nullptr };
+	object_ptr<Ui::DropdownMenu> _menu = {nullptr};
 
-	object_ptr<TWidget> _membersShowArea = { nullptr };
+	object_ptr<TWidget> _membersShowArea = {nullptr};
 
 	int _unreadCounterSubscription = 0;
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index e2f94d8fd..92a6e6174 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -20,13 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/window_controller.h"
 
-#include "window/main_window.h"
-#include "mainwidget.h"
-#include "styles/style_window.h"
-#include "styles/style_dialogs.h"
-#include "boxes/calendar_box.h"
-#include "auth_session.h"
 #include "apiwrap.h"
+#include "auth_session.h"
+#include "boxes/calendar_box.h"
+#include "mainwidget.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_window.h"
+#include "window/main_window.h"
 
 namespace Window {
 
@@ -111,7 +111,7 @@ Controller::ColumnLayout Controller::computeColumnLayout() const {
 		accumulate_max(dialogsWidth, st::dialogsWidthMin);
 		chatWidth = bodyWidth - dialogsWidth;
 	}
-	return { bodyWidth, dialogsWidth, chatWidth, layout };
+	return {bodyWidth, dialogsWidth, chatWidth, layout};
 }
 
 bool Controller::canProvideChatWidth(int requestedWidth) const {
@@ -136,7 +136,7 @@ void Controller::provideChatWidth(int requestedWidth) {
 	}
 }
 
-void Controller::showJumpToDate(not_null<PeerData*> peer, QDate requestedDate) {
+void Controller::showJumpToDate(not_null<PeerData *> peer, QDate requestedDate) {
 	Expects(peer != nullptr);
 	auto currentPeerDate = [peer] {
 		if (auto history = App::historyLoaded(peer)) {
@@ -177,7 +177,8 @@ void Controller::showJumpToDate(not_null<PeerData*> peer, QDate requestedDate) {
 	};
 	auto highlighted = requestedDate.isNull() ? currentPeerDate() : requestedDate;
 	auto month = highlighted;
-	auto box = Box<CalendarBox>(month, highlighted, [this, peer](const QDate &date) { Auth().api().jumpToDate(peer, date); });
+	auto box =
+	    Box<CalendarBox>(month, highlighted, [this, peer](const QDate &date) { Auth().api().jumpToDate(peer, date); });
 	box->setMinDate(minPeerDate());
 	box->setMaxDate(maxPeerDate());
 	Ui::show(std::move(box));
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 5d5703989..03e75b0fa 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -29,15 +29,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 namespace Window {
 
 enum class GifPauseReason {
-	Any           = 0,
+	Any = 0,
 	InlineResults = (1 << 0),
-	SavedGifs     = (1 << 1),
-	Layer         = (1 << 2),
-	RoundPlaying  = (1 << 3),
-	MediaPreview  = (1 << 4),
+	SavedGifs = (1 << 1),
+	Layer = (1 << 2),
+	RoundPlaying = (1 << 3),
+	MediaPreview = (1 << 4),
 };
 using GifPauseReasons = base::flags<GifPauseReason>;
-inline constexpr bool is_flag_type(GifPauseReason) { return true; };
+inline constexpr bool is_flag_type(GifPauseReason) {
+	return true;
+};
 
 class MainWindow;
 
@@ -45,23 +47,23 @@ class Controller {
 public:
 	static constexpr auto kDefaultDialogsWidthRatio = 5. / 14;
 
-	Controller(not_null<MainWindow*> window) : _window(window) {
-	}
+	Controller(not_null<MainWindow *> window)
+	    : _window(window) {}
 
-	not_null<MainWindow*> window() const {
+	not_null<MainWindow *> window() const {
 		return _window;
 	}
 
 	// This is needed for History TopBar updating when searchInPeer
 	// is changed in the DialogsWidget of the current window.
-	base::Observable<PeerData*> &searchInPeerChanged() {
+	base::Observable<PeerData *> &searchInPeerChanged() {
 		return _searchInPeerChanged;
 	}
 
 	// This is needed while we have one HistoryWidget and one TopBarWidget
 	// for all histories we show in a window. Once each history is shown
 	// in its own HistoryWidget with its own TopBarWidget this can be removed.
-	base::Observable<PeerData*> &historyPeerChanged() {
+	base::Observable<PeerData *> &historyPeerChanged() {
 		return _historyPeerChanged;
 	}
 
@@ -86,7 +88,7 @@ public:
 	bool canProvideChatWidth(int requestedWidth) const;
 	void provideChatWidth(int requestedWidth);
 
-	void showJumpToDate(not_null<PeerData*> peer, QDate requestedDate);
+	void showJumpToDate(not_null<PeerData *> peer, QDate requestedDate);
 
 	base::Variable<double> &dialogsWidthRatio() {
 		return _dialogsWidthRatio;
@@ -108,19 +110,18 @@ public:
 	}
 
 private:
-	not_null<MainWindow*> _window;
+	not_null<MainWindow *> _window;
 
-	base::Observable<PeerData*> _searchInPeerChanged;
-	base::Observable<PeerData*> _historyPeerChanged;
+	base::Observable<PeerData *> _searchInPeerChanged;
+	base::Observable<PeerData *> _historyPeerChanged;
 
 	GifPauseReasons _gifPauseReasons = 0;
 	base::Observable<void> _gifPauseLevelChanged;
 	base::Observable<void> _floatPlayerAreaUpdated;
 
-	base::Variable<double> _dialogsWidthRatio = { kDefaultDialogsWidthRatio };
-	base::Variable<bool> _dialogsListFocused = { false };
-	base::Variable<bool> _dialogsListDisplayForced = { false };
-
+	base::Variable<double> _dialogsWidthRatio = {kDefaultDialogsWidthRatio};
+	base::Variable<bool> _dialogsListFocused = {false};
+	base::Variable<bool> _dialogsListDisplayForced = {false};
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index ad7e40d2b..b71193070 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -20,35 +20,34 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/window_main_menu.h"
 
-#include "styles/style_window.h"
-#include "styles/style_dialogs.h"
-#include "profile/profile_userpic_button.h"
-#include "window/themes/window_theme.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/menu.h"
-#include "mainwindow.h"
-#include "storage/localstorage.h"
+#include "auth_session.h"
 #include "boxes/about_box.h"
 #include "boxes/peer_list_controllers.h"
 #include "calls/calls_box_controller.h"
-#include "lang/lang_keys.h"
 #include "core/click_handler_types.h"
-#include "observer_peer.h"
-#include "auth_session.h"
+#include "lang/lang_keys.h"
 #include "mainwidget.h"
+#include "mainwindow.h"
+#include "observer_peer.h"
+#include "profile/profile_userpic_button.h"
+#include "storage/localstorage.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_window.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/menu.h"
+#include "window/themes/window_theme.h"
 
 namespace Window {
 
-MainMenu::MainMenu(QWidget *parent) : TWidget(parent)
-, _menu(this, st::mainMenu)
-, _telegram(this, st::mainMenuTelegramLabel)
-, _version(this, st::mainMenuVersionLabel) {
+MainMenu::MainMenu(QWidget *parent)
+    : TWidget(parent)
+    , _menu(this, st::mainMenu)
+    , _telegram(this, st::mainMenuTelegramLabel)
+    , _version(this, st::mainMenuVersionLabel) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
-	subscribe(Global::RefSelfChanged(), [this] {
-		checkSelf();
-	});
+	subscribe(Global::RefSelfChanged(), [this] { checkSelf(); });
 	checkSelf();
 
 	_nightThemeSwitch.setCallback([this] {
@@ -60,24 +59,25 @@ MainMenu::MainMenu(QWidget *parent) : TWidget(parent)
 	});
 
 	resize(st::mainMenuWidth, parentWidget()->height());
-	_menu->setTriggeredCallback([](QAction *action, int actionTop, Ui::Menu::TriggeredSource source) {
-		emit action->triggered();
-	});
+	_menu->setTriggeredCallback(
+	    [](QAction *action, int actionTop, Ui::Menu::TriggeredSource source) { emit action->triggered(); });
 	refreshMenu();
 
 	_telegram->setRichText(textcmdLink(1, str_const_toString(AppName)));
 	_telegram->setLink(1, MakeShared<UrlClickHandler>(lang(lng_url_about)));
-	_version->setRichText(textcmdLink(1, lng_settings_current_version(lt_version, currentVersionText())) + QChar(' ') + QChar(8211) + QChar(' ') + textcmdLink(2, lang(lng_menu_about)));
+	_version->setRichText(textcmdLink(1, lng_settings_current_version(lt_version, currentVersionText())) + QChar(' ') +
+	                      QChar(8211) + QChar(' ') + textcmdLink(2, lang(lng_menu_about)));
 	_version->setLink(1, MakeShared<UrlClickHandler>(lang(lng_url_changelog)));
 	_version->setLink(2, MakeShared<LambdaClickHandler>([] { Ui::show(Box<AboutBox>()); }));
 
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
 	subscribe(Auth().downloaderTaskFinished(), [this] { update(); });
-	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserPhoneChanged, [this](const Notify::PeerUpdate &update) {
-		if (update.peer->isSelf()) {
-			updatePhone();
-		}
-	}));
+	subscribe(Notify::PeerUpdated(), Notify::PeerUpdatedHandler(Notify::PeerUpdate::Flag::UserPhoneChanged,
+	                                                            [this](const Notify::PeerUpdate &update) {
+		                                                            if (update.peer->isSelf()) {
+			                                                            updatePhone();
+		                                                            }
+	                                                            }));
 	subscribe(Global::RefPhoneCallsEnabledChanged(), [this] { refreshMenu(); });
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &update) {
 		if (update.type == Window::Theme::BackgroundUpdate::Type::ApplyingTheme) {
@@ -89,37 +89,42 @@ MainMenu::MainMenu(QWidget *parent) : TWidget(parent)
 
 void MainMenu::refreshMenu() {
 	_menu->clearActions();
-	_menu->addAction(lang(lng_create_group_title), [] {
-		App::wnd()->onShowNewGroup();
-	}, &st::mainMenuNewGroup, &st::mainMenuNewGroupOver);
-	_menu->addAction(lang(lng_create_channel_title), [] {
-		App::wnd()->onShowNewChannel();
-	}, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver);
-	_menu->addAction(lang(lng_menu_contacts), [] {
-		Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox*> box) {
-			box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
-			box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); });
-		}));
-	}, &st::mainMenuContacts, &st::mainMenuContactsOver);
+	_menu->addAction(lang(lng_create_group_title), [] { App::wnd()->onShowNewGroup(); }, &st::mainMenuNewGroup,
+	                 &st::mainMenuNewGroupOver);
+	_menu->addAction(lang(lng_create_channel_title), [] { App::wnd()->onShowNewChannel(); }, &st::mainMenuNewChannel,
+	                 &st::mainMenuNewChannelOver);
+	_menu->addAction(
+	    lang(lng_menu_contacts),
+	    [] {
+		    Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(), [](not_null<PeerListBox *> box) {
+			    box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
+			    box->addLeftButton(langFactory(lng_profile_add_contact), [] { App::wnd()->onShowAddContact(); });
+		    }));
+	    },
+	    &st::mainMenuContacts, &st::mainMenuContactsOver);
 	if (Global::PhoneCallsEnabled()) {
-		_menu->addAction(lang(lng_menu_calls), [] {
-			Ui::show(Box<PeerListBox>(std::make_unique<Calls::BoxController>(), [](not_null<PeerListBox*> box) {
-				box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
-			}));
-		}, &st::mainMenuCalls, &st::mainMenuCallsOver);
+		_menu->addAction(
+		    lang(lng_menu_calls),
+		    [] {
+			    Ui::show(Box<PeerListBox>(std::make_unique<Calls::BoxController>(), [](not_null<PeerListBox *> box) {
+				    box->addButton(langFactory(lng_close), [box] { box->closeBox(); });
+			    }));
+		    },
+		    &st::mainMenuCalls, &st::mainMenuCallsOver);
 	}
-	_menu->addAction(lang(lng_menu_settings), [] {
-		App::wnd()->showSettings();
-	}, &st::mainMenuSettings, &st::mainMenuSettingsOver);
+	_menu->addAction(lang(lng_menu_settings), [] { App::wnd()->showSettings(); }, &st::mainMenuSettings,
+	                 &st::mainMenuSettingsOver);
 
 	if (!Window::Theme::IsNonDefaultUsed()) {
 		_nightThemeAction = std::make_shared<QPointer<QAction>>(nullptr);
-		auto action = _menu->addAction(lang(lng_menu_night_mode), [this] {
-			if (auto action = *_nightThemeAction) {
-				action->setChecked(!action->isChecked());
-				_nightThemeSwitch.callOnce(st::mainMenu.itemToggle.duration);
-			}
-		}, &st::mainMenuNightMode, &st::mainMenuNightModeOver);
+		auto action = _menu->addAction(lang(lng_menu_night_mode),
+		                               [this] {
+			                               if (auto action = *_nightThemeAction) {
+				                               action->setChecked(!action->isChecked());
+				                               _nightThemeSwitch.callOnce(st::mainMenu.itemToggle.duration);
+			                               }
+		                               },
+		                               &st::mainMenuNightMode, &st::mainMenuNightModeOver);
 		*_nightThemeAction = action;
 		action->setCheckable(true);
 		action->setChecked(Window::Theme::IsNightTheme());
@@ -195,7 +200,8 @@ void MainMenu::paintEvent(QPaintEvent *e) {
 		p.setPen(st::mainMenuCoverFg);
 		p.setFont(st::semiboldFont);
 		if (auto self = App::self()) {
-			self->nameText.drawLeftElided(p, st::mainMenuCoverTextLeft, st::mainMenuCoverNameTop, width() - 2 * st::mainMenuCoverTextLeft, width());
+			self->nameText.drawLeftElided(p, st::mainMenuCoverTextLeft, st::mainMenuCoverNameTop,
+			                              width() - 2 * st::mainMenuCoverTextLeft, width());
 			p.setFont(st::normalFont);
 			p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText);
 		}
@@ -204,8 +210,8 @@ void MainMenu::paintEvent(QPaintEvent *e) {
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::mainMenuCloudBg);
 			auto cloudBg = QRect(_cloudButton->x() + (_cloudButton->width() - st::mainMenuCloudSize) / 2,
-				_cloudButton->y() + (_cloudButton->height() - st::mainMenuCloudSize) / 2,
-				st::mainMenuCloudSize, st::mainMenuCloudSize);
+			                     _cloudButton->y() + (_cloudButton->height() - st::mainMenuCloudSize) / 2,
+			                     st::mainMenuCloudSize, st::mainMenuCloudSize);
 			p.drawEllipse(cloudBg);
 		}
 	}
diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h
index 7aa32f91d..9da08fc4c 100644
--- a/Telegram/SourceFiles/window/window_main_menu.h
+++ b/Telegram/SourceFiles/window/window_main_menu.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "base/timer.h"
 #include "base/lambda.h"
+#include "base/timer.h"
 #include "ui/twidget.h"
 
 namespace Ui {
@@ -55,8 +55,8 @@ private:
 	void updatePhone();
 	void refreshMenu();
 
-	object_ptr<Profile::UserpicButton> _userpicButton = { nullptr };
-	object_ptr<Ui::IconButton> _cloudButton = { nullptr };
+	object_ptr<Profile::UserpicButton> _userpicButton = {nullptr};
+	object_ptr<Ui::IconButton> _cloudButton = {nullptr};
 	object_ptr<Ui::Menu> _menu;
 	object_ptr<Ui::FlatLabel> _telegram;
 	object_ptr<Ui::FlatLabel> _version;
@@ -65,7 +65,6 @@ private:
 
 	bool _showFinished = false;
 	QString _phoneText;
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_slide_animation.cpp b/Telegram/SourceFiles/window/window_slide_animation.cpp
index 1bde0556f..19f251400 100644
--- a/Telegram/SourceFiles/window/window_slide_animation.cpp
+++ b/Telegram/SourceFiles/window/window_slide_animation.cpp
@@ -32,14 +32,17 @@ void SlideAnimation::paintContents(Painter &p, const QRect &update) const {
 	auto coordUnder = anim::interpolate(0, -st::slideShift, progress);
 	auto coordOver = anim::interpolate(_cacheOver.width() / cIntRetinaFactor(), 0, progress);
 	if (coordOver) {
-		p.drawPixmap(QRect(0, 0, coordOver, _cacheUnder.height() / retina), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, _cacheUnder.height()));
+		p.drawPixmap(QRect(0, 0, coordOver, _cacheUnder.height() / retina), _cacheUnder,
+		             QRect(-coordUnder * retina, 0, coordOver * retina, _cacheUnder.height()));
 		p.setOpacity(progress);
 		p.fillRect(0, 0, coordOver, _cacheUnder.height() / retina, st::slideFadeOutBg);
 		p.setOpacity(1);
 	}
-	p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver, QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
+	p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, _cacheOver.height() / retina), _cacheOver,
+	             QRect(0, 0, _cacheOver.width(), _cacheOver.height()));
 	p.setOpacity(progress);
-	st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), _cacheOver.height() / retina));
+	st::slideShadow.fill(
+	    p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), _cacheOver.height() / retina));
 
 	if (_topBarShadowEnabled) {
 		p.setOpacity(1);
@@ -72,7 +75,8 @@ void SlideAnimation::start() {
 	auto delta = st::slideShift;
 	auto fromLeft = (_direction == SlideDirection::FromLeft);
 	if (fromLeft) std::swap(_cacheUnder, _cacheOver);
-	_animation.start([this] { animationCallback(); }, fromLeft ? 1. : 0., fromLeft ? 0. : 1., st::slideDuration, transition());
+	_animation.start([this] { animationCallback(); }, fromLeft ? 1. : 0., fromLeft ? 0. : 1., st::slideDuration,
+	                 transition());
 	_repaintCallback();
 }
 
diff --git a/Telegram/SourceFiles/window/window_slide_animation.h b/Telegram/SourceFiles/window/window_slide_animation.h
index 89b549c76..96e9a829f 100644
--- a/Telegram/SourceFiles/window/window_slide_animation.h
+++ b/Telegram/SourceFiles/window/window_slide_animation.h
@@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QPixmap>
 #include "base/lambda.h"
 #include "ui/animation.h"
 #include "ui/twidget.h"
+#include <QPixmap>
 
 namespace Window {
 
@@ -63,7 +63,6 @@ private:
 
 	RepaintCallback _repaintCallback;
 	FinishedCallback _finishedCallback;
-
 };
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_title.h b/Telegram/SourceFiles/window/window_title.h
index 0469c520c..704893493 100644
--- a/Telegram/SourceFiles/window/window_title.h
+++ b/Telegram/SourceFiles/window/window_title.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include <QRect>
-#include <QPoint>
 #include "ui/twidget.h"
+#include <QPoint>
+#include <QRect>
 
 namespace Window {
 
@@ -45,15 +45,13 @@ class TitleWidget : public TWidget {
 public:
 	using TWidget::TWidget;
 
-	virtual void init() {
-	}
+	virtual void init() {}
 	virtual HitTestResult hitTest(const QPoint &p) const {
 		return HitTestResult::None;
 	}
 	virtual QRect iconRect() const {
 		return QRect();
 	}
-
 };
 
 } // namespace Window