4 files changed, 28 insertions, 4 deletions
diff --git a/web/react/dispatcher/event_helpers.jsx b/web/react/dispatcher/event_helpers.jsx
index 306c59e8b..297555f38 100644
--- a/web/react/dispatcher/event_helpers.jsx
+++ b/web/react/dispatcher/event_helpers.jsx
@@ -148,3 +148,10 @@ export function emitClearSuggestions(suggestionId) {
         id: suggestionId
     });
 }
+
+export function emitPreferenceChangedEvent(preference) {
+    AppDispatcher.handleServerAction({
+        type: Constants.ActionTypes.RECIEVED_PREFERENCE,
+        preference
+    });
+}
diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx
index 068bc29c2..e6a1d8a2b 100644
--- a/web/react/stores/preference_store.jsx
+++ b/web/react/stores/preference_store.jsx
@@ -90,8 +90,8 @@ class PreferenceStoreClass extends EventEmitter {
         return preference;
     }
 
-    emitChange(preferences) {
-        this.emit(CHANGE_EVENT, preferences);
+    emitChange() {
+        this.emit(CHANGE_EVENT);
     }
 
     addChangeListener(callback) {
@@ -106,6 +106,12 @@ class PreferenceStoreClass extends EventEmitter {
         const action = payload.action;
 
         switch (action.type) {
+        case ActionTypes.RECIEVED_PREFERENCE: {
+            const preference = action.preference;
+            this.setPreference(preference.category, preference.name, preference.value);
+            this.emitChange();
+            break;
+        }
         case ActionTypes.RECIEVED_PREFERENCES: {
             const preferences = this.getAllPreferences();
 
@@ -114,7 +120,7 @@ class PreferenceStoreClass extends EventEmitter {
             }
 
             this.setAllPreferences(preferences);
-            this.emitChange(preferences);
+            this.emitChange();
             break;
         }
         }
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 29aa32a08..ee501c149 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -135,6 +135,10 @@ class SocketStoreClass extends EventEmitter {
             handleChannelViewedEvent(msg);
             break;
 
+        case SocketEvents.PREFERENCE_CHANGED:
+            handlePreferenceChangedEvent(msg);
+            break;
+
         default:
         }
     }
@@ -279,6 +283,11 @@ function handleChannelViewedEvent(msg) {
     }
 }
 
+function handlePreferenceChangedEvent(msg) {
+    const preference = JSON.parse(msg.props.preference);
+    EventHelpers.emitPreferenceChangedEvent(preference);
+}
+
 var SocketStore = new SocketStoreClass();
 
 /*SocketStore.dispatchToken = AppDispatcher.register((payload) => {
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 170a16049..27cf2b175 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -35,6 +35,7 @@ export default {
         RECIEVED_AUDITS: null,
         RECIEVED_TEAMS: null,
         RECIEVED_STATUSES: null,
+        RECIEVED_PREFERENCE: null,
         RECIEVED_PREFERENCES: null,
 
         RECIEVED_MSG: null,
@@ -74,7 +75,8 @@ export default {
         NEW_USER: 'new_user',
         USER_ADDED: 'user_added',
         USER_REMOVED: 'user_removed',
-        TYPING: 'typing'
+        TYPING: 'typing',
+        PREFERENCE_CHANGED: 'preference_changed'
     },
 
     //SPECIAL_MENTIONS: ['all', 'channel'],