diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 5e6199579a..0fedd6a3e3 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -455,11 +455,13 @@ export function bodyToHtml(content, highlights, opts={}) {
         contentBodyTrimmed = contentBodyTrimmed.replace(ZWJ_REGEX, '');
 
         const match = EMOJI_REGEX.exec(contentBodyTrimmed);
-        emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length
+        emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length &&
                     // Prevent user pills expanding for users with only emoji in
                     // their username
-                    && (content.formatted_body == undefined
-		        || !content.formatted_body.includes("https://matrix.to/"));
+                    (
+                        content.formatted_body == undefined ||
+		                !content.formatted_body.includes("https://matrix.to/")
+                    );
     }
 
     const className = classNames({