From 3d7b9fe194f35e4026284c568d74f779890dc87a Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 1 Feb 2022 18:17:34 +0100
Subject: [PATCH 1/2] Ensure we use IMAP IDLE like it's supposed to work

imap_idle_notify_interval = 2 mins -> 29 mins

See https://peterkieser.com/2011/03/25/androids-k-9-mail-battery-life-and-dovecots-push-imap/
---
 core/dovecot/conf/dovecot.conf    | 1 +
 towncrier/newsfragments/2211.misc | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 towncrier/newsfragments/2211.misc

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 6b97a086..39c98d57 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -100,6 +100,7 @@ service auth-worker {
 protocol imap {
   mail_plugins = $mail_plugins imap_quota imap_sieve
   mail_max_userip_connections = 20
+  imap_idle_notify_interval = 29 mins
 }
 
 protocol pop3 {
diff --git a/towncrier/newsfragments/2211.misc b/towncrier/newsfragments/2211.misc
new file mode 100644
index 00000000..61eb145e
--- /dev/null
+++ b/towncrier/newsfragments/2211.misc
@@ -0,0 +1 @@
+Set imap_idle_notify_interval to 29 mins (see rfc2177) to ensure we use IMAP IDLE effectively

From 224880822f88e7af7c8f4ad4e6f11a42b8799177 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@users.noreply.github.com>
Date: Thu, 3 Feb 2022 11:31:33 +0100
Subject: [PATCH 2/2] remove space

---
 core/dovecot/conf/dovecot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 39c98d57..ed2c4cdf 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -100,7 +100,7 @@ service auth-worker {
 protocol imap {
   mail_plugins = $mail_plugins imap_quota imap_sieve
   mail_max_userip_connections = 20
-  imap_idle_notify_interval = 29 mins
+  imap_idle_notify_interval = 29mins
 }
 
 protocol pop3 {