diff --git a/res/search.css b/res/search.css
index 96c8c192b7e7598f1d846e3bfc16fb021a73b118..60d5ddd7c1a150e6d96187e9ea8bac7b892a90f0 100644
--- a/res/search.css
+++ b/res/search.css
@@ -49,7 +49,7 @@ buffer > h2 {
 message {
     display: flex;
     line-height: 24px;
-    padding: 12px 0;
+    padding: 12px 24px;
     border-bottom: 1px solid #e5e5e5;
     color: #212121;
     background: #fff;
@@ -57,30 +57,33 @@ message {
 }
 
 message.faded * {
-    opacity: .6
+    opacity: .8
 }
 
 message sender {
     width: 148px;
     display: inline-block;
+    padding: 0 24px;
     font-weight: bold;
     flex-shrink: 0;
 }
 
 message time {
-    width: 180px;
+    width: 132px;
     display: inline-block;
-    padding: 0 24px;
     text-align: right;
     flex-shrink: 0;
 }
 
-message content {
-    padding: 0 24px;
+message .container, message content {
     flex-shrink: 1;
     overflow: hidden;
 }
 
+message .container {
+    display: flex;
+}
+
 message:last-child {
     border-bottom: none;
 }
@@ -208,7 +211,7 @@ message:before, inline-button:before {
     top: 0;
 }
 
-message > content > b {
+message content > b {
     font-weight: initial;
     background-color: rgba(251, 246, 167, 0.5);
 }
@@ -480,4 +483,50 @@ nav.search #actions > * {
 
 #results.hidden + #modal-background {
     display: block;
+}
+
+@media(max-width: 800px) {
+    #results {
+        padding-left: 2rem;
+        padding-right: 2rem;
+    }
+
+    nav .wrapper, #autocomplete {
+        padding-left: 2rem;
+        padding-right: 4rem;
+    }
+
+    #actions {
+        padding-left: 1rem;
+        padding-right: 1rem;
+    }
+
+    message {
+        padding-left: 1rem;
+        padding-right: 1rem;
+        padding-bottom: 2rem;
+    }
+
+    message sender {
+        padding: 0;
+        width: initial;
+    }
+
+    message sender:after {
+        content: ":";
+        margin-right: 8px;
+    }
+
+    message .container {
+        display: block;
+    }
+
+    message time {
+        position: absolute;
+        right: 8px;
+        bottom: 8px;
+        width: initial;
+        font-style: italic;
+        color: #777;
+    }
 }
\ No newline at end of file
diff --git a/res/search.js b/res/search.js
index f0a29d1ce3e770612a2fb51193e84194c1383525..4d57a80b77a4565b0d81b0c5ebc58b7279bfb8a6 100644
--- a/res/search.js
+++ b/res/search.js
@@ -170,8 +170,10 @@ var render = {
         return (
             "<message id='message" + message.messageid + "' data-messageid='" + message.messageid + "' " + (highlight === true ? "" : "class='faded'") + ">" + (
                 "<time>" + new Date(message.time.replace(" ", "T") + "Z").toLocaleString() + "</time>" +
-                "<sender style='color: " + sendercolor(message.sender.split("!")[0]) + "'>" + message.sender.split("!")[0] + "</sender>" +
-                "<content>" + content + "</content>"
+                "<div class='container'>" + (
+                    "<sender style='color: " + sendercolor(message.sender.split("!")[0]) + "'>" + message.sender.split("!")[0] + "</sender>" +
+                    "<content>" + content + "</content>"
+                ) + "</div>"
             ) + "</message>"
         )
     },