diff --git a/frontend/src/components/Message.svelte b/frontend/src/components/Message.svelte
index 6398795..5218744 100644
--- a/frontend/src/components/Message.svelte
+++ b/frontend/src/components/Message.svelte
@@ -7,8 +7,11 @@
 
 <style>
     .message {
+        display: flex;
+        align-items: center;
         overflow-x: none;
         word-break: break-all;
+        padding: 1px var(--space-normplus) 1px var(--space-normplus);
     }
 
     .message .edit-message {
@@ -32,11 +35,13 @@
     }
 
     .author {
+        flex-shrink: 0;
         font-weight: bold;
-        margin-right: var(--space-xxs);
+        margin-right: var(--space-xs);
     }
 
     .edit-message {
+        flex-shrink: 0;
         float: right;
     }
 </style>
diff --git a/frontend/src/components/Messages.svelte b/frontend/src/components/Messages.svelte
index 5cbfb48..6f20ea8 100644
--- a/frontend/src/components/Messages.svelte
+++ b/frontend/src/components/Messages.svelte
@@ -48,8 +48,6 @@
 
 <style>
     .messages-container {
-        padding: var(--space-normplus);
-        padding-bottom: 0;
         height: 100%;
         width: 100%;
         flex-grow: 0;