diff --git a/Telegram/SourceFiles/core/crash_reports.cpp b/Telegram/SourceFiles/core/crash_reports.cpp
index e799eed1b..9480e51f2 100644
--- a/Telegram/SourceFiles/core/crash_reports.cpp
+++ b/Telegram/SourceFiles/core/crash_reports.cpp
@@ -493,6 +493,31 @@ void SetAnnotation(const std::string &key, const QString &value) {
 	}
 }
 
+void SetAnnotationHex(const std::string &key, const QString &value) {
+	if (value.isEmpty()) {
+		return SetAnnotation(key, value);
+	}
+	const auto utf = value.toUtf8();
+	auto buffer = std::string();
+	buffer.reserve(4 * utf.size());
+	const auto hexDigit = [](std::uint8_t value) {
+		if (value >= 10) {
+			return 'A' + (value - 10);
+		}
+		return '0' + value;
+	};
+	const auto appendHex = [&](std::uint8_t value) {
+		buffer.push_back('\\');
+		buffer.push_back('x');
+		buffer.push_back(hexDigit(value / 16));
+		buffer.push_back(hexDigit(value % 16));
+	};
+	for (const auto ch : utf) {
+		appendHex(ch);
+	}
+	ProcessAnnotations[key] = std::move(buffer);
+}
+
 void SetAnnotationRef(const std::string &key, const QString *valuePtr) {
 	if (valuePtr) {
 		ProcessAnnotationRefs[key] = valuePtr;
diff --git a/Telegram/SourceFiles/core/crash_reports.h b/Telegram/SourceFiles/core/crash_reports.h
index 24bd735be..dfb7e43ef 100644
--- a/Telegram/SourceFiles/core/crash_reports.h
+++ b/Telegram/SourceFiles/core/crash_reports.h
@@ -34,6 +34,7 @@ Status Restart(); // can be only CantOpen or Started
 void Finish();
 
 void SetAnnotation(const std::string &key, const QString &value);
+void SetAnnotationHex(const std::string &key, const QString &value);
 inline void ClearAnnotation(const std::string &key) {
 	SetAnnotation(key, QString());
 }
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 9461d7c81..ea64928cc 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -496,7 +496,9 @@ HistoryMessage::HistoryMessage(
 	initMedia(msg.has_media() ? (&msg.vmedia) : nullptr);
 
 	auto text = TextUtilities::Clean(qs(msg.vmessage));
-	auto entities = msg.has_entities() ? TextUtilities::EntitiesFromMTP(msg.ventities.v) : EntitiesInText();
+	auto entities = msg.has_entities()
+		? TextUtilities::EntitiesFromMTP(msg.ventities.v)
+		: EntitiesInText();
 	setText({ text, entities });
 }
 
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
index bb3dce40d..dddfbbe34 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <private/qharfbuzz_p.h>
 
 #include "core/click_handler_types.h"
+#include "core/crash_reports.h"
 #include "ui/text/text_block.h"
 #include "lang/lang_keys.h"
 #include "platform/platform_specific.h"
@@ -293,19 +294,15 @@ 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
+				&& (isLinkEntity(*waitingEntity)
+					|| isInvalidEntity(*waitingEntity))) {
 				++waitingEntity;
 			}
 		} else {
-			while (waitingEntity != entitiesEnd && waitingEntity->length() <= 0) ++waitingEntity;
+			while (waitingEntity != entitiesEnd && isInvalidEntity(*waitingEntity)) {
+				++waitingEntity;
+			}
 		}
 		return true;
 	}
@@ -479,9 +476,13 @@ public:
 		for (int l = len - emojiLookback - 1; l > 0; --l) {
 			_t->_text.push_back(*++ptr);
 		}
-		if (e->hasPostfix() && _t->_text.at(_t->_text.size() - 1).unicode() != Ui::Emoji::kPostfix) {
-			_t->_text.push_back(QChar(Ui::Emoji::kPostfix));
-			++len;
+		if (e->hasPostfix()) {
+			Assert(!_t->_text.isEmpty());
+			const auto last = _t->_text[_t->_text.size() - 1];
+			if (last.unicode() != Ui::Emoji::kPostfix) {
+				_t->_text.push_back(QChar(Ui::Emoji::kPostfix));
+				++len;
+			}
 		}
 
 		createBlock(-len);
@@ -530,6 +531,25 @@ public:
 		parse(options);
 	}
 
+	bool isInvalidEntity(const EntityInText &entity) const {
+		const auto length = entity.length();
+		return (start + entity.offset() + length > end) || (length <= 0);
+	}
+
+	bool isLinkEntity(const EntityInText &entity) const {
+		const auto type = entity.type();
+		const auto urls = {
+			EntityInTextUrl,
+			EntityInTextCustomUrl,
+			EntityInTextEmail,
+			EntityInTextHashtag,
+			EntityInTextMention,
+			EntityInTextMentionName,
+			EntityInTextBotCommand
+		};
+		return ranges::find(urls, type) != std::end(urls);
+	}
+
 	void parse(const TextParseOptions &options) {
 		if (options.maxw > 0 && options.maxh > 0) {
 			stopAfterWidth = ((options.maxh / _t->_st->font->height) + 1) * options.maxw;
@@ -540,7 +560,9 @@ public:
 
 		entitiesEnd = source.entities.cend();
 		waitingEntity = source.entities.cbegin();
-		while (waitingEntity != entitiesEnd && waitingEntity->length() <= 0) ++waitingEntity;
+		while (waitingEntity != entitiesEnd && isInvalidEntity(*waitingEntity)) {
+			++waitingEntity;
+		}
 		int firstMonospaceOffset = EntityInText::firstMonospaceOffset(source.entities, end - start);
 
 		ptr = start;