diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagePreviewParams.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagePreviewParams.java
index fb149152a7..1a47195aab 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagePreviewParams.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagePreviewParams.java
@@ -547,6 +547,10 @@ public void attach(MessagePreviewView previewView) {
         this.previewView = previewView;
     }
 
+    public void setHideForwardSendersName(boolean hideForwardSendersName) {
+        this.hideForwardSendersName = hideForwardSendersName;
+    }
+
     public void checkEdits(ArrayList<MessageObject> replaceMessageObjects) {
         boolean replaced = false;
         if (forwardMessages != null) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index c6abba7075..ce0679a4fd 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -13814,6 +13814,7 @@ public void showFieldPanel(boolean show, MessageObject messageObjectToReply, Mes
                 fieldPanelShown = 1;
                 forbidForwardingWithDismiss = false;
                 if (messagePreviewParams != null) {
+                    messagePreviewParams.setHideForwardSendersName(noForwardQuote);
                     messagePreviewParams.updateForward(null, dialog_id);
                     messagePreviewParams.updateReply(null, null, dialog_id, null);
                 }
@@ -14059,6 +14060,7 @@ public void showFieldPanel(boolean show, MessageObject messageObjectToReply, Mes
                     messagePreviewParams = new MessagePreviewParams(currentEncryptedChat != null, getMessagesController().isChatNoForwards(currentChat), noForwardQuote);
                     messagePreviewParams.attach(forwardingPreviewView);
                 }
+                messagePreviewParams.setHideForwardSendersName(noForwardQuote);
                 messagePreviewParams.updateForward(messageObjectsToForward, dialog_id);
                 if (messagePreviewParams.isEmpty() && editingMessageObject == null) {
                     messagePreviewParams = null;