diff --git a/td/telegram/MessageInputReplyTo.cpp b/td/telegram/MessageInputReplyTo.cpp
index a85a986c4..b7931051a 100644
--- a/td/telegram/MessageInputReplyTo.cpp
+++ b/td/telegram/MessageInputReplyTo.cpp
@@ -131,7 +131,7 @@ td_api::object_ptr<td_api::InputMessageReplyTo> MessageInputReplyTo::get_input_m
 }
 
 MessageId MessageInputReplyTo::get_same_chat_reply_to_message_id() const {
-  return is_same_chat_reply() ? message_id_ : MessageId();
+  return message_id_.is_valid() || message_id_.is_valid_scheduled() ? message_id_ : MessageId();
 }
 
 MessageFullId MessageInputReplyTo::get_reply_message_full_id(DialogId owner_dialog_id) const {
diff --git a/td/telegram/MessageInputReplyTo.h b/td/telegram/MessageInputReplyTo.h
index 63a259b51..1e95714f4 100644
--- a/td/telegram/MessageInputReplyTo.h
+++ b/td/telegram/MessageInputReplyTo.h
@@ -57,10 +57,6 @@ class MessageInputReplyTo {
     return !is_empty();
   }
 
-  bool is_same_chat_reply() const {
-    return message_id_.is_valid() || message_id_.is_valid_scheduled();
-  }
-
   StoryFullId get_story_full_id() const {
     return story_full_id_;
   }
diff --git a/td/telegram/RepliedMessageInfo.cpp b/td/telegram/RepliedMessageInfo.cpp
index d11419bf4..4c2a9ca75 100644
--- a/td/telegram/RepliedMessageInfo.cpp
+++ b/td/telegram/RepliedMessageInfo.cpp
@@ -75,9 +75,6 @@ RepliedMessageInfo::RepliedMessageInfo(Td *td, tl_object_ptr<telegram_api::messa
           message_id_ = MessageId();
           dialog_id_ = DialogId();
         }
-        if (dialog_id_ == dialog_id) {
-          dialog_id_ = DialogId();  // just in case
-        }
       }
       if (!message_id_.is_valid()) {
         LOG(ERROR) << "Receive " << to_string(reply_header) << " in " << MessageFullId{dialog_id, message_id};
@@ -300,7 +297,7 @@ MessageInputReplyTo RepliedMessageInfo::get_input_reply_to() const {
 }
 
 MessageId RepliedMessageInfo::get_same_chat_reply_to_message_id() const {
-  return is_same_chat_reply() ? message_id_ : MessageId();
+  return dialog_id_ == DialogId() && origin_date_ == 0 ? message_id_ : MessageId();
 }
 
 MessageFullId RepliedMessageInfo::get_reply_message_full_id(DialogId owner_dialog_id) const {
diff --git a/td/telegram/RepliedMessageInfo.h b/td/telegram/RepliedMessageInfo.h
index 0bc18c0cb..220e32aff 100644
--- a/td/telegram/RepliedMessageInfo.h
+++ b/td/telegram/RepliedMessageInfo.h
@@ -61,10 +61,6 @@ class RepliedMessageInfo {
 
   RepliedMessageInfo(Td *td, const MessageInputReplyTo &input_reply_to);
 
-  bool is_same_chat_reply() const {
-    return dialog_id_ == DialogId() && origin_date_ == 0;
-  }
-
   bool is_empty() const {
     return message_id_ == MessageId() && dialog_id_ == DialogId() && origin_date_ == 0 && origin_.is_empty() &&
            quote_.text.empty() && content_ == nullptr;