diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 72e376648..6a7dbff9a 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,5 +1,4 @@
 import { useSearchStore } from 'src/stores/search.js'
-import { useUsersStore } from 'src/stores/users.js'
 
 /**
  * suggest - generates a suggestor function to be used by emoji-input
@@ -72,7 +71,7 @@ export const suggestEmoji = (emojis) => (input, nameKeywordLocalizer) => {
     })
 }
 
-export const suggestUsers = () => {
+export const suggestUsers = ({ dispatch, state }) => {
   // Keep some persistent values in closure, most importantly for the
   // custom debounce to work. Lodash debounce does not return a promise.
   let suggestions = []
@@ -108,7 +107,7 @@ export const suggestUsers = () => {
       await debounceUserSearch(noPrefix)
     }
 
-    const newSuggestions = [...useUsersStore().users.values()]
+    const newSuggestions = state.users.users
       .filter(
         (user) =>
           user.screen_name &&
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 749e0a12e..8230b0917 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -136,9 +136,6 @@ const Status = {
     status() {
       return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
     },
-    repeatedStatus() {
-      return useStatusesStore().allStatuses.get(this.status.retweeted_status.id)
-    },
     repeater() {
       return useUsersStore().findUser(this.status.user.id)
     },
@@ -167,7 +164,7 @@ const Status = {
     userClass() {
       return highlightClass(this.user)
     },
-    isDeleted() {
+    deleted() {
       return this.status.deleted
     },
     repeaterStyle() {
@@ -187,13 +184,11 @@ const Status = {
         const user = useUsersStore().findUser(
           this.mainStatus.in_reply_to_user_id,
         )
-
-        // User referenced in post might not be yet present in store
-        // since their data is not included in status data
-        return user?.statusnet_profile_url
+        // FIXME Why user not found sometimes???
+        return user ? user.statusnet_profile_url : 'NOT_FOUND'
       }
     },
-    isRepeat() {
+    retweet() {
       return !!this.status.retweeted_status
     },
     repeaterName() {
@@ -209,8 +204,8 @@ const Status = {
       )
     },
     mainStatus() {
-      if (this.isRepeat) {
-        return this.repeatedStatus
+      if (this.retweet) {
+        return this.status.retweeted_status
       } else {
         return this.status
       }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index f0b2f1277..a42432f25 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -22,7 +22,7 @@
       <div class="status-container muted">
         <small class="status-username">
           <FAIcon
-            v-if="muted && isRepeat"
+            v-if="muted && retweet"
             class="fa-scale-110 fa-old-padding repeat-icon"
             icon="retweet"
           />
@@ -47,7 +47,7 @@
     </template>
     <template v-else>
       <div
-        v-if="isRepeat && !noHeading && !inConversation"
+        v-if="retweet && !noHeading && !inConversation"
         :class="[repeaterClass, { highlighted: repeaterStyle }]"
         :style="[repeaterStyle]"
         class="status-container repeat-info"
@@ -91,8 +91,8 @@
       </div>
 
       <div
-        v-if="!isDeleted"
-        :class="[userClass, { highlighted: userStyle, '-repeat': isRepeat && !inConversation }]"
+        v-if="!deleted"
+        :class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
         :style="[ userStyle ]"
         class="status-container"
         :data-tags="tags"
@@ -542,7 +542,7 @@
           ref="postStatusForm"
           class="reply-body"
           :closeable="true"
-          :replied-status="mainStatus"
+          :replied-status="status"
           @posted="closeReplyForm"
           @draft-done="closeReplyForm"
           @close-accepted="closeReplyForm"
diff --git a/src/stores/statuses.js b/src/stores/statuses.js
index a08d1293b..91a3448a8 100644
--- a/src/stores/statuses.js
+++ b/src/stores/statuses.js
@@ -115,6 +115,7 @@ export const useStatusesStore = defineStore('statuses', {
           return addStatus(status)
         },
         retweet: (status) => {
+          // RetweetedStatuses are never shown immediately
           if (status.retweeted_status) addStatus(status.retweeted_status)
           return addStatus(status)
         },
@@ -142,11 +143,6 @@ export const useStatusesStore = defineStore('statuses', {
         timestamp,
       })
 
-      const { in_reply_to_user_id } = status
-      if (in_reply_to_user_id) {
-        useUsersStore().fetchUserIfMissing({ id: in_reply_to_user_id })
-      }
-
       existing.user = user // reactive update in case we return old
 
       // implicit: if oldTimestamp is undefined this will still be false
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
index ded412d4b..34fc57f79 100644
--- a/src/stores/timelines.js
+++ b/src/stores/timelines.js
@@ -158,7 +158,6 @@ export const useTimelinesStore = defineStore('timelines', {
       timeline.newStatusCount = 0
       timeline.maxId = ''
       timeline.minId = ''
-      timeline.flushMarker = 0
     },
     activatePersistents() {
       TIMELINES.forEach((name) => {