fix "Always Load Remote Images" should be hidden for contact requests (…

…#3183) fixes: 3180
deltachat · Apr 13, 2023 · a6fa467 · a6fa467
1 parent 5bf91b5
commit a6fa467
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
 - Update inApp help (11.4.2023)
 - improve confirm abort dialog for setup second device #3173
 
+### Fixed
+- fix "Always Load Remote Images" should be hidden for contact requests #3180
+
 <a id="1_36_1"></a>
 
 ## [1.36.1] - 2023-04-09

diff --git a/src/main/windows/html_email.ts b/src/main/windows/html_email.ts
@@ -155,10 +155,15 @@ export function openHtmlEmailWindow(
         },
       }),
     }
-    const menu = electron.Menu.buildFromTemplate([
-      menuItems.always_show(),
-      menuItems.dont_ask(),
-    ])
+    let menu: Electron.Menu
+    if (isContactRequest) {
+      menu = electron.Menu.buildFromTemplate([menuItems.dont_ask()])
+    } else {
+      menu = electron.Menu.buildFromTemplate([
+        menuItems.always_show(),
+        menuItems.dont_ask(),
+      ])
+    }
     menu.popup({ window, x, y })
   })