diff --git a/src/components/wrappers/messageActionTextNew.ts b/src/components/wrappers/messageActionTextNew.ts
index 7911912e0..f79774da2 100644
--- a/src/components/wrappers/messageActionTextNew.ts
+++ b/src/components/wrappers/messageActionTextNew.ts
@@ -9,7 +9,8 @@ import wrapMessageActionTextNewUnsafe from './messageActionTextNewUnsafe';
 
 export type WrapMessageActionTextOptions = {
   message: MyMessage,
-  plain?: boolean
+  plain?: boolean,
+  noLinks?: boolean
 } & WrapSomethingOptions;
 
 export default async function wrapMessageActionTextNew<T extends WrapMessageActionTextOptions>(
diff --git a/src/components/wrappers/messageActionTextNewUnsafe.ts b/src/components/wrappers/messageActionTextNewUnsafe.ts
index f9933e664..517be2658 100644
--- a/src/components/wrappers/messageActionTextNewUnsafe.ts
+++ b/src/components/wrappers/messageActionTextNewUnsafe.ts
@@ -103,7 +103,7 @@ async function wrapMessageActionTopicIconAndName(options: WrapMessageActionTextO
 }
 
 export default async function wrapMessageActionTextNewUnsafe(options: WrapMessageActionTextOptions) {
-  const {plain, message, middleware, lazyLoadQueue, customEmojiSize, animationGroup} = options;
+  const {plain, message, noLinks} = options;
   const element: HTMLElement = plain ? undefined : document.createElement('span');
   const action = 'action' in message && message.action;
 
@@ -147,6 +147,8 @@ export default async function wrapMessageActionTextNewUnsafe(options: WrapMessag
 
         if(action.duration !== undefined) {
           args.push(formatCallDuration(action.duration, plain));
+        } else if(noLinks) {
+          args.push('');
         } else {
           args.push(wrapJoinVoiceChatAnchor(message as any));
         }
@@ -164,7 +166,7 @@ export default async function wrapMessageActionTextNewUnsafe(options: WrapMessag
 
         langPackKey = a as LangPackKey;
         args = peerIds.map((peerId) => getNameDivHTML(peerId, plain));
-        args.push(wrapJoinVoiceChatAnchor(message as any));
+        args.push(noLinks ? '' : wrapJoinVoiceChatAnchor(message as any));
         break;
       }
 
@@ -316,7 +318,8 @@ export default async function wrapMessageActionTextNewUnsafe(options: WrapMessag
             _: 'messageEntityUrl',
             length: action.domain.length,
             offset: 0
-          }]
+          }],
+          noLinks
         });
 
         const node = htmlToSpan(anchorHTML);
@@ -496,6 +499,10 @@ export default async function wrapMessageActionTextNewUnsafe(options: WrapMessag
     if(plain) {
       return I18n.format(langPackKey, true, waited);
     } else {
+      // if(waited && noLinks) {
+      //   waited = waited.map((arg) => arg instanceof HTMLAnchorElement ? arg.textContent : arg);
+      // }
+
       return _i18n(element, langPackKey, waited);
     }
 
diff --git a/src/components/wrappers/messageForReply.ts b/src/components/wrappers/messageForReply.ts
index 5a19d3900..e20e603b7 100644
--- a/src/components/wrappers/messageForReply.ts
+++ b/src/components/wrappers/messageForReply.ts
@@ -208,7 +208,12 @@ export default async function wrapMessageForReply<T extends WrapMessageForReplyO
   }
 
   if((message as Message.messageService).action) {
-    const actionWrapped = await wrapMessageActionTextNew({message: (message as Message.messageService), plain});
+    const actionWrapped = await wrapMessageActionTextNew({
+      message: (message as Message.messageService),
+      plain,
+      noLinks: true
+    });
+
     if(actionWrapped) {
       addPart(undefined, actionWrapped);
     }
diff --git a/src/lib/langPack.ts b/src/lib/langPack.ts
index 0d6a9c860..3d1051b5b 100644
--- a/src/lib/langPack.ts
+++ b/src/lib/langPack.ts
@@ -391,12 +391,18 @@ namespace I18n {
             a = a.firstChild as any;
           }
 
-          a.textContent = ''; // reset content
+          if(typeof(a) !== 'string') {
+            a.textContent = ''; // reset content
+          }
         }
 
-        a.append(...superFormatter(text, args, indexHolder) as any);
-
-        out.push(a);
+        const formatted = superFormatter(text, args, indexHolder) as any;
+        if(typeof(a) === 'string') {
+          out.push(...formatted);
+        } else {
+          a.append(...formatted);
+          out.push(a);
+        }
       } else if(args) {
         pushNextArgument(out, args, indexHolder);
       }