diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp
index 54ed838f7..839422c3c 100644
--- a/td/telegram/MessageReplyInfo.cpp
+++ b/td/telegram/MessageReplyInfo.cpp
@@ -46,7 +46,21 @@ bool MessageReplyInfo::need_update_to(const MessageReplyInfo &other) const {
   if (other.pts < pts) {
     return false;
   }
-  return true;
+  return reply_count != other.reply_count || recent_replier_dialog_ids != other.recent_replier_dialog_ids;
+}
+
+void MessageReplyInfo::add_reply(DialogId replier_dialog_id) {
+  CHECK(!is_empty());
+
+  reply_count++;
+  if (replier_dialog_id.is_valid() &&
+      (recent_replier_dialog_ids.empty() || recent_replier_dialog_ids[0] != replier_dialog_id)) {
+    td::remove(recent_replier_dialog_ids, replier_dialog_id);
+    recent_replier_dialog_ids.insert(recent_replier_dialog_ids.begin(), replier_dialog_id);
+    if (recent_replier_dialog_ids.size() > 3) {
+      recent_replier_dialog_ids.pop_back();
+    }
+  }
 }
 
 StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) {
diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h
index bc4c1f90e..fbfe0c02a 100644
--- a/td/telegram/MessageReplyInfo.h
+++ b/td/telegram/MessageReplyInfo.h
@@ -33,6 +33,8 @@ struct MessageReplyInfo {
 
   bool need_update_to(const MessageReplyInfo &other) const;
 
+  void add_reply(DialogId replier_dialog_id);
+
   template <class StorerT>
   void store(StorerT &storer) const {
     CHECK(!is_empty());
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index aca06dca0..5b1c5c217 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -6186,7 +6186,7 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
   if (is_active_reply_info) {
     reply_count = m->reply_info.reply_count;
     for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) {
-      if (dialog_id.get_type() == DialogType::User) {
+      if (recent_replier_dialog_id.get_type() == DialogType::User) {
         recent_replier_user_ids.push_back(recent_replier_dialog_id.get_user_id());
       }
     }
@@ -12226,7 +12226,7 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     if (reply_to_message_id.is_valid()) {
       if ((message_info.reply_header->flags_ & telegram_api::messageReplyHeader::REPLY_TO_TOP_ID_MASK) != 0) {
         top_reply_message_id = MessageId(ServerMessageId(message_info.reply_header->reply_to_top_id_));
-      } else if (message_info.reply_info != nullptr && !is_broadcast_channel(dialog_id)) {
+      } else if (!is_broadcast_channel(dialog_id)) {
         top_reply_message_id = reply_to_message_id;
       }
     }
@@ -12279,6 +12279,10 @@ std::pair<DialogId, unique_ptr<MessagesManager::Message>> MessagesManager::creat
     forward_count = 0;
   }
   MessageReplyInfo reply_info(std::move(message_info.reply_info), td_->auth_manager_->is_bot());
+  if (!top_reply_message_id.is_valid() && !is_broadcast_channel(dialog_id) &&
+      is_active_message_reply_info(dialog_id, reply_info)) {
+    top_reply_message_id = message_id;
+  }
 
   bool has_forward_info = message_info.forward_header != nullptr;
 
@@ -29176,6 +29180,10 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
       LOG(INFO) << "Preloaded previously pinned " << d->pinned_message_notification_message_id << " from database";
     }
   }
+  if (from_update && message->top_reply_message_id.is_valid() && message->top_reply_message_id != message_id &&
+      have_message_force({dialog_id, message->top_reply_message_id}, "preload top reply message")) {
+    LOG(INFO) << "Preloaded top reply message pinned " << message->top_reply_message_id << " from database";
+  }
 
   // there must be no two recursive calls to add_message_to_dialog
   LOG_CHECK(!d->being_added_message_id.is_valid())
@@ -29522,6 +29530,18 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
           UNREACHABLE();
       }
     }
+
+    if (m->top_reply_message_id.is_valid() && m->top_reply_message_id != message_id) {
+      Message *top_m = get_message(d, m->top_reply_message_id);
+      if (top_m != nullptr && is_active_message_reply_info(dialog_id, top_m->reply_info)) {
+        top_m->reply_info.add_reply(m->sender_dialog_id.is_valid() ? m->sender_dialog_id : DialogId(m->sender_user_id));
+        on_message_changed(d, top_m, true, "update_message_reply_count");
+        send_closure(
+            G()->td(), &Td::send_update,
+            make_tl_object<td_api::updateMessageInteractionInfo>(
+                dialog_id.get(), top_m->message_id.get(), get_message_interaction_info_object(dialog_id, top_m)));
+      }
+    }
   }
 
   Message *result_message = treap_insert_message(&d->messages, std::move(message));