diff --git a/internal_packages/message-list/lib/email-frame.jsx b/internal_packages/message-list/lib/email-frame.jsx
index 30aee531e..9d6813701 100644
--- a/internal_packages/message-list/lib/email-frame.jsx
+++ b/internal_packages/message-list/lib/email-frame.jsx
@@ -114,7 +114,7 @@ export default class EmailFrame extends React.Component {
     }
 
     if (doc && doc.documentElement) {
-      height = doc.documentElement.scrollHeight;
+      height = Math.max(height, doc.documentElement.scrollHeight);
     }
 
     // scrollHeight does not include space required by scrollbar