diff --git a/app/soapbox/reducers/contexts.js b/app/soapbox/reducers/contexts.js
index 1dd93d119..3acd96ed5 100644
--- a/app/soapbox/reducers/contexts.js
+++ b/app/soapbox/reducers/contexts.js
@@ -4,7 +4,7 @@ import {
 } from '../actions/accounts';
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { STATUS_IMPORT, STATUSES_IMPORT } from 'soapbox/actions/importer';
+import { STREAMING_TIMELINE_UPDATE } from 'soapbox/actions/streaming';
 import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 
 const initialState = ImmutableMap({
@@ -24,12 +24,6 @@ const importStatus = (state, { id, in_reply_to_id }) => {
   });
 };
 
-const importStatuses = (state, statuses) => {
-  return state.withMutations(state => {
-    statuses.forEach(status => importStatus(state, status));
-  });
-};
-
 const insertTombstone = (state, ancestorId, descendantId) => {
   const tombstoneId = `${descendantId}-tombstone`;
   return state.withMutations(state => {
@@ -100,10 +94,8 @@ export default function replies(state = initialState, action) {
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
   case TIMELINE_DELETE:
     return deleteStatuses(state, [action.id]);
-  case STATUS_IMPORT:
+  case STREAMING_TIMELINE_UPDATE:
     return importStatus(state, action.status);
-  case STATUSES_IMPORT:
-    return importStatuses(state, action.statuses);
   default:
     return state;
   }
diff --git a/app/soapbox/reducers/scheduled_statuses.js b/app/soapbox/reducers/scheduled_statuses.js
index 2e304a8eb..60d431752 100644
--- a/app/soapbox/reducers/scheduled_statuses.js
+++ b/app/soapbox/reducers/scheduled_statuses.js
@@ -4,12 +4,14 @@ import {
   SCHEDULED_STATUS_CANCEL_REQUEST,
   SCHEDULED_STATUS_CANCEL_SUCCESS,
 } from 'soapbox/actions/scheduled_statuses';
-import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const importStatus = (state, status) => {
-  if (!status.scheduled_at) return state;
-  return state.set(status.id, fromJS(status));
+  if (status.scheduled_at) {
+    return state.set(status.id, fromJS(status));
+  } else {
+    return state;
+  }
 };
 
 const importStatuses = (state, statuses) =>
@@ -21,10 +23,8 @@ const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
   switch(action.type) {
-  case STATUS_IMPORT:
   case STATUS_CREATE_SUCCESS:
     return importStatus(state, action.status);
-  case STATUSES_IMPORT:
   case SCHEDULED_STATUSES_FETCH_SUCCESS:
     return importStatuses(state, action.statuses);
   case SCHEDULED_STATUS_CANCEL_REQUEST:
diff --git a/app/soapbox/reducers/statuses.js b/app/soapbox/reducers/statuses.js
index 202a36d77..304ab820b 100644
--- a/app/soapbox/reducers/statuses.js
+++ b/app/soapbox/reducers/statuses.js
@@ -1,45 +1,141 @@
 import {
   REBLOG_REQUEST,
+  REBLOG_SUCCESS,
   REBLOG_FAIL,
+  UNREBLOG_SUCCESS,
   FAVOURITE_REQUEST,
-  UNFAVOURITE_REQUEST,
+  FAVOURITE_SUCCESS,
   FAVOURITE_FAIL,
-} from '../actions/interactions';
+  UNFAVOURITE_REQUEST,
+  UNFAVOURITE_SUCCESS,
+  PIN_SUCCESS,
+  UNPIN_SUCCESS,
+} from 'soapbox/actions/interactions';
 import {
+  STATUS_FETCH_SUCCESS,
+  CONTEXT_FETCH_SUCCESS,
   STATUS_MUTE_SUCCESS,
   STATUS_UNMUTE_SUCCESS,
   STATUS_REVEAL,
   STATUS_HIDE,
-} from '../actions/statuses';
+} from 'soapbox/actions/statuses';
 import {
   EMOJI_REACT_REQUEST,
   UNEMOJI_REACT_REQUEST,
-} from '../actions/emoji_reacts';
-import { TIMELINE_DELETE } from '../actions/timelines';
-import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
+} from 'soapbox/actions/emoji_reacts';
+import {
+  TIMELINE_REFRESH_SUCCESS,
+  TIMELINE_DELETE,
+  TIMELINE_EXPAND_SUCCESS,
+} from 'soapbox/actions/timelines';
+import {
+  NOTIFICATIONS_UPDATE,
+  NOTIFICATIONS_REFRESH_SUCCESS,
+  NOTIFICATIONS_EXPAND_SUCCESS,
+} from 'soapbox/actions/notifications';
+import {
+  STREAMING_TIMELINE_UPDATE,
+} from 'soapbox/actions/streaming';
+import {
+  FAVOURITED_STATUSES_FETCH_SUCCESS,
+  FAVOURITED_STATUSES_EXPAND_SUCCESS,
+} from 'soapbox/actions/favourites';
+import {
+  PINNED_STATUSES_FETCH_SUCCESS,
+} from 'soapbox/actions/pin_statuses';
+import { SEARCH_FETCH_SUCCESS } from '../actions/search';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts';
+import escapeTextContentForBrowser from 'escape-html';
+import emojify from 'soapbox/features/emoji/emoji';
 
-const importStatus = (state, status) => state.set(status.id, fromJS(status));
+const domParser = new DOMParser();
 
-const importStatuses = (state, statuses) =>
-  state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status)));
+const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
+  obj[`:${emoji.shortcode}:`] = emoji;
+  return obj;
+}, {});
+
+export function normalizeStatus(status, normalOldStatus, expandSpoilers) {
+  const normalStatus   = { ...status };
+
+  normalStatus.account = status.account.id;
+
+  if (status.reblog && status.reblog.id) {
+    normalStatus.reblog = status.reblog.id;
+  }
+
+  if (status.poll && status.poll.id) {
+    normalStatus.poll = status.poll.id;
+  }
+
+  // Only calculate these values when status first encountered
+  // Otherwise keep the ones already in the reducer
+  if (normalOldStatus) {
+    normalStatus.search_index = normalOldStatus.get('search_index');
+    normalStatus.contentHtml = normalOldStatus.get('contentHtml');
+    normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
+    normalStatus.hidden = normalOldStatus.get('hidden');
+  } else {
+    const spoilerText   = normalStatus.spoiler_text || '';
+    const searchContent = [spoilerText, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+    const emojiMap      = makeEmojiMap(normalStatus);
+
+    normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
+    normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
+    normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
+    normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+  }
+
+  return fromJS(normalStatus);
+}
+
+const importStatus = (state, status) => {
+  try {
+    return state.set(status.id, normalizeStatus(status));
+  } catch(e) {
+    // Skip broken statuses
+    console.warn(`Skipped broken status returned from the API: ${e}`);
+    console.warn(status);
+    return state;
+  }
+};
+
+const importStatuses = (state, statuses) => {
+  return state.withMutations(state => {
+    statuses.forEach(status => importStatus(state, status));
+  });
+};
 
 const deleteStatus = (state, id, references) => {
-  references.forEach(ref => {
-    state = deleteStatus(state, ref[0], []);
+  return state.withMutations(state => {
+    references.forEach(ref => deleteStatus(state, ref[0], []));
   });
-
-  return state.delete(id);
 };
 
 const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
   switch(action.type) {
-  case STATUS_IMPORT:
+  case STREAMING_TIMELINE_UPDATE:
+  case STATUS_FETCH_SUCCESS:
+  case NOTIFICATIONS_UPDATE:
+  case REBLOG_SUCCESS:
+  case UNREBLOG_SUCCESS:
+  case FAVOURITE_SUCCESS:
+  case UNFAVOURITE_SUCCESS:
+  case PIN_SUCCESS:
+  case UNPIN_SUCCESS:
     return importStatus(state, action.status);
-  case STATUSES_IMPORT:
+  case TIMELINE_REFRESH_SUCCESS:
+  case TIMELINE_EXPAND_SUCCESS:
+  case CONTEXT_FETCH_SUCCESS:
+  case NOTIFICATIONS_REFRESH_SUCCESS:
+  case NOTIFICATIONS_EXPAND_SUCCESS:
+  case FAVOURITED_STATUSES_FETCH_SUCCESS:
+  case FAVOURITED_STATUSES_EXPAND_SUCCESS:
+  case PINNED_STATUSES_FETCH_SUCCESS:
+  case SEARCH_FETCH_SUCCESS:
     return importStatuses(state, action.statuses);
   case FAVOURITE_REQUEST:
     return state.update(action.status.get('id'), status =>