diff --git a/src/shared/components/Chat/EditMessageInput/EditMessageInput.module.scss b/src/shared/components/Chat/EditMessageInput/EditMessageInput.module.scss
index 0c2fee8611..73b1191ea5 100644
--- a/src/shared/components/Chat/EditMessageInput/EditMessageInput.module.scss
+++ b/src/shared/components/Chat/EditMessageInput/EditMessageInput.module.scss
@@ -15,18 +15,12 @@ $phone-breakpoint: 415px;
   padding: 0.5rem 1rem;
 }
 
-.ownerName {
-  font-size: $xsmall;
-  font-weight: 600;
-  color: $secondary-blue;
-  margin-bottom: 0.5rem;
-}
-
 .input {
   resize: none;
   width: 100%;
   border-width: 0;
   outline: 0;
+  padding-right: 1.75rem;
 }
 
 .buttonContainer {
diff --git a/src/shared/components/Chat/EditMessageInput/EditMessageInput.tsx b/src/shared/components/Chat/EditMessageInput/EditMessageInput.tsx
index 1004145a2d..1933cddc55 100644
--- a/src/shared/components/Chat/EditMessageInput/EditMessageInput.tsx
+++ b/src/shared/components/Chat/EditMessageInput/EditMessageInput.tsx
@@ -11,9 +11,14 @@ import {
   checkIsUserDiscussionMessage,
   DiscussionMessage,
 } from "@/shared/models";
-import { BaseTextEditor, Button, ButtonVariant } from "@/shared/ui-kit";
+import {
+  BaseTextEditor,
+  Button,
+  ButtonVariant,
+  TextEditorSize,
+} from "@/shared/ui-kit";
 import { parseStringToTextEditorValue } from "@/shared/ui-kit/TextEditor/utils";
-import { emptyFunction, getUserName } from "@/shared/utils";
+import { emptyFunction } from "@/shared/utils";
 import styles from "./EditMessageInput.module.scss";
 
 interface Props {
@@ -104,12 +109,6 @@ export default function EditMessageInput({
 
   return (
     <div className={styles.container}>
-      <div className={styles.ownerName}>
-        {checkIsUserDiscussionMessage(discussionMessage)
-          ? getUserName(discussionMessage.owner)
-          : "System"}
-      </div>
-
       <BaseTextEditor
         className={styles.input}
         emojiPickerContainerClassName={styles.pickerContainer}
@@ -119,6 +118,7 @@ export default function EditMessageInput({
         users={users}
         shouldReinitializeEditor={false}
         onClearFinished={emptyFunction}
+        size={TextEditorSize.Auto}
       />
 
       <div className={styles.buttonContainer}>
diff --git a/src/shared/ui-kit/TextEditor/BaseTextEditor.module.scss b/src/shared/ui-kit/TextEditor/BaseTextEditor.module.scss
index 64a3de8b6d..7ce5c294c1 100644
--- a/src/shared/ui-kit/TextEditor/BaseTextEditor.module.scss
+++ b/src/shared/ui-kit/TextEditor/BaseTextEditor.module.scss
@@ -2,4 +2,4 @@
   position: relative;
   width: 100%;
   height: 100%;
-}
\ No newline at end of file
+}