3 files changed, 17 insertions, 3 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index dd5e5217..2838e102 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -287,7 +287,11 @@ const EmojiPicker = {
       return 0
     },
     allCustomGroups () {
-      return this.$store.getters.groupedCustomEmojis
+      const emojis = this.$store.getters.groupedCustomEmojis
+      if (emojis.unpacked) {
+        emojis.unpacked.text = this.$t('emoji.unpacked')
+      }
+      return emojis
     },
     defaultGroup () {
       return Object.keys(this.allCustomGroups)[0]
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index c22d1323..c33659df 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -95,10 +95,10 @@ const ListsNew = {
       return this.addedUserIds.has(user.id)
     },
     addUser (user) {
-      this.$store.dispatch('addListAccount', { accountId: this.user.id, listId: this.id })
+      this.$store.dispatch('addListAccount', { accountId: user.id, listId: this.id })
     },
     removeUser (userId) {
-      this.$store.dispatch('removeListAccount', { accountId: this.user.id, listId: this.id })
+      this.$store.dispatch('removeListAccount', { accountId: userId, listId: this.id })
     },
     onSearchLoading (results) {
       this.searchLoading = true
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue
index e3b7f407..48356c9b 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.vue
+++ b/src/components/settings_modal/tabs/data_import_export_tab.vue
@@ -78,6 +78,16 @@
                 {{ $t('settings.download_backup') }}
               </a>
               <span
+                v-else-if="backup.state === 'running'"
+              >
+                {{ $tc('settings.backup_running', backup.processed_number, { number: backup.processed_number }) }}
+              </span>
+              <span
+                v-else-if="backup.state === 'failed'"
+              >
+                {{ $t('settings.backup_failed') }}
+              </span>
+              <span
                 v-else
               >
                 {{ $t('settings.backup_not_ready') }}