Merge pull request #1852 from matrix-org/paul/issue-1382

Don't clobber a displayname or avatar_url if provided by an m.room.member event

synapse/handlers/message.py

@@ -208,7 +208,9 @@ class MessageHandler(BaseHandler):
                     content = builder.content
 
                     try:
+                        if "displayname" not in content:
                             content["displayname"] = yield profile.get_displayname(target)
+                        if "avatar_url" not in content:
                             content["avatar_url"] = yield profile.get_avatar_url(target)
                     except Exception as e:
                         logger.info(