diff --git a/src/assets/tgs-previews/message/Writing.svg b/src/assets/tgs-previews/message/Writing.svg
new file mode 100644
index 000000000..6cf2b0bc2
--- /dev/null
+++ b/src/assets/tgs-previews/message/Writing.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 60" width="48" height="60" class="lottie-svg" preserveAspectRatio="xMidYMid meet" style="width: 100%; height: 100%; transform: translate3d(0px, 0px, 0px); content-visibility: visible;"><defs><clipPath id="__lottie_element_17"><rect width="48" height="60" x="0" y="0"></rect></clipPath><clipPath id="__lottie_element_19"><path d="M0,0 L512,0 L512,512 L0,512z"></path></clipPath></defs><g clip-path="url(#__lottie_element_17)"><g clip-path="url(#__lottie_element_19)" transform="matrix(0.0949999988079071,0,0,0.0949999988079071,-0.31999969482421875,18.68000030517578)" opacity="1" style="display: block;"><g transform="matrix(1,0,0,1,291,256)" opacity="1" style="display: block;"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill="rgb(0,0,0)" fill-opacity="1" d=" M102.4000015258789,-32 C120.072998046875,-32 134.39999389648438,-17.67300033569336 134.39999389648438,0 C134.39999389648438,17.67300033569336 120.072998046875,32 102.4000015258789,32 C84.72699737548828,32 70.4000015258789,17.67300033569336 70.4000015258789,0 C70.4000015258789,-17.67300033569336 84.72699737548828,-32 102.4000015258789,-32z"></path></g></g><g transform="matrix(1,0,0,1,256,256)" opacity="1" style="display: block;"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill="rgb(0,0,0)" fill-opacity="1" d=" M0,-32 C17.67300033569336,-32 32,-17.67300033569336 32,0 C32,17.67300033569336 17.67300033569336,32 0,32 C-17.67300033569336,32 -32,17.67300033569336 -32,0 C-32,-17.67300033569336 -17.67300033569336,-32 0,-32z"></path></g></g><g transform="matrix(1,0,0,1,221,256)" opacity="1" style="display: block;"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill="rgb(0,0,0)" fill-opacity="1" d=" M-102.4000015258789,-32 C-84.72699737548828,-32 -70.4000015258789,-17.67300033569336 -70.4000015258789,0 C-70.4000015258789,17.67300033569336 -84.72699737548828,32 -102.4000015258789,32 C-120.072998046875,32 -134.39999389648438,17.67300033569336 -134.39999389648438,0 C-134.39999389648438,-17.67300033569336 -120.072998046875,-32 -102.4000015258789,-32z"></path></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/components/common/TypingWrapper.module.scss b/src/components/common/TypingWrapper.module.scss
index aa1cd95ed..4089f5b4d 100644
--- a/src/components/common/TypingWrapper.module.scss
+++ b/src/components/common/TypingWrapper.module.scss
@@ -20,6 +20,11 @@
   }
 }
 
+.fullyRevealed {
+  --typing-draft-progress: 100%;
+  --typing-draft-spread: 0%;
+}
+
 .placeholder {
   display: inline-block;
   width: 1.25rem;
diff --git a/src/components/common/TypingWrapper.tsx b/src/components/common/TypingWrapper.tsx
index 2079fc9b4..8fac167c9 100644
--- a/src/components/common/TypingWrapper.tsx
+++ b/src/components/common/TypingWrapper.tsx
@@ -6,7 +6,8 @@ import {
 import type { ApiFormattedText } from '../../api/types';
 
 import { requestMutation } from '../../lib/fasterdom/fasterdom';
-import { LOCAL_TGS_URLS } from './helpers/animatedAssets';
+import buildClassName from '../../util/buildClassName';
+import { LOCAL_TGS_PREVIEW_URLS, LOCAL_TGS_URLS } from './helpers/animatedAssets';
 import { REM } from './helpers/mediaDimensions';
 
 import useLastCallback from '../../hooks/useLastCallback';
@@ -57,9 +58,11 @@ const TypingWrapper = ({
   renderText,
   onCompleted,
 }: OwnProps) => {
+  const fullText = formattedText.text;
+
   const ref = useRef<HTMLSpanElement>();
   const animationRef = useRef<Animation>();
-  const progressRef = useRef(0);
+  const progressRef = useRef(fullText ? 0 : 100);
   const prevRevealedRef = useRef(0);
   const fullTextRef = useRef('');
 
@@ -69,7 +72,6 @@ const TypingWrapper = ({
   const completedKeyRef = useRef<string>();
   const prevFullTextRef = useRef('');
 
-  const fullText = formattedText.text;
   fullTextRef.current = fullText;
 
   const stopAnimation = useLastCallback(() => {
@@ -244,14 +246,16 @@ const TypingWrapper = ({
     text: fullText.slice(0, revealedLength),
     entities: formattedText.entities,
   }), [fullText, formattedText.entities, revealedLength]);
+  const className = buildClassName(styles.root, !fullText && styles.fullyRevealed);
 
   return (
-    <span ref={ref} className={styles.root}>
+    <span ref={ref} className={className}>
       {renderText(truncatedText)}
       {shouldRenderPlaceholder && (
         <span key="typing-placeholder" className={styles.placeholder}>
           <AnimatedIconWithPreview
             tgsUrl={LOCAL_TGS_URLS.Writing}
+            previewUrl={LOCAL_TGS_PREVIEW_URLS.Writing}
             size={PLACEHOLDER_SIZE}
             play
             noLoop={false}
diff --git a/src/components/common/helpers/animatedAssets.ts b/src/components/common/helpers/animatedAssets.ts
index 2fbcd7f62..bd1bb9d96 100644
--- a/src/components/common/helpers/animatedAssets.ts
+++ b/src/components/common/helpers/animatedAssets.ts
@@ -45,6 +45,7 @@ import StarReaction from '../../../assets/tgs/stars/StarReaction.tgs';
 import StarReactionEffect from '../../../assets/tgs/stars/StarReactionEffect.tgs';
 import Unlock from '../../../assets/tgs/Unlock.tgs';
 import DuckNothingFoundPreview from '../../../assets/tgs-previews/DuckNothingFound.svg';
+import WritingPreview from '../../../assets/tgs-previews/message/Writing.svg';
 import SearchPreview from '../../../assets/tgs-previews/Search.svg';
 import HandStopPreview from '../../../assets/tgs-previews/settings/HandStopPreview.png';
 import PasskeysPreview from '../../../assets/tgs-previews/settings/Passkeys.svg';
@@ -55,6 +56,7 @@ export const LOCAL_TGS_PREVIEW_URLS = {
   DuckNothingFound: DuckNothingFoundPreview,
   Search: SearchPreview,
   Passkeys: PasskeysPreview,
+  Writing: WritingPreview,
 };
 
 export const LOCAL_TGS_URLS = {
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 3caea0670..30c2da8d8 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -1129,7 +1129,7 @@ const Message = ({
         observeIntersectionForPlaying={observeIntersectionForPlaying}
         withTranslucentThumbs={isCustomShape}
         isInSelectMode={isInSelectMode}
-        canBeEmpty={hasFactCheck}
+        canBeEmpty={hasFactCheck || isTypingDraft}
         maxTimestamp={maxTimestamp}
         threadId={threadId}
         shouldAnimateTyping={isTypingDraft}