diff --git a/app/assets/javascripts/expandCollapse.js b/app/assets/javascripts/expandCollapse.js
index be1a0ab41..1ae95a5b1 100644
--- a/app/assets/javascripts/expandCollapse.js
+++ b/app/assets/javascripts/expandCollapse.js
@@ -11,12 +11,9 @@
         `)
         .addClass('collapsed');
 
-      this.$toggle = this.$component.find('.toggle');
-
-      this.$toggle
+      this.$toggle = this.$component.find('.toggle')
         .on(
           "click",
-          ".toggle",
           this.change
         )
         .on("keydown", this.filterKeyPresses([32, 13], this.change));
@@ -34,7 +31,7 @@
 
     this.change = () => this.toggleCollapsed() && this.$toggle.remove();
 
-    this.toggleCollapsed = () => this.$component.toggleClass('collapsed');
+    this.toggleCollapsed = () => this.$component.removeClass('collapsed');
 
   };
 
diff --git a/app/templates/components/email-message.html b/app/templates/components/email-message.html
index 616f6e9e1..25b8733fd 100644
--- a/app/templates/components/email-message.html
+++ b/app/templates/components/email-message.html
@@ -32,7 +32,7 @@
       </table>
     {% endif %}
     <div class="email-message-body" data-module="expand-collapse">
-      <div class="email-message-body-wrapper collapsed">
+      <div class="email-message-body-wrapper">
       {{ body|nl2br }}
       </div>
     </div>