diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.new-rows-spacing.test.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.new-rows-spacing.test.tsx
index c2a5f3aca42..089d606a41d 100644
--- a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.new-rows-spacing.test.tsx
+++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.new-rows-spacing.test.tsx
@@ -27,7 +27,6 @@ const context: NativeChatTranscriptRowContext = {
   taskListPredecessors: new Map(),
   expandedTurnIds: new Set(),
   onToggleExpandedTurn: vi.fn(),
-  subagentDisclosure: { setSectionOpen: vi.fn(), setRosterOpen: vi.fn() },
   onScrollMessageToTop: vi.fn(),
   onRevealDiff: vi.fn()
 }
@@ -51,8 +50,6 @@ function slot(overrides: Partial<NativeChatMessageSlot> = {}): NativeChatMessage
     drawsMessage: true,
     turnFolds: false,
     turnDiff: undefined,
-    subagentRoster: undefined,
-    depth: 0,
     estimatedHeight: 40,
     ...overrides
   }
@@ -127,7 +124,17 @@ describe('NativeChatTranscriptRow New line spacing', () => {
       ['-mb-3'],
       ['-mt-6']
     ],
-    ['above-turn-bar', user(), { text: 'Not sent' }, ['-mb-3'], ['-mt-6']]
+    ['above-turn-bar', user(), { text: 'Not sent' }, ['-mb-3'], ['-mt-6']],
+    ['above-turn-bar', user(), { sending: true }, ['-mb-3'], ['-mt-6']],
+    ['above-turn-bar', user({ timestamp: null }), undefined, ['-mb-3'], ['-mt-6']],
+    ['above-turn-bar', { ...user(), drawsMessage: false }, undefined, ['-mb-3'], ['-mt-6']],
+    [
+      'above-row',
+      slot({ statusAbove: true, status: { startedAt: 1, thinking: false, workedSeconds: null } }),
+      undefined,
+      ['-mb-3'],
+      ['-mt-6', '-mb-1.5']
+    ]
   ] as const)('spaces the line %s, case %#', (place, row, notice, has, lacks) => {
     const view = render(
       <NativeChatTranscriptRow
diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx
index 6649fe1a9fc..6e5d83be691 100644
--- a/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx
+++ b/src/renderer/src/components/native-chat/messages/rows/NativeChatTranscriptRow.tsx
@@ -58,14 +58,17 @@ function newRowsMarkerSpacing(
   deliveryNotice: NativeChatDeliveryNotice | undefined
 ): string {
   if (place === 'above-row') {
-    return '-mb-1.5'
+    // A turn with no prompt opens on its bar, which needs the deeper trim too.
+    return slot.statusAbove && slot.status ? '-mb-3' : '-mb-1.5'
   }
+  // Only where the hover row is drawn: it always shows a time, so a message without one may have none.
   const afterHoverMeta =
     slot.drawsMessage &&
     !slot.receipt &&
     slot.message.role === 'user' &&
     !slot.message.from &&
-    deliveryNotice === undefined
+    deliveryNotice === undefined &&
+    Number.isFinite(slot.message.timestamp)
   return cn('-mb-3', afterHoverMeta && '-mt-6')
 }