diff --git a/static/templates/message.handlebars b/static/templates/message.handlebars
index 978dc95e34..000789f49c 100644
--- a/static/templates/message.handlebars
+++ b/static/templates/message.handlebars
@@ -200,11 +200,7 @@
           </div>
         </div>
         </div>
-        <div class="message_content">
-          {{#unless status_message}}
-            {{#if ../../../use_match_properties}}{{{match_content}}}{{else}}{{{content}}}{{/if}}
-          {{/unless}}
-        </div>
+        <div class="message_content">{{#unless status_message}}{{#if ../../../use_match_properties}}{{{match_content}}}{{else}}{{{content}}}{{/if}}{{/unless}}</div>
         <div class="message_edit">
             <div class="message_edit_form" id="{{id}}"></div>
         </div>