diff --git a/decnet_web/src/components/AttackerDetail.tsx b/decnet_web/src/components/AttackerDetail.tsx
index 124bbf57..88257903 100644
--- a/decnet_web/src/components/AttackerDetail.tsx
+++ b/decnet_web/src/components/AttackerDetail.tsx
@@ -1479,7 +1479,7 @@ const AttackerDetail: React.FC = () => {
   }
 
   return (
-    <div className="dashboard">
+    <div className="dashboard page-scroll">
       {/* Back Button */}
       <button onClick={() => navigate('/attackers')} className="back-button">
         <ArrowLeft size={18} />
@@ -2059,6 +2059,7 @@ const AttackerDetail: React.FC = () => {
                   <th>DECKY</th>
                   <th>SUBJECT</th>
                   <th>FROM</th>
+                  <th>DATE (attacker)</th>
                   <th>SIZE</th>
                   <th></th>
                 </tr>
@@ -2078,7 +2079,10 @@ const AttackerDetail: React.FC = () => {
                         {fields.subject || '—'}
                       </td>
                       <td className="matrix-text" style={{ fontFamily: 'monospace', wordBreak: 'break-all' }}>
-                        {fields.from_addr || fields.mail_from || '—'}
+                        {fields.from_hdr || fields.from_addr || fields.mail_from || '—'}
+                      </td>
+                      <td className="matrix-text" style={{ fontFamily: 'monospace', whiteSpace: 'nowrap', fontSize: '0.75rem' }}>
+                        {fields.date_hdr || '—'}
                       </td>
                       <td className="matrix-text" style={{ fontFamily: 'monospace' }}>
                         {fields.size ? `${fields.size} B` : '—'}
diff --git a/decnet_web/src/components/MailDrawer.tsx b/decnet_web/src/components/MailDrawer.tsx
index f2657121..9f43b315 100644
--- a/decnet_web/src/components/MailDrawer.tsx
+++ b/decnet_web/src/components/MailDrawer.tsx
@@ -81,9 +81,9 @@ const MailDrawer: React.FC<MailDrawerProps> = ({ decky, storedAs, fields, onClos
     }
   };
 
-  const recipients = Array.isArray(fields.rcpts)
-    ? fields.rcpts.join(', ')
-    : (typeof fields.rcpts === 'string' ? fields.rcpts : null);
+  const recipients = fields.to_hdr
+    || (Array.isArray(fields.rcpts) ? fields.rcpts.join(', ') : null)
+    || (typeof fields.rcpts === 'string' ? fields.rcpts : null);
 
   return (
     <div
@@ -156,10 +156,10 @@ const MailDrawer: React.FC<MailDrawerProps> = ({ decky, storedAs, fields, onClos
             HEADERS
           </h3>
           <Row label="Subject" value={fields.subject} />
-          <Row label="From" value={fields.from_addr ?? fields.from} />
+          <Row label="From" value={fields.from_hdr || fields.from_addr || fields.from} />
           <Row label="To" value={recipients} />
-          <Row label="Date" value={fields.date} />
-          <Row label="Message-ID" value={fields.message_id} />
+          <Row label="Date" value={fields.date_hdr || fields.date} />
+          <Row label="Message-ID" value={fields.message_id_hdr || fields.message_id} />
           <Row label="Mail from" value={fields.mail_from} />
         </section>