From c587ad459e5d95ff912da3d1c1c7434b73a41342 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Mon, 12 Oct 2026 02:00:02 +0200
Subject: [PATCH] fix: keep the dark body backdrop full width in Mountain View
 and show Gmail's help button

---
 components/email/email-viewer.tsx | 2 +-
 components/layout/mv-top-bar.tsx  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index 892520484..61017f113 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -5503,7 +5503,7 @@ export function EmailViewer({
           <div className={cn(
             "email-content-wrapper overflow-x-auto",
             // Mountain View indents the body under the sender's name, as Gmail does.
-            mvViewer && "lg:ms-[60px]",
+            mvViewer && "lg:ps-[60px]",
             !isDark && resolvedTheme === 'dark' ? "bg-white email-content-light" : "bg-background"
           )}
           style={isDark ? { backgroundColor: '#121212' } : undefined}>
diff --git a/components/layout/mv-top-bar.tsx b/components/layout/mv-top-bar.tsx
index 909b7b36a..d1a0b484d 100644
--- a/components/layout/mv-top-bar.tsx
+++ b/components/layout/mv-top-bar.tsx
@@ -6,7 +6,7 @@ import {
   Calendar,
   Grid3x3,
   HardDrive,
-  Keyboard,
+  HelpCircle,
   Mail,
   Menu,
   Settings,
@@ -241,7 +241,8 @@ export function MvTopBar({
             title={t("keyboard_shortcuts")}
             aria-label={t("keyboard_shortcuts")}
           >
-            <Keyboard className="w-5 h-5" />
+            {/* Gmail's help button, which is where it keeps the shortcuts too. */}
+            <HelpCircle className="w-5 h-5" />
           </button>
         )}
         {/* Admin (Stalwart admins), as in the navigation rail this bar replaces.