Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none

Use user_id in email greeting if display name is null

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