diff --git a/src/components/Conversations/Conversations.vue b/src/components/Conversations/Conversations.vue
index 99531a99..410852a0 100644
--- a/src/components/Conversations/Conversations.vue
+++ b/src/components/Conversations/Conversations.vue
@@ -36,22 +36,22 @@
 
 <script>
 import Vue from 'vue';
-import { i18n } from '@/utils';
 import Hash from 'object-hash';
-import { Util, Api, SessionCache, TimeUtils } from '@/utils';
+import { Util, Api, i18n, SessionCache, TimeUtils } from '@/utils';
 import ConversationItem from './ConversationItem.vue';
 import DayLabel from './DayLabel.vue';
 import Spinner from '@/components/Spinner.vue';
+import unreadCountMixin from '@/mixins/unreadCountMixin.js';
 import joypixels from 'emoji-toolkit';
 
 export default {
     name: 'Conversations',
-
     components: {
         ConversationItem,
         DayLabel,
         Spinner
     },
+    mixins: [ unreadCountMixin ],
     props: ['small', 'index', 'folderId', 'folderName'],
 
     data () {
@@ -197,8 +197,6 @@ export default {
                 this.unFilteredAllConversations = response;
             }
 
-            let unreadCount = 0;
-
             const updatedConversations = [];
 
             const cache = [];
@@ -223,10 +221,6 @@ export default {
                     }
                 }
 
-                // Update unread count
-                if (!item.read && (!this.index || this.index == "index_public_unarchived"))
-                    unreadCount++;
-
                 updatedConversations.push(item);
 
                 // Save to contact cache
@@ -252,7 +246,7 @@ export default {
 
             // Set unread, only on unarchived public index
             if (!this.index || this.index == "index_public_unarchived")
-                this.$store.commit('unread_count', unreadCount);
+                this.updateUnreadCount();
 
             if (!this.small) {
                 this.$store.commit("loading", false);
@@ -281,10 +275,12 @@ export default {
                 return false;
             }
 
-            // Increment unread, only on unarchived public index
+            // Update unread, only on unarchived public index
+            // This check is probably not totally necessary, but it prevents
+            // unnecessarily calling updateUnreadCount
             if (conv.read != event_obj.read && !event_obj.read
                 && (!this.index || this.index == "index_public_unarchived"))
-                this.$store.commit('increment_unread_count'); // Increment unread
+                this.updateUnreadCount();
 
 
             // Generate new snippet
@@ -354,9 +350,9 @@ export default {
             if(!conv || !conv_index)
                 return false;
 
-            // Decrement unread, only on unarchived public index
+            // Update unread, only on unarchived public index
             if (!conv.read)
-                this.$store.commit('decrement_unread_count');
+                this.updateUnreadCount();
 
             conv.read = true;
             conv.hash = Hash(conv);
diff --git a/src/mixins/unreadCountMixin.js b/src/mixins/unreadCountMixin.js
new file mode 100644
index 00000000..d8a8c3cb
--- /dev/null
+++ b/src/mixins/unreadCountMixin.js
@@ -0,0 +1,11 @@
+import store from '@/store';
+
+export default {
+    methods: {
+        updateUnreadCount () {
+            const conversations = store.state.session_conversations.index_public_unarchived;
+            const newUnreadCount = conversations.reduce((count, conv) => count + (conv.read ? 0 : 1), 0);
+            store.commit('unread_count', newUnreadCount);
+        },
+    },
+};
diff --git a/src/store/state.js b/src/store/state.js
index 0471b7db..0fa74f06 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -93,8 +93,6 @@ export const mutations = {
     loading: (state, loading) => state.loading = loading,
     hotkey_navigation: (state, hotkey_navigation) => state.hotkey_navigation = hotkey_navigation,
     unread_count: (state, unread_count) => state.unread_count = unread_count,
-    increment_unread_count: (state) => state.unread_count++,
-    decrement_unread_count: (state) => state.unread_count--,
     full_theme: (state, full_theme) => state.full_theme = full_theme,
     sidebar_open: (state, sidebar_open) => state.sidebar_open = sidebar_open,
     account_id: (state, account_id) => state.account_id = account_id,
diff --git a/src/utils/cache_manager.js b/src/utils/cache_manager.js
index 5437c8e0..640a6241 100644
--- a/src/utils/cache_manager.js
+++ b/src/utils/cache_manager.js
@@ -68,7 +68,7 @@ export default class SessionCache {
 
     static putMessages (messages, conversation_id) {
         let sessionMessages = SessionCache.getAllMessages();
-        sessionMessages[conversation_id] = messages;
+        sessionMessages[conversation_id] = JSON.parse(JSON.stringify(messages));
 
         store.commit('session_messages', sessionMessages);
     }
@@ -225,6 +225,7 @@ export default class SessionCache {
         if (conversations != null) {
             for (let i = 0; i < conversations.length; i++) {
                 if (conversations[i].device_id == message.conversation_id) {
+                    conversations[i].read = message.read;
                     conversations[i].timestamp = message.timestamp;
                     conversations[i].snippet = message.mime_type.indexOf("text") > -1 ? message.data : "";
                     this.putConversations(this.resortConversations(conversations), 'index_public_unarchived');
@@ -237,6 +238,7 @@ export default class SessionCache {
         if (conversations != null) {
             for (let i = 0; i < conversations.length; i++) {
                 if (conversations[i].device_id == message.conversation_id) {
+                    conversations[i].read = message.read;
                     conversations[i].timestamp = message.timestamp;
                     conversations[i].snippet = message.mime_type.indexOf("text") > -1 ? message.data : "";
                     this.putConversations(this.resortConversations(conversations), 'index_archived');
@@ -249,6 +251,7 @@ export default class SessionCache {
         if (conversations != null) {
             for (let i = 0; i < conversations.length; i++) {
                 if (conversations[i].device_id == message.conversation_id) {
+                    conversations[i].read = message.read;
                     conversations[i].timestamp = message.timestamp;
                     conversations[i].snippet = message.mime_type.indexOf("text") > -1 ? message.data : "";
                     this.putConversations(this.resortConversations(conversations), 'index_private');