diff --git a/web/src/view/mod.rs b/web/src/view/mod.rs
index ab53b6c..98ee69d 100644
--- a/web/src/view/mod.rs
+++ b/web/src/view/mod.rs
@@ -901,13 +901,22 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
         .collect();
     let show_x_original_to = !*to_xinu.borrow() && msg.x_original_to.is_some();
     let show_delivered_to = !*to_xinu.borrow() && !show_x_original_to && msg.delivered_to.is_some();
+    let common_style = C!["text-sm", "pr-2", "text-gray-500"];
     div![
-        C!["flex", "p-4", "bg-neutral-800"],
-        div![avatar],
+        C!["flex", "bg-neutral-800"],
+        div![C!["self-center"], avatar],
         div![
-            C!["px-4", "mr-auto"],
-            span![
-                C!["font-semibold", "text-sm"],
+            C![
+                "mx-2",
+                "flex-1",
+                "flex",
+                "flex-nowrap",
+                "items-center",
+                "truncate",
+            ],
+            div![
+                C!["font-semibold", "text-white"],
+                &common_style,
                 from_detail.as_ref().map(|addr| attrs! {
                     At::Title => addr
                 }),
@@ -915,7 +924,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
             ],
             " ",
             IF!(!msg.to.is_empty() => div![
-                C!["text-xs"],
+                &common_style,
                 span![
                     C!["font-semibold"],
                     "To: "
@@ -926,7 +935,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 " "
             ]),
             IF!(!msg.cc.is_empty() => div![
-                C!["text-xs", "max-w-full", "overflow-clip", "text-ellipsis"],
+                &common_style,
                 span![
                     C!["font-semibold"],
                     "CC: "
@@ -934,7 +943,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 cc_addrs
             ]),
             IF!(show_x_original_to => div![
-                C!["text-xs"],
+                &common_style,
                 span![
                     C!["font-semibold"],
                     "Original To: "
@@ -953,7 +962,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ]
             ]),
             IF!(show_delivered_to => div![
-                C!["text-xs"],
+                &common_style,
                 span![
                     C!["font-semibold"],
                     "Delivered To: "
@@ -972,27 +981,25 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ]
             ]),
         ],
-        span![
-            C!["text-right"],
-            msg.timestamp
-                .map(|ts| div![C!["text-xs", "text-nowrap"], human_age(ts)]),
-            div![
-                C!["p-2"],
-                i![C![
-                    "mx-4",
-                    "read-status",
-                    "far",
-                    if is_unread {
-                        "fa-envelope"
-                    } else {
-                        "fa-envelope-open"
-                    },
-                ]],
-                ev(Ev::Click, move |e| {
-                    e.stop_propagation();
-                    Msg::SetUnread(id, !is_unread)
-                })
-            ],
+        msg.timestamp.map(|ts| div![
+            C!["text-xs", "text-nowrap", "justify-self-end", "self-center"],
+            human_age(ts)
+        ]),
+        div![
+            i![C![
+                "m-2",
+                "read-status",
+                "far",
+                if is_unread {
+                    "fa-envelope"
+                } else {
+                    "fa-envelope-open"
+                },
+            ]],
+            ev(Ev::Click, move |e| {
+                e.stop_propagation();
+                Msg::SetUnread(id, !is_unread)
+            })
         ]
     ]
 }
@@ -1007,7 +1014,7 @@ fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool)
     };
     let from = from.map(|f| f.replace('.', "-").replace('@', "-"));
     div![
-        C!["lg:mb-4"],
+        C!["pb-1"],
         div![
             if open {
                 render_open_header(&msg)