diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index 2ce35f43..aca153ff 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -1818,7 +1818,7 @@ export default class ChatBubbles {
     }
 
     const isOut = our && (!message.fwd_from || this.peerId != rootScope.myId);
-    let nameContainer = bubbleContainer;
+    let nameContainer: HTMLElement = bubbleContainer;
     
     // media
     if(messageMedia/*  && messageMedia._ == 'messageMediaPhoto' */) {
@@ -2084,7 +2084,7 @@ export default class ChatBubbles {
               nameContainer = newNameContainer;
             }
 
-            const lastContainer = messageDiv.lastElementChild.querySelector('.document-size, .audio');
+            const lastContainer = messageDiv.lastElementChild.querySelector('.document-message, .document-size, .audio');
             lastContainer && lastContainer.append(timeSpan.cloneNode(true));
 
             bubble.classList.remove('is-message-empty');
diff --git a/src/components/wrappers.ts b/src/components/wrappers.ts
index 8569c090..f9d656f2 100644
--- a/src/components/wrappers.ts
+++ b/src/components/wrappers.ts
@@ -1099,7 +1099,7 @@ export function wrapGroupedDocuments({albumMustBeRenderedFull, message, bubble,
   chat: Chat,
   loadPromises?: Promise<any>[]
 }) {
-  let nameContainer: HTMLDivElement;
+  let nameContainer: HTMLElement;
   const mids = albumMustBeRenderedFull ? chat.getMidsByMid(message.mid) : [message.mid];
   /* if(isPending) {
     mids.reverse();