From e793866398ffb3e222a86ebb15b9d24220accbc8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 2 Jun 2016 09:41:13 +0100
Subject: [PATCH] Use user_id in email greeting if display name is null

---
 synapse/push/mailer.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 3ae92d1574..fe5d67a03c 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -122,6 +122,8 @@ class Mailer(object):
             user_display_name = yield self.store.get_profile_displayname(
                 UserID.from_string(user_id).localpart
             )
+            if user_display_name is None:
+                user_display_name = user_id
         except StoreError:
             user_display_name = user_id