diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js
index a3e743c87b..729dc128e0 100644
Binary files a/app/soapbox/actions/chats.js and b/app/soapbox/actions/chats.js differ
diff --git a/app/soapbox/features/chats/chat_room.js b/app/soapbox/features/chats/chat_room.js
index 4a8c480eae..f3e81cc120 100644
Binary files a/app/soapbox/features/chats/chat_room.js and b/app/soapbox/features/chats/chat_room.js differ
diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index 40123ca251..12b28d513b 100644
Binary files a/app/soapbox/features/chats/components/chat_box.js and b/app/soapbox/features/chats/components/chat_box.js differ
diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index e2fe305bd6..baa50a08f2 100644
Binary files a/app/soapbox/features/chats/components/chat_message_list.js and b/app/soapbox/features/chats/components/chat_message_list.js differ
diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js
index 0d635070fe..b584dca724 100644
Binary files a/app/soapbox/reducers/chat_message_lists.js and b/app/soapbox/reducers/chat_message_lists.js differ
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 011543ca3d..38550ac3b5 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -99,12 +99,18 @@
 .chat-messages {
   overflow-y: scroll;
   flex: 1;
+  display: flex;
+  flex-direction: column-reverse;
 }
 
 .chat-message {
-  margin: 14px 10px;
+  padding: 7px 10px;
   display: flex;
 
+  &:last-child {
+    padding-top: 14px;
+  }
+
   &__bubble {
     font-size: 15px;
     padding: 4px 10px;