Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 8 insertions, 6 deletions

diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index b4bd88f308..f1ffc8115f 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -377,12 +377,14 @@ class Mailer:
             #
             # Note that many email clients will not render the unsubscribe link
             # unless DKIM, etc. is properly setup.
-            additional_headers={
-                "List-Unsubscribe-Post": "List-Unsubscribe=One-Click",
-                "List-Unsubscribe": f"<{unsubscribe_link}>",
-            }
-            if unsubscribe_link
-            else None,
+            additional_headers=(
+                {
+                    "List-Unsubscribe-Post": "List-Unsubscribe=One-Click",
+                    "List-Unsubscribe": f"<{unsubscribe_link}>",
+                }
+                if unsubscribe_link
+                else None
+            ),
         )
 
     async def _get_room_vars(