diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 1c5467fff..7de601f72 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -42,15 +42,12 @@ MessageList = React.createClass
 
     <div className="message-list" id="message-list">
       <div tabIndex=1 className="messages-wrap">
-        {@_oldMessageListHeaders()}
-
-        <div className="title-and-messages">
-          {@_messageListHeaders()}
-
-          <div className="message-components-wrap">
-            {@_messageComponents()}
-          </div>
+        <div className="message-list-notification-bars">
+          {@_messageListNotificationBars()}
         </div>
+
+        {@_messageListHeaders()}
+        {@_messageComponents()}
       </div>
     </div>
 
@@ -67,8 +64,6 @@ MessageList = React.createClass
     <div className="message-list-headers">
       <h2 className="message-subject">{@state.current_thread.subject}</h2>
 
-      {@_oldParticipants()}
-
       {for MessageListHeader in MessageListHeaders
         <MessageListHeader thread={@state.current_thread} />
       }
@@ -137,26 +132,5 @@ MessageList = React.createClass
     return _.values(participants)
 
 
-
-
-
-
-
-  # TODO Add actions and notifications back in.
-  _oldMessageListHeaders: ->
-    return <div></div>
-    <div className="message-list-notification-bars">
-      {@_messageListNotificationBars()}
-    </div>
-
-  # TODO Add participants back in
-  _oldParticipants: ->
-    return <div></div>
-    <Participants clickable={true}
-                  context={'primary'}
-                  participants={@_threadParticipants()}/>
-
-
-
 MessageList.minWidth = 600
 MessageList.maxWidth = 900
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index f7f67de39..93d22fd0d 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -31,23 +31,10 @@
   position: relative;
 
   width: 100%;
-  height: 100%;
   padding: 0;
-
+  overflow-y: auto;
   order: 2;
 
-  .title-and-messages {
-    height: 100%;
-    overflow: auto;
-  }
-
-  .messages-wrap {
-    position: relative;
-
-    height: 100%;
-    width: 100%;
-  }
-
   .message-list-headers {
     margin: 0 auto;
     padding: @spacing-double;