diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fd32261e6..72e88d9d94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Added
 - mark webxdc app context as secure #3413
 - Experimental: Related Chats
+- Developer option to disable IMAP IDLE #4803
 
 ### Changed
 - update deltachat-node and deltachat/jsonrpc-client to `v1.123.0`
diff --git a/_locales/_untranslated_en.json b/_locales/_untranslated_en.json
index 1c0056d686..081afba7d4 100644
--- a/_locales/_untranslated_en.json
+++ b/_locales/_untranslated_en.json
@@ -32,6 +32,12 @@
   "pref_donate": {
     "message": "Donate"
   },
+  "pref_disable_idle_title": {
+    "message": "Disable IMAP IDLE"
+  },
+  "pref_disable_idle_explain": {
+    "message": "Do not use IMAP IDLE extension even if the server supports it. Enabling this option will delay message retrieval, enable it only for testing."
+  },
   "clear_chat": {
     "message": "Clear Chat"
   },
diff --git a/src/renderer/components/dialogs/Settings-Advanced.tsx b/src/renderer/components/dialogs/Settings-Advanced.tsx
index f56f2c4aa5..8376a40df3 100644
--- a/src/renderer/components/dialogs/Settings-Advanced.tsx
+++ b/src/renderer/components/dialogs/Settings-Advanced.tsx
@@ -41,6 +41,7 @@ export function SettingsAdvanced({
       <SettingsExperimentalFeatures
         settingsStore={settingsStore}
         renderDTSettingSwitch={renderDTSettingSwitch}
+        renderDeltaSwitch2={renderDeltaSwitch2}
       />
     </>
   )
diff --git a/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx b/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
index 9529463430..e45236de9d 100644
--- a/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
+++ b/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
@@ -1,6 +1,10 @@
 import React, { useState, useContext } from 'react'
 import { Card, Elevation } from '@blueprintjs/core'
-import { RenderDTSettingSwitchType, SettingsSelector } from './Settings'
+import {
+  RenderDeltaSwitch2Type,
+  RenderDTSettingSwitchType,
+  SettingsSelector,
+} from './Settings'
 import { ScreenContext, useTranslationFunction } from '../../contexts'
 import { DeltaInput } from '../Login-Styles'
 import {
@@ -22,9 +26,11 @@ const VIDEO_CHAT_INSTANCE_AUTISTICI = 'https://vc.autistici.org/$ROOM'
 export function SettingsExperimentalFeatures({
   settingsStore,
   renderDTSettingSwitch,
+  renderDeltaSwitch2,
 }: {
   renderDTSettingSwitch: RenderDTSettingSwitchType
   settingsStore: SettingsStoreState
+  renderDeltaSwitch2: RenderDeltaSwitch2Type
 }) {
   const tx = window.static_translate
   const { openDialog } = useContext(ScreenContext)
@@ -94,6 +100,11 @@ export function SettingsExperimentalFeatures({
         description:
           'Careful: opening developer tools on a malicious webxdc app could lead to the app getting access to the Internet',
       })}
+      {renderDeltaSwitch2({
+        label: tx('pref_disable_idle_title'),
+        key: 'disable_idle',
+        description: tx('pref_disable_idle_explain'),
+      })}
       <SettingsSelector
         onClick={onClickEdit.bind(null, false)}
         currentValue={showVideochatInstance(
diff --git a/src/renderer/stores/settings.ts b/src/renderer/stores/settings.ts
index a00397bf47..65600b6511 100644
--- a/src/renderer/stores/settings.ts
+++ b/src/renderer/stores/settings.ts
@@ -23,6 +23,7 @@ export interface SettingsStoreState {
     webrtc_instance: string
     download_limit: string
     only_fetch_mvbox: string
+    disable_idle: string
     'ui.lastchatid': string
   }
   desktopSettings: DesktopSettingsType
@@ -44,6 +45,7 @@ const settingsKeys: Array<keyof SettingsStoreState['settings']> = [
   'webrtc_instance',
   'download_limit',
   'only_fetch_mvbox',
+  'disable_idle',
   'ui.lastchatid',
 ]