diff --git a/src/plugins/converse-rai.js b/src/plugins/converse-rai.js
index 4f185fec57bce72b3a5dbc0d4283e785d1634586..6b28cd24901010a609f5ef1a0957375401de06c3 100644
--- a/src/plugins/converse-rai.js
+++ b/src/plugins/converse-rai.js
@@ -86,14 +86,14 @@
 
             });
 
-            _converse.on('message', function (data)
+            _converse.api.listen.on('message', function (data)
             {
                 var chatbox = data.chatbox;
-                var message = data.stanza;
-                var history = message.querySelector('forwarded');
-                var body = message.querySelector('body');
+                var history = data.attrs.is_archived;
+                var sender = data.attrs.sender;
+                var body = data.attrs.body;
 
-                if (!history && body && chatbox)
+                if (!history && body && chatbox && sender !== 'me')
                 {
                     const alert = chatbox.get("num_unread") > 0;
                     const notify = chatbox.get("num_unread_general") > 0;