diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html
index 8543fae86..6099d4341 100644
--- a/app/templates/components/email-message.html
+++ b/app/templates/components/email-message.html
@@ -6,7 +6,8 @@
   recipient=None,
   id=None,
   show_placeholder_for_recipient=False,
-  show_id=False
+  show_id=False,
+  expanded=False
 ) %}
   <div class="email-message">
     {% if from_name or subject %}
@@ -45,11 +46,15 @@
         </tbody>
       </table>
     {% endif %}
-    <div class="email-message-body" data-module="expand-collapse" data-max-height="200">
+    <div class="email-message-body" {% if not expanded %}data-module="expand-collapse" data-max-height="200"{% endif %}>
+      {% if not expanded %}
       <div class="email-message-body-wrapper">
-      {{ body|nl2br }}
+      {% endif %}
+        {{ body|nl2br }}
+      {% if not expanded %}
       </div>
       <div class='toggle' tabindex='0'>...<span class='visually-hidden'>show full email</span></div>
+      {% endif %}
     </div>
   </div>
 {% endmacro %}
diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html
index 50cf966f9..50c01ef71 100644
--- a/app/templates/views/templates/_template.html
+++ b/app/templates/views/templates/_template.html
@@ -6,7 +6,8 @@
     {{ email_message(
       template.formatted_subject_as_markup,
       template.formatted_as_markup,
-      id=template.id
+      id=template.id,
+      expanded=expanded
     ) }}
   {% elif 'sms' == template.template_type %}
     {{ sms_message(
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index 4257761f6..3f73a33ae 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -14,7 +14,7 @@
   <h1 class="heading-large">{{ template.name }}</h1>
 
   <div class="grid-row">
-    {% with show_title=False %}
+    {% with show_title=False, expanded=True %}
       {% include 'views/templates/_template.html' %}
     {% endwith %}
   </div>