diff --git a/app/assets/javascripts/expandCollapse.js b/app/assets/javascripts/expandCollapse.js
index 1ae95a5b1..a624b3605 100644
--- a/app/assets/javascripts/expandCollapse.js
+++ b/app/assets/javascripts/expandCollapse.js
@@ -5,7 +5,11 @@
 
     this.start = function(component) {
 
-      this.$component = $(component)
+      this.$component = $(component);
+
+      if (this.$component.height() < this.$component.data('max-height')) return;
+
+      this.$component      
         .append(`
           <div class='toggle' tabindex='0'>...<span class='visually-hidden'>show full email</span></div>
         `)
diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html
index 25b8733fd..9df0f3d26 100644
--- a/app/templates/components/email-message.html
+++ b/app/templates/components/email-message.html
@@ -31,7 +31,7 @@
         </tbody>
       </table>
     {% endif %}
-    <div class="email-message-body" data-module="expand-collapse">
+    <div class="email-message-body" data-module="expand-collapse" data-max-height="200">
       <div class="email-message-body-wrapper">
       {{ body|nl2br }}
       </div>