diff --git a/internal_packages/message-list/lib/email-frame.jsx b/internal_packages/message-list/lib/email-frame.jsx
index cc20e4880..3906b0f51 100644
--- a/internal_packages/message-list/lib/email-frame.jsx
+++ b/internal_packages/message-list/lib/email-frame.jsx
@@ -113,7 +113,7 @@ export default class EmailFrame extends React.Component {
     // This is a hack, but I'm not sure of a better solution.
     if (Math.abs(height - this._lastComputedHeight) > 5) {
       this.refs.iframe.setHeightQuietly(height);
-      holderNode.height = `${height}px`;
+      holderNode.style.height = `${height}px`;
       this._lastComputedHeight = height;
     }
 
@@ -124,7 +124,10 @@ export default class EmailFrame extends React.Component {
 
   render() {
     return (
-      <div ref="iframeHeightHolder" style={{height: this._lastComputedHeight}}>
+      <div
+        className="iframe-container"
+        ref="iframeHeightHolder"
+        style={{height: this._lastComputedHeight}}>
         <EventedIFrame
           ref="iframe"
           seamless="seamless"
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index ee14b3d23..7273b0481 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -468,12 +468,16 @@ body.platform-win32 {
     margin: 0 auto;
     padding: 0 20px @spacing-standard 20px;
 
-    iframe {
-      width: 100%;
-      border: 0;
-      padding: 0;
+    .iframe-container {
       margin-top: 10px;
-      overflow: auto;
+      width: 100%;
+
+      iframe {
+        width: 100%;
+        border: 0;
+        padding: 0;
+        overflow: auto;
+      }
     }
   }