diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 88ce38953..acc1ff31d 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -76,7 +76,9 @@ const ChatMessage = {
       return !!this.message.user
     },
     author() {
-      const accountId = this.isStatus ? this.message.user.id : this.message.account_id
+      const accountId = this.isStatus
+        ? this.message.user.id
+        : this.message.account_id
 
       return this.$store.getters.findUser(accountId)
     },
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
index c91675e35..e610f627b 100644
--- a/src/components/draft/draft.vue
+++ b/src/components/draft/draft.vue
@@ -51,7 +51,7 @@
           @pause="$emit('mediapause', attachment.id)"
         />
         <div
-          v-if="draft.poll.options"
+          v-if="draft.poll?.options"
           class="poll-indicator-container"
           :title="$t('drafts.poll_tooltip')"
         >
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index a34e9a3ec..11aac3c1b 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -266,9 +266,9 @@ const PostStatusForm = {
     mentionsString() {
       if (this.statusType !== 'reply' && this.statusType !== 'mention')
         return ''
-      let allAttentions = [...(this.attentions || [])]
+      let allAttentions = [...(this.newStatus.mentions || [])]
 
-      allAttentions.unshift(this.repliedUser)
+      if (this.repliedUser) allAttentions.unshift(this.repliedUser)
 
       allAttentions = uniqBy(allAttentions, 'id')
       allAttentions = reject(allAttentions, { id: this.currentUser.id })
@@ -303,12 +303,11 @@ const PostStatusForm = {
 
       if (this.mentionsLine) {
         defaultNewStatus.status = statusText
-        defaultNewStatus.mentions = this.mentionsString.trim()
       } else {
         defaultNewStatus.status = this.mentionsString + statusText
-        defaultNewStatus.mentions = ''
       }
 
+      defaultNewStatus.mentions = this.attentions
       defaultNewStatus.spoilerText = this.repliedSubjectString ?? ''
       defaultNewStatus.nsfw = this.userDefaultSensitive
       defaultNewStatus.visibility = scope
@@ -591,7 +590,8 @@ const PostStatusForm = {
     // Composing
     onMentionsLineUpdate(e) {
       if (this.mentionsLineReadOnly) return
-      this.newStatus.mentionsLine = e
+      // TODO
+      //this.newStatus.mentions = e
     },
     changeVis(visibility) {
       this.newStatus.visibility = visibility
@@ -599,13 +599,13 @@ const PostStatusForm = {
     clearStatus() {
       this.saveInhibited = true
       this.newStatus.status = ''
-      ;(this.newStatus.mentionsLine = ''),
-        (this.newStatus.spoilerText = ''),
-        (this.newStatus.files = []),
-        (this.newStatus.poll = null),
-        (this.newStatus.quote = null),
-        (this.newStatus.mediaDescriptions = {}),
-        this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
+      this.newStatus.mentions = null
+      this.newStatus.spoilerText = ''
+      this.newStatus.files = []
+      this.newStatus.poll = null
+      this.newStatus.quote = null
+      this.newStatus.mediaDescriptions = {}
+      this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
       this.clearQuoteForm()
       if (this.preserveFocus) {
         this.$nextTick(() => {