diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js
index c7007bf..8391ac8 100644
--- a/src/render/components/messenger.js
+++ b/src/render/components/messenger.js
@@ -37,13 +37,9 @@ const Messenger = {
                 {
                     messages.value.push(update);
                 }
-                else if (update.category)
+                else
                 {
-                    search(update.message).content.push(update);
-                }
-                else if (update.context)
-                {
-                    search(update.message).context = update.context;
+                    messages.at(-1).content.push(update);
                 }
                 
             });
diff --git a/src/session.js b/src/session.js
index 9cd33ca..866debb 100644
--- a/src/session.js
+++ b/src/session.js
@@ -43,24 +43,19 @@ function handleMessageQueue()
             }
             else if (update.category)
             {
-                search(update.message).content.push(update);
+                ui.messages.at(-1).content.push(update)
             }
             else if (update.title)
             {
                 new Notification(update).show(); return;
             }
-            else if (update.context)
-            {
-                search(update.message).context = update.context;
-            }
+            else playback(...update); return;
 
             ipcEmit("message", update);
         }
     }
 }
 
-const search = (id) => ui.messages.find(m => m.id == id);
-
 function launchSession(account)
 {
     connectToPlatform(account);