diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
index a69ad4ca7a71..84b56e5dbe76 100644
--- a/app/ui-message/client/message.html
+++ b/app/ui-message/client/message.html
@@ -121,7 +121,7 @@
 				</div>
 			{{/if}}
 
-			{{#if and settings.showReplyButton msg.tcount}}
+			{{#if $and settings.showReplyButton msg.tcount}}
 				<div class="message-discussion">
 					<button class="js-open-thread rc-button rc-button--primary rc-button--small" data-rid={{roomId}}>
 						{{> icon icon="thread"}}
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 628534eb07d4..ed093e5db9c5 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -47,9 +47,6 @@ Template.message.helpers({
 		const { msg, settings } = this;
 		return Tracker.nonreactive(() => renderBody(msg, settings));
 	},
-	and(a, b) {
-		return a && b;
-	},
 	i18nReplyCounter() {
 		const { msg } = this;
 		return `<span class='reply-counter'>${ msg.tcount }</span>`;