2 files changed, 4 insertions, 2 deletions
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 226db0798b..027c80a1b6 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -213,7 +213,9 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService
         // The events are copied to avoid referencing the same event when adding
         // the message (circular json structures)
         if (isStateEvent || isLiveEvent) {
-            room.current_room_state.storeStateEvent(angular.copy(event));
+            var newEvent = angular.copy(event);
+            newEvent.cnt = event.content;
+            room.current_room_state.storeStateEvent(newEvent);
         }
         else if (!isLiveEvent) {
             // mutate the old room state
diff --git a/webclient/components/matrix/model-service.js b/webclient/components/matrix/model-service.js
index 7277ae347b..8b2ee877b1 100644
--- a/webclient/components/matrix/model-service.js
+++ b/webclient/components/matrix/model-service.js
@@ -46,7 +46,7 @@ angular.module('modelService', [])
             // every message must reference the RoomMember which made it *at
             // that time* so things like display names display correctly.
             var stateAtTheTime = toFront ? this.old_room_state : this.current_room_state;
-            event.room_member = stateAtTheTime.getStateEvent("m.room.member", event.user_id);
+            event.__room_member = stateAtTheTime.getStateEvent("m.room.member", event.user_id);
             if (event.type === "m.room.member" && event.content.membership === "invite") {
                 // give information on both the inviter and invitee
                 event.__target_room_member = stateAtTheTime.getStateEvent("m.room.member", event.state_key);