From aeedf48d841b89ab75736d4b3cd4f5e65ea0822e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 11 Feb 2018 11:45:13 +0000
Subject: [PATCH] fix weird `in` op behaviour with null

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Reply.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Reply.js b/src/components/views/elements/Reply.js
index 31e94e1d4a..944d90cdbd 100644
--- a/src/components/views/elements/Reply.js
+++ b/src/components/views/elements/Reply.js
@@ -137,9 +137,9 @@ export default class Reply extends React.Component {
         if (ev.isRedacted()) return;
 
         const mRelatesTo = ev.getWireContent()['m.relates_to'];
-        if (mRelatesTo) {
+        if (mRelatesTo && mRelatesTo['m.in_reply_to']) {
             const mInReplyTo = mRelatesTo['m.in_reply_to'];
-            if ('event_id' in mInReplyTo) return mInReplyTo;
+            if (mInReplyTo['event_id']) return mInReplyTo;
         }
     }