diff --git a/src/components/Layout/Layout.module.scss b/src/components/Layout/Layout.module.scss
index 8511090..52bab13 100644
--- a/src/components/Layout/Layout.module.scss
+++ b/src/components/Layout/Layout.module.scss
@@ -101,8 +101,19 @@
     height: 100%;
     border-left: 1px solid var(--devider);
   }
+
+  &.messagesHeader {
+    >div {
+      border-left: none;
+    }
+  }
 }
 
+.messagesSearch {
+  border-right: 1px solid var(--devider);
+}
+
+
 .rightHeader {
   width: var(--right-col-w);
   height: var(--header-height);
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
index 2bbae15..98769ba 100644
--- a/src/components/Layout/Layout.tsx
+++ b/src/components/Layout/Layout.tsx
@@ -136,10 +136,10 @@ const Layout: Component = () => {
         </div>
 
 
-        <div class={styles.rightColumn}>
+        <div class={`${styles.rightColumn} ${location.pathname.startsWith('/messages') ? styles.messagesHeader : ''}`}>
           <div>
             <div class={styles.rightHeader}>
-              <div id="search_section">
+              <div id="search_section" class={location.pathname.startsWith('/messages') ? styles.messagesSearch : ''}>
               </div>
             </div>
             <div class={styles.rightContent}>
diff --git a/src/pages/Messages.module.scss b/src/pages/Messages.module.scss
index 19509ce..cd35a38 100644
--- a/src/pages/Messages.module.scss
+++ b/src/pages/Messages.module.scss
@@ -232,9 +232,8 @@
     top: 0;
     left: 320px;
     background-color: var(--background-card );
-    width: 600px;
+    width: 628px;
     height: calc(100vh - var(--header-height));
-    z-index: var(--z-index-lifted);
     overflow: hidden;
     display: flex;
     flex-direction: column-reverse;
@@ -302,7 +301,7 @@
       .textAreaBorder {
         padding: 1px;
         border-radius: 8px;
-        width: 510px;
+        width: 538px;
         height: 34px;
         box-sizing: border-box;
 
@@ -318,7 +317,7 @@
           margin: 0;
           padding-inline: 16px;
           padding-block: 8px;
-          width: 508px;
+          width: 536px;
           max-height: none;
 
           &:focus {