2 files changed, 13 insertions, 18 deletions
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index aba95074..4d737e42 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -66,9 +66,9 @@ const ChatMessage = {
       }
 
       if (this.isCurrentUser) {
-        res.right = '5px'
+        res.right = '0.4rem'
       } else {
-        res.left = '5px'
+        res.left = '0.4rem'
       }
 
       return res
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index e4028537..9d7b7936 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -12,19 +12,15 @@
     }
   }
 
-  &:last-child {
-    margin-bottom: 16px;
-  }
-
   .chat-message-menu {
     transition: opacity 0.1s;
     opacity: 0;
     position: absolute;
-    top: -10px;
+    top: -0.8em;
 
     button {
-      padding-top: 3px;
-      padding-bottom: 3px;
+      padding-top: 0.2em;
+      padding-bottom: 0.2em;
     }
   }
 
@@ -41,21 +37,21 @@
   }
 
   .popover {
-    width: 12rem;
+    width: 12em;
   }
 
   .chat-message {
     display: flex;
-    padding-bottom: 7px;
+    padding-bottom: 0.5em;
   }
 
   .avatar-wrapper {
-    margin-right: 10px;
+    margin-right: 0.72em;
     width: 32px;
   }
 
   .link-preview, .attachments {
-    margin-bottom: 0.9em;
+    margin-bottom: 1em;
   }
 
   .chat-message-inner {
@@ -63,7 +59,7 @@
     flex-direction: column;
     align-items: flex-start;
     max-width: 80%;
-    min-width: 10rem;
+    min-width: 10em;
     width: 100%;
 
     &.with-media {
@@ -87,19 +83,18 @@
   }
 
   .created-at {
+    position: relative;
     float: right;
     font-size: 0.8em;
-    margin: -10px 0 -5px 4px;
+    margin: -1em 0 -0.5em 0;
     font-style: italic;
     opacity: 0.8;
   }
 
   .without-attachment {
     .status-content {
-      white-space: normal;
-
       &::after {
-        margin-right: 75px;
+        margin-right: 5.4em;
         content: " ";
         display: inline-block;
       }