Make sure encrypted messages aren't falsely matched as CSNs

dist/converse.js

@@ -82163,7 +82163,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       attrs = attrs.attributes;
     }
 
-    return attrs['chat_state'] && !attrs['oob_url'] && !attrs['file'] && !attrs['message'];
+    return attrs['chat_state'] && !attrs['oob_url'] && !attrs['file'] && !(attrs['is_encrypted'] && attrs['plaintext']) && !attrs['message'];
   };
 
   u.isHeadlineMessage = function (_converse, message) {

src/converse-chatview.js

@@ -682,7 +682,7 @@
                         }
                     }
                     const current_msg_date = moment(view.model.get('time')) || moment,
-                            previous_msg_date = this.getLastMessageDate(current_msg_date);
+                          previous_msg_date = this.getLastMessageDate(current_msg_date);
 
                     if (_.isNull(previous_msg_date)) {
                         this.content.insertAdjacentElement('afterbegin', view.el);

src/utils/core.js

@@ -602,6 +602,7 @@
         return attrs['chat_state'] &&
             !attrs['oob_url'] &&
             !attrs['file'] &&
+            !(attrs['is_encrypted'] && attrs['plaintext']) &&
             !attrs['message'];
     };