From 3e394faf92be9ea4017a11f7717f4e6ce428734a Mon Sep 17 00:00:00 2001
From: Kevin Falcoz <0pc0defr@gmail.com>
Date: Mon, 31 Jan 2022 16:40:37 +0100
Subject: [PATCH 1/5] Patch function "Display Name" into admin page

---
 core/admin/mailu/ui/templates/sidebar.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
index 6145bef3..7620f0e0 100644
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@@ -5,7 +5,11 @@
       <div class="div-circle elevation-2"><i class="fa fa-user text-lg text-dark"></i></div>
     </div>
     <div class="info">
+      {%- if current_user.displayed_name %}
+      <a href="{{ url_for('.user_settings') }}" class="d-block">{{ current_user.displayed_name }}</a>
+      {% else %}
       <a href="{{ url_for('.user_settings') }}" class="d-block">{{ current_user }}</a>
+      {%- endif %}
     </div>
   </div>
   {%- endif %}

From c69f886a73da50b1a63a29c3212e7dd0b8710bc6 Mon Sep 17 00:00:00 2001
From: Kevin Falcoz <0pc0deFR@gmail.com>
Date: Tue, 1 Feb 2022 09:10:51 +0100
Subject: [PATCH 2/5] Update code with ghostwheel42 comments

---
 core/admin/mailu/ui/templates/sidebar.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
index 7620f0e0..931842e8 100644
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@@ -5,11 +5,7 @@
       <div class="div-circle elevation-2"><i class="fa fa-user text-lg text-dark"></i></div>
     </div>
     <div class="info">
-      {%- if current_user.displayed_name %}
-      <a href="{{ url_for('.user_settings') }}" class="d-block">{{ current_user.displayed_name }}</a>
-      {% else %}
-      <a href="{{ url_for('.user_settings') }}" class="d-block">{{ current_user }}</a>
-      {%- endif %}
+      <a href="{{ url_for('.user_settings') }}" class="d-block">{{ current_user.displayed_name or current_user }}</a>
     </div>
   </div>
   {%- endif %}

From 278d74ce6fdde65cb58eef0f85306a57d019244b Mon Sep 17 00:00:00 2001
From: Kevin Falcoz <0pc0defr@gmail.com>
Date: Tue, 1 Feb 2022 13:53:11 +0100
Subject: [PATCH 3/5] Add title attribute on user-panel div

---
 core/admin/mailu/ui/templates/sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
index 931842e8..a57a2abe 100644
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@@ -1,6 +1,6 @@
 <div class="sidebar text-sm">
   {%- if current_user.is_authenticated %}
-  <div class="user-panel mt-3 pb-3 mb-3 d-flex">
+  <div class="user-panel mt-3 pb-3 mb-3 d-flex" title="{{ current_user }}">
     <div class="image">
       <div class="div-circle elevation-2"><i class="fa fa-user text-lg text-dark"></i></div>
     </div>

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 4/5] 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 5/5] 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 {