From 89cf18302b5f72a3ffae7336df857a02e1503552 Mon Sep 17 00:00:00 2001
From: Cyberes <64224601+Cyberes@users.noreply.github.com>
Date: Wed, 29 Mar 2023 13:41:13 -0600
Subject: [PATCH 1/2] Update mailer.py

Fix `KeyError: 'app'`
---
 synapse/push/mailer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 93b255ced579..491a09b71d54 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -149,7 +149,7 @@ async def send_password_reset_mail(
         await self.send_email(
             email_address,
             self.email_subjects.password_reset
-            % {"server_name": self.hs.config.server.server_name},
+            % {"server_name": self.hs.config.server.server_name, "app": self.app_name},
             template_vars,
         )
 

From b8848df219464c9c28eda30771b3aa3443235912 Mon Sep 17 00:00:00 2001
From: Drake Panzer <64224601+Cyberes@users.noreply.github.com>
Date: Wed, 29 Mar 2023 14:03:44 -0600
Subject: [PATCH 2/2] Create 15352.bugfix

Signed-off-by: Cyberes <cyberes@evulid.cc>
---
 changelog.d/15352.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/15352.bugfix

diff --git a/changelog.d/15352.bugfix b/changelog.d/15352.bugfix
new file mode 100644
index 000000000000..36d6615cac3c
--- /dev/null
+++ b/changelog.d/15352.bugfix
@@ -0,0 +1 @@
+Fix missing app variable in mail subject for password resets. Contributed by Cyberes.