diff --git a/CHANGELOG.md b/CHANGELOG.md
index 421bdd8be..f103eba08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The chat composer shrinks with its pane, so the send button stays reachable. It sat outside the layout's clip below a 1014px viewport with the navigation expanded, and on any phone 402 CSS px or narrower.
 - The channel and status pane heading truncates with an ellipsis and carries its full text in a tooltip. A long title previously ran past the panel edge, cut mid-glyph with nothing to signal it.
 - The Chats page shows one pane at a time from 769px to 888px with the navigation expanded, where two panes left the room narrower than the composer and pushed the send button out of the panel. The message field now keeps a floor rather than shrinking to nothing.
+- The reply banner's quoted name truncates with an ellipsis, and a location message's map preview is bounded by its bubble. Both previously painted outside the chat panel when the room was narrow.
 
 ## [0.23.0] - 2026-08-20
 
diff --git a/dashboard/src/components/chats/ChatThread.tsx b/dashboard/src/components/chats/ChatThread.tsx
index a22036e42..8fb71abd0 100644
--- a/dashboard/src/components/chats/ChatThread.tsx
+++ b/dashboard/src/components/chats/ChatThread.tsx
@@ -186,14 +186,7 @@ function ChatThread({
               const thumb = msg.body && msg.body.length > 100 ? `data:image/jpeg;base64,${msg.body}` : '';
               return (
                 <div className="message-location">
-                  {thumb && (
-                    <img
-                      src={thumb}
-                      alt=""
-                      onLoad={onMediaLoad}
-                      style={{ maxWidth: 220, borderRadius: 8, display: 'block', marginBottom: 4 }}
-                    />
-                  )}
+                  {thumb && <img src={thumb} alt="" onLoad={onMediaLoad} className="chat-location-media" />}
                   <span className="message-media-omitted">📍 {t('chats.media.location')}</span>
                 </div>
               );
diff --git a/dashboard/src/pages/Chats.css b/dashboard/src/pages/Chats.css
index d7e0c1fca..47269de3d 100644
--- a/dashboard/src/pages/Chats.css
+++ b/dashboard/src/pages/Chats.css
@@ -970,6 +970,15 @@
   text-decoration: none;
 }
 
+/* The map preview keeps its own modest cap, but bounded by the bubble the way every other media type
+   here is. As a bare pixel width it stayed 220px wide in a narrower room and ran past the panel edge. */
+.chats-page .chat-location-media {
+  max-width: min(220px, 100%);
+  border-radius: 8px;
+  display: block;
+  margin-bottom: 0.25rem;
+}
+
 .chats-page .chat-video-media {
   max-width: 100%;
   max-height: 250px;
@@ -1228,6 +1237,11 @@
   font-size: 0.8125rem;
   font-weight: 700;
   color: var(--primary-text);
+  /* Same treatment as `.replying-to-body` below. Without it a quoted name with no break opportunity
+     keeps its box but paints straight through the close button and out of the panel. */
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .chats-page .replying-to-body {