diff --git a/TelegramCore/PeerUtils.swift b/TelegramCore/PeerUtils.swift
index 775a55b93a..2a2e6ed8e7 100644
--- a/TelegramCore/PeerUtils.swift
+++ b/TelegramCore/PeerUtils.swift
@@ -133,6 +133,17 @@ public extension Peer {
                 return false
         }
     }
+    
+    public var isVerified: Bool {
+        switch self {
+            case let user as TelegramUser:
+                return user.flags.contains(.isVerified)
+            case let channel as TelegramChannel:
+                return channel.flags.contains(.isVerified)
+            default:
+                return false
+        }
+    }
 }
 
 public extension PeerId {
diff --git a/TelegramCore/PendingMessageManager.swift b/TelegramCore/PendingMessageManager.swift
index 0de0e02627..050ffe051a 100644
--- a/TelegramCore/PendingMessageManager.swift
+++ b/TelegramCore/PendingMessageManager.swift
@@ -84,6 +84,9 @@ private enum PendingMessageResult {
 }
 
 private func uploadActivityTypeForMessage(_ message: Message) -> PeerInputActivity? {
+    guard message.forwardInfo == nil else {
+        return nil
+    }
     for media in message.media {
         if let _ = media as? TelegramMediaImage {
             return .uploadingPhoto(progress: 0)