diff --git a/src/styles/chat/_index.scss b/src/styles/chat/_index.scss
index f3a202af08d221a54a4daf5312e8f27daedb72e0..373240ae8a526a44f199edd442a040920393a0df 100644
--- a/src/styles/chat/_index.scss
+++ b/src/styles/chat/_index.scss
@@ -1,7 +1,42 @@
-.chat-view {
-  height: calc(100vh - 50px - 78px);
+#messages {
+  
+  .chat-view {
+    height: calc(100vh - 50px - 78px);
+  }
 
   @media (max-width: 768px) {
-    height: calc(100vh - 50px - 68px);
+
+    height: calc(100vh - 50px - 58px);
+
+    .messages-header {
+      display: flex;
+    }
+
+    solid-set-default[name="segment2"] {
+      font-size: 14px;
+      line-height: 16px;
+      width: 75%;
+    }
+
+    orbit-user-avatar {
+      height: 31px;
+      width: 31px;
+    }
+
+    solid-display-value[name="name"] {
+      display: block;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 210px;
+    }
+
+    solid-display-value[name="hyphen"] {
+        display: none;
+    }
+
+    solid-link {
+      vertical-align: super;
+    }
   }
 }
diff --git a/src/views/page-messages.pug b/src/views/page-messages.pug
index a3b2e465a816c41b2569518509f8053ad4dfdedf..d89d442ab10e6dee16ee0fd62078b51bea5b2486 100644
--- a/src/views/page-messages.pug
+++ b/src/views/page-messages.pug
@@ -1,4 +1,4 @@
-div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white
+div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xxsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white.message-header
   solid-display.labelled-avatar.small(
     bind-resources
     fields='segment1(account.picture), segment2(name, hyphen, at, username)'