diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index ba7233d6..ccbde2a0 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -55,7 +55,7 @@
     -webkit-user-select: text;
   }
   .container {
-    height : calc(100% - (36px + 5px + 1px + 4px));
+    height: calc(100% - (#{$header-height} + 5px + 1px + 4px));
   }
 }
 
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 6b63dcf6..6fdb9d14 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -623,8 +623,7 @@ input.search {
     padding: 0 1em;
     -webkit-user-select: text; }
   .key-verification .container {
-    height : calc(100% - (36px + 5px + 1px + 4px));
-  }
+    height: calc(100% - (36px + 5px + 1px + 4px)); }
 
 .message-detail .container {
   height: calc(100% - (36px + 4px)); }