1 files changed, 2 insertions, 14 deletions
diff --git a/app/assets/javascripts/components/features/ui/containers/compose_form_container.jsx b/app/assets/javascripts/components/features/ui/containers/compose_form_container.jsx
index a092a1e8e..b9c22a19d 100644
--- a/app/assets/javascripts/components/features/ui/containers/compose_form_container.jsx
+++ b/app/assets/javascripts/components/features/ui/containers/compose_form_container.jsx
@@ -1,25 +1,13 @@
 import { connect }                                          from 'react-redux';
 import ComposeForm                                          from '../components/compose_form';
 import { changeCompose, submitCompose, cancelReplyCompose } from '../../../actions/compose';
-
-function selectStatus(state) {
-  let statusId = state.getIn(['compose', 'in_reply_to'], null);
-
-  if (statusId === null) {
-    return null;
-  }
-
-  let status = state.getIn(['timelines', 'statuses', statusId]);
-  status = status.set('account', state.getIn(['timelines', 'accounts', status.get('account')]));
-
-  return status;
-};
+import { selectStatus }                                     from '../../../reducers/timelines';
 
 const mapStateToProps = function (state, props) {
   return {
     text: state.getIn(['compose', 'text']),
     is_submitting: state.getIn(['compose', 'is_submitting']),
-    in_reply_to: selectStatus(state)
+    in_reply_to: selectStatus(state, state.getIn(['compose', 'in_reply_to']))
   };
 };