diff --git a/Telegram/SourceFiles/codegen/common/cpp_file.cpp b/Telegram/SourceFiles/codegen/common/cpp_file.cpp
index 48df537a5..ca57a8749 100644
--- a/Telegram/SourceFiles/codegen/common/cpp_file.cpp
+++ b/Telegram/SourceFiles/codegen/common/cpp_file.cpp
@@ -64,6 +64,7 @@ void writeLicense(QTextStream &stream, const ProjectInfo &project) {
 CppFile::CppFile(const QString &path, const ProjectInfo &project)
     : stream_(&content_)
     , forceReGenerate_(project.forceReGenerate) {
+	stream_.setCodec("UTF-8");
 	bool cpp = path.toLower().endsWith(".cpp");
 
 	QFileInfo info(path);
diff --git a/Telegram/SourceFiles/codegen/emoji/generator.cpp b/Telegram/SourceFiles/codegen/emoji/generator.cpp
index 05b945f3f..a301b97cb 100644
--- a/Telegram/SourceFiles/codegen/emoji/generator.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/generator.cpp
@@ -643,7 +643,7 @@ const std::map<QString, int> EmojiMap = {\n\
 \n";
 
 	for (auto &item : data_.map) {
-		source_->stream() << "{\"" << item.first << "\"," << item.second << "},\n";
+		source_->stream() << "{QString(\"" << item.first << "\")," << item.second << "},\n";
 	}
 	source_->stream() << "\
 \n\
@@ -674,10 +674,10 @@ bool Generator::writeFindFromDictionary(const std::map<QString, int, std::greate
 	auto max_length = max_el->first.size();
 	source_->stream() << "\tstd::array<size_t, " << max_length + 1 << "> sizes;\n";
 	if (skipPostfixes) {
-		source_->stream() << "\tfor (int i=0,l=0; i<str.size() && l < " << max_length << R"code(; ++i) {
-		if (str[i] == kPostfix) {continue;}
+		source_->stream() << "\tfor (int i=0,l=0; i<full_str.size() && l < " << max_length << R"code(; ++i) {
+		if (full_str[i] == kPostfix) {continue;}
 		++l;
-		sizes[l]=i;
+		sizes[l]=i+1;
 		str+=full_str[i];
 	}
 )code";