Ignore expireTimer on session reset messages

js/models/messages.js

@@ -394,6 +394,8 @@
                         } else if (dataMessage.expireTimer) {
                             message.set({expireTimer: dataMessage.expireTimer});
                         }
+
+                        if (!message.isEndSession()) {
                             if (dataMessage.expireTimer) {
                                 if (dataMessage.expireTimer !== conversation.get('expireTimer')) {
                                   conversation.addExpirationTimerUpdate(
@@ -404,6 +406,7 @@
                                 conversation.addExpirationTimerUpdate(0, source,
                                     message.get('received_at'));
                             }
+                        }
 
                         var conversation_timestamp = conversation.get('timestamp');
                         if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {