diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
index 9be53bc34..49fbaaa32 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
@@ -9871,7 +9871,7 @@ public static CharSequence groupSpan() {
     private static CharSequence channelSpan;
     public static CharSequence channelSpan() {
         if (channelSpan == null) {
-            channelSpan = new SpannableStringBuilder("c");
+            channelSpan = new SpannableStringBuilder(LocaleController.getString(R.string.Channel));
             ColoredImageSpan span = new ColoredImageSpan(R.drawable.msg_folders_channels);
             span.setScale(.7f, .7f);
             ((SpannableStringBuilder) channelSpan).setSpan(span, 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 2073541a6..4082c98d6 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -13680,7 +13680,7 @@ public void showFieldPanel(boolean show, MessageObject messageObjectToReply, Mes
                     nameText = AndroidUtilities.replaceCharSequence("%s", LocaleController.getString(R.string.ReplyTo), name == null ? "" : name);
                 }
                 nameText = Emoji.replaceEmoji(nameText, replyNameTextView.getPaint().getFontMetricsInt(), false);
-                replyNameTextView.setText(StringUtils.zalgoFilter(name));
+                replyNameTextView.setText(StringUtils.zalgoFilter(nameText));
                 replyIconImageView.setContentDescription(LocaleController.getString("AccDescrReplying", R.string.AccDescrReplying));
                 replyCloseImageView.setContentDescription(LocaleController.getString("AccDescrCancelReply", R.string.AccDescrCancelReply));