diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 7db0ad185..c560a12d5 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -2773,7 +2773,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
 
 	auto indices = base::flat_map<uint64, int>(); // copied from feedMsgs
 	for (auto i = 0, l = v->size(); i != l; ++i) {
-		const auto msgId = idFromMessage(v->at(i));
+		const auto msgId = IdFromMessage(v->at(i));
 		indices.emplace((uint64(uint32(msgId)) << 32) | uint64(i), i);
 	}
 
@@ -3434,8 +3434,8 @@ void ApiWrap::requestMessageAfterDate(
 		if (auto list = getMessagesList()) {
 			App::feedMsgs(*list, NewMessageExisting);
 			for (auto &message : *list) {
-				if (dateFromMessage(message) >= offsetDate) {
-					callback(idFromMessage(message));
+				if (DateFromMessage(message) >= offsetDate) {
+					callback(IdFromMessage(message));
 					return;
 				}
 			}
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 1e26b628e..5dfea1f6e 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -874,22 +874,20 @@ namespace App {
 		return false;
 	}
 
-	void updateEditedMessage(const MTPMessage &m) {
-		auto apply = [](const auto &data) {
-			auto peerId = peerFromMTP(data.vto_id);
-			if (data.has_from_id() && peerId == Auth().userPeerId()) {
-				peerId = peerFromUser(data.vfrom_id);
+	void updateEditedMessage(const MTPMessage &message) {
+		message.match([](const MTPDmessageEmpty &) {
+		}, [](const auto &message) {
+			auto peerId = peerFromMTP(message.vto_id);
+			if (message.has_from_id() && peerId == Auth().userPeerId()) {
+				peerId = peerFromUser(message.vfrom_id);
 			}
-			if (auto existing = App::histItemById(peerToChannel(peerId), data.vid.v)) {
-				existing->applyEdition(data);
+			const auto existing = App::histItemById(
+				peerToChannel(peerId),
+				message.vid.v);
+			if (existing) {
+				existing->applyEdition(message);
 			}
-		};
-
-		if (m.type() == mtpc_message) { // apply message edit
-			apply(m.c_message());
-		} else if (m.type() == mtpc_messageService) {
-			apply(m.c_messageService());
-		}
+		});
 	}
 
 	void addSavedGif(DocumentData *doc) {
@@ -932,7 +930,7 @@ namespace App {
 					}
 				}
 			}
-			const auto msgId = idFromMessage(msg);
+			const auto msgId = IdFromMessage(msg);
 			indices.emplace((uint64(uint32(msgId)) << 32) | uint64(i), i);
 		}
 		for (const auto [position, index] : indices) {
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index 0a355b0ab..33cfe65a8 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -303,8 +303,8 @@ void BoxController::receivedCalls(const QVector<MTPMessage> &result) {
 	}
 
 	for_const (auto &message, result) {
-		auto msgId = idFromMessage(message);
-		auto peerId = peerFromMessage(message);
+		auto msgId = IdFromMessage(message);
+		auto peerId = PeerFromMessage(message);
 		if (auto peer = App::peerLoaded(peerId)) {
 			auto item = App::histories().addNewMessage(message, NewMessageExisting);
 			insertRow(item, InsertWay::Append);
diff --git a/Telegram/SourceFiles/data/data_types.cpp b/Telegram/SourceFiles/data/data_types.cpp
index 1b78bac20..f40833f24 100644
--- a/Telegram/SourceFiles/data/data_types.cpp
+++ b/Telegram/SourceFiles/data/data_types.cpp
@@ -133,3 +133,38 @@ HistoryItem *FileClickHandler::getActionItem() const {
 		? App::histItemById(context())
 		: nullptr;
 }
+
+PeerId PeerFromMessage(const MTPmessage &message) {
+	return message.match([](const MTPDmessageEmpty &) {
+		return PeerId(0);
+	}, [](const auto &message) {
+		auto from_id = message.has_from_id() ? peerFromUser(message.vfrom_id) : 0;
+		auto to_id = peerFromMTP(message.vto_id);
+		auto out = message.is_out();
+		return (out || !peerIsUser(to_id)) ? to_id : from_id;
+	});
+}
+
+MTPDmessage::Flags FlagsFromMessage(const MTPmessage &message) {
+	return message.match([](const MTPDmessageEmpty &) {
+		return MTPDmessage::Flags(0);
+	}, [](const MTPDmessage &message) {
+		return message.vflags.v;
+	}, [](const MTPDmessageService &message) {
+		return mtpCastFlags(message.vflags.v);
+	});
+}
+
+MsgId IdFromMessage(const MTPmessage &message) {
+	return message.match([](const auto &message) {
+		return message.vid.v;
+	});
+}
+
+TimeId DateFromMessage(const MTPmessage &message) {
+	return message.match([](const MTPDmessageEmpty &) {
+		return TimeId(0);
+	}, [](const auto &message) {
+		return message.vdate.v;
+	});
+}
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index 01ee9be27..8c7b2ae52 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -234,41 +234,10 @@ Q_DECLARE_METATYPE(FullMsgId);
 
 using MessageIdsList = std::vector<FullMsgId>;
 
-inline PeerId peerFromMessage(const MTPmessage &msg) {
-	auto compute = [](auto &message) {
-		auto from_id = message.has_from_id() ? peerFromUser(message.vfrom_id) : 0;
-		auto to_id = peerFromMTP(message.vto_id);
-		auto out = message.is_out();
-		return (out || !peerIsUser(to_id)) ? to_id : from_id;
-	};
-	switch (msg.type()) {
-	case mtpc_message: return compute(msg.c_message());
-	case mtpc_messageService: return compute(msg.c_messageService());
-	}
-	return 0;
-}
-inline MTPDmessage::Flags flagsFromMessage(const MTPmessage &msg) {
-	switch (msg.type()) {
-	case mtpc_message: return msg.c_message().vflags.v;
-	case mtpc_messageService: return mtpCastFlags(msg.c_messageService().vflags.v);
-	}
-	return 0;
-}
-inline MsgId idFromMessage(const MTPmessage &msg) {
-	switch (msg.type()) {
-	case mtpc_messageEmpty: return msg.c_messageEmpty().vid.v;
-	case mtpc_message: return msg.c_message().vid.v;
-	case mtpc_messageService: return msg.c_messageService().vid.v;
-	}
-	Unexpected("Type in idFromMessage()");
-}
-inline TimeId dateFromMessage(const MTPmessage &msg) {
-	switch (msg.type()) {
-	case mtpc_message: return msg.c_message().vdate.v;
-	case mtpc_messageService: return msg.c_messageService().vdate.v;
-	}
-	return 0;
-}
+PeerId PeerFromMessage(const MTPmessage &message);
+MTPDmessage::Flags FlagsFromMessage(const MTPmessage &message);
+MsgId IdFromMessage(const MTPmessage &message);
+TimeId DateFromMessage(const MTPmessage &message);
 
 class DocumentData;
 class PhotoData;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 8ca192448..df582d89a 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1885,9 +1885,9 @@ bool DialogsInner::searchReceived(
 	auto unknownUnreadCounts = std::vector<not_null<History*>>();
 	TimeId lastDateFound = 0;
 	for_const (auto message, messages) {
-		auto msgId = idFromMessage(message);
-		auto peerId = peerFromMessage(message);
-		auto lastDate = dateFromMessage(message);
+		auto msgId = IdFromMessage(message);
+		auto peerId = PeerFromMessage(message);
+		auto lastDate = DateFromMessage(message);
 		if (const auto peer = App::peerLoaded(peerId)) {
 			if (lastDate) {
 				const auto item = App::histories().addNewMessage(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 9c9aa0bc7..2a3b2c178 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -470,9 +470,9 @@ void DialogsWidget::updateDialogsOffset(
 		}
 		for (auto j = messages.size(); j != 0;) {
 			const auto &message = messages[--j];
-			if (idFromMessage(message) == msgId
-				&& peerFromMessage(message) == peer) {
-				if (const auto date = dateFromMessage(message)) {
+			if (IdFromMessage(message) == msgId
+				&& PeerFromMessage(message) == peer) {
+				if (const auto date = DateFromMessage(message)) {
 					lastDate = date;
 				}
 				return;
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index 80d097493..a1b85d846 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -36,52 +36,50 @@ TextWithEntities PrepareText(const QString &value, const QString &emptyValue) {
 	return result;
 }
 
-MTPMessage PrepareLogMessage(const MTPMessage &message, MsgId newId, int32 newDate) {
-	switch (message.type()) {
-	case mtpc_messageEmpty: return MTP_messageEmpty(MTP_int(newId));
-	case mtpc_messageService: {
-		auto &data = message.c_messageService();
-		auto removeFlags = MTPDmessageService::Flag::f_out
+MTPMessage PrepareLogMessage(
+		const MTPMessage &message,
+		MsgId newId,
+		TimeId newDate) {
+	return message.match([&](const MTPDmessageEmpty &) {
+		return MTP_messageEmpty(MTP_int(newId));
+	}, [&](const MTPDmessageService &message) {
+		const auto removeFlags = MTPDmessageService::Flag::f_out
 			| MTPDmessageService::Flag::f_post
 			/* | MTPDmessageService::Flag::f_reply_to_msg_id*/;
-		auto flags = data.vflags.v & ~removeFlags;
+		const auto flags = message.vflags.v & ~removeFlags;
 		return MTP_messageService(
 			MTP_flags(flags),
 			MTP_int(newId),
-			data.vfrom_id,
-			data.vto_id,
-			data.vreply_to_msg_id,
+			message.vfrom_id,
+			message.vto_id,
+			message.vreply_to_msg_id,
 			MTP_int(newDate),
-			data.vaction);
-	} break;
-	case mtpc_message: {
-		auto &data = message.c_message();
-		auto removeFlags = MTPDmessage::Flag::f_out
+			message.vaction);
+	}, [&](const MTPDmessage &message) {
+		const auto removeFlags = MTPDmessage::Flag::f_out
 			| MTPDmessage::Flag::f_post
 			| MTPDmessage::Flag::f_reply_to_msg_id
 			| MTPDmessage::Flag::f_edit_date
 			| MTPDmessage::Flag::f_grouped_id;
-		auto flags = data.vflags.v & ~removeFlags;
+		const auto flags = message.vflags.v & ~removeFlags;
 		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,
+			message.vfrom_id,
+			message.vto_id,
+			message.vfwd_from,
+			message.vvia_bot_id,
+			message.vreply_to_msg_id,
 			MTP_int(newDate),
-			data.vmessage,
-			data.vmedia,
-			data.vreply_markup,
-			data.ventities,
-			data.vviews,
-			data.vedit_date,
+			message.vmessage,
+			message.vmedia,
+			message.vreply_markup,
+			message.ventities,
+			message.vviews,
+			message.vedit_date,
 			MTP_string(""),
-			data.vgrouped_id);
-	} break;
-	}
-	Unexpected("Type in PrepareLogMessage()");
+			message.vgrouped_id);
+	});
 }
 
 bool MediaCanHaveCaption(const MTPMessage &message) {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 879a2e562..5cc9c41ef 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -154,7 +154,7 @@ void Histories::remove(const PeerId &peer) {
 HistoryItem *Histories::addNewMessage(
 		const MTPMessage &msg,
 		NewMessageType type) {
-	auto peer = peerFromMessage(msg);
+	auto peer = PeerFromMessage(msg);
 	if (!peer) return nullptr;
 
 	auto result = App::history(peer)->addNewMessage(msg, type);
@@ -750,7 +750,7 @@ bool History::updateSendActionNeedsAnimating(TimeMs ms, bool force) {
 HistoryItem *History::createItem(
 		const MTPMessage &message,
 		bool detachExistingItem) {
-	const auto messageId = idFromMessage(message);
+	const auto messageId = IdFromMessage(message);
 	if (!messageId) {
 		return nullptr;
 	}
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index f74cd32f2..fb740193c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -41,6 +41,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
+enum class MediaCheckResult {
+	Good,
+	Unsupported,
+	Empty,
+	HasTimeToLive,
+};
+
 not_null<HistoryItem*> CreateUnsupportedMessage(
 		not_null<History*> history,
 		MsgId msgId,
@@ -69,6 +76,75 @@ not_null<HistoryItem*> CreateUnsupportedMessage(
 		text);
 }
 
+MediaCheckResult CheckMessageMedia(const MTPMessageMedia &media) {
+	using Result = MediaCheckResult;
+	return media.match([](const MTPDmessageMediaEmpty &) {
+		return Result::Good;
+	}, [](const MTPDmessageMediaContact &) {
+		return Result::Good;
+	}, [](const MTPDmessageMediaGeo &data) {
+		return data.vgeo.match([](const MTPDgeoPoint &) {
+			return Result::Good;
+		}, [](const MTPDgeoPointEmpty &) {
+			return Result::Empty;
+		});
+	}, [](const MTPDmessageMediaVenue &data) {
+		return data.vgeo.match([](const MTPDgeoPoint &) {
+			return Result::Good;
+		}, [](const MTPDgeoPointEmpty &) {
+			return Result::Empty;
+		});
+	}, [](const MTPDmessageMediaGeoLive &data) {
+		return data.vgeo.match([](const MTPDgeoPoint &) {
+			return Result::Good;
+		}, [](const MTPDgeoPointEmpty &) {
+			return Result::Empty;
+		});
+	}, [](const MTPDmessageMediaPhoto &data) {
+		if (data.has_ttl_seconds()) {
+			return Result::HasTimeToLive;
+		} else if (!data.has_photo()) {
+			return Result::Empty;
+		}
+		return data.vphoto.match([](const MTPDphoto &) {
+			return Result::Good;
+		}, [](const MTPDphotoEmpty &) {
+			return Result::Empty;
+		});
+	}, [](const MTPDmessageMediaDocument &data) {
+		if (data.has_ttl_seconds()) {
+			return Result::HasTimeToLive;
+		} else if (!data.has_document()) {
+			return Result::Empty;
+		}
+		return data.vdocument.match([](const MTPDdocument &) {
+			return Result::Good;
+		}, [](const MTPDdocumentEmpty &) {
+			return Result::Empty;
+		});
+	}, [](const MTPDmessageMediaWebPage &data) {
+		return data.vwebpage.match([](const MTPDwebPage &) {
+			return Result::Good;
+		}, [](const MTPDwebPageEmpty &) {
+			return Result::Good;
+		}, [](const MTPDwebPagePending &) {
+			return Result::Good;
+		}, [](const MTPDwebPageNotModified &) {
+			return Result::Unsupported;
+		});
+	}, [](const MTPDmessageMediaGame &data) {
+		return data.vgame.match([](const MTPDgame &) {
+			return Result::Good;
+		});
+	}, [](const MTPDmessageMediaInvoice &) {
+		return Result::Good;
+	}, [](const MTPDmessageMediaPoll &) { // #TODO polls
+		return Result::Unsupported;
+	}, [](const MTPDmessageMediaUnsupported &) {
+		return Result::Unsupported;
+	});
+}
+
 } // namespace
 
 void HistoryItem::HistoryItem::Destroyer::operator()(HistoryItem *value) {
@@ -676,98 +752,11 @@ ClickHandlerPtr goToMessageClickHandler(
 not_null<HistoryItem*> HistoryItem::Create(
 		not_null<History*> history,
 		const MTPMessage &message) {
-	switch (message.type()) {
-	case mtpc_messageEmpty: {
-		const auto &data = message.c_messageEmpty();
-		const auto text = HistoryService::PreparedText {
-			lang(lng_message_empty)
-		};
-		return new HistoryService(history, data.vid.v, TimeId(0), text);
-	} break;
-
-	case mtpc_message: {
-		const auto &data = message.c_message();
-		enum class MediaCheckResult {
-			Good,
-			Unsupported,
-			Empty,
-			HasTimeToLive,
-		};
-		auto badMedia = MediaCheckResult::Good;
-		const auto &media = data.vmedia;
-		if (data.has_media()) switch (media.type()) {
-		case mtpc_messageMediaEmpty:
-		case mtpc_messageMediaContact: break;
-		case mtpc_messageMediaGeo:
-			switch (media.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 (media.c_messageMediaVenue().vgeo.type()) {
-			case mtpc_geoPoint: break;
-			case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
-			default: badMedia = MediaCheckResult::Unsupported; break;
-			}
-			break;
-		case mtpc_messageMediaGeoLive:
-			switch (media.c_messageMediaGeoLive().vgeo.type()) {
-			case mtpc_geoPoint: break;
-			case mtpc_geoPointEmpty: badMedia = MediaCheckResult::Empty; break;
-			default: badMedia = MediaCheckResult::Unsupported; break;
-			}
-			break;
-		case mtpc_messageMediaPhoto: {
-			auto &photo = media.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 = media.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 (media.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 (media.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) {
+	return message.match([&](const MTPDmessage &data) -> HistoryItem* {
+		const auto checked = data.has_media()
+			? CheckMessageMedia(data.vmedia)
+			: MediaCheckResult::Good;
+		if (checked == MediaCheckResult::Unsupported) {
 			return CreateUnsupportedMessage(
 				history,
 				data.vid.v,
@@ -776,7 +765,7 @@ not_null<HistoryItem*> HistoryItem::Create(
 				data.vvia_bot_id.v,
 				data.vdate.v,
 				data.vfrom_id.v);
-		} else if (badMedia == MediaCheckResult::Empty) {
+		} else if (checked == MediaCheckResult::Empty) {
 			const auto text = HistoryService::PreparedText {
 				lang(lng_message_empty)
 			};
@@ -787,20 +776,19 @@ not_null<HistoryItem*> HistoryItem::Create(
 				text,
 				data.vflags.v,
 				data.has_from_id() ? data.vfrom_id.v : UserId(0));
-		} else if (badMedia == MediaCheckResult::HasTimeToLive) {
+		} else if (checked == MediaCheckResult::HasTimeToLive) {
 			return new HistoryService(history, data);
 		}
 		return new HistoryMessage(history, data);
-	} break;
-
-	case mtpc_messageService: {
-		auto &data = message.c_messageService();
+	}, [&](const MTPDmessageService &data) -> HistoryItem* {
 		if (data.vaction.type() == mtpc_messageActionPhoneCall) {
 			return new HistoryMessage(history, data);
 		}
 		return new HistoryService(history, data);
-	} break;
-	}
-
-	Unexpected("Type in HistoryItem::Create().");
+	}, [&](const MTPDmessageEmpty &data) -> HistoryItem* {
+		const auto text = HistoryService::PreparedText{
+			lang(lng_message_empty)
+		};
+		return new HistoryService(history, data.vid.v, TimeId(0), text);
+	});
 }
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 45569706d..2cf34a94b 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -758,110 +758,110 @@ void HistoryMessage::setMedia(const MTPMessageMedia &media) {
 std::unique_ptr<Data::Media> HistoryMessage::CreateMedia(
 		not_null<HistoryMessage*> item,
 		const MTPMessageMedia &media) {
-	switch (media.type()) {
-	case mtpc_messageMediaContact: {
-		const auto &data = media.c_messageMediaContact();
+	using Result = std::unique_ptr<Data::Media>;
+	return media.match([&](const MTPDmessageMediaContact &media) -> Result {
 		return std::make_unique<Data::MediaContact>(
 			item,
-			data.vuser_id.v,
-			qs(data.vfirst_name),
-			qs(data.vlast_name),
-			qs(data.vphone_number));
-	} break;
-	case mtpc_messageMediaGeo: {
-		const auto &data = media.c_messageMediaGeo().vgeo;
-		if (data.type() == mtpc_geoPoint) {
+			media.vuser_id.v,
+			qs(media.vfirst_name),
+			qs(media.vlast_name),
+			qs(media.vphone_number));
+	}, [&](const MTPDmessageMediaGeo &media) -> Result {
+		return media.vgeo.match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
-				LocationCoords(data.c_geoPoint()));
-		}
-	} break;
-	case mtpc_messageMediaGeoLive: {
-		const auto &data = media.c_messageMediaGeoLive().vgeo;
-		if (data.type() == mtpc_geoPoint) {
+				LocationCoords(point));
+		}, [](const MTPDgeoPointEmpty &) -> Result {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaGeoLive &media) -> Result {
+		return media.vgeo.match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
-				LocationCoords(data.c_geoPoint()));
-		}
-	} break;
-	case mtpc_messageMediaVenue: {
-		const auto &data = media.c_messageMediaVenue();
-		if (data.vgeo.type() == mtpc_geoPoint) {
+				LocationCoords(point));
+		}, [](const MTPDgeoPointEmpty &) -> Result {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaVenue &media) -> Result {
+		return media.vgeo.match([&](const MTPDgeoPoint &point) -> Result {
 			return std::make_unique<Data::MediaLocation>(
 				item,
-				LocationCoords(data.vgeo.c_geoPoint()),
-				qs(data.vtitle),
-				qs(data.vaddress));
-		}
-	} break;
-	case mtpc_messageMediaPhoto: {
-		const auto &data = media.c_messageMediaPhoto();
-		if (data.has_ttl_seconds()) {
+				LocationCoords(point),
+				qs(media.vtitle),
+				qs(media.vaddress));
+		}, [](const MTPDgeoPointEmpty &data) -> Result {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaPhoto &media) -> Result {
+		if (media.has_ttl_seconds()) {
 			LOG(("App Error: "
 				"Unexpected MTPMessageMediaPhoto "
 				"with ttl_seconds in HistoryMessage."));
-		} else if (data.has_photo() && data.vphoto.type() == mtpc_photo) {
-			return std::make_unique<Data::MediaPhoto>(
-				item,
-				Auth().data().photo(data.vphoto.c_photo()));
-		} else {
+			return nullptr;
+		} else if (!media.has_photo()) {
 			LOG(("API Error: "
 				"Got MTPMessageMediaPhoto "
 				"without photo and without ttl_seconds."));
+			return nullptr;
 		}
-	} break;
-	case mtpc_messageMediaDocument: {
-		const auto &data = media.c_messageMediaDocument();
-		if (data.has_ttl_seconds()) {
+		return media.vphoto.match([&](const MTPDphoto &photo) -> Result {
+			return std::make_unique<Data::MediaPhoto>(
+				item,
+				Auth().data().photo(photo));
+		}, [](const MTPDphotoEmpty &) -> Result {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaDocument &media) -> Result {
+		if (media.has_ttl_seconds()) {
 			LOG(("App Error: "
 				"Unexpected MTPMessageMediaDocument "
 				"with ttl_seconds in HistoryMessage."));
-		} else if (data.has_document()
-			&& data.vdocument.type() == mtpc_document) {
-			return std::make_unique<Data::MediaFile>(
-				item,
-				Auth().data().document(data.vdocument.c_document()));
-		} else {
+			return nullptr;
+		} else if (!media.has_document()) {
 			LOG(("API Error: "
 				"Got MTPMessageMediaDocument "
 				"without document and without ttl_seconds."));
+			return nullptr;
 		}
-	} break;
-	case mtpc_messageMediaWebPage: {
-		const auto &data = media.c_messageMediaWebPage().vwebpage;
-		switch (data.type()) {
-		case mtpc_webPageEmpty: break;
-		case mtpc_webPagePending:
+		const auto &document = media.vdocument;
+		return document.match([&](const MTPDdocument &document) -> Result {
+			return std::make_unique<Data::MediaFile>(
+				item,
+				Auth().data().document(document));
+		}, [](const MTPDdocumentEmpty &) -> Result {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaWebPage &media) {
+		return media.vwebpage.match([](const MTPDwebPageEmpty &) -> Result {
+			return nullptr;
+		}, [&](const MTPDwebPagePending &webpage) -> Result {
 			return std::make_unique<Data::MediaWebPage>(
 				item,
-				Auth().data().webpage(data.c_webPagePending()));
-			break;
-		case mtpc_webPage:
+				Auth().data().webpage(webpage));
+		}, [&](const MTPDwebPage &webpage) -> Result {
 			return std::make_unique<Data::MediaWebPage>(
 				item,
-				Auth().data().webpage(data.c_webPage()));
-			break;
-		case mtpc_webPageNotModified:
+				Auth().data().webpage(webpage));
+		}, [](const MTPDwebPageNotModified &) -> Result {
 			LOG(("API Error: "
 				"webPageNotModified is unexpected in message media."));
-			break;
-		}
-	} break;
-	case mtpc_messageMediaGame: {
-		const auto &data = media.c_messageMediaGame().vgame;
-		if (data.type() == mtpc_game) {
+			return nullptr;
+		});
+	}, [&](const MTPDmessageMediaGame &media) -> Result {
+		return media.vgame.match([&](const MTPDgame &game) {
 			return std::make_unique<Data::MediaGame>(
 				item,
-				Auth().data().game(data.c_game()));
-		}
-	} break;
-	case mtpc_messageMediaInvoice: {
-		return std::make_unique<Data::MediaInvoice>(
-			item,
-			media.c_messageMediaInvoice());
-	} break;
-	};
-
+				Auth().data().game(game));
+		});
+	}, [&](const MTPDmessageMediaInvoice &media) -> Result {
+		return std::make_unique<Data::MediaInvoice>(item, media);
+	}, [&](const MTPDmessageMediaPoll &media) -> Result { // #TODO polls
+		return nullptr;
+	}, [](const MTPDmessageMediaEmpty &) -> Result {
+		return nullptr;
+	}, [](const MTPDmessageMediaUnsupported &) -> Result {
+		return nullptr;
+	});
 	return nullptr;
 }
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index d964b0277..bc36da0c1 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2285,10 +2285,10 @@ void HistoryWidget::messagesReceived(PeerData *peer, const MTPmessages_Messages
 	}
 
 	const auto ExtractFirstId = [&] {
-		return histList->empty() ? -1 : idFromMessage(histList->front());
+		return histList->empty() ? -1 : IdFromMessage(histList->front());
 	};
 	const auto ExtractLastId = [&] {
-		return histList->empty() ? -1 : idFromMessage(histList->back());
+		return histList->empty() ? -1 : IdFromMessage(histList->back());
 	};
 	const auto PeerString = [](PeerId peerId) {
 		if (peerIsUser(peerId)) {
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 1516b923b..ce0fba121 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -3846,56 +3846,57 @@ enum class DataIsLoadedResult {
 	MentionNotLoaded = 2,
 	Ok = 3,
 };
-DataIsLoadedResult allDataLoadedForMessage(const MTPMessage &msg) {
-	switch (msg.type()) {
-	case mtpc_message: {
-		const MTPDmessage &d(msg.c_message());
-		if (!d.is_post() && d.has_from_id()) {
-			if (!App::userLoaded(peerFromUser(d.vfrom_id))) {
+DataIsLoadedResult allDataLoadedForMessage(const MTPMessage &message) {
+	return message.match([](const MTPDmessage &message) {
+		if (!message.is_post() && message.has_from_id()) {
+			if (!App::userLoaded(peerFromUser(message.vfrom_id))) {
 				return DataIsLoadedResult::FromNotLoaded;
 			}
 		}
-		if (d.has_via_bot_id()) {
-			if (!App::userLoaded(peerFromUser(d.vvia_bot_id))) {
+		if (message.has_via_bot_id()) {
+			if (!App::userLoaded(peerFromUser(message.vvia_bot_id))) {
 				return DataIsLoadedResult::NotLoaded;
 			}
 		}
-		if (d.has_fwd_from() && !fwdInfoDataLoaded(d.vfwd_from)) {
+		if (message.has_fwd_from()
+			&& !fwdInfoDataLoaded(message.vfwd_from)) {
 			return DataIsLoadedResult::NotLoaded;
 		}
-		if (d.has_entities() && !mentionUsersLoaded(d.ventities)) {
+		if (message.has_entities()
+			&& !mentionUsersLoaded(message.ventities)) {
 			return DataIsLoadedResult::MentionNotLoaded;
 		}
-	} break;
-	case mtpc_messageService: {
-		const MTPDmessageService &d(msg.c_messageService());
-		if (!d.is_post() && d.has_from_id()) {
-			if (!App::userLoaded(peerFromUser(d.vfrom_id))) {
+		return DataIsLoadedResult::Ok;
+	}, [](const MTPDmessageService &message) {
+		if (!message.is_post() && message.has_from_id()) {
+			if (!App::userLoaded(peerFromUser(message.vfrom_id))) {
 				return DataIsLoadedResult::FromNotLoaded;
 			}
 		}
-		switch (d.vaction.type()) {
-		case mtpc_messageActionChatAddUser: {
-			for_const (const MTPint &userId, d.vaction.c_messageActionChatAddUser().vusers.v) {
+		return message.vaction.match(
+		[](const MTPDmessageActionChatAddUser &action) {
+			for (const MTPint &userId : action.vusers.v) {
 				if (!App::userLoaded(peerFromUser(userId))) {
 					return DataIsLoadedResult::NotLoaded;
 				}
 			}
-		} break;
-		case mtpc_messageActionChatJoinedByLink: {
-			if (!App::userLoaded(peerFromUser(d.vaction.c_messageActionChatJoinedByLink().vinviter_id))) {
+			return DataIsLoadedResult::Ok;
+		}, [](const MTPDmessageActionChatJoinedByLink &action) {
+			if (!App::userLoaded(peerFromUser(action.vinviter_id))) {
 				return DataIsLoadedResult::NotLoaded;
 			}
-		} break;
-		case mtpc_messageActionChatDeleteUser: {
-			if (!App::userLoaded(peerFromUser(d.vaction.c_messageActionChatDeleteUser().vuser_id))) {
+			return DataIsLoadedResult::Ok;
+		}, [](const MTPDmessageActionChatDeleteUser &action) {
+			if (!App::userLoaded(peerFromUser(action.vuser_id))) {
 				return DataIsLoadedResult::NotLoaded;
 			}
-		} break;
-		}
-	} break;
-	}
-	return DataIsLoadedResult::Ok;
+			return DataIsLoadedResult::Ok;
+		}, [](const auto &) {
+			return DataIsLoadedResult::Ok;
+		});
+	}, [](const MTPDmessageEmpty &message) {
+		return DataIsLoadedResult::Ok;
+	});
 }
 
 } // namespace
@@ -4052,7 +4053,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateNewChannelMessage: {
 		auto &d = update.c_updateNewChannelMessage();
-		auto channel = App::channelLoaded(peerToChannel(peerFromMessage(d.vmessage)));
+		auto channel = App::channelLoaded(peerToChannel(PeerFromMessage(d.vmessage)));
 		auto isDataLoaded = allDataLoadedForMessage(d.vmessage);
 		if (!requestingDifference() && (!channel || isDataLoaded != DataIsLoadedResult::Ok)) {
 			MTP_LOG(0, ("getDifference { good - "
@@ -4146,7 +4147,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateEditChannelMessage: {
 		auto &d = update.c_updateEditChannelMessage();
-		auto channel = App::channelLoaded(peerToChannel(peerFromMessage(d.vmessage)));
+		auto channel = App::channelLoaded(peerToChannel(PeerFromMessage(d.vmessage)));
 
 		if (channel && !_handlingChannelDifference) {
 			if (channel->ptsRequesting()) { // skip global updates while getting channel difference