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/en.xml b/_locales/en.xml
index 55311abf23..cd98a16870 100644
--- a/_locales/en.xml
+++ b/_locales/en.xml
@@ -678,6 +678,8 @@
     <string name="pref_auto_folder_moves_explain">Chat conversations are moved to avoid cluttering the Inbox</string>
     <string name="pref_only_fetch_mvbox_title">Only Fetch from DeltaChat Folder</string>
     <string name="pref_only_fetch_mvbox_explain">Ignore other folders. Requires your server to move chat messages to the DeltaChat folder.</string>
+    <string name="pref_disable_idle_title">Disable IMAP IDLE</string>
+    <string name="pref_disable_idle_explain">Poll IMAP server for new messages even if the server supports IDLE.</string>
     <string name="pref_show_emails">Show Classic E-Mails</string>
     <string name="pref_show_emails_no">No, chats only</string>
     <string name="pref_show_emails_accepted_contacts">For accepted contacts</string>
diff --git a/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx b/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
index 9529463430..081fa90798 100644
--- a/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
+++ b/src/renderer/components/dialogs/Settings-ExperimentalFeatures.tsx
@@ -81,6 +81,10 @@ export function SettingsExperimentalFeatures({
         key: 'experimentalEnableMarkdownInMessages',
         label: 'Render Markdown in Messages',
       })}
+      {renderDTSettingSwitch({
+        key: 'disableImapIdle',
+        label: tx('pref_disable_imap_idle'),
+      })}
       {renderDTSettingSwitch({
         key: 'enableWebxdcDevTools',
         label: 'Enable Webxdc Devtools',
diff --git a/src/renderer/components/dialogs/Settings-ImapFolderHandling.tsx b/src/renderer/components/dialogs/Settings-ImapFolderHandling.tsx
index e7b3c00ebc..6fc4f95153 100644
--- a/src/renderer/components/dialogs/Settings-ImapFolderHandling.tsx
+++ b/src/renderer/components/dialogs/Settings-ImapFolderHandling.tsx
@@ -41,6 +41,11 @@ export default function SettingsImapFolderHandling({
         key: 'only_fetch_mvbox',
         description: tx('pref_only_fetch_mvbox_explain'),
       })}
+      {renderDeltaSwitch2({
+        label: tx('pref_disable_idle_title'),
+        key: 'disable_idle',
+        description: tx('pref_disable_idle_explain'),
+      })}
     </>
   )
 }