diff --git a/resources/js/app-webmail.js b/resources/js/app-webmail.js
new file mode 100644
index 0000000..4142bb8
--- /dev/null
+++ b/resources/js/app-webmail.js
@@ -0,0 +1,17 @@
+import axios from 'axios';
+window.axios = axios;
+window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+
+import '@tailwindplus/elements';
+import "@phosphor-icons/web/duotone";
+import "@phosphor-icons/web/light";
+import "@phosphor-icons/web/regular";
+import "@phosphor-icons/web/bold";
+
+import $ from "jquery";
+window.$ = $;
+window.jQuery = $;
+
+import './plugins/GlassToastra/toastra.glass.js';
+import './plugins/GlassToastra/livewire-adapter';
+import './utils/events.js';
diff --git a/resources/js/webserver/websocket.js b/resources/js/webserver/websocket.js
index 7c044e2..dcf7298 100644
--- a/resources/js/webserver/websocket.js
+++ b/resources/js/webserver/websocket.js
@@ -392,7 +392,6 @@ function renderOrUpdateToast(ev) {
 
 // Initiale Tasks aus dem Backend laden (damit Redirect-Toasts sichtbar bleiben)
 async function bootstrapToasts() {
-    if (document.querySelector('meta[name="mw-context"][content="webmail"]')) return;
     try {
         const res = await fetch('/ui/tasks/active', {
             credentials: 'same-origin',
diff --git a/resources/views/layouts/webmail-login.blade.php b/resources/views/layouts/webmail-login.blade.php
index ce7713a..88676ee 100644
--- a/resources/views/layouts/webmail-login.blade.php
+++ b/resources/views/layouts/webmail-login.blade.php
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $title ?? 'Webmail' }} · {{ config('app.name') }}</title>
-    <meta name="mw-context" content="webmail">
     @vite(['resources/css/app.css'])
     @livewireStyles
 </head>
@@ -41,7 +40,7 @@
 
     </div>
 
-@vite(['resources/js/app.js'])
+@vite(['resources/js/app-webmail.js'])
 @livewireScripts
 </body>
 </html>
diff --git a/resources/views/layouts/webmail.blade.php b/resources/views/layouts/webmail.blade.php
index 4502cfe..a41b9f2 100644
--- a/resources/views/layouts/webmail.blade.php
+++ b/resources/views/layouts/webmail.blade.php
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $title ?? 'Webmail' }} · {{ config('app.name') }}</title>
-    <meta name="mw-context" content="webmail">
     @vite(['resources/css/app.css'])
     @livewireStyles
     <style>
@@ -133,7 +132,7 @@ function wmOpenSidebar()  { document.getElementById('wm-sidebar').classList.add(
 function wmCloseSidebar() { document.getElementById('wm-sidebar').classList.remove('open'); document.getElementById('wm-overlay').style.display='none'; }
 </script>
 
-@vite(['resources/js/app.js'])
+@vite(['resources/js/app-webmail.js'])
 @livewireScripts
 </body>
 </html>
diff --git a/vite.config.js b/vite.config.js
index 57abc13..4c27bac 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -13,7 +13,7 @@ export default ({mode}) => {
     return defineConfig({
         plugins: [
             laravel({
-                input: ['resources/css/app.css', 'resources/js/app.js'],
+                input: ['resources/css/app.css', 'resources/js/app.js', 'resources/js/app-webmail.js'],
                 refresh: true,
             }),
             tailwindcss(),