diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 5be9b9b9..afbf61e0 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -54,10 +54,9 @@
 
 
 .message-list {
-  max-height: 100%;
   margin: 0;
   padding: 1em 0;
-  overflow-y: scroll;
+  overflow-y: auto;
 
   .timestamp {
     cursor: pointer;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 0d5e1d78..62d44187 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -317,10 +317,9 @@ input.new-message {
   content: "✓"; }
 
 .message-list {
-  max-height: 100%;
   margin: 0;
   padding: 1em 0;
-  overflow-y: scroll; }
+  overflow-y: auto; }
   .message-list .timestamp {
     cursor: pointer; }
     .message-list .timestamp:hover {