diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 4239394d5..3b7b40115 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -137,8 +137,6 @@ class MessageList extends React.Component
     @_draftScrollInProgress = true
     draftElement.focus()
     @refs.messageWrap.scrollTo(draftElement, {
-      position: ScrollRegion.ScrollPosition.Bottom,
-      settle: true
       position: ScrollRegion.ScrollPosition.Top,
       settle: true,
       done: =>
diff --git a/internal_packages/thread-list/lib/thread-list.cjsx b/internal_packages/thread-list/lib/thread-list.cjsx
index 9b22291e8..73fab6bfc 100644
--- a/internal_packages/thread-list/lib/thread-list.cjsx
+++ b/internal_packages/thread-list/lib/thread-list.cjsx
@@ -169,30 +169,30 @@ class ThreadList extends React.Component
 
   render: =>
     if @state.style is 'wide'
-        <MultiselectList
-          dataStore={ThreadListStore}
-          columns={@wideColumns}
-          commands={@commands}
-          itemPropsProvider={@itemPropsProvider}
-          itemHeight={39}
-          className="thread-list"
-          scrollTooltipComponent={ThreadListScrollTooltip}
-          emptyComponent={EmptyState}
-          onDragStart={@_onDragStart}
-          onDragEnd={@_onDragEnd}
-          draggable="true"
-          collection="thread" />
+      <MultiselectList
+        dataStore={ThreadListStore}
+        columns={@wideColumns}
+        commands={@commands}
+        itemPropsProvider={@itemPropsProvider}
+        itemHeight={39}
+        className="thread-list"
+        scrollTooltipComponent={ThreadListScrollTooltip}
+        emptyComponent={EmptyState}
+        onDragStart={@_onDragStart}
+        onDragEnd={@_onDragEnd}
+        draggable="true"
+        collection="thread" />
     else if @state.style is 'narrow'
-        <MultiselectList
-          dataStore={ThreadListStore}
-          columns={@narrowColumns}
-          commands={@commands}
-          itemPropsProvider={@itemPropsProvider}
-          itemHeight={90}
-          className="thread-list thread-list-narrow"
-          scrollTooltipComponent={ThreadListScrollTooltip}
-          emptyComponent={EmptyState}
-          collection="thread" />
+      <MultiselectList
+        dataStore={ThreadListStore}
+        columns={@narrowColumns}
+        commands={@commands}
+        itemPropsProvider={@itemPropsProvider}
+        itemHeight={90}
+        className="thread-list thread-list-narrow"
+        scrollTooltipComponent={ThreadListScrollTooltip}
+        emptyComponent={EmptyState}
+        collection="thread" />
     else
       <div></div>