diff --git a/src/plugins/converse-rai.js b/src/plugins/converse-rai.js
index 4f185fec57bce72b3a5dbc0d4283e785d1634586..e4c837c890a63d7d4762024869d6fe1e623fb714 100644
--- a/src/plugins/converse-rai.js
+++ b/src/plugins/converse-rai.js
@@ -88,7 +88,8 @@
 
             _converse.on('message', function (data)
             {
-                var chatbox = data.chatbox;
+                var bareFrom = Strophe.getBareJidFromJid(message.getAttributes("from"));
+                var chatbox = _converse.chatboxes.get(bareFrom);
                 var message = data.stanza;
                 var history = message.querySelector('forwarded');
                 var body = message.querySelector('body');