From c3f33efa1b9fbe0097a950743ebd0d901feacb56 Mon Sep 17 00:00:00 2001
From: Eduard Kuzmenko <thanwords24@gmail.com>
Date: Fri, 16 Jul 2021 18:44:30 +0300
Subject: [PATCH] Misc fixes

---
 src/components/chat/bubbles.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index 561e1587..2a1aaa77 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -2296,7 +2296,7 @@ export default class ChatBubbles {
     }
 
     const messageWithReplies = this.appMessagesManager.getMessageWithReplies(message);
-    const withReplies = !!messageWithReplies;
+    const withReplies = !!messageWithReplies && message.mid > 0;
 
     if(withReplies) {
       bubble.classList.add('with-replies');
@@ -3298,7 +3298,7 @@ export default class ChatBubbles {
   }
 
   private generateLocalFirstMessage<T extends boolean>(service?: T, fill?: (message: GenerateLocalMessageType<T>) => void): GenerateLocalMessageType<T> {
-    const offset = this.appMessagesManager.generateMessageId(0);
+    const offset = this.appMessagesManager.generateMessageId(this.chat.type === 'scheduled' ? -1 : 0);
 
     const message: Omit<Message.message | Message.messageService, 'message'> & {message?: string} = {
       _: service ? 'messageService' : 'message',