From ff0834ad9d1f50b951e363bcfd9615d62edf421d Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 21:31:09 +0100
Subject: [PATCH] Add comment.

---
 src/components/structures/MessagePanel.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 248c874fa8..773c9710dd 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -450,7 +450,12 @@ module.exports = React.createClass({
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
                 && mxEv.sender.userId === prevEvent.sender.userId
-                 && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
+                // The preferred way of checking for 'continuation messages' is by
+                // checking whether subsiquent messages from the same user have a
+                // message body. This is because all messages intended to be displayed
+                // should have a 'body' whereas some (non-m.room) messages (such as
+                // m.sticker) may not have a message 'type'.
+                && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
             continuation = true;
         }