diff --git a/__mocks__/@wireapp/core.ts b/__mocks__/@wireapp/core.ts
index ef293db93b1..72a24543d90 100644
--- a/__mocks__/@wireapp/core.ts
+++ b/__mocks__/@wireapp/core.ts
@@ -113,4 +113,11 @@ export const util = {
   TaskScheduler,
 };
 
+export enum ConnectionState {
+  CLOSED = 'closed',
+  CONNECTING = 'connecting',
+  PROCESSING_NOTIFICATIONS = 'processing_notifications',
+  LIVE = 'live',
+}
+
 export {Ciphersuite} from '@wireapp/core-crypto';
diff --git a/package.json b/package.json
index b3b4b16dfef..c4ef2adb742 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,10 @@
     "@mediapipe/tasks-vision": "0.10.21",
     "@tanstack/react-table": "8.21.3",
     "@tanstack/react-virtual": "3.13.4",
-    "@wireapp/avs": "10.2.17",
+    "@wireapp/avs": "10.2.19",
     "@wireapp/avs-debugger": "0.0.7",
     "@wireapp/commons": "5.4.9",
-    "@wireapp/core": "46.46.3",
+    "@wireapp/core": "^46.46.6-beta.9.457c85ad6",
     "@wireapp/kalium-backup": "0.0.4",
     "@wireapp/promise-queue": "2.4.9",
     "@wireapp/react-ui-kit": "9.69.6",
@@ -27,11 +27,11 @@
     "beautiful-react-hooks": "5.0.3",
     "classnames": "2.5.1",
     "copy-webpack-plugin": "13.0.1",
-    "core-js": "3.46.0",
+    "core-js": "3.47.0",
     "date-fns": "4.1.0",
     "dexie-batch": "0.4.3",
     "dexie-encrypted": "2.0.0",
-    "emoji-picker-react": "4.15.1",
+    "emoji-picker-react": "4.15.2",
     "http-status-codes": "2.3.0",
     "immer": "10.2.0",
     "jimp": "0.22.12",
@@ -39,13 +39,13 @@
     "jszip": "3.10.1",
     "keyboardjs": "2.7.0",
     "knockout": "3.5.1",
-    "lexical": "0.27.2",
+    "lexical": "0.38.2",
     "libsodium-wrappers": "0.7.15",
     "linkify-it": "5.0.0",
     "long": "5.3.2",
     "markdown-it": "14.0.0",
     "murmurhash": "2.0.1",
-    "oidc-client-ts": "3.4.0",
+    "oidc-client-ts": "3.4.1",
     "path-to-regexp": "8.3.0",
     "platform": "1.3.6",
     "prism-themes": "^1.9.0",
@@ -123,7 +123,7 @@
     "autoprefixer": "10.4.22",
     "babel-loader": "10.0.0",
     "babel-plugin-transform-import-meta": "2.3.3",
-    "baseline-browser-mapping": "^2.8.28",
+    "baseline-browser-mapping": "^2.8.31",
     "browserslist": "^4.28.0",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
@@ -135,7 +135,7 @@
     "eslint-plugin-prettier": "5.1.3",
     "fake-indexeddb": "6.2.5",
     "generate-changelog": "1.8.0",
-    "html-webpack-plugin": "5.6.4",
+    "html-webpack-plugin": "5.6.5",
     "husky": "9.1.7",
     "i18next-scanner": "4.6.0",
     "intersection-observer": "0.12.2",
@@ -164,19 +164,19 @@
     "simple-git": "3.30.0",
     "sinon": "18.0.0",
     "style-loader": "4.0.0",
-    "stylelint": "16.25.0",
+    "stylelint": "16.26.0",
     "stylelint-config-idiomatic-order": "10.0.0",
     "svg-inline-loader": "0.8.2",
     "text-encoding": "0.7.0",
     "ts-node": "10.9.2",
     "tsc-watch": "6.2.1",
     "typescript": "5.5.2",
-    "webpack": "5.102.1",
+    "webpack": "5.103.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "6.0.1",
     "webpack-dev-middleware": "7.4.5",
     "webpack-hot-middleware": "2.26.1",
-    "workbox-webpack-plugin": "7.3.0"
+    "workbox-webpack-plugin": "7.4.0"
   },
   "engines": {
     "yarn": ">= 4.1.1",
@@ -237,7 +237,8 @@
     "xml2js": "0.5.0",
     "@stablelib/utf8": "1.0.2",
     "dexie-encrypted@2.0.0": "patch:dexie-encrypted@npm%3A2.0.0#./.yarn/patches/dexie-encrypted-npm-2.0.0-eb61eb5975.patch",
-    "axios": "^1.9.0"
+    "axios": "^1.9.0",
+    "js-yaml": "^4.1.0"
   },
   "version": "0.27.0",
   "packageManager": "yarn@4.1.1"
diff --git a/server/package.json b/server/package.json
index 4e645f0c470..3f7cbae30b4 100644
--- a/server/package.json
+++ b/server/package.json
@@ -20,7 +20,7 @@
     "maxmind": "4.3.10",
     "nocache": "4.0.0",
     "opn": "6.0.0",
-    "pm2": "6.0.13"
+    "pm2": "6.0.14"
   },
   "devDependencies": {
     "@types/express": "4.17.21",
@@ -33,7 +33,7 @@
     "@types/node": "22.5.5",
     "browserslist": "^4.28.0",
     "jest": "29.7.0",
-    "rimraf": "6.1.0",
+    "rimraf": "6.1.2",
     "typescript": "5.6.3"
   },
   "resolutions": {
diff --git a/server/yarn.lock b/server/yarn.lock
index a776c859411..3b1893853e9 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -797,7 +797,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pm2/pm2-version-check@npm:latest":
+"@pm2/pm2-version-check@npm:^1.0.4":
   version: 1.0.4
   resolution: "@pm2/pm2-version-check@npm:1.0.4"
   dependencies:
@@ -3623,26 +3623,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:4.1.0":
-  version: 4.1.0
-  resolution: "js-yaml@npm:4.1.0"
+"js-yaml@npm:4.1.1":
+  version: 4.1.1
+  resolution: "js-yaml@npm:4.1.1"
   dependencies:
     argparse: "npm:^2.0.1"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 10/c138a34a3fd0d08ebaf71273ad4465569a483b8a639e0b118ff65698d257c2791d3199e3f303631f2cb98213fa7b5f5d6a4621fd0fff819421b990d30d967140
+  checksum: 10/a52d0519f0f4ef5b4adc1cde466cb54c50d56e2b4a983b9d5c9c0f2f99462047007a6274d7e95617a21d3c91fde3ee6115536ed70991cd645ba8521058b78f77
   languageName: node
   linkType: hard
 
 "js-yaml@npm:^3.13.1":
-  version: 3.14.1
-  resolution: "js-yaml@npm:3.14.1"
+  version: 3.14.2
+  resolution: "js-yaml@npm:3.14.2"
   dependencies:
     argparse: "npm:^1.0.7"
     esprima: "npm:^4.0.0"
   bin:
     js-yaml: bin/js-yaml.js
-  checksum: 10/9e22d80b4d0105b9899135365f746d47466ed53ef4223c529b3c0f7a39907743fdbd3c4379f94f1106f02755b5e90b2faaf84801a891135544e1ea475d1a1379
+  checksum: 10/172e0b6007b0bf0fc8d2469c94424f7dd765c64a047d2b790831fecef2204a4054eabf4d911eb73ab8c9a3256ab8ba1ee8d655b789bf24bf059c772acc2075a1
   languageName: node
   linkType: hard
 
@@ -4525,15 +4525,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pm2@npm:6.0.13":
-  version: 6.0.13
-  resolution: "pm2@npm:6.0.13"
+"pm2@npm:6.0.14":
+  version: 6.0.14
+  resolution: "pm2@npm:6.0.14"
   dependencies:
     "@pm2/agent": "npm:~2.1.1"
     "@pm2/blessed": "npm:0.1.81"
     "@pm2/io": "npm:~6.1.0"
     "@pm2/js-api": "npm:~0.8.0"
-    "@pm2/pm2-version-check": "npm:latest"
+    "@pm2/pm2-version-check": "npm:^1.0.4"
     ansis: "npm:4.0.0-node10"
     async: "npm:3.2.6"
     chokidar: "npm:3.6.0"
@@ -4545,7 +4545,7 @@ __metadata:
     enquirer: "npm:2.3.6"
     eventemitter2: "npm:5.0.1"
     fclone: "npm:1.0.11"
-    js-yaml: "npm:4.1.0"
+    js-yaml: "npm:4.1.1"
     mkdirp: "npm:1.0.4"
     needle: "npm:2.4.0"
     pidusage: "npm:3.0.2"
@@ -4567,7 +4567,7 @@ __metadata:
     pm2-dev: bin/pm2-dev
     pm2-docker: bin/pm2-docker
     pm2-runtime: bin/pm2-runtime
-  checksum: 10/6743d91fc52413ed2e7e1764769e95f8db5916c9d75f2f8066014372fa304933a53284e39806f6e8cb58754e115ddd6a8c431b3fff1215d1136c6215db46a5de
+  checksum: 10/7211b4647c993d295e52f9a11fa2f604fd4dd1149b264beadde69d0c1739839230ce038c9081a9c8adaac8d632e0eb64ddcd02e10f9d8c2512da4e02e5d4df3b
   languageName: node
   linkType: hard
 
@@ -4796,15 +4796,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:6.1.0":
-  version: 6.1.0
-  resolution: "rimraf@npm:6.1.0"
+"rimraf@npm:6.1.2":
+  version: 6.1.2
+  resolution: "rimraf@npm:6.1.2"
   dependencies:
-    glob: "npm:^11.0.3"
+    glob: "npm:^13.0.0"
     package-json-from-dist: "npm:^1.0.1"
   bin:
     rimraf: dist/esm/bin.mjs
-  checksum: 10/ce376c041ef4212dce2b30690dff3c09fc34253ec21821dffec77731061241888c04c3baf0b052bc5a1698b9f348c08ef83bddbd6e2553e79bf939bedb1a31a9
+  checksum: 10/add8e566fe903f59d7b55c6c2382320c48302778640d1951baf247b3b451af496c2dee7195c204a8c646fd6327feadd1f5b61ce68c1362d4898075a726d83cc6
   languageName: node
   linkType: hard
 
@@ -5554,8 +5554,8 @@ __metadata:
     maxmind: "npm:4.3.10"
     nocache: "npm:4.0.0"
     opn: "npm:6.0.0"
-    pm2: "npm:6.0.13"
-    rimraf: "npm:6.1.0"
+    pm2: "npm:6.0.14"
+    rimraf: "npm:6.1.2"
     typescript: "npm:5.6.3"
   languageName: unknown
   linkType: soft
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index b4b5dbc0845..45f60d255d5 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -270,6 +270,8 @@
   "authLoginTitle": "Log in",
   "authPlaceholderEmail": "Email",
   "authPlaceholderPassword": "Password",
+  "showTogglePasswordLabel": "Show password",
+  "hideTogglePasswordLabel": "Hide password",
   "authPostedResend": "Resend to {email}",
   "authPostedResendAction": "No email showing up?",
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
@@ -1969,6 +1971,8 @@
   "verify.headline": "You’ve got mail",
   "verify.resendCode": "Resend code",
   "verify.subhead": "Enter the six-digit verification code we sent to{newline}{email}",
+  "verify.codeLabel": "Six-digit code",
+  "verify.codePlaceholder": "Input field, enter digit",
   "videoCallMenuMoreAddReaction": "Add reaction",
   "videoCallMenuMoreAudioSettings": "Audio Settings",
   "videoCallMenuMoreChangeView": "Change view",
diff --git a/src/script/auth/component/AccountForm.tsx b/src/script/auth/component/AccountForm.tsx
index c20b3aa7e86..40e65d4a014 100644
--- a/src/script/auth/component/AccountForm.tsx
+++ b/src/script/auth/component/AccountForm.tsx
@@ -248,6 +248,8 @@ const AccountFormComponent = ({
           placeholder={t('accountForm.passwordPlaceholder')}
           pattern={ValidationUtil.getNewPasswordPattern(Config.getConfig().NEW_PASSWORD_MINIMUM_LENGTH)}
           data-uie-name="enter-password"
+          showTogglePasswordLabel={t('showTogglePasswordLabel')}
+          hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
         />
         <Text muted css={styles.passwordInfo(!!validationErrors.length)} data-uie-name="element-password-help">
           {t('accountForm.passwordHelp', {minPasswordLength: String(Config.getConfig().NEW_PASSWORD_MINIMUM_LENGTH)})}
@@ -269,6 +271,8 @@ const AccountFormComponent = ({
           placeholder={t('accountForm.confirmPasswordPlaceholder')}
           pattern={`^${registrationData.password?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`}
           data-uie-name="enter-confirm-password"
+          showTogglePasswordLabel={t('showTogglePasswordLabel')}
+          hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
         />
 
         <Exception errors={[authError, ...validationErrors]} />
diff --git a/src/script/auth/component/BackButton.tsx b/src/script/auth/component/BackButton.tsx
index 31284face23..3bdf333bbb0 100644
--- a/src/script/auth/component/BackButton.tsx
+++ b/src/script/auth/component/BackButton.tsx
@@ -27,12 +27,14 @@ export const BackButton = () => {
   const navigate = useNavigate();
 
   return (
-    <ArrowIcon
+    <button
+      type="button"
       onClick={() => navigate(-1)}
-      direction="left"
-      data-uie-name="go-index"
       aria-label={t('createPersonalAccount.goBack')}
-      color={COLOR.TEXT}
-    />
+      data-uie-name="go-index"
+      css={{background: 'none', border: 'none', cursor: 'pointer'}}
+    >
+      <ArrowIcon direction="left" aria-hidden="true" focusable="false" color={COLOR.TEXT} />
+    </button>
   );
 };
diff --git a/src/script/auth/component/ClientItem.tsx b/src/script/auth/component/ClientItem.tsx
index 8e88f04ade6..54d2922650e 100644
--- a/src/script/auth/component/ClientItem.tsx
+++ b/src/script/auth/component/ClientItem.tsx
@@ -311,6 +311,8 @@ const ClientItem = ({selected, onClientRemoval, onClick, client, clientError, re
                     placeholder={t('clientItem.passwordPlaceholder')}
                     required
                     type="password"
+                    showTogglePasswordLabel={t('showTogglePasswordLabel')}
+                    hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
                     value={password}
                   />
                 </FlexBox>
diff --git a/src/script/auth/component/JoinGuestLinkPasswordModal.tsx b/src/script/auth/component/JoinGuestLinkPasswordModal.tsx
index 847cbae8aa8..7301a687f30 100644
--- a/src/script/auth/component/JoinGuestLinkPasswordModal.tsx
+++ b/src/script/auth/component/JoinGuestLinkPasswordModal.tsx
@@ -83,6 +83,8 @@ const JoinGuestLinkPasswordModal = ({
             id="guest_link_join_password"
             className="modal__input"
             type="password"
+            showTogglePasswordLabel={t('showTogglePasswordLabel')}
+            hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
             autoComplete="off"
             value={passwordValue}
             onChange={event => setPasswordValue(event.currentTarget.value)}
diff --git a/src/script/auth/component/LoginForm.tsx b/src/script/auth/component/LoginForm.tsx
index e7fef114d0e..d13d698e708 100644
--- a/src/script/auth/component/LoginForm.tsx
+++ b/src/script/auth/component/LoginForm.tsx
@@ -140,6 +140,8 @@ const LoginForm = ({isFetching, onSubmit}: LoginFormProps) => {
         pattern={'.{1,1024}'}
         required
         data-uie-name="enter-password"
+        showTogglePasswordLabel={t('showTogglePasswordLabel')}
+        hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
       />
 
       {isFetching ? (
diff --git a/src/script/auth/component/RouteA11y.tsx b/src/script/auth/component/RouteA11y.tsx
new file mode 100644
index 00000000000..f9706be1535
--- /dev/null
+++ b/src/script/auth/component/RouteA11y.tsx
@@ -0,0 +1,25 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useRouteA11y} from '../hooks/useRouteA11y';
+
+export const RouteA11y: React.FC = (): null => {
+  useRouteA11y();
+  return null;
+};
diff --git a/src/script/auth/hooks/useRouteA11y.ts b/src/script/auth/hooks/useRouteA11y.ts
new file mode 100644
index 00000000000..df390968504
--- /dev/null
+++ b/src/script/auth/hooks/useRouteA11y.ts
@@ -0,0 +1,53 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useLocation} from 'react-router-dom';
+
+export function useRouteA11y(screenKey?: string) {
+  const location = useLocation();
+
+  useEffect(() => {
+    const focusTarget: HTMLElement | null =
+      document.querySelector<HTMLElement>('[data-page-title]') ||
+      document.querySelector<HTMLElement>('main,[role="main"]') ||
+      document.querySelector<HTMLElement>('h1');
+
+    if (!focusTarget) {
+      return;
+    }
+
+    // scroll to top on each route change
+    window.scrollTo({top: 0, left: 0});
+
+    const element = focusTarget;
+    element.setAttribute('tabindex', '-1');
+    element.classList.add('sr-only-focus');
+    element.focus({preventScroll: true});
+
+    // remove tabindex after blur
+    const handleBlur = () => {
+      element.classList.remove('sr-only-focus');
+      element.removeAttribute('tabindex');
+      element.removeEventListener('blur', handleBlur);
+    };
+    element.addEventListener('blur', handleBlur);
+  }, [location.key, screenKey]);
+}
diff --git a/src/script/auth/page/CreatePersonalAccount.tsx b/src/script/auth/page/CreatePersonalAccount.tsx
index 77e870b17a7..1f034f9ceb2 100644
--- a/src/script/auth/page/CreatePersonalAccount.tsx
+++ b/src/script/auth/page/CreatePersonalAccount.tsx
@@ -51,7 +51,9 @@ export const CreatePersonalAccount = () => {
             <div css={styles.backButtonContainer}>
               <BackButton />
             </div>
-            <p css={styles.header}>{t('createPersonalAccount.headLine')}</p>
+            <p css={styles.header} role="heading" aria-level={1} data-page-title tabIndex={-1}>
+              {t('createPersonalAccount.headLine')}
+            </p>
             <AccountForm onSubmit={onSubmit} />
             <p css={styles.footer}>{t('createPersonalAccount.subHeader')}</p>
             <a css={styles.teamCreateButton} href={EXTERNAL_ROUTE.WIRE_TEAMS_SIGNUP} target="_blank" rel="noreferrer">
diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx
index 42d6c6ab6b7..6eb660bc06b 100644
--- a/src/script/auth/page/Login.tsx
+++ b/src/script/auth/page/Login.tsx
@@ -23,12 +23,14 @@ import {LoginData} from '@wireapp/api-client/lib/auth';
 import {ClientType} from '@wireapp/api-client/lib/client/index';
 import {BackendError, BackendErrorLabel, SyntheticErrorLabel} from '@wireapp/api-client/lib/http/';
 import {StatusCodes} from 'http-status-codes';
+import {FormattedMessage} from 'react-intl';
 import {connect} from 'react-redux';
 import {useNavigate} from 'react-router-dom';
 import {AnyAction, Dispatch} from 'redux';
 
 import {Runtime, UrlUtil} from '@wireapp/commons';
 import {
+  ActionLinkButton,
   Button,
   ButtonVariant,
   Checkbox,
@@ -49,7 +51,6 @@ import {
   QUERY,
   QueryKeys,
   Text,
-  TextLink,
   useMatchMedia,
 } from '@wireapp/react-ui-kit';
 
@@ -61,6 +62,7 @@ import {isBackendError} from 'Util/TypePredicateUtil';
 import {EntropyContainer} from './EntropyContainer';
 import {separator} from './Login.styles';
 import {Page} from './Page';
+import {styles} from './VerifyEmailCode.styles';
 
 import {Config} from '../../Config';
 import {AccountAlreadyExistsModal} from '../component/AccountAlreadyExistsModal';
@@ -70,6 +72,7 @@ import {Exception} from '../component/Exception';
 import {JoinGuestLinkPasswordModal} from '../component/JoinGuestLinkPasswordModal';
 import {LoginForm} from '../component/LoginForm';
 import {EXTERNAL_ROUTE} from '../externalRoute';
+import {useRouteA11y} from '../hooks/useRouteA11y';
 import {actionRoot} from '../module/action/';
 import {LabeledError} from '../module/action/LabeledError';
 import {ValidationError} from '../module/action/ValidationError';
@@ -129,6 +132,11 @@ const LoginComponent = ({
 
   const isOauth = UrlUtil.hasURLParameter(QUERY_KEY.SCOPE, window.location.hash);
 
+  const [routeAction, setRouteAction] = useState<'login' | 'verify'>('login');
+
+  // this triggers the hook every time screen changes under the same route
+  useRouteA11y(routeAction);
+
   const {
     ENABLE_ACCOUNT_REGISTRATION: isAccountRegistrationEnabled,
     ENABLE_DOMAIN_DISCOVERY: isDomainDiscoveryEnabled,
@@ -296,6 +304,7 @@ const LoginComponent = ({
             if (login.email || login.handle) {
               await doSendTwoFactorCode(login.email || login.handle || '');
               setTwoFactorLoginData(login);
+              setRouteAction('verify');
               await doSetLocalStorage(QUERY_KEY.JOIN_EXPIRES, Date.now() + 1000 * 60 * 10);
             }
             break;
@@ -423,11 +432,26 @@ const LoginComponent = ({
               >
                 {twoFactorLoginData ? (
                   <div>
-                    <Text fontSize="1.5rem" css={{fontWeight: '500'}} center block>
+                    <Text
+                      fontSize="1.5rem"
+                      css={{fontWeight: '500'}}
+                      center
+                      block
+                      role="heading"
+                      aria-level={1}
+                      data-page-title
+                      tabIndex={-1}
+                    >
                       {t('login.twoFactorLoginTitle')}
                     </Text>
-                    <Text data-uie-name="label-with-email" fontSize="1rem">
-                      {t('login.twoFactorLoginSubHead', {email: twoFactorLoginData.email as string})}
+                    <Text block data-uie-name="label-with-email" fontSize="1rem" css={styles.subhead}>
+                      <FormattedMessage
+                        id="login.twoFactorLoginSubHead"
+                        values={{
+                          email: twoFactorLoginData.email as string,
+                          newline: <br />,
+                        }}
+                      />
                     </Text>
                     <Label markInvalid={!!twoFactorSubmitError}>
                       <CodeInput
@@ -435,6 +459,8 @@ const LoginComponent = ({
                         style={{marginTop: '1rem'}}
                         onCodeComplete={submitTwoFactorLogin}
                         data-uie-name="enter-code"
+                        codeInputLabel={t('verify.codeLabel')}
+                        codePlaceholder={t('verify.codePlaceholder')}
                       />
                     </Label>
                     <div style={{display: 'flex', justifyContent: 'center', marginTop: 10}}>
@@ -444,9 +470,13 @@ const LoginComponent = ({
                       {isSendingTwoFactorCode ? (
                         <Loading size={20} />
                       ) : (
-                        <TextLink onClick={resendTwoFactorCode} center data-uie-name="do-resend-code">
+                        <ActionLinkButton
+                          onClick={resendTwoFactorCode}
+                          data-uie-name="do-resend-code"
+                          css={styles.resendLink}
+                        >
                           {t('verify.resendCode')}
-                        </TextLink>
+                        </ActionLinkButton>
                       )}
                     </div>
                     <FlexBox justify="center">
@@ -464,11 +494,17 @@ const LoginComponent = ({
                   <>
                     <div>
                       {isEnterpriseLoginV2Enabled ? (
-                        <div css={{fontWeight: '500', fontSize: '1.5rem', marginBottom: '2rem'}}>
+                        <div
+                          css={{fontWeight: '500', fontSize: '1.5rem', marginBottom: '2rem'}}
+                          role="heading"
+                          aria-level={1}
+                          data-page-title
+                          tabIndex={-1}
+                        >
                           {t('index.welcome', {brandName: Config.getConfig().BACKEND_NAME})}
                         </div>
                       ) : (
-                        <Heading level={embedded ? '2' : '1'} center>
+                        <Heading level={embedded ? '2' : '1'} center data-page-title tabIndex={-1}>
                           {t('login.headline')}
                         </Heading>
                       )}
diff --git a/src/script/auth/page/Root.tsx b/src/script/auth/page/Root.tsx
index 5c1ebe6d248..a3b0dff6706 100644
--- a/src/script/auth/page/Root.tsx
+++ b/src/script/auth/page/Root.tsx
@@ -50,6 +50,7 @@ import {VerifyEmailCode} from './VerifyEmailCode';
 import {VerifyEmailLink} from './VerifyEmailLink';
 
 import {Config} from '../../Config';
+import {RouteA11y} from '../component/RouteA11y';
 import {mapLanguage, normalizeLanguage} from '../localeConfig';
 import {actionRoot as ROOT_ACTIONS} from '../module/action/';
 import {bindActionCreators, RootState} from '../module/reducer';
@@ -73,6 +74,15 @@ const RootComponent: FC<RootProps & ConnectedProps & DispatchProps> = ({
   isFetchingSSOSettings,
   doGetSSOSettings,
 }) => {
+  // Injects the helper class used by useRouteA11y so programmatic focus targets (for screen readers)
+  // lose their outlines while the focus trap is active.
+  useEffect(() => {
+    const style = document.createElement('style');
+    style.textContent = `.sr-only-focus:focus, .sr-only-focus:focus-visible { outline: none !important; }`;
+    document.head.appendChild(style);
+    return () => style.remove();
+  }, []);
+
   useEffect(() => {
     // Force the hash url to have a initial `/` (see https://stackoverflow.com/a/71864506)
     const forceSlashAfterHash = () => {
@@ -146,6 +156,7 @@ const RootComponent: FC<RootProps & ConnectedProps & DispatchProps> = ({
           </ContainerXS>
         ) : (
           <Router>
+            <RouteA11y />
             <Routes>
               <Route
                 path={ROUTE.INDEX}
diff --git a/src/script/auth/page/SetAccountType.tsx b/src/script/auth/page/SetAccountType.tsx
index e2576a72bd2..e3516bf0629 100644
--- a/src/script/auth/page/SetAccountType.tsx
+++ b/src/script/auth/page/SetAccountType.tsx
@@ -81,7 +81,9 @@ export const SetAccountType = () => {
           <FlexBox css={styles.headerIcon}>
             <BackButton />
           </FlexBox>
-          <FlexBox css={styles.headerText}>{t('selectAccountTypeHeading')}</FlexBox>
+          <FlexBox css={styles.headerText} role="heading" aria-level={1} data-page-title tabIndex={-1}>
+            {t('selectAccountTypeHeading')}
+          </FlexBox>
         </FlexBox>
         <FlexBox css={styles.optionWrapper}>
           {accountTypeOptions.map((option, index) => (
diff --git a/src/script/auth/page/SetPassword.tsx b/src/script/auth/page/SetPassword.tsx
index 770297117ad..954062054fc 100644
--- a/src/script/auth/page/SetPassword.tsx
+++ b/src/script/auth/page/SetPassword.tsx
@@ -91,6 +91,8 @@ const SetPasswordComponent = ({
             name="password"
             placeholder={t('setPassword.passwordPlaceholder')}
             type="password"
+            showTogglePasswordLabel={t('showTogglePasswordLabel')}
+            hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
             markInvalid={!isValidPassword}
             onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
               passwordInput.current.setCustomValidity('');
diff --git a/src/script/auth/page/SingleSignOn.tsx b/src/script/auth/page/SingleSignOn.tsx
index f41b641def4..06e5ac31f09 100644
--- a/src/script/auth/page/SingleSignOn.tsx
+++ b/src/script/auth/page/SingleSignOn.tsx
@@ -259,7 +259,13 @@ const SingleSignOnComponent = ({hasDefaultSSOCode}: Props & ConnectedProps & Dis
               <div>
                 {isEnterpriseLoginV2Enabled ? (
                   <>
-                    <div css={{fontWeight: '500', fontSize: '1.5rem'}}>
+                    <div
+                      css={{fontWeight: '500', fontSize: '1.5rem'}}
+                      role="heading"
+                      aria-level={1}
+                      data-page-title
+                      tabIndex={-1}
+                    >
                       {t('index.welcome', {brandName: Config.getConfig().BACKEND_NAME})}
                     </div>
 
diff --git a/src/script/auth/page/Success.tsx b/src/script/auth/page/Success.tsx
index 6796357abef..e175250602a 100644
--- a/src/script/auth/page/Success.tsx
+++ b/src/script/auth/page/Success.tsx
@@ -21,7 +21,7 @@ import {useEffect} from 'react';
 
 import {SuccessShield} from '@wireapp/react-ui-kit/lib/Images/SuccessShield';
 
-import {FlexBox, Text, TextLink} from '@wireapp/react-ui-kit';
+import {ActionLinkButton, FlexBox, Text} from '@wireapp/react-ui-kit';
 
 import {Config} from 'src/script/Config';
 import {t} from 'Util/LocalizerUtil';
@@ -56,21 +56,21 @@ export const Success = () => {
             {t('success.subheader')}
           </Text>
 
-          <TextLink
+          <ActionLinkButton
             data-uie-name="do-download-wire"
             onClick={() => secureOpen(pathWithParams(Config.getConfig().GET_WIRE_URL))}
             css={styles.link}
           >
             {t('success.downloadButton')}
-          </TextLink>
+          </ActionLinkButton>
 
-          <TextLink
+          <ActionLinkButton
             data-uie-name="do-open-wire-web"
             onClick={() => secureOpen(pathWithParams(EXTERNAL_ROUTE.WEBAPP))}
             css={styles.link}
           >
             {t('success.openWebAppText')}
-          </TextLink>
+          </ActionLinkButton>
         </FlexBox>
       </AccountRegistrationLayout>
     </Page>
diff --git a/src/script/auth/page/VerifyEmailCode.tsx b/src/script/auth/page/VerifyEmailCode.tsx
index 6248ae83601..e6db33a2ebb 100644
--- a/src/script/auth/page/VerifyEmailCode.tsx
+++ b/src/script/auth/page/VerifyEmailCode.tsx
@@ -25,7 +25,7 @@ import {connect} from 'react-redux';
 import {useNavigate} from 'react-router-dom';
 import {AnyAction, Dispatch} from 'redux';
 
-import {CodeInput, FlexBox, Text} from '@wireapp/react-ui-kit';
+import {ActionLinkButton, CodeInput, FlexBox, Text} from '@wireapp/react-ui-kit';
 
 import {t} from 'Util/LocalizerUtil';
 import {getLogger} from 'Util/Logger';
@@ -35,7 +35,6 @@ import {styles} from './VerifyEmailCode.styles';
 
 import {AccountRegistrationLayout} from '../component/AccountRegistrationLayout';
 import {BackButton} from '../component/BackButton';
-import {LinkButton} from '../component/LinkButton';
 import {actionRoot as ROOT_ACTIONS} from '../module/action';
 import {RootState, bindActionCreators} from '../module/reducer';
 import * as AuthSelector from '../module/selector/AuthSelector';
@@ -103,11 +102,17 @@ const VerifyEmailCodeComponent = ({
               }}
             />
           </Text>
-          <CodeInput style={styles.codeInput} onCodeComplete={createAccount} data-uie-name="enter-code" />
+          <CodeInput
+            style={styles.codeInput}
+            onCodeComplete={createAccount}
+            data-uie-name="enter-code"
+            codeInputLabel={t('verify.codeLabel')}
+            codePlaceholder={t('verify.codePlaceholder')}
+          />
           {parseError(authError)}
-          <LinkButton onClick={resendCode} data-uie-name="do-resend-code" css={styles.resendLink}>
+          <ActionLinkButton onClick={resendCode} data-uie-name="do-resend-code" css={styles.resendLink}>
             {t('verify.resendCode')}
-          </LinkButton>
+          </ActionLinkButton>
         </FlexBox>
       </AccountRegistrationLayout>
     </Page>
diff --git a/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx b/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
index 750e2baec88..737f449eeae 100644
--- a/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
+++ b/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
@@ -93,6 +93,7 @@ const MessageTimerButton = ({conversation, teamState = container.resolve(TeamSta
       onClick={isTimerDisabled ? undefined : onClick}
       onKeyDown={handleContextKeyDown}
       title={t('tooltipConversationEphemeral')}
+      disabled={isTimerDisabled}
       data-uie-value={isTimerDisabled ? 'disabled' : 'enabled'}
       data-uie-name="do-set-ephemeral-timer"
       type="button"
diff --git a/src/script/components/Modals/PrimaryModal/GuestLinkPasswordForm/GuestLinkPasswordForm.tsx b/src/script/components/Modals/PrimaryModal/GuestLinkPasswordForm/GuestLinkPasswordForm.tsx
index e0c40e33f1f..c87c439d757 100644
--- a/src/script/components/Modals/PrimaryModal/GuestLinkPasswordForm/GuestLinkPasswordForm.tsx
+++ b/src/script/components/Modals/PrimaryModal/GuestLinkPasswordForm/GuestLinkPasswordForm.tsx
@@ -75,6 +75,8 @@ export const GuestLinkPasswordForm = ({
           id="modal_pswd"
           className="modal__input"
           type="password"
+          showTogglePasswordLabel={t('showTogglePasswordLabel')}
+          hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
           autoComplete="off"
           value={passwordValue}
           ref={passwordValueRef}
@@ -91,6 +93,8 @@ export const GuestLinkPasswordForm = ({
           label={t('modalGuestLinkJoinConfirmLabel')}
           className="modal__input"
           type="password"
+          showTogglePasswordLabel={t('showTogglePasswordLabel')}
+          hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
           id="modal_pswd_confirmation"
           autoComplete="off"
           value={passwordConfirmationValue}
diff --git a/src/script/components/Modals/PrimaryModal/PasswordAdvancedSecurityForm/PasswordAdvancedSecurityForm.tsx b/src/script/components/Modals/PrimaryModal/PasswordAdvancedSecurityForm/PasswordAdvancedSecurityForm.tsx
index 01aa717f580..4b749896078 100644
--- a/src/script/components/Modals/PrimaryModal/PasswordAdvancedSecurityForm/PasswordAdvancedSecurityForm.tsx
+++ b/src/script/components/Modals/PrimaryModal/PasswordAdvancedSecurityForm/PasswordAdvancedSecurityForm.tsx
@@ -21,6 +21,8 @@ import type {ReactElement, ChangeEvent, FormEvent} from 'react';
 
 import {Input} from '@wireapp/react-ui-kit';
 
+import {t} from 'Util/LocalizerUtil';
+
 interface PasswordAdvancedSecurityFormProps {
   onSubmit: (event: FormEvent<HTMLFormElement>) => void;
   inputValue: string;
@@ -45,6 +47,8 @@ export const PasswordAdvancedSecurityForm = ({
       <Input
         id="modal_pswd_with_rules"
         type="password"
+        showTogglePasswordLabel={t('showTogglePasswordLabel')}
+        hideTogglePasswordLabel={t('hideTogglePasswordLabel')}
         value={inputValue}
         placeholder={inputPlaceholder}
         required
diff --git a/src/script/repositories/calling/CallingRepository.ts b/src/script/repositories/calling/CallingRepository.ts
index 9be32d19777..452a7e95cf4 100644
--- a/src/script/repositories/calling/CallingRepository.ts
+++ b/src/script/repositories/calling/CallingRepository.ts
@@ -35,16 +35,16 @@ import 'webrtc-adapter';
 
 import {
   AUDIO_STATE,
-  ENV as AVS_ENV,
-  STATE as CALL_STATE,
   CALL_TYPE,
   CONV_TYPE,
+  ENV as AVS_ENV,
   ERROR,
   getAvsInstance,
   LOG_LEVEL,
   QUALITY,
   REASON,
   RESOLUTION,
+  STATE as CALL_STATE,
   VIDEO_STATE,
   VSTREAMS,
   Wcall,
@@ -1666,6 +1666,12 @@ export class CallingRepository {
     }
   };
 
+  /**
+   * Leaves the call in the given conversation and on the basis of the given reason,
+   * Remove the call from the call state.
+   * @param conversationId
+   * @param reason
+   */
   readonly leaveCall = (conversationId: QualifiedId, reason: LEAVE_CALL_REASON): void => {
     const call = this.findCall(conversationId);
     if (call) {
@@ -1674,6 +1680,11 @@ export class CallingRepository {
       if (call.getSelfParticipant().sharesScreen()) {
         this.stopScreenShare(call.getSelfParticipant(), call.conversation, call);
       }
+
+      // If the user is not part of the conversation, the call must be removed from the state
+      if (reason === LEAVE_CALL_REASON.USER_IS_REMOVED_FROM_CONVERSATION) {
+        this.removeCall(call);
+      }
     }
 
     if (isTelemetryEnabledAtCurrentEnvironment()) {
@@ -1692,7 +1703,7 @@ export class CallingRepository {
       call.muteState(shouldMute ? MuteState.SELF_MUTED : MuteState.NOT_MUTED);
       return;
     }
-    if (call.hasWorkingAudioInput === false && call.muteState() !== MuteState.NOT_MUTED) {
+    if (!shouldMute && call.hasWorkingAudioInput === false && call.muteState() !== MuteState.NOT_MUTED) {
       this.showNoAudioInputModal();
       return;
     }
diff --git a/src/script/repositories/calling/enum/LeaveCallReason.ts b/src/script/repositories/calling/enum/LeaveCallReason.ts
index cf23c5e9748..89d2de3d597 100644
--- a/src/script/repositories/calling/enum/LeaveCallReason.ts
+++ b/src/script/repositories/calling/enum/LeaveCallReason.ts
@@ -25,7 +25,7 @@ export enum LEAVE_CALL_REASON {
   MANUAL_LEAVE_TO_JOIN_ANOTHER_CALL = 'manual_leave_to_join_another_call',
   MANUAL_LEAVE_BY_UI_CLICK = 'manual_leave_by_ui_click',
   USER_MANUALY_LEFT_CONVERSATION = 'user_manualy_left_conversation',
-  USER_IS_REMOVED_BY_AN_ADMIN_OR_LEFT_ON_ANOTHER_CLIENT = 'user_is_removed_by_an_admin_or_left_on_another_client',
+  USER_IS_REMOVED_FROM_CONVERSATION = 'user_is_removed_from_conversation',
   ABORTED_BECAUSE_FAILED_TO_UPDATE_MISSING_CLIENTS = 'abort_failed_to_update_missing_clients',
   ABORTED_BECAUSE_FAILED_TO_SEND_CALLING_MESSAGE = 'abort_failed_to_update_missing_clients',
   ABORTED_BECAUSE_USER_CANCELLED_MESSAGE_SENDING_BECAUSE_OF_A_DEGRADATION_WARNING = 'abort_failed_because_user_cancelled_message_sending_because_of_a_degradation_warning',
diff --git a/src/script/repositories/conversation/ConversationRepository.ts b/src/script/repositories/conversation/ConversationRepository.ts
index eb7b5c1175d..29d73f02a90 100644
--- a/src/script/repositories/conversation/ConversationRepository.ts
+++ b/src/script/repositories/conversation/ConversationRepository.ts
@@ -18,38 +18,38 @@
  */
 
 import {
+  ADD_PERMISSION,
   Conversation as BackendConversation,
+  CONVERSATION_CELLS_STATE,
   CONVERSATION_TYPE,
   DefaultConversationRoleName as DefaultRole,
-  NewConversation,
   MessageSendingStatus,
+  NewConversation,
   RemoteConversations,
-  ADD_PERMISSION,
-  CONVERSATION_CELLS_STATE,
 } from '@wireapp/api-client/lib/conversation';
 import {
-  MemberLeaveReason,
   ConversationReceiptModeUpdateData,
+  MemberLeaveReason,
   RECEIPT_MODE,
 } from '@wireapp/api-client/lib/conversation/data';
 import {CONVERSATION_TYPING} from '@wireapp/api-client/lib/conversation/data/ConversationTypingData';
 import {
+  CONVERSATION_EVENT,
+  ConversationAddPermissionUpdateEvent,
   ConversationCreateEvent,
   ConversationEvent,
   ConversationMemberJoinEvent,
   ConversationMemberLeaveEvent,
   ConversationMemberUpdateEvent,
   ConversationMessageTimerUpdateEvent,
+  ConversationMLSResetEvent,
+  ConversationProtocolUpdateEvent,
   ConversationReceiptModeUpdateEvent,
   ConversationRenameEvent,
   ConversationTypingEvent,
-  CONVERSATION_EVENT,
-  ConversationProtocolUpdateEvent,
-  ConversationAddPermissionUpdateEvent,
-  ConversationMLSResetEvent,
 } from '@wireapp/api-client/lib/event';
-import {BackendErrorLabel} from '@wireapp/api-client/lib/http/';
 import type {BackendError} from '@wireapp/api-client/lib/http/';
+import {BackendErrorLabel} from '@wireapp/api-client/lib/http/';
 import {CONVERSATION_PROTOCOL} from '@wireapp/api-client/lib/team';
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
 import {BaseCreateConversationResponse} from '@wireapp/core/lib/conversation';
@@ -118,16 +118,16 @@ import {ConversationLabelRepository} from './ConversationLabelRepository';
 import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper';
 import {ConversationRoleRepository} from './ConversationRoleRepository';
 import {
+  isBackendProteus1to1Conversation,
+  isConnectionRequestConversation,
   isMixedConversation,
   isMLSCapableConversation,
   isMLSConversation,
+  isProteus1to1ConversationWithUser,
   isProteusConversation,
   MLSCapableConversation,
   MLSConversation,
-  isProteus1to1ConversationWithUser,
   ProteusConversation,
-  isConnectionRequestConversation,
-  isBackendProteus1to1Conversation,
 } from './ConversationSelectors';
 import {ConversationService} from './ConversationService';
 import {ConversationState} from './ConversationState';
@@ -160,7 +160,7 @@ import {MessageRepository} from './MessageRepository';
 import {NOTIFICATION_STATE} from './NotificationSetting';
 
 import {Config} from '../../Config';
-import {BaseError, BASE_ERROR_TYPE} from '../../error/BaseError';
+import {BASE_ERROR_TYPE, BaseError} from '../../error/BaseError';
 import {ConversationError} from '../../error/ConversationError';
 import {isMemberMessage} from '../../guards/Message';
 import * as LegalHoldEvaluator from '../../legal-hold/LegalHoldEvaluator';
@@ -4026,7 +4026,7 @@ export class ConversationRepository {
       conversationEntity.status(ConversationStatus.PAST_MEMBER);
       this.callingRepository.leaveCall(
         conversationEntity.qualifiedId,
-        LEAVE_CALL_REASON.USER_IS_REMOVED_BY_AN_ADMIN_OR_LEFT_ON_ANOTHER_CLIENT,
+        LEAVE_CALL_REASON.USER_IS_REMOVED_FROM_CONVERSATION,
       );
 
       if (this.userState.self().isTemporaryGuest()) {
diff --git a/src/script/repositories/event/EventRepository.test.ts b/src/script/repositories/event/EventRepository.test.ts
index 2eb8ee6c9c8..08454ce0d46 100644
--- a/src/script/repositories/event/EventRepository.test.ts
+++ b/src/script/repositories/event/EventRepository.test.ts
@@ -19,12 +19,15 @@
 
 import {BackendEvent, CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/';
 
+import {ConnectionState} from '@wireapp/core';
+
 import {ClientConversationEvent} from 'Repositories/conversation/EventBuilder';
 
 import {ClientEvent} from './Client';
 import {EventRepository} from './EventRepository';
 import {EventSource} from './EventSource';
 import {NOTIFICATION_HANDLING_STATE} from './NotificationHandlingState';
+import {EventValidationError} from './preprocessor/EventStorageMiddleware/eventHandlers/EventValidationError';
 
 import {TestFactory} from '../../../../test/helper/TestFactory';
 
@@ -43,114 +46,733 @@ describe('EventRepository', () => {
       spyOn<any>(testFactory.event_repository!, 'distributeEvent');
     });
 
-    it('should not save but distribute "user.*" events', () => {
-      return testFactory
-        .event_repository![
-          'handleEvent'
-        ]({event: {type: USER_EVENT.UPDATE, user: {id: ''}}}, EventSource.NOTIFICATION_STREAM)
-        .then(() => {
+    describe('event type handling', () => {
+      it('should not save but distribute "user.*" events', () => {
+        return testFactory
+          .event_repository![
+            'handleEvent'
+          ]({event: {type: USER_EVENT.UPDATE, user: {id: ''}}}, EventSource.NOTIFICATION_STREAM)
+          .then(() => {
+            expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+          });
+      });
+
+      it('should not save but distribute "call.*" events', () => {
+        return testFactory
+          .event_repository![
+            'handleEvent'
+          ]({event: {type: ClientEvent.CALL.E_CALL} as any}, EventSource.NOTIFICATION_STREAM)
+          .then(() => {
+            expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+          });
+      });
+
+      it('should not save but distribute "conversation.create" events', () => {
+        return testFactory
+          .event_repository![
+            'handleEvent'
+          ]({event: {type: CONVERSATION_EVENT.CREATE} as any}, EventSource.NOTIFICATION_STREAM)
+          .then(() => {
+            expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+          });
+      });
+    });
+
+    describe('conversation events', () => {
+      it('accepts "conversation.rename" events', () => {
+        const event = {
+          conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
+          data: {name: 'Renamed'},
+          from: '532af01e-1e24-4366-aacf-33b67d4ee376',
+          id: '7.800122000b2f7cca',
+          time: '2016-08-09T11:57:37.498Z',
+          type: 'conversation.rename',
+        } as BackendEvent;
+
+        return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
-    });
+      });
+
+      it('accepts "conversation.member-join" events', () => {
+        const event = {
+          conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
+          data: {user_ids: ['e47bfafa-03dc-43ed-aadb-ad6c4d9f3d86']},
+          from: '532af01e-1e24-4366-aacf-33b67d4ee376',
+          id: '8.800122000b2f7d20',
+          time: '2016-08-09T12:01:14.688Z',
+          type: 'conversation.member-join',
+        } as BackendEvent;
 
-    it('should not save but distribute "call.*" events', () => {
-      return testFactory
-        .event_repository![
-          'handleEvent'
-        ]({event: {type: ClientEvent.CALL.E_CALL} as any}, EventSource.NOTIFICATION_STREAM)
-        .then(() => {
+        return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
+      });
+
+      it('accepts "conversation.member-leave" events', () => {
+        const event = {
+          conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
+          data: {user_ids: ['e47bfafa-03dc-43ed-aadb-ad6c4d9f3d86'], qualified_user_ids: []},
+          from: '532af01e-1e24-4366-aacf-33b67d4ee376',
+          id: '9.800122000b3d69bc',
+          time: '2016-08-09T12:01:56.363Z',
+          type: 'conversation.member-leave',
+        } as BackendEvent;
+
+        return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
+          expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+        });
+      });
+
+      it('accepts "conversation.voice-channel-deactivate" (missed call) events', async () => {
+        const fakeProp: any = undefined;
+        const eventRepo = new EventRepository({} as any, fakeProp, fakeProp, fakeProp);
+        eventRepo.notificationHandlingState(NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
+        jest.spyOn<any, any>(eventRepo, 'distributeEvent').mockImplementation(() => {});
+
+        const event = {
+          conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
+          data: {reason: 'missed', duration: 0},
+          from: '0410795a-58dc-40d8-b216-cbc2360be21a',
+          id: '16.800122000b3d4ade',
+          time: '2016-08-09T12:09:28.294Z',
+          type: 'conversation.voice-channel-deactivate',
+        } as any;
+
+        await eventRepo['handleEvent']({event}, EventSource.NOTIFICATION_STREAM);
+
+        expect(eventRepo['distributeEvent']).toHaveBeenCalled();
+      });
     });
 
-    it('should not save but distribute "conversation.create" events', () => {
-      return testFactory
-        .event_repository![
-          'handleEvent'
-        ]({event: {type: CONVERSATION_EVENT.CREATE} as any}, EventSource.NOTIFICATION_STREAM)
-        .then(() => {
+    describe('decryption errors', () => {
+      it('accepts plain decryption error events', () => {
+        const event = {
+          conversation: '7f0939c8-dbd9-48f5-839e-b0ebcfffec8c',
+          error: 'Offset is outside the bounds of the DataView (17cd13b4b2a3a98)',
+          error_code: '1778 (17cd13b4b2a3a98)',
+          from: '532af01e-1e24-4366-aacf-33b67d4ee376',
+          id: 'f518d6ff-19d3-48a0-b0c1-cc71c6e81136',
+          time: '2016-08-09T12:58:49.485Z',
+          type: 'conversation.unable-to-decrypt',
+        } as ClientConversationEvent;
+
+        return testFactory.event_repository!.injectEvent(event).then(() => {
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
+      });
     });
+  });
+
+  describe('injectEvent', () => {
+    describe('validation', () => {
+      it('should throw an error if no event is provided', async () => {
+        await expect(testFactory.event_repository!.injectEvent(null as any)).rejects.toThrow();
+      });
+
+      it('should not inject events into self conversation', async () => {
+        const selfUserId = testFactory.event_repository!['userState'].self()?.id;
+        const event = {
+          conversation: selfUserId,
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
 
-    it('accepts "conversation.rename" events', () => {
-      const event = {
-        conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
-        data: {name: 'Renamed'},
-        from: '532af01e-1e24-4366-aacf-33b67d4ee376',
-        id: '7.800122000b2f7cca',
-        time: '2016-08-09T11:57:37.498Z',
-        type: 'conversation.rename',
-      } as BackendEvent;
+        jest.spyOn<any, any>(testFactory.event_repository!, 'processEvent');
+        await testFactory.event_repository!.injectEvent(event);
 
-      return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+        expect(testFactory.event_repository!['processEvent']).not.toHaveBeenCalled();
       });
     });
 
-    it('accepts "conversation.member-join" events', () => {
-      const event = {
-        conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
-        data: {user_ids: ['e47bfafa-03dc-43ed-aadb-ad6c4d9f3d86']},
-        from: '532af01e-1e24-4366-aacf-33b67d4ee376',
-        id: '8.800122000b2f7d20',
-        time: '2016-08-09T12:01:14.688Z',
-        type: 'conversation.member-join',
-      } as BackendEvent;
+    describe('event source handling', () => {
+      it('should inject event with correct source when not handling websocket', async () => {
+        testFactory.event_repository!.notificationHandlingState(NOTIFICATION_HANDLING_STATE.STREAM);
+        const event = {
+          conversation: 'conv-id',
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
 
-      return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+        jest.spyOn<any, any>(testFactory.event_repository!, 'processEvent');
+        await testFactory.event_repository!.injectEvent(event, EventSource.WEBSOCKET);
+
+        expect(testFactory.event_repository!['processEvent']).toHaveBeenCalledWith(event, EventSource.INJECTED);
       });
     });
+  });
 
-    it('accepts "conversation.member-leave" events', () => {
-      const event = {
-        conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
-        data: {user_ids: ['e47bfafa-03dc-43ed-aadb-ad6c4d9f3d86'], qualified_user_ids: []},
-        from: '532af01e-1e24-4366-aacf-33b67d4ee376',
-        id: '9.800122000b3d69bc',
-        time: '2016-08-09T12:01:56.363Z',
-        type: 'conversation.member-leave',
-      } as BackendEvent;
+  describe('configuration', () => {
+    describe('setEventProcessMiddlewares', () => {
+      it('should set event process middlewares', () => {
+        const middlewares = [{processEvent: jest.fn()}, {processEvent: jest.fn()}] as any;
 
-      return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+        testFactory.event_repository!.setEventProcessMiddlewares(middlewares);
+        expect(testFactory.event_repository!['eventProcessMiddlewares']).toEqual(middlewares);
       });
     });
 
-    it('accepts "conversation.voice-channel-deactivate" (missed call) events', async () => {
-      const fakeProp: any = undefined;
-      const eventRepo = new EventRepository({} as any, fakeProp, fakeProp, fakeProp);
-      eventRepo.notificationHandlingState(NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
-      jest.spyOn<any, any>(eventRepo, 'distributeEvent').mockImplementation(() => {});
+    describe('setEventProcessors', () => {
+      it('should set event processors', () => {
+        const processors = [{processEvent: jest.fn()}, {processEvent: jest.fn()}] as any;
 
-      const event = {
-        conversation: '64dcb45f-bf8d-4eac-a263-649a60d69305',
-        data: {reason: 'missed', duration: 0},
-        from: '0410795a-58dc-40d8-b216-cbc2360be21a',
-        id: '16.800122000b3d4ade',
-        time: '2016-08-09T12:09:28.294Z',
-        type: 'conversation.voice-channel-deactivate',
-      } as any;
+        testFactory.event_repository!.setEventProcessors(processors);
+        expect(testFactory.event_repository!['eventProcessors']).toEqual(processors);
+      });
+    });
+  });
+
+  describe('processEvent', () => {
+    describe('middleware execution', () => {
+      it('should run all middlewares sequentially', async () => {
+        const callOrder: number[] = [];
+        const middleware1 = {
+          processEvent: jest.fn(async (event: any) => {
+            callOrder.push(1);
+            return event;
+          }),
+        };
+        const middleware2 = {
+          processEvent: jest.fn(async (event: any) => {
+            callOrder.push(2);
+            return event;
+          }),
+        };
 
-      await eventRepo['handleEvent']({event}, EventSource.NOTIFICATION_STREAM);
+        testFactory.event_repository!.setEventProcessMiddlewares([middleware1, middleware2] as any);
+        jest.spyOn<any, any>(testFactory.event_repository!, 'handleEventDistribution').mockResolvedValue(undefined);
 
-      expect(eventRepo['distributeEvent']).toHaveBeenCalled();
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
+
+        await testFactory.event_repository!['processEvent'](event, EventSource.WEBSOCKET);
+
+        expect(callOrder).toEqual([1, 2]);
+        expect(middleware1.processEvent).toHaveBeenCalled();
+        expect(middleware2.processEvent).toHaveBeenCalled();
+      });
+    });
+
+    describe('error handling', () => {
+      it('should stop processing if middleware throws EventValidationError', async () => {
+        const middleware = {
+          processEvent: jest.fn().mockRejectedValue(new EventValidationError('Validation failed')),
+        };
+
+        testFactory.event_repository!.setEventProcessMiddlewares([middleware] as any);
+        jest.spyOn<any, any>(testFactory.event_repository!, 'handleEventDistribution');
+
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
+
+        await testFactory.event_repository!['processEvent'](event, EventSource.WEBSOCKET);
+
+        expect(middleware.processEvent).toHaveBeenCalled();
+        expect(testFactory.event_repository!['handleEventDistribution']).not.toHaveBeenCalled();
+      });
+
+      it('should rethrow non-EventValidationError errors', async () => {
+        const middleware = {
+          processEvent: jest.fn().mockRejectedValue(new Error('Some other error')),
+        };
+
+        testFactory.event_repository!.setEventProcessMiddlewares([middleware] as any);
+
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
+
+        await expect(testFactory.event_repository!['processEvent'](event, EventSource.WEBSOCKET)).rejects.toThrow(
+          'Some other error',
+        );
+      });
     });
+  });
+
+  describe('getIsoDateFromEvent', () => {
+    describe('extracting time from events', () => {
+      it('should return time field if present', () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          time: '2023-01-01T12:00:00.000Z',
+        } as any;
+
+        const result = testFactory.event_repository!['getIsoDateFromEvent'](event);
+        expect(result).toBe('2023-01-01T12:00:00.000Z');
+      });
+
+      it('should return client.time for CLIENT_ADD event', () => {
+        const event = {
+          type: USER_EVENT.CLIENT_ADD,
+          client: {
+            time: '2023-01-01T12:00:00.000Z',
+          },
+        } as any;
+
+        const result = testFactory.event_repository!['getIsoDateFromEvent'](event);
+        expect(result).toBe('2023-01-01T12:00:00.000Z');
+      });
+
+      it('should return connection.last_update for CONNECTION event', () => {
+        const event = {
+          type: USER_EVENT.CONNECTION,
+          connection: {
+            last_update: '2023-01-01T12:00:00.000Z',
+          },
+        } as any;
+
+        const result = testFactory.event_repository!['getIsoDateFromEvent'](event);
+        expect(result).toBe('2023-01-01T12:00:00.000Z');
+      });
+    });
+
+    describe('fallback behavior', () => {
+      it('should return epoch date if defaultValue is true and no time found', () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+        } as any;
+
+        const result = testFactory.event_repository!['getIsoDateFromEvent'](event, true);
+        expect(result).toBe(new Date(0).toISOString());
+      });
+
+      it('should return undefined if defaultValue is false and no time found', () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+        } as any;
+
+        const result = testFactory.event_repository!['getIsoDateFromEvent'](event, false);
+        expect(result).toBeUndefined();
+      });
+    });
+  });
+
+  describe('updateLastEventDate', () => {
+    it('should update last event date if new date is greater', async () => {
+      const oldDate = '2023-01-01T12:00:00.000Z';
+      const newDate = '2023-01-02T12:00:00.000Z';
+
+      testFactory.event_repository!['lastEventDate'](oldDate);
+      jest
+        .spyOn(testFactory.event_repository!['notificationService'], 'saveLastEventDateToDb')
+        .mockResolvedValue(newDate);
+
+      await testFactory.event_repository!['updateLastEventDate'](newDate);
+
+      expect(testFactory.event_repository!['lastEventDate']()).toBe(newDate);
+      expect(testFactory.event_repository!['notificationService'].saveLastEventDateToDb).toHaveBeenCalledWith(newDate);
+    });
+
+    it('should not update last event date if new date is not greater', async () => {
+      const oldDate = '2023-01-02T12:00:00.000Z';
+      const newDate = '2023-01-01T12:00:00.000Z';
+
+      testFactory.event_repository!['lastEventDate'](oldDate);
+      jest.spyOn(testFactory.event_repository!['notificationService'], 'saveLastEventDateToDb');
+
+      await testFactory.event_repository!['updateLastEventDate'](newDate);
+
+      expect(testFactory.event_repository!['lastEventDate']()).toBe(oldDate);
+      expect(testFactory.event_repository!['notificationService'].saveLastEventDateToDb).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('distributeEvent', () => {
+    describe('processor execution', () => {
+      it('should call all event processors in parallel', async () => {
+        const processor1 = {processEvent: jest.fn().mockResolvedValue(undefined)};
+        const processor2 = {processEvent: jest.fn().mockResolvedValue(undefined)};
+
+        testFactory.event_repository!.setEventProcessors([processor1, processor2] as any);
+
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
+
+        await testFactory.event_repository!['distributeEvent'](event, EventSource.WEBSOCKET);
+
+        expect(processor1.processEvent).toHaveBeenCalledWith(event, EventSource.WEBSOCKET);
+        expect(processor2.processEvent).toHaveBeenCalledWith(event, EventSource.WEBSOCKET);
+      });
+    });
+
+    describe('error handling', () => {
+      it('should throw if a processor fails', async () => {
+        const processor1 = {processEvent: jest.fn().mockRejectedValue(new Error('Processor 1 failed'))};
+        const processor2 = {processEvent: jest.fn().mockResolvedValue(undefined)};
+
+        testFactory.event_repository!.setEventProcessors([processor1, processor2] as any);
+
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+        } as any;
+
+        await expect(testFactory.event_repository!['distributeEvent'](event, EventSource.WEBSOCKET)).rejects.toThrow(
+          'Processor 1 failed',
+        );
+
+        expect(processor1.processEvent).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('updateConnectivityStatus', () => {
+    beforeEach(() => {
+      testFactory.event_repository!['latestConnectionState'] = ConnectionState.CLOSED;
+    });
+
+    describe('notification handling state changes', () => {
+      it('should update notification handling state to STREAM when PROCESSING_NOTIFICATIONS', () => {
+        testFactory.event_repository!['updateConnectivityStatus'](ConnectionState.PROCESSING_NOTIFICATIONS);
+
+        expect(testFactory.event_repository!.notificationHandlingState()).toBe(NOTIFICATION_HANDLING_STATE.STREAM);
+      });
+
+      it('should update notification handling state to WEB_SOCKET when LIVE', () => {
+        testFactory.event_repository!['updateConnectivityStatus'](ConnectionState.LIVE);
+
+        expect(testFactory.event_repository!.notificationHandlingState()).toBe(NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
+      });
+    });
+
+    describe('connection state tracking', () => {
+      it('should track latest connection state', () => {
+        testFactory.event_repository!['updateConnectivityStatus'](ConnectionState.CONNECTING);
+        expect(testFactory.event_repository!['latestConnectionState']).toBe(ConnectionState.CONNECTING);
+
+        testFactory.event_repository!['updateConnectivityStatus'](ConnectionState.LIVE);
+        expect(testFactory.event_repository!['latestConnectionState']).toBe(ConnectionState.LIVE);
+      });
+    });
+  });
+
+  describe('mapEncryptedEvent', () => {
+    describe('ignored decryption errors', () => {
+      it('should return undefined for ignored decryption error codes', async () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+          data: 'encrypted',
+        } as any;
+
+        const decryptionError = {
+          name: 'DecryptionError',
+          code: 208,
+          message: 'Outdated message',
+        };
+
+        const result = await testFactory.event_repository!['mapEncryptedEvent'](
+          event,
+          {decryptionError, decryptedData: undefined},
+          EventSource.WEBSOCKET,
+        );
+
+        expect(result).toBeUndefined();
+      });
+
+      it('should return undefined for duplicate message decryption errors', async () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+          data: 'encrypted',
+        } as any;
+
+        const decryptionError = {
+          name: 'DecryptionError',
+          code: 209,
+          message: 'Duplicate message',
+        };
+
+        const result = await testFactory.event_repository!['mapEncryptedEvent'](
+          event,
+          {decryptionError, decryptedData: undefined},
+          EventSource.WEBSOCKET,
+        );
+
+        expect(result).toBeUndefined();
+      });
+    });
+
+    describe('non-ignored decryption errors', () => {
+      it('should build unable-to-decrypt event for non-ignored decryption errors', async () => {
+        const event = {
+          type: CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+          conversation: 'conv-id',
+          from: 'user-id',
+          time: new Date().toISOString(),
+          data: 'encrypted',
+        } as any;
+
+        const decryptionError = {
+          name: 'DecryptionError',
+          code: 500,
+          message: 'Unknown error',
+        };
+
+        const result = await testFactory.event_repository!['mapEncryptedEvent'](
+          event,
+          {decryptionError, decryptedData: undefined},
+          EventSource.WEBSOCKET,
+        );
+
+        expect(result).toBeDefined();
+        expect(result?.type).toBe('conversation.unable-to-decrypt');
+      });
+    });
+  });
+
+  describe('CONFIG', () => {
+    it('should have correct configuration values', () => {
+      expect(EventRepository.CONFIG.E_CALL_EVENT_LIFETIME).toBe(30000);
+      expect(EventRepository.CONFIG.NOTIFICATION_BATCHES.INITIAL).toBe(500);
+      expect(EventRepository.CONFIG.NOTIFICATION_BATCHES.SUBSEQUENT).toBe(5000);
+      expect(EventRepository.CONFIG.NOTIFICATION_BATCHES.MAX).toBe(10000);
+      expect(EventRepository.CONFIG.IGNORED_ERRORS).toContain('VALIDATION_FAILED');
+    });
+  });
+
+  describe('connectWebSocket', () => {
+    let mockAccount: any;
+
+    beforeEach(() => {
+      jest.useFakeTimers();
+      mockAccount = {
+        listen: jest.fn().mockResolvedValue(jest.fn()),
+        isWebsocketHealthy: jest.fn().mockResolvedValue(true),
+      };
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+      jest.restoreAllMocks();
+    });
+
+    describe('network event handling', () => {
+      it('should handle offline event by disconnecting websocket', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+        const disconnectMock = jest.fn();
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          onConnectionStateChanged(ConnectionState.LIVE);
+          return disconnectMock;
+        });
+
+        const connectPromise = eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        await connectPromise;
+
+        window.dispatchEvent(new Event('offline'));
+
+        expect(disconnectMock).toHaveBeenCalled();
+      });
+
+      it('should handle online event by attempting to reconnect', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+        let listenCallCount = 0;
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          listenCallCount++;
+          onConnectionStateChanged(ConnectionState.LIVE);
+          return jest.fn();
+        });
+
+        await eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        expect(listenCallCount).toBe(1);
+
+        window.dispatchEvent(new Event('online'));
+
+        await jest.runOnlyPendingTimersAsync();
+
+        expect(listenCallCount).toBeGreaterThan(1);
+      });
+    });
+
+    describe('health monitoring', () => {
+      it('should periodically check websocket health and reconnect if unhealthy', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+        let listenCallCount = 0;
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          listenCallCount++;
+          onConnectionStateChanged(ConnectionState.LIVE);
+          return jest.fn();
+        });
+
+        mockAccount.isWebsocketHealthy = jest
+          .fn()
+          .mockResolvedValueOnce(true)
+          .mockResolvedValueOnce(false)
+          .mockResolvedValue(true);
+
+        await eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        expect(listenCallCount).toBe(1);
+
+        await jest.advanceTimersByTimeAsync(60000);
+
+        expect(mockAccount.isWebsocketHealthy).toHaveBeenCalledTimes(1);
+
+        await jest.advanceTimersByTimeAsync(60000);
+
+        expect(listenCallCount).toBeGreaterThan(1);
+      });
+    });
+
+    describe('connection retry', () => {
+      it('should retry connection on failure', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+        let attemptCount = 0;
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          attemptCount++;
+          if (attemptCount === 1) {
+            throw new Error('Connection failed');
+          }
+          onConnectionStateChanged(ConnectionState.LIVE);
+          return jest.fn();
+        });
+
+        const connectPromise = eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        await expect(connectPromise).rejects.toThrow('Connection failed');
+
+        await jest.advanceTimersByTimeAsync(5000);
+
+        expect(attemptCount).toBeGreaterThan(1);
+      });
+
+      it('should reject and retry if connection moves to CLOSED state', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+        let attemptCount = 0;
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          attemptCount++;
+          if (attemptCount === 1) {
+            onConnectionStateChanged(ConnectionState.CLOSED);
+          } else {
+            onConnectionStateChanged(ConnectionState.LIVE);
+          }
+          return jest.fn();
+        });
+
+        const connectPromise = eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        await expect(connectPromise).rejects.toThrow('WebSocket connection closed');
+
+        await jest.advanceTimersByTimeAsync(5000);
+
+        expect(attemptCount).toBeGreaterThan(1);
+      });
+
+      it('should timeout if connection does not reach LIVE state', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          // Stay in CONNECTING state indefinitely
+          onConnectionStateChanged(ConnectionState.CONNECTING);
+          return jest.fn();
+        });
+
+        const connectPromise = eventRepo.connectWebSocket(mockAccount, false, jest.fn());
+
+        // Prevent unhandled rejection error during timer advancement
+        const catchUnhandled = connectPromise.catch(() => {});
+
+        // Advance past the 30 second timeout
+        await jest.advanceTimersByTimeAsync(30000);
+
+        // Wait for the catch handler to process
+        await catchUnhandled;
+
+        // The promise should have already rejected by now
+        await expect(connectPromise).rejects.toThrow('WebSocket connection timeout');
+      });
+    });
+
+    describe('cleanup', () => {
+      it('should clean up event listeners when removeConnectivityListeners is called', async () => {
+        const mockNotificationService = {getServerTime: jest.fn().mockResolvedValue('2023-01-01T00:00:00.000Z')};
+        const eventRepo = new EventRepository(
+          {} as any,
+          mockNotificationService as any,
+          {computeTimeOffset: jest.fn()} as any,
+          {} as any,
+        );
+
+        mockAccount.listen = jest.fn().mockImplementation(async ({onConnectionStateChanged}: any) => {
+          onConnectionStateChanged(ConnectionState.LIVE);
+          return jest.fn();
+        });
+        const removeEventListenerSpy = jest.spyOn(window, 'removeEventListener');
+        const clearIntervalSpy = jest.spyOn(window, 'clearInterval');
+
+        await eventRepo.connectWebSocket(mockAccount, false, jest.fn());
 
-    it('accepts plain decryption error events', () => {
-      const event = {
-        conversation: '7f0939c8-dbd9-48f5-839e-b0ebcfffec8c',
-        error: 'Offset is outside the bounds of the DataView (17cd13b4b2a3a98)',
-        error_code: '1778 (17cd13b4b2a3a98)',
-        from: '532af01e-1e24-4366-aacf-33b67d4ee376',
-        id: 'f518d6ff-19d3-48a0-b0c1-cc71c6e81136',
-        time: '2016-08-09T12:58:49.485Z',
-        type: 'conversation.unable-to-decrypt',
-      } as ClientConversationEvent;
+        eventRepo['removeConnectivityListeners']();
 
-      return testFactory.event_repository.injectEvent(event).then(() => {
-        expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
+        expect(removeEventListenerSpy).toHaveBeenCalledWith('online', expect.any(Function));
+        expect(removeEventListenerSpy).toHaveBeenCalledWith('offline', expect.any(Function));
+        expect(clearIntervalSpy).toHaveBeenCalled();
       });
     });
   });
diff --git a/src/script/repositories/event/EventRepository.ts b/src/script/repositories/event/EventRepository.ts
index fe5c860f278..bed8f848778 100644
--- a/src/script/repositories/event/EventRepository.ts
+++ b/src/script/repositories/event/EventRepository.ts
@@ -129,7 +129,8 @@ export class EventRepository {
   // WebSocket handling
   //##############################################################################
 
-  private readonly updateConnectivitityStatus = (state: ConnectionState) => {
+  private readonly updateConnectivityStatus = (state: ConnectionState) => {
+    this.latestConnectionState = state;
     this.logger.log('Websocket connection state changed to', state);
     switch (state) {
       case ConnectionState.CONNECTING: {
@@ -201,45 +202,209 @@ export class EventRepository {
     onNotificationStreamProgress: (currentProcessingNotificationTimestamp: string) => void,
     dryRun = false,
   ): Promise<void> {
+    // Clean up any existing connectivity listeners from previous connection attempts
+    this.removeConnectivityListeners?.();
     await this.handleTimeDrift();
-    const connect = () => {
-      // We make sure there is only be a single active connection to the WebSocket.
-      this.disconnectWebSocket?.();
-      return new Promise<void>(async resolve => {
-        this.disconnectWebSocket = await account.listen({
-          useLegacy,
-          onConnectionStateChanged: connectionState => {
-            this.updateConnectivitityStatus(connectionState);
-            if (connectionState === ConnectionState.LIVE) {
-              resolve();
-            }
-          },
-          onEvent: this.handleIncomingEvent,
-          onMissedNotifications: this.triggerMissedSystemEventMessageRendering,
-          onNotificationStreamProgress: onNotificationStreamProgress,
-          dryRun,
+
+    // Track the current connection attempt to prevent concurrent connections
+    let activeConnectionAttempt: Promise<void> | undefined;
+
+    const RETRY_DELAY_MS = TIME_IN_MILLIS.SECOND * 5;
+    const HEARTBEAT_CHECK_INTERVAL_MS = TIME_IN_MILLIS.MINUTE;
+    const CONNECTION_TIMEOUT_MS = TIME_IN_MILLIS.SECOND * 30;
+
+    /**
+     * Schedules a reconnection attempt after a delay.
+     * Ensures only one retry is scheduled at a time.
+     */
+    const scheduleReconnectionRetry = () => {
+      // Don't schedule if a retry is already pending
+      if (this.reconnectRetryTimeout) {
+        return;
+      }
+
+      this.reconnectRetryTimeout = window.setTimeout(() => {
+        this.reconnectRetryTimeout = undefined;
+        attemptWebSocketConnection().catch(error => {
+          this.logger.error('Scheduled reconnection failed', error);
         });
+      }, RETRY_DELAY_MS);
+    };
+
+    /**
+     * Attempts a single WebSocket connection.
+     * Returns the existing attempt if one is already in progress.
+     */
+    const attemptWebSocketConnection = () => {
+      // Return existing connection attempt to prevent concurrent connections
+      if (activeConnectionAttempt) {
+        return activeConnectionAttempt;
+      }
+      // We make sure there is only one active connection to the WebSocket.
+      if (
+        this.latestConnectionState !== ConnectionState.LIVE &&
+        this.latestConnectionState !== ConnectionState.CONNECTING
+      ) {
+        this.disconnectWebSocket?.();
+      }
+
+      activeConnectionAttempt = new Promise<void>((resolve, reject) => {
+        let connectionTimeoutHandle: number | undefined;
+        let hasConnectionSettled = false;
+
+        const clearConnectionTimeout = () => {
+          if (connectionTimeoutHandle) {
+            window.clearTimeout(connectionTimeoutHandle);
+            connectionTimeoutHandle = undefined;
+          }
+        };
+
+        /**
+         * Settles the connection promise (resolve or reject).
+         * On failure, schedules a retry attempt.
+         * Ensures the promise is only settled once.
+         */
+        const settleConnectionAttempt = (isSuccessful: boolean, error?: Error) => {
+          if (hasConnectionSettled) {
+            return;
+          }
+          hasConnectionSettled = true;
+          clearConnectionTimeout();
+
+          if (!isSuccessful) {
+            scheduleReconnectionRetry();
+            reject(error as Error);
+            return;
+          }
+          resolve();
+        };
+
+        // Start timeout timer - connection must reach LIVE state within this time
+        connectionTimeoutHandle = window.setTimeout(() => {
+          settleConnectionAttempt(false, new Error('WebSocket connection timeout'));
+        }, CONNECTION_TIMEOUT_MS);
+
+        account
+          .listen({
+            useLegacy,
+            onConnectionStateChanged: connectionState => {
+              this.updateConnectivityStatus(connectionState);
+
+              // Connection successfully reached LIVE state
+              if (connectionState === ConnectionState.LIVE) {
+                settleConnectionAttempt(true);
+              }
+
+              // Connection closed before reaching LIVE state
+              if (connectionState === ConnectionState.CLOSED) {
+                settleConnectionAttempt(false, new Error('WebSocket connection closed'));
+              }
+            },
+            onEvent: this.handleIncomingEvent,
+            onMissedNotifications: this.triggerMissedSystemEventMessageRendering,
+            onNotificationStreamProgress: onNotificationStreamProgress,
+            dryRun,
+          })
+          .then(disconnect => {
+            this.disconnectWebSocket = disconnect;
+          })
+          .catch(error => {
+            this.logger.error('Failed to establish WebSocket connection', error);
+            settleConnectionAttempt(false, error);
+          });
+      }).finally(() => {
+        // Clean up the reference once the connection attempt settles
+        activeConnectionAttempt = undefined;
       });
+
+      return activeConnectionAttempt;
     };
 
-    window.addEventListener('online', () => {
+    /**
+     * Handles browser 'online' event by attempting to reconnect.
+     * This fires when the browser detects internet connectivity is restored.
+     */
+    const handleOnline = () => {
       this.logger.info('Internet connection regained. Re-establishing WebSocket connection...');
-      connect();
-    });
+      attemptWebSocketConnection().catch(error => {
+        this.logger.error('Failed to reconnect on online event', error);
+      });
+    };
 
-    window.addEventListener('offline', () => {
+    /**
+     * Handles browser 'offline' event by disconnecting and showing warning.
+     * Cancels any pending retry attempts.
+     */
+    const handleOffline = () => {
       this.logger.warn('Internet connection lost');
       this.disconnectWebSocket();
       Warnings.showWarning(Warnings.TYPE.NO_INTERNET);
-    });
 
-    return connect();
+      // Cancel any pending retry since we're explicitly offline
+      if (this.reconnectRetryTimeout) {
+        window.clearTimeout(this.reconnectRetryTimeout);
+        this.reconnectRetryTimeout = undefined;
+      }
+    };
+
+    // Listen for browser connectivity events
+    window.addEventListener('online', handleOnline);
+    window.addEventListener('offline', handleOffline);
+
+    /**
+     * Fallback heartbeat check to detect stale connections.
+     * This handles cases where the 'online' event never fires (e.g., after system sleep).
+     * Periodically verifies the WebSocket is healthy and reconnects if needed.
+     */
+    this.fallbackReconnectIntervalId = window.setInterval(async () => {
+      try {
+        // Use heartbeat to check connection health without disconnecting
+        const isWebsocketHealthy = await account.isWebsocketHealthy();
+        if (isWebsocketHealthy) {
+          this.logger.debug('Periodic WebSocket health check: heartbeat succeeded, skipping reconnect');
+          return;
+        }
+
+        this.logger.info('Periodic WebSocket health check: attempting reconnect (heartbeat failed)');
+        attemptWebSocketConnection().catch(error => {
+          this.logger.error('Periodic health check reconnection failed', error);
+        });
+      } catch (error) {
+        this.logger.error('Error during periodic WebSocket health check', error);
+      }
+    }, HEARTBEAT_CHECK_INTERVAL_MS);
+
+    /**
+     * Cleanup function to remove all connectivity-related event listeners and timers.
+     * Should be called when disconnecting or before setting up new listeners.
+     */
+    this.removeConnectivityListeners = () => {
+      window.removeEventListener('online', handleOnline);
+      window.removeEventListener('offline', handleOffline);
+
+      if (this.reconnectRetryTimeout) {
+        window.clearTimeout(this.reconnectRetryTimeout);
+        this.reconnectRetryTimeout = undefined;
+      }
+
+      if (this.fallbackReconnectIntervalId) {
+        window.clearInterval(this.fallbackReconnectIntervalId);
+        this.fallbackReconnectIntervalId = undefined;
+      }
+    };
+
+    // Initiate the first connection attempt
+    return attemptWebSocketConnection();
   }
 
   /**
    * Close the WebSocket connection. (will be set only once the connectWebSocket is called)
    */
-  disconnectWebSocket: () => void = () => {};
+  public disconnectWebSocket: () => void = () => {};
+  private removeConnectivityListeners: () => void = () => {};
+  private reconnectRetryTimeout?: number;
+  private fallbackReconnectIntervalId?: number;
+  private latestConnectionState: ConnectionState = ConnectionState.CLOSED;
 
   //##############################################################################
   // Notification Stream handling
diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts
index 85a09eb95cf..7d5f53b1820 100644
--- a/src/types/i18n.d.ts
+++ b/src/types/i18n.d.ts
@@ -274,6 +274,8 @@ declare module 'I18n/en-US.json' {
     'authLoginTitle': `Log in`;
     'authPlaceholderEmail': `Email`;
     'authPlaceholderPassword': `Password`;
+    'showTogglePasswordLabel': `Show password`;
+    'hideTogglePasswordLabel': `Hide password`;
     'authPostedResend': `Resend to {email}`;
     'authPostedResendAction': `No email showing up?`;
     'authPostedResendDetail': `Check your email inbox and follow the instructions.`;
@@ -584,6 +586,7 @@ declare module 'I18n/en-US.json' {
     'conversationAudioAssetUploadFailed': `Upload failed: {name}`;
     'conversationAudioAssetUploading': `Uploading: {name}`;
     'conversationButtonSeparator': `or`;
+    'conversationCellsConversationEnabled': `File collaboration (Cells beta) is on`;
     'conversationClassified': `Security level: VS-NfD`;
     'conversationCommonFeature1': `Up to [bold]{capacity}[/bold] people`;
     'conversationCommonFeature2': `Video conferencing`;
@@ -602,7 +605,6 @@ declare module 'I18n/en-US.json' {
     'conversationContextMenuLike': `Like`;
     'conversationContextMenuReply': `Reply`;
     'conversationContextMenuUnlike': `Unlike`;
-    'conversationCellsConversationEnabled': `File collaboration (Cells beta) is on`;
     'conversationCreateReceiptsEnabled': `Read receipts are on`;
     'conversationCreateTeam': `with [showmore]all team members[/showmore]`;
     'conversationCreateTeamGuest': `with [showmore]all team members and one guest[/showmore]`;
@@ -625,8 +627,8 @@ declare module 'I18n/en-US.json' {
     'conversationDetailsActionArchive': `Archive`;
     'conversationDetailsActionBlock': `Block`;
     'conversationDetailsActionCancelRequest': `Cancel request`;
-    'conversationDetailsActionCellsTitle': `File collaboration (Cells beta version) is on`;
     'conversationDetailsActionCellsOption': `Permanently on for this conversation.`;
+    'conversationDetailsActionCellsTitle': `File collaboration (Cells beta version) is on`;
     'conversationDetailsActionClear': `Clear content`;
     'conversationDetailsActionConversationParticipants': `Show all ({number})`;
     'conversationDetailsActionCreateGroup': `Create group`;
@@ -1973,6 +1975,8 @@ declare module 'I18n/en-US.json' {
     'verify.headline': `You’ve got mail`;
     'verify.resendCode': `Resend code`;
     'verify.subhead': `Enter the six-digit verification code we sent to{newline}{email}`;
+    'verify.codeLabel': `Six-digit code`;
+    'verify.codePlaceholder': `Input field, enter digit`;
     'videoCallMenuMoreAddReaction': `Add reaction`;
     'videoCallMenuMoreAudioSettings': `Audio Settings`;
     'videoCallMenuMoreChangeView': `Change view`;
diff --git a/test/e2e_tests/backend/ConversationRepository/conversationRepository.e2e.ts b/test/e2e_tests/backend/ConversationRepository/conversationRepository.e2e.ts
index c30c0a212ea..7dd3cad1b5c 100644
--- a/test/e2e_tests/backend/ConversationRepository/conversationRepository.e2e.ts
+++ b/test/e2e_tests/backend/ConversationRepository/conversationRepository.e2e.ts
@@ -68,58 +68,39 @@ export class ConversationRepositoryE2E extends BackendClientE2E {
     }
   }
 
-  async getMLSConversationWithUser(token: string, conversationPartnerId: string, timeout = 10000) {
-    const retryDelay = 1000;
-    const maxRetries = timeout / retryDelay;
-    let mlsConversationId = null;
-
-    for (let attempt = 0; attempt < maxRetries && !mlsConversationId; attempt++) {
-      const listIdsResponse = await this.axiosInstance.post(
-        'conversations/list-ids',
-        {},
-        {
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
+  async getConversationWithUser(token: string, conversationPartnerId: string) {
+    const listIdsResponse = await this.axiosInstance.post(
+      'conversations/list-ids',
+      {},
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
         },
-      );
+      },
+    );
 
-      const qualifiedIds = listIdsResponse.data.qualified_conversations;
+    const qualifiedIds = listIdsResponse.data.qualified_conversations;
 
-      if (!qualifiedIds) {
-        throw new Error('No qualified conversations found');
-      }
+    if (!qualifiedIds) {
+      throw new Error('No qualified conversations found');
+    }
 
-      const response = await this.axiosInstance.post(
-        'conversations/list',
-        {
-          qualified_ids: qualifiedIds,
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-          },
+    const response = await this.axiosInstance.post(
+      'conversations/list',
+      {qualified_ids: qualifiedIds},
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
         },
-      );
-
-      // Filtering out conversations that are not MLS;
-      const responseData = response.data;
-      mlsConversationId =
-        responseData.found.find(
-          (conversation: {protocol: string; members: {others: {conversation_role: string; id: string}[]}}) =>
-            conversation.protocol === 'mls' &&
-            conversation.members.others.some(
-              (member: {conversation_role: string; id: string}) =>
-                member.conversation_role === 'wire_member' && member.id === conversationPartnerId,
-            ),
-        )?.qualified_id?.id ?? null;
+      },
+    );
 
-      await new Promise(resolve => setTimeout(resolve, retryDelay));
-    }
-    if (!mlsConversationId) {
-      throw new Error(`No MLS conversation found with user ID: ${conversationPartnerId}`);
-    }
-    return mlsConversationId;
+    // Find a conversation with the given user
+    const conversation = response.data.found.find(
+      (conversation: {members: {others: {conversation_role: string; id: string}[]}}) =>
+        conversation.members.others.some((member: {id: string}) => member.id === conversationPartnerId),
+    );
+    return conversation?.qualified_id?.id;
   }
 }
diff --git a/test/e2e_tests/backend/apiManager.e2e.ts b/test/e2e_tests/backend/apiManager.e2e.ts
index 31123a0d436..cdfcbc244d8 100644
--- a/test/e2e_tests/backend/apiManager.e2e.ts
+++ b/test/e2e_tests/backend/apiManager.e2e.ts
@@ -71,15 +71,6 @@ export class ApiManagerE2E {
     }
   }
 
-  async sendMessageToPersonalConversation(sender: User, receiver: User, text: string) {
-    const senderToken = sender.token ?? (await this.auth.loginUser(sender)).data.access_token;
-    const receiverId = receiver.id ?? (await this.auth.loginUser(receiver)).data.user;
-    const conversationId = await this.conversation.getMLSConversationWithUser(senderToken, receiverId);
-
-    // Using the first device from the list of devices
-    await this.testService.sendText(sender.devices[0], conversationId, text);
-  }
-
   async createPersonalUser(user: User, invitationCode?: string) {
     // 1. Register
     const registerResponse = await this.auth.registerUser(user, invitationCode);
diff --git a/test/e2e_tests/backend/authRepository.e2e.ts b/test/e2e_tests/backend/authRepository.e2e.ts
index a2e0ba8746e..29b12dbfbad 100644
--- a/test/e2e_tests/backend/authRepository.e2e.ts
+++ b/test/e2e_tests/backend/authRepository.e2e.ts
@@ -63,6 +63,23 @@ export class AuthRepositoryE2E extends BackendClientE2E {
     });
   }
 
+  async upgradeUserToTeamOwner(user: User, teamName: string) {
+    const res = this.axiosInstance.post(
+      'upgrade-personal-to-team',
+      {
+        name: teamName,
+        icon: 'default',
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${user.token}`,
+        },
+      },
+    );
+    const data = (await res).data;
+    return {teamId: data.team_id, teamName: data.team_name};
+  }
+
   public async activateAccount(email: string, code: string) {
     await this.axiosInstance.post('activate', {
       code,
diff --git a/test/e2e_tests/backend/backendClient.e2e.ts b/test/e2e_tests/backend/backendClient.e2e.ts
index f2bcf49a901..bb8a9492101 100644
--- a/test/e2e_tests/backend/backendClient.e2e.ts
+++ b/test/e2e_tests/backend/backendClient.e2e.ts
@@ -17,10 +17,10 @@
  *
  */
 
-import {MINIMUM_API_VERSION} from '@wireapp/api-client/lib/Config';
 import axios, {AxiosInstance} from 'axios';
 
-const TEST_API_VERSION = `v${MINIMUM_API_VERSION}`;
+// ToDo: Fix via export from api-client
+const TEST_API_VERSION = `v13`;
 export class BackendClientE2E {
   readonly axiosInstance: AxiosInstance;
 
diff --git a/test/e2e_tests/backend/teamRepository.e2e.ts b/test/e2e_tests/backend/teamRepository.e2e.ts
index ba701206ee5..7cdcd117cc1 100644
--- a/test/e2e_tests/backend/teamRepository.e2e.ts
+++ b/test/e2e_tests/backend/teamRepository.e2e.ts
@@ -42,6 +42,22 @@ export class TeamRepositoryE2E extends BackendClientE2E {
     return (await response).data.id;
   }
 
+  async acceptTeamInvitation(teamInvitationCode: string, user: Pick<User, 'password' | 'token'>) {
+    await this.axiosInstance.post(
+      'teams/invitations/accept',
+      {
+        code: teamInvitationCode,
+        password: user.password,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${user.token}`,
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+  }
+
   async addServiceToTeamWhitelist(teamId: string, service: Service, token: string) {
     await this.axiosInstance.post(
       `teams/${teamId}/services/whitelist`,
diff --git a/test/e2e_tests/backend/testServiceClient.e2e.ts b/test/e2e_tests/backend/testServiceClient.e2e.ts
index 673f9662535..2b39e2e238c 100644
--- a/test/e2e_tests/backend/testServiceClient.e2e.ts
+++ b/test/e2e_tests/backend/testServiceClient.e2e.ts
@@ -51,4 +51,15 @@ export class TestServiceClientE2E {
       text,
     });
   }
+
+  async sendLocation(
+    instanceId: string,
+    conversationId: string,
+    message: {locationName: string; latitude: number; longitude: number; zoom: number},
+  ) {
+    return await this.axiosInstance.post(`/api/v1/instance/${instanceId}/sendLocation`, {
+      conversationId,
+      ...message,
+    });
+  }
 }
diff --git a/test/e2e_tests/pageManager/index.ts b/test/e2e_tests/pageManager/index.ts
index a068d98116a..1e430462f40 100644
--- a/test/e2e_tests/pageManager/index.ts
+++ b/test/e2e_tests/pageManager/index.ts
@@ -36,6 +36,7 @@ import {AppLockModal} from './webapp/modals/appLock.modal';
 import {BlockWarningModal} from './webapp/modals/blockWarning.modal';
 import {CallNotEstablishedModal} from './webapp/modals/callNotEstablished.modal';
 import {CancelRequestModal} from './webapp/modals/cancelRequest.modal';
+import {ConfirmModal} from './webapp/modals/confirm.modal';
 import {ConfirmLogoutModal} from './webapp/modals/confirmLogout.modal';
 import {ConversationNotConnectedModal} from './webapp/modals/conversationNotConnected.modal';
 import {CopyPasswordModal} from './webapp/modals/copyPassword.modal';
@@ -47,6 +48,7 @@ import {ErrorModal} from './webapp/modals/error.modal';
 import {ExportBackupModal} from './webapp/modals/exportBackup.modal';
 import {importBackupModal} from './webapp/modals/importBackup.modal';
 import {LeaveConversationModal} from './webapp/modals/leaveConversation.modal';
+import {PasswordModal} from './webapp/modals/password.modal';
 import {RemoveMemberModal} from './webapp/modals/removeMember.modal';
 import {UnableToOpenConversationModal} from './webapp/modals/unableToOpenConversation.modal';
 import {UserProfileModal} from './webapp/modals/userProfile.modal';
@@ -54,11 +56,13 @@ import {VerifyEmailModal} from './webapp/modals/verifyEmail.modal';
 import {AccountPage} from './webapp/pages/account.page';
 import {AudioVideoSettingsPage} from './webapp/pages/audioVideoSettings.page';
 import {CallingPage} from './webapp/pages/calling.page';
+import {CollectionPage} from './webapp/pages/collection.page';
 import {ConnectRequestPage} from './webapp/pages/connectRequest.page';
 import {ConversationPage} from './webapp/pages/conversation.page';
 import {ConversationDetailsPage} from './webapp/pages/conversationDetails.page';
 import {ConversationListPage} from './webapp/pages/conversationList.page';
 import {DeleteAccountPage} from './webapp/pages/deleteAccount.page';
+import {DevicesPage} from './webapp/pages/devices.page';
 import {EmailVerificationPage} from './webapp/pages/emailVerification.page';
 import {GroupCreationPage} from './webapp/pages/groupCreation.page';
 import {GuestOptionsPage} from './webapp/pages/guestOptions.page';
@@ -165,6 +169,7 @@ export class PageManager {
       conversationDetails: () =>
         this.getOrCreate('webapp.pages.conversationDetails', () => new ConversationDetailsPage(this.page)),
       conversation: () => this.getOrCreate('webapp.pages.conversation', () => new ConversationPage(this.page)),
+      collection: () => this.getOrCreate('webapp.pages.collection', () => new CollectionPage(this.page)),
       cellsConversation: () =>
         this.getOrCreate('webapp.pages.cellsConversation', () => new CellsConversationPage(this.page)),
       cellsConversationFiles: () =>
@@ -172,6 +177,7 @@ export class PageManager {
       connectRequest: () => this.getOrCreate('webapp.pages.connectRequest', () => new ConnectRequestPage(this.page)),
       calling: () => this.getOrCreate('webapp.pages.calling', () => new CallingPage(this.page)),
       settings: () => this.getOrCreate('webapp.pages.settings', () => new SettingsPage(this.page)),
+      devices: () => this.getOrCreate('webapp.pages.devices', () => new DevicesPage(this.page)),
       options: () => this.getOrCreate('webapp.pages.options', () => new OptionsPage(this.page)),
       audioVideoSettings: () =>
         this.getOrCreate('webapp.pages.audioVideoSettings', () => new AudioVideoSettingsPage(this.page)),
@@ -220,6 +226,8 @@ export class PageManager {
       marketingConsent: () =>
         this.getOrCreate('webapp.modals.marketingConsent', () => new MarketingConsentModal(this.page)),
       acknowledge: () => this.getOrCreate('webapp.modals.marketingConsent', () => new AcknowledgeModal(this.page)),
+      confirm: () => this.getOrCreate('webapp.modals.confirm', () => new ConfirmModal(this.page)),
+      password: () => this.getOrCreate('webapp.modals.password', () => new PasswordModal(this.page)),
       cellsFileDetailView: () =>
         this.getOrCreate('webapp.modals.cellsFileDetailView', () => new CellsFileDetailViewModal(this.page)),
       cancelRequest: () =>
diff --git a/test/e2e_tests/pageManager/webapp/modals/confirm.modal.ts b/test/e2e_tests/pageManager/webapp/modals/confirm.modal.ts
new file mode 100644
index 00000000000..5a21594fec6
--- /dev/null
+++ b/test/e2e_tests/pageManager/webapp/modals/confirm.modal.ts
@@ -0,0 +1,28 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Page} from '@playwright/test';
+
+import {BaseModal} from './base.modal';
+
+export class ConfirmModal extends BaseModal {
+  constructor(page: Page) {
+    super(page, 'modal-template-confirm');
+  }
+}
diff --git a/test/e2e_tests/pageManager/webapp/modals/password.modal.ts b/test/e2e_tests/pageManager/webapp/modals/password.modal.ts
new file mode 100644
index 00000000000..fb2d97a9738
--- /dev/null
+++ b/test/e2e_tests/pageManager/webapp/modals/password.modal.ts
@@ -0,0 +1,33 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Locator, Page} from '@playwright/test';
+
+import {BaseModal} from './base.modal';
+
+export class PasswordModal extends BaseModal {
+  readonly passwordInput: Locator;
+
+  constructor(page: Page) {
+    // For some reason the password modal is rendered using the `modal-template-option` attribute
+    super(page, 'modal-template-option');
+
+    this.passwordInput = this.modal.getByLabel('Password');
+  }
+}
diff --git a/test/e2e_tests/pageManager/webapp/pages/collection.page.ts b/test/e2e_tests/pageManager/webapp/pages/collection.page.ts
new file mode 100644
index 00000000000..0cd0e29b48c
--- /dev/null
+++ b/test/e2e_tests/pageManager/webapp/pages/collection.page.ts
@@ -0,0 +1,41 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Locator, Page} from '@playwright/test';
+
+/** POM for the "collection". This page is accessible by searching for a message within a conversation. */
+export class CollectionPage {
+  readonly page: Locator;
+
+  constructor(page: Page) {
+    this.page = page.locator('#collection');
+  }
+
+  get searchInput() {
+    return this.page.getByRole('textbox', {name: 'Search text messages'});
+  }
+
+  get searchItems() {
+    return this.page.getByTestId('full-search-item');
+  }
+
+  async searchForMessages(search: string) {
+    await this.searchInput.fill(search);
+  }
+}
diff --git a/test/e2e_tests/pageManager/webapp/pages/conversation.page.ts b/test/e2e_tests/pageManager/webapp/pages/conversation.page.ts
index 98fa1234fc1..8f18759f4e7 100644
--- a/test/e2e_tests/pageManager/webapp/pages/conversation.page.ts
+++ b/test/e2e_tests/pageManager/webapp/pages/conversation.page.ts
@@ -21,7 +21,9 @@ import {Locator, Page} from '@playwright/test';
 
 import {User} from 'test/e2e_tests/data/user';
 import {downloadAssetAndGetFilePath} from 'test/e2e_tests/utils/asset.util';
-import {selectById, selectByClass, selectByDataAttribute} from 'test/e2e_tests/utils/selector.util';
+import {selectByClass, selectByDataAttribute} from 'test/e2e_tests/utils/selector.util';
+
+import {ConfirmModal} from '../modals/confirm.modal';
 
 type EmojiReaction = 'plus-one' | 'heart' | 'joy';
 
@@ -34,9 +36,11 @@ export class ConversationPage {
   readonly createGroupSubmitButton: Locator;
   readonly messageInput: Locator;
   readonly sendMessageButton: Locator;
+  readonly searchButton: Locator;
   readonly conversationTitle: Locator;
   readonly watermark: Locator;
   readonly timerMessageButton: Locator;
+  readonly timerOffButton: Locator;
   readonly timerTenSecondsButton: Locator;
   readonly openGroupInformationViaName: Locator;
   readonly membersList: Locator;
@@ -49,6 +53,7 @@ export class ConversationPage {
   readonly callButton: Locator;
   readonly conversationInfoButton: Locator;
   readonly pingButton: Locator;
+  /** Messages in conversation, only contains message items which have been sent successfully */
   readonly messages: Locator;
   readonly messageDetails: Locator;
   readonly messageItems: Locator;
@@ -76,10 +81,12 @@ export class ConversationPage {
     this.messageInput = page.locator(selectByDataAttribute('input-message'));
     this.watermark = page.locator(`${selectByDataAttribute('no-conversation')} svg`);
     this.sendMessageButton = page.locator(selectByDataAttribute('do-send-message'));
+    this.searchButton = page.getByRole('button', {name: 'Search'});
     this.conversationTitle = page.locator('[data-uie-name="status-conversation-title-bar-label"]');
     this.openGroupInformationViaName = page.locator(selectByDataAttribute('status-conversation-title-bar-label'));
     this.timerMessageButton = page.locator(selectByDataAttribute('do-set-ephemeral-timer'));
-    this.timerTenSecondsButton = page.locator(selectById('btn-10-seconds'));
+    this.timerOffButton = page.getByRole('button', {name: 'Off'});
+    this.timerTenSecondsButton = page.getByRole('button', {name: '10 seconds'});
     this.membersList = page.locator(selectByDataAttribute('list-members'));
     this.adminsList = page.locator(selectByDataAttribute('list-admins'));
     this.leaveConversationButton = page.locator(selectByDataAttribute('do-leave-item-text'));
@@ -94,7 +101,8 @@ export class ConversationPage {
     this.pingButton = page.locator(selectByDataAttribute('do-ping'));
     this.messageItems = page.locator(selectByDataAttribute('item-message'));
     this.messages = page.locator(
-      `${selectByDataAttribute('item-message')} ${selectByClass('message-body')}:not(:has(p${selectByClass('text-foreground')})):has(${selectByClass('text')})`,
+      // The attribute 'send-status' indicates whether the optimistic update for sending the message was successful
+      `${selectByDataAttribute('item-message')}${selectByDataAttribute('2', 'send-status')}`,
     );
     this.messageDetails = page.locator('#message-details');
     this.filesTab = page.locator('#conversation-tab-files');
@@ -162,6 +170,21 @@ export class ConversationPage {
     await this.createGroupSubmitButton.click();
   }
 
+  async replyToMessage(message: Locator) {
+    await message.hover();
+    await message.getByRole('group').getByTestId('do-reply-message').click();
+  }
+
+  async enableSelfDeletingMessages() {
+    await this.timerMessageButton.click();
+    await this.timerTenSecondsButton.click();
+  }
+
+  async disableSelfDeletingMessages() {
+    await this.timerMessageButton.click();
+    await this.timerOffButton.click();
+  }
+
   async sendMessageWithUserMention(userFullName: string, messageText?: string) {
     await this.messageInput.fill(`@`);
     await this.page
@@ -204,7 +227,7 @@ export class ConversationPage {
    * @returns a Locator to the matching message(s)
    */
   getMessage(options?: {content?: string | RegExp; sender?: User}): Locator {
-    let message = this.messageItems;
+    let message = this.messages;
 
     if (options?.content) {
       message = message.filter({hasText: options.content});
@@ -242,6 +265,12 @@ export class ConversationPage {
     await menu.getByRole('button', {name: 'Details'}).click();
   }
 
+  async deleteMessage(message: Locator, deleteFor: 'Me' | 'Everyone') {
+    const menu = await this.openMessageOptions(message);
+    await menu.getByRole('button', {name: `Delete for ${deleteFor}…`}).click();
+    await new ConfirmModal(this.page).clickAction();
+  }
+
   async reactOnMessage(message: Locator, emojiType: EmojiReaction) {
     await message.hover();
     const reactionButton = message.getByRole('group').getByRole('button').first();
diff --git a/test/e2e_tests/pageManager/webapp/pages/conversationDetails.page.ts b/test/e2e_tests/pageManager/webapp/pages/conversationDetails.page.ts
index 00607624c6a..4f2253057d3 100644
--- a/test/e2e_tests/pageManager/webapp/pages/conversationDetails.page.ts
+++ b/test/e2e_tests/pageManager/webapp/pages/conversationDetails.page.ts
@@ -27,6 +27,7 @@ export class ConversationDetailsPage {
   readonly addPeopleButton: Locator;
   readonly conversationDetails: Locator;
   readonly guestOptionsButton: Locator;
+  readonly selfDeletingMessageButton: Locator;
   readonly archiveButton: Locator;
 
   constructor(page: Page) {
@@ -35,6 +36,7 @@ export class ConversationDetailsPage {
     this.addPeopleButton = page.locator(`${selectByDataAttribute('go-add-people')}`);
     this.conversationDetails = page.locator('#conversation-details');
     this.guestOptionsButton = this.conversationDetails.locator('[data-uie-name="go-guest-options"]');
+    this.selfDeletingMessageButton = this.conversationDetails.getByRole('button', {name: 'Self-deleting messages'});
     this.archiveButton = this.conversationDetails.locator(selectByDataAttribute('do-archive'));
   }
 
@@ -102,6 +104,15 @@ export class ConversationDetailsPage {
     await this.archiveButton.click();
   }
 
+  /** Opens the self deleting messages panel, selects the given value and closes it again */
+  async setSelfDeletingMessages(value: 'Off' | '10 seconds') {
+    await this.selfDeletingMessageButton.click();
+    const selfDeletingMessagesPanel = this.page.locator('#timed-messages');
+    // The radio options are currently not accessible so accessible locators can't be used
+    await selfDeletingMessagesPanel.getByRole('radiogroup').locator('label', {hasText: value}).click();
+    await selfDeletingMessagesPanel.getByRole('button', {name: 'Go back'}).click();
+  }
+
   async addServiceToConversation(serviceName: string) {
     // Click on the Services/Apps tab
     const servicesTab = this.page.locator(
diff --git a/test/e2e_tests/pageManager/webapp/pages/devices.page.ts b/test/e2e_tests/pageManager/webapp/pages/devices.page.ts
new file mode 100644
index 00000000000..86102da1bef
--- /dev/null
+++ b/test/e2e_tests/pageManager/webapp/pages/devices.page.ts
@@ -0,0 +1,35 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Locator, Page} from '@playwright/test';
+
+export class DevicesPage {
+  readonly page: Page;
+
+  readonly proteusId: Locator;
+  readonly activeDevices: Locator;
+
+  constructor(page: Page) {
+    this.page = page;
+
+    // The id is not using any label or similar but just multiple paragraphs beneath each other
+    this.proteusId = page.locator("p:text('Proteus ID') + p");
+    this.activeDevices = page.getByRole('group', {name: 'Active'}).getByRole('button', {name: /device details/});
+  }
+}
diff --git a/test/e2e_tests/pageManager/webapp/pages/login.page.ts b/test/e2e_tests/pageManager/webapp/pages/login.page.ts
index 778c997e888..63c389fc7df 100644
--- a/test/e2e_tests/pageManager/webapp/pages/login.page.ts
+++ b/test/e2e_tests/pageManager/webapp/pages/login.page.ts
@@ -28,6 +28,7 @@ export class LoginPage {
   readonly emailInput: Locator;
   readonly passwordInput: Locator;
   readonly loginErrorText: Locator;
+  readonly publicComputerCheckbox: Locator;
 
   constructor(page: Page) {
     this.page = page;
@@ -36,6 +37,7 @@ export class LoginPage {
     this.emailInput = page.locator('[data-uie-name="enter-email"]');
     this.passwordInput = page.locator('[data-uie-name="enter-password"]');
     this.loginErrorText = page.locator('[data-uie-name="error-message"]');
+    this.publicComputerCheckbox = page.getByText('This is a public computer');
   }
 
   async login(user: Pick<User, 'email' | 'password'>) {
diff --git a/test/e2e_tests/pageManager/webapp/pages/settings.page.ts b/test/e2e_tests/pageManager/webapp/pages/settings.page.ts
index b49d31c13c8..f2e91cb3bb4 100644
--- a/test/e2e_tests/pageManager/webapp/pages/settings.page.ts
+++ b/test/e2e_tests/pageManager/webapp/pages/settings.page.ts
@@ -22,19 +22,21 @@ import {Page, Locator} from '@playwright/test';
 export class SettingsPage {
   readonly page: Page;
 
-  readonly audioVideoSettingsButton: Locator;
   readonly accountButton: Locator;
+  readonly devicesButton: Locator;
   readonly optionsButton: Locator;
+  readonly audioVideoButton: Locator;
 
   constructor(page: Page) {
     this.page = page;
-    this.audioVideoSettingsButton = page.locator("[data-uie-name='go-audio-video']");
-    this.accountButton = page.locator("[data-uie-name='go-account']");
-    this.optionsButton = page.locator("[data-uie-name='go-options']");
+    this.accountButton = page.getByRole('button', {name: 'Account'});
+    this.devicesButton = page.getByRole('button', {name: 'Devices'});
+    this.optionsButton = page.getByRole('button', {name: 'Options'});
+    this.audioVideoButton = page.getByRole('button', {name: 'Audio / Video'});
   }
 
   async clickAudioVideoSettingsButton() {
-    await this.audioVideoSettingsButton.click();
+    await this.audioVideoButton.click();
   }
 
   async clickAccountButton() {
diff --git a/test/e2e_tests/specs/Authentication/authentication.spec.ts b/test/e2e_tests/specs/Authentication/authentication.spec.ts
index 5e1bec59ab1..6c8c0c21b5a 100644
--- a/test/e2e_tests/specs/Authentication/authentication.spec.ts
+++ b/test/e2e_tests/specs/Authentication/authentication.spec.ts
@@ -17,9 +17,34 @@
  *
  */
 
-import {test, expect} from 'test/e2e_tests/test.fixtures';
+import {IncomingMessage} from 'node:http';
+import https from 'node:https';
+import {SecureVersion} from 'node:tls';
+
+import {PageManager, webAppPath} from 'test/e2e_tests/pageManager';
+import {test, expect, withLogin} from 'test/e2e_tests/test.fixtures';
+import {connectWithUser} from 'test/e2e_tests/utils/userActions';
 
 test.describe('Authentication', () => {
+  test(
+    'Verify sign in button is disabled in case of empty credentials',
+    {tag: ['@TC-3457', '@regression']},
+    async ({pageManager}) => {
+      const {pages} = pageManager.webapp;
+      const {emailInput, passwordInput, signInButton} = pages.login();
+      await pageManager.openLoginPage();
+
+      await expect(signInButton).toBeDisabled();
+
+      await emailInput.fill('invalid@email');
+      await passwordInput.fill('invalidPassword');
+      await expect(signInButton).not.toBeDisabled();
+
+      await passwordInput.clear();
+      await expect(signInButton).toBeDisabled();
+    },
+  );
+
   test(
     'I want to be asked to share telemetry data when I log in',
     {tag: ['@TC-8780', '@regression']},
@@ -33,4 +58,202 @@ test.describe('Authentication', () => {
       await expect(modals.dataShareConsent().modalTitle).toBeVisible();
     },
   );
+
+  test(
+    'Verify sign in error appearance in case of suspended team account',
+    {tag: ['@TC-3468', '@regression']},
+    async ({pageManager}) => {
+      const {pages} = pageManager.webapp;
+      await pageManager.openLoginPage();
+
+      const userOfSuspendedTeam = {email: 'sven+team6@wire.com', password: '12345678'};
+      await pages.login().login(userOfSuspendedTeam);
+
+      await expect(pages.login().loginErrorText).toHaveText('This account is no longer authorized to log in');
+    },
+  );
+
+  test(
+    'Verify current browser is set as temporary device',
+    {tag: ['@TC-3460', '@regression']},
+    async ({pageManager, createUser}) => {
+      const user = await createUser();
+      const {pages, components} = pageManager.webapp;
+
+      await test.step('Log in with public computer checked', async () => {
+        await pageManager.openLoginPage();
+        await pages.login().publicComputerCheckbox.click();
+        await pages.login().login(user);
+        await pages.historyInfo().clickConfirmButton();
+      });
+
+      let proteusId: string;
+      await test.step('Open device settings and get current proteus id', async () => {
+        await components.conversationSidebar().clickPreferencesButton();
+        await pages.settings().devicesButton.click();
+
+        proteusId = (await pages.devices().proteusId.textContent()) ?? '';
+        expect(proteusId).toBeTruthy();
+      });
+
+      await test.step('Log out of public computer', async () => {
+        await pages.settings().accountButton.click();
+        await pages.account().clickLogoutButton();
+      });
+
+      await test.step('Log in again on non public computer', async () => {
+        await pageManager.openLoginPage();
+        await pages.login().login(user);
+      });
+
+      await test.step("Open device settings and ensure the public computer isn't active and the ID was re-generated", async () => {
+        await components.conversationSidebar().clickPreferencesButton();
+        await pages.settings().devicesButton.click();
+
+        await expect(pages.devices().activeDevices).toHaveCount(0);
+        await expect(pages.devices().proteusId).not.toContainText(proteusId);
+      });
+    },
+  );
+
+  test(
+    'Verify sign in error appearance in case of wrong credentials',
+    {tag: ['@TC-3465', '@regression']},
+    async ({pageManager}) => {
+      const {pages} = pageManager.webapp;
+      await pageManager.openLoginPage();
+
+      await pages.login().login({email: 'invalid@wire.com', password: 'invalid'});
+
+      await expect(pages.login().loginErrorText).toHaveText('Please verify your details and try again');
+    },
+  );
+
+  [
+    {tag: '@TC-3472', deviceType: 'permanent'},
+    {tag: '@TC-3473', deviceType: 'temporary'},
+  ].forEach(({deviceType, tag}) => {
+    test(
+      `I want to keep my history after refreshing the page on ${deviceType} device`,
+      {tag: [tag, '@regression']},
+      async ({pageManager, createTeam}) => {
+        const {pages} = pageManager.webapp;
+        const team = await createTeam('Test Team', {withMembers: 1});
+        const userA = team.owner;
+        const userB = team.members[0];
+
+        await test.step('Log in and connect with user B', async () => {
+          await pageManager.openLoginPage();
+
+          if (deviceType === 'temporary') {
+            await pages.login().publicComputerCheckbox.click();
+            await pages.login().login(userA);
+            await pages.historyInfo().clickConfirmButton();
+          } else {
+            await pages.login().login(userA);
+          }
+
+          await connectWithUser(pageManager, userB);
+        });
+
+        await test.step('Send a message', async () => {
+          await pages.conversationList().openConversation(userB.fullName);
+          await pages.conversation().sendMessage('Before refresh');
+        });
+
+        await test.step('Ensure message is still visible after page refresh', async () => {
+          const message = pages.conversation().getMessage({content: 'Before refresh'});
+          await expect(message).toBeVisible();
+
+          await pageManager.refreshPage();
+
+          await pages.conversationList().openConversation(userB.fullName);
+          await expect(message).toBeVisible();
+        });
+      },
+    );
+  });
+
+  // Bug: Connecting using TLSv1.2 should not be allowed but succeeds
+  test.skip(
+    'I want to make sure i connect to webapp only through TLS >= 1.3 connection',
+    {tag: ['@TC-3480', '@regression']},
+    async () => {
+      const requestWithTlsVersion = (versions: {min?: SecureVersion; max?: SecureVersion}) =>
+        new Promise<IncomingMessage>((res, rej) => {
+          https.get(webAppPath, {minVersion: versions.min, maxVersion: versions.max}, res).on('error', rej);
+        });
+
+      await expect(requestWithTlsVersion({max: 'TLSv1.2'})).rejects.toBeDefined();
+      await expect(requestWithTlsVersion({min: 'TLSv1.3'})).resolves.toBeDefined();
+    },
+  );
+
+  test(
+    'Make sure user does not see data of user of previous sessions on same browser',
+    {tag: ['@TC-1311', '@regression']},
+    async ({pageManager, createTeam}) => {
+      const {pages, components} = pageManager.webapp;
+      const team = await createTeam('Test Team', {withMembers: 1});
+      const userA = team.owner;
+      const userB = team.members[0];
+
+      await test.step('Log in with public computer checked', async () => {
+        await pageManager.openLoginPage();
+        await pages.login().publicComputerCheckbox.click();
+        await pages.login().login(userA);
+        await pages.historyInfo().clickConfirmButton();
+      });
+
+      await test.step('Connect with and send message to userB', async () => {
+        await connectWithUser(pageManager, userB);
+        await pages.conversationList().openConversation(userB.fullName);
+        await pages.conversation().sendMessage('Test message');
+      });
+
+      await test.step('Log out of public computer', async () => {
+        await components.conversationSidebar().clickPreferencesButton();
+        await pages.settings().accountButton.click();
+        await pages.account().clickLogoutButton();
+      });
+
+      await test.step('Log in again', async () => {
+        await pageManager.openLoginPage();
+        await pages.login().login(userA);
+        await pages.historyInfo().clickConfirmButton();
+      });
+
+      await test.step('Verify previously sent message is gone', async () => {
+        await pages.conversationList().openConversation(userB.fullName);
+        await expect(pages.conversation().getMessage({content: 'Test message'})).not.toBeAttached();
+      });
+    },
+  );
+
+  test(
+    'Verify session expired info is visible on login page',
+    {tag: ['@TC-1311', '@regression']},
+    async ({createPage, createUser}) => {
+      const user = await createUser();
+      const device1Pages = PageManager.from(await createPage(withLogin(user))).webapp.pages;
+
+      const {
+        pages: device2Pages,
+        modals: device2Modals,
+        components: device2Components,
+      } = PageManager.from(await createPage(withLogin(user))).webapp;
+      await device2Pages.historyInfo().clickConfirmButton();
+
+      await device2Components.conversationSidebar().clickPreferencesButton();
+      await device2Pages.settings().devicesButton.click();
+      await device2Pages.devices().activeDevices.getByRole('button', {name: 'Remove Device'}).click();
+
+      await device2Modals.password().passwordInput.fill(user.password);
+      await device2Modals.password().clickAction();
+
+      await expect(
+        device1Pages.singleSignOn().page.getByText('You were signed out because your device was deleted'),
+      ).toBeVisible();
+    },
+  );
 });
diff --git a/test/e2e_tests/specs/Edit/edit.spec.ts b/test/e2e_tests/specs/Edit/edit.spec.ts
index 11ef8a85c5b..dcd0ced94e0 100644
--- a/test/e2e_tests/specs/Edit/edit.spec.ts
+++ b/test/e2e_tests/specs/Edit/edit.spec.ts
@@ -19,26 +19,21 @@
 
 import {User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
-import {test as baseTest, expect, withConversation, withLogin} from 'test/e2e_tests/test.fixtures';
+import {test, expect, withConnectedUser, withLogin} from 'test/e2e_tests/test.fixtures';
 import {createGroup} from 'test/e2e_tests/utils/userActions';
 
-const test = baseTest.extend<{userA: User; userB: User}>({
-  userA: async ({createUser}, use) => {
-    await use(await createUser());
-  },
-  userB: async ({createUser}, use) => {
-    await use(await createUser());
-  },
-});
-
 test.describe('Edit', () => {
-  test.beforeEach(async ({api, userA, userB}) => {
-    await api.connectUsers(userA, userB);
-  });
+  let userA: User;
+  let userB: User;
 
-  test('I can edit my message in 1:1', {tag: ['@TC-679', '@regression']}, async ({createPage, userA, userB}) => {
-    const pages = (await PageManager.from(createPage(withLogin(userA), withConversation(userB)))).webapp.pages;
+  test.beforeEach(async ({createTeam}) => {
+    const team = await createTeam('Test Team', {withMembers: 1});
+    userA = team.owner;
+    userB = team.members[0];
+  });
 
+  test('I can edit my message in 1:1', {tag: ['@TC-679', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
     await pages.conversation().sendMessage('Test Message');
 
     const message = pages.conversation().getMessage({sender: userA});
@@ -52,36 +47,32 @@ test.describe('Edit', () => {
     await expect(message).toContainText('Edited Message');
   });
 
-  test(
-    'I can edit my message in a group conversation',
-    {tag: ['@TC-680', '@regression']},
-    async ({createPage, userA, userB}) => {
-      const pages = (await PageManager.from(createPage(withLogin(userA)))).webapp.pages;
+  test('I can edit my message in a group conversation', {tag: ['@TC-680', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA)))).webapp.pages;
+    await createGroup(pages, 'Test Group', [userB]);
 
-      await createGroup(pages, 'Test Group', [userB]);
-      await pages.conversationList().openConversation('Test Group');
-      await pages.conversation().sendMessage('Test Message');
+    await pages.conversationList().openConversation('Test Group');
+    await pages.conversation().sendMessage('Test Message');
 
-      const message = pages.conversation().getMessage({sender: userA});
-      await expect(message).toContainText('Test Message');
+    const message = pages.conversation().getMessage({sender: userA});
+    await expect(message).toContainText('Test Message');
 
-      await pages.conversation().editMessage(message);
-      await expect(pages.conversation().messageInput).toContainText('Test Message');
+    await pages.conversation().editMessage(message);
+    await expect(pages.conversation().messageInput).toContainText('Test Message');
 
-      // Overwrite the text in the message input and send it
-      await pages.conversation().sendMessage('Edited Message');
-      await expect(message).toContainText('Edited Message');
-    },
-  );
+    // Overwrite the text in the message input and send it
+    await pages.conversation().sendMessage('Edited Message');
+    await expect(message).toContainText('Edited Message');
+  });
 
   test(
     'I see changed message if message was edited from another device',
     {tag: ['@TC-682', '@regression']},
-    async ({createPage, userA, userB}) => {
-      const deviceA = (await PageManager.from(createPage(withLogin(userA), withConversation(userB)))).webapp.pages;
+    async ({createPage}) => {
+      const deviceA = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+
       // Device 2 is intentionally created after device 1 to ensure the history info warning is confirmed
       const deviceB = (await PageManager.from(createPage(withLogin(userA)))).webapp.pages;
-
       await deviceB.historyInfo().clickConfirmButton();
       await deviceB.conversationList().openConversation(userB.fullName);
 
@@ -101,10 +92,10 @@ test.describe('Edit', () => {
     },
   );
 
-  test('I cannot edit another users message', {tag: ['@TC-683', '@regression']}, async ({createPage, userA, userB}) => {
+  test('I cannot edit another users message', {tag: ['@TC-683', '@regression']}, async ({createPage}) => {
     const [userAPages, userBPages] = await Promise.all([
-      PageManager.from(createPage(withLogin(userA), withConversation(userB))).then(pm => pm.webapp.pages),
-      PageManager.from(createPage(withLogin(userB), withConversation(userA))).then(pm => pm.webapp.pages),
+      PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+      PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))).then(pm => pm.webapp.pages),
     ]);
 
     await userAPages.conversation().sendMessage('Test Message');
@@ -119,8 +110,8 @@ test.describe('Edit', () => {
   test(
     'I can edit my last message by pressing the up arrow key',
     {tag: ['@TC-686', '@regression']},
-    async ({createPage, userA, userB}) => {
-      const pages = (await PageManager.from(createPage(withLogin(userA), withConversation(userB)))).webapp.pages;
+    async ({createPage}) => {
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
 
       await pages.conversation().sendMessage('Test Message');
       await expect(pages.conversation().getMessage({content: 'Test Message'})).toBeVisible();
@@ -133,10 +124,10 @@ test.describe('Edit', () => {
   test(
     'Editing a message does not create unread dot on receiver side',
     {tag: ['@TC-690', '@regression']},
-    async ({createPage, userA, userB}) => {
+    async ({createPage}) => {
       const [userAPages, userBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConversation(userB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(userB), withConversation(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))).then(pm => pm.webapp.pages),
       ]);
 
       await test.step('Create group as second conversation', async () => {
@@ -184,10 +175,10 @@ test.describe('Edit', () => {
   test(
     'I can see the changed message was edited from another user',
     {tag: ['@TC-692', '@regression']},
-    async ({createPage, userA, userB}) => {
+    async ({createPage}) => {
       const [userAPages, userBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConversation(userB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(userB), withConversation(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))).then(pm => pm.webapp.pages),
       ]);
 
       await userAPages.conversation().sendMessage('Test');
@@ -208,7 +199,7 @@ test.describe('Edit', () => {
   test(
     'I want to see the last edited text including a timestamp in message detail view if the message has been edited',
     {tag: ['@TC-3563', '@regression']},
-    async ({createPage, userA, userB}) => {
+    async ({createPage}) => {
       const pages = await PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages);
       await createGroup(pages, 'Test Group', [userB]); // The message detail view is only available for group conversations
 
diff --git a/test/e2e_tests/specs/Reply/reply.spec.ts b/test/e2e_tests/specs/Reply/reply.spec.ts
new file mode 100644
index 00000000000..7bde9f65ed2
--- /dev/null
+++ b/test/e2e_tests/specs/Reply/reply.spec.ts
@@ -0,0 +1,340 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {User} from 'test/e2e_tests/data/user';
+import {PageManager} from 'test/e2e_tests/pageManager';
+import {ConfirmModal} from 'test/e2e_tests/pageManager/webapp/modals/confirm.modal';
+import {test, expect, withLogin, withConnectedUser} from 'test/e2e_tests/test.fixtures';
+import {getAudioFilePath, getTextFilePath, getVideoFilePath, shareAssetHelper} from 'test/e2e_tests/utils/asset.util';
+import {getImageFilePath} from 'test/e2e_tests/utils/sendImage.util';
+import {createGroup} from 'test/e2e_tests/utils/userActions';
+
+test.describe('Reply', () => {
+  let userA: User;
+  let userB: User;
+
+  test.beforeEach(async ({createTeam}) => {
+    const team = await createTeam('Test Team', {withMembers: 1});
+    userA = team.owner;
+    userB = team.members[0];
+  });
+
+  test('I should not be able to reply to a ping', {tag: ['@TC-8038', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+
+    await pages.conversation().sendPing();
+    const ping = pages.conversation().systemMessages.last();
+    await expect(pages.conversation().systemMessages.last()).toContainText('pinged');
+
+    await pages.conversation().systemMessages.last().hover();
+    await expect(ping.getByTestId('do-reply-message')).not.toBeAttached();
+  });
+
+  test('I should not be able to reply to timed messages', {tag: ['@TC-8039', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+
+    await pages.conversation().enableSelfDeletingMessages();
+    await pages.conversation().sendMessage('Gone in 10s');
+    const message = pages.conversation().getMessage({content: 'Gone in 10s'});
+    await message.hover();
+
+    await expect(message.getByTestId('do-reply-message')).not.toBeAttached();
+  });
+
+  test(
+    'I want to see a placeholder text as quote when original message is not available anymore',
+    {tag: ['@TC-2994', '@regression']},
+    async ({createPage}) => {
+      const [userAPages, userBPages] = await Promise.all([
+        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))).then(pm => pm.webapp.pages),
+      ]);
+
+      await userAPages.conversation().sendMessage('Test');
+
+      const messageToReplyTo = userBPages.conversation().getMessage({content: 'Test'});
+      await userBPages.conversation().replyToMessage(messageToReplyTo);
+      await userBPages.conversation().sendMessage('Reply');
+
+      const replyMessage = userBPages.conversation().getMessage({content: 'Reply'});
+      await expect(replyMessage.getByTestId('quote-item')).toContainText('Test');
+
+      const messageToDelete = userAPages.conversation().getMessage({content: 'Test', sender: userA});
+      await userAPages.conversation().deleteMessage(messageToDelete, 'Everyone');
+
+      await expect(replyMessage.getByTestId('quote-item')).toContainText('You cannot see this message');
+    },
+  );
+
+  test(
+    'I should not see the quoted message when searching for original message in collections',
+    {tag: ['@TC-2996', '@regression']},
+    async ({createPage}) => {
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+      await pages.conversation().sendMessage('Test');
+
+      const messageToReplyTo = pages.conversation().getMessage({content: 'Test'});
+      await pages.conversation().replyToMessage(messageToReplyTo);
+      await pages.conversation().sendMessage('Reply');
+
+      await pages.conversation().searchButton.click();
+      await pages.collection().searchForMessages('Test');
+
+      // Only the original message should be shown since the reply doesn't contain the search term
+      await expect(pages.collection().searchItems).toHaveCount(1);
+      await expect(pages.collection().searchItems).not.toContainText('Reply');
+    },
+  );
+
+  test(
+    'I want to see truncated quote preview if quote is too long',
+    {tag: ['@TC-2997', '@regression']},
+    async ({createPage}) => {
+      const longMessage =
+        'This is a very long message which should be truncated within the UI since it is as already stated very long.';
+
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+      await pages.conversation().sendMessage(longMessage);
+
+      const messageToReplyTo = pages.conversation().getMessage({content: longMessage});
+      await pages.conversation().replyToMessage(messageToReplyTo);
+      await pages.conversation().sendMessage('Reply');
+
+      // Since the text is truncated using CSS the only reliable way for testing it is truncated is to assert the existence of the show more button
+      const quoteInReply = pages.conversation().getMessage({content: 'Reply'}).getByTestId('quote-item');
+      await expect(quoteInReply.getByRole('button', {name: 'Show more'})).toBeVisible();
+    },
+  );
+
+  test('I want to reply to a picture', {tag: ['@TC-3002', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    const {page} = pages.conversation();
+    await shareAssetHelper(getImageFilePath(), page, page.getByRole('button', {name: 'Add picture'}));
+
+    const messageWithImage = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithImage);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item').getByTestId('image-asset-img')).toBeVisible();
+  });
+
+  test('I want to reply to an audio message', {tag: ['@TC-3003', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    const {page} = pages.conversation();
+    await shareAssetHelper(getAudioFilePath(), page, page.getByRole('button', {name: 'Add file'}));
+
+    const messageWithAudio = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithAudio);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item').getByTestId('audio-asset')).toBeVisible();
+  });
+
+  test('I want to reply to a video message', {tag: ['@TC-3004', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    const {page} = pages.conversation();
+    await shareAssetHelper(getVideoFilePath(), page, page.getByRole('button', {name: 'Add file'}));
+
+    const messageWithVideo = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithVideo);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item').getByTestId('video-asset')).toBeVisible();
+  });
+
+  test('I want to reply to a link', {tag: ['@TC-3005', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    await pages.conversation().sendMessage('https://www.lidl.de/');
+
+    const messageWithLink = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithLink);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item').getByTestId('markdown-link')).toBeVisible();
+  });
+
+  test('I want to reply to a file', {tag: ['@TC-3006', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    const {page} = pages.conversation();
+    await shareAssetHelper(getTextFilePath(), page, page.getByRole('button', {name: 'Add file'}));
+
+    const messageWithFile = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithFile);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item').getByTestId('file-asset')).toBeVisible();
+  });
+
+  test('I want to reply to a reply', {tag: ['@TC-3007', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    await pages.conversation().sendMessage('Message');
+
+    const message = pages.conversation().getMessage({content: 'Message'});
+    await pages.conversation().replyToMessage(message);
+    await pages.conversation().sendMessage('Reply 1');
+
+    const reply1 = pages.conversation().getMessage({content: 'Reply 1'});
+    await pages.conversation().replyToMessage(reply1);
+    await pages.conversation().sendMessage('Reply 2');
+
+    const reply = pages.conversation().getMessage({content: 'Reply 2'});
+    await expect(reply.getByTestId('quote-item')).toContainText('Reply 1');
+  });
+
+  test('I want to reply to a link mixed with text', {tag: ['@TC-3008', '@regression']}, async ({createPage}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+    await pages.conversation().sendMessage('Link: https://www.lidl.de/');
+
+    const messageWithLink = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithLink);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item')).toContainText('Link: https://www.lidl.de');
+    await expect(reply.getByTestId('quote-item').getByTestId('markdown-link')).toBeVisible();
+  });
+
+  test('I want to reply to a location share', {tag: ['@TC-3009', '@regression']}, async ({createPage, api}) => {
+    const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+
+    await test.step('Prerequisite: Send location via TestService', async () => {
+      const {instanceId} = await api.testService.createInstance(
+        userA.password,
+        userA.email,
+        'Test Service Device',
+        false,
+      );
+      const conversationId = await api.conversation.getConversationWithUser(userA.token, userB.id!);
+      await api.testService.sendLocation(instanceId, conversationId, {
+        locationName: 'Test Location',
+        latitude: 52.5170365,
+        longitude: 13.404954,
+        zoom: 42,
+      });
+    });
+
+    const messageWithLink = pages.conversation().getMessage({sender: userA});
+    await pages.conversation().replyToMessage(messageWithLink);
+    await pages.conversation().sendMessage('Reply');
+
+    const reply = pages.conversation().getMessage({content: 'Reply'});
+    await expect(reply.getByTestId('quote-item')).toContainText('Test Location');
+    await expect(reply.getByTestId('quote-item').getByRole('link', {name: 'Open Map'})).toBeVisible();
+  });
+
+  test(
+    'I want to send a timed message as a reply to any type of a message',
+    {tag: ['@TC-3011', '@regression']},
+    async ({createPage}) => {
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+      await pages.conversation().sendMessage('Message');
+
+      const message = pages.conversation().getMessage({sender: userA});
+      await pages.conversation().replyToMessage(message);
+      await pages.conversation().enableSelfDeletingMessages();
+      await pages.conversation().sendMessage('Timed Reply');
+
+      const reply = pages.conversation().getMessage({content: 'Timed Reply'});
+      await expect(reply.getByTestId('quote-item')).toContainText('Message');
+    },
+  );
+
+  test(
+    'I want to click the quoted message to jump to the original message',
+    {tag: ['@TC-3013', '@regression']},
+    async ({createPage}) => {
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+      await pages.conversation().sendMessage('Message');
+      await pages.conversation().sendMessage('Line\n'.repeat(50)); // Send a message with a lot of lines to test the scrolling behavior
+
+      // .first() is needed as the reply quotes the original message, so we need to make sure the first one is used
+      const message = pages.conversation().getMessage({content: 'Message', sender: userA}).first();
+      await pages.conversation().replyToMessage(message);
+      await pages.conversation().sendMessage('Reply');
+      await expect(message).not.toBeInViewport();
+
+      const reply = pages.conversation().getMessage({content: 'Reply'});
+      await reply
+        .getByTestId('quote-item')
+        .getByRole('button', {name: /Original message from/})
+        .click();
+
+      // Validate the chat scrolled up, bringing the original message back into view
+      await expect(message).toBeInViewport();
+    },
+  );
+
+  test(
+    'I should not be able to send a reply after I got removed from the conversation',
+    {tag: ['@TC-3014', '@regression']},
+    async ({createPage}) => {
+      const [userAPages, userBPages] = await Promise.all([
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
+      ]);
+      await createGroup(userAPages, 'Test Group', [userB]);
+
+      await Promise.all([
+        userAPages.conversationList().openConversation('Test Group'),
+        userBPages.conversationList().openConversation('Test Group'),
+      ]);
+
+      await userAPages.conversation().sendMessage('Message');
+      const message = userBPages.conversation().getMessage({content: 'Message', sender: userA});
+      await expect(message).toBeVisible();
+
+      await userAPages.conversation().clickConversationInfoButton();
+      await userAPages.conversation().removeMemberFromGroup(userB.fullName);
+      await new ConfirmModal(userAPages.conversation().page).clickAction();
+      await expect(userBPages.conversation().getMessage({content: `${userA.fullName} removed you`})).toBeVisible();
+
+      await message.hover();
+      await expect(message.getByTestId('do-reply-message')).not.toBeAttached();
+    },
+  );
+
+  test(
+    'I want to reply with mention and tap on the mention in the reply opens the user profile',
+    {tag: ['@TC-3016', '@regression']},
+    async ({createPage}) => {
+      const pages = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp.pages;
+
+      await pages.conversation().sendMessageWithUserMention(userB.fullName, 'Message');
+      const message = pages.conversation().getMessage({content: 'Message'});
+
+      await pages.conversation().replyToMessage(message);
+      await pages.conversation().sendMessage('Reply');
+
+      const reply = pages.conversation().getMessage({content: 'Reply'});
+
+      await reply
+        .getByTestId('quote-item')
+        .getByRole('button', {name: `@${userB.fullName}`})
+        // There seems to be a bug where clicking the "@" in front of the mention won't do anything, so we have to move the position a bit to the right to hit the name
+        .click({position: {x: 16, y: 8}});
+
+      await expect(pages.conversationDetails().conversationDetails).toBeVisible();
+    },
+  );
+});
diff --git a/test/e2e_tests/specs/SelfDeletingMessages/selfDeletingMessages.spec.ts b/test/e2e_tests/specs/SelfDeletingMessages/selfDeletingMessages.spec.ts
new file mode 100644
index 00000000000..f1b814799e7
--- /dev/null
+++ b/test/e2e_tests/specs/SelfDeletingMessages/selfDeletingMessages.spec.ts
@@ -0,0 +1,248 @@
+/*
+ * Wire
+ * Copyright (C) 2025 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Locator} from '@playwright/test';
+
+import {User} from 'test/e2e_tests/data/user';
+import {PageManager} from 'test/e2e_tests/pageManager';
+import {test, expect, withLogin, withConnectedUser} from 'test/e2e_tests/test.fixtures';
+import {createGroup} from 'test/e2e_tests/utils/userActions';
+
+test.describe('Self Deleting Messages', () => {
+  let userA: User;
+  let userB: User;
+
+  test.beforeEach(async ({createTeam}) => {
+    const team = await createTeam('Test Team', {withMembers: 1});
+    userA = team.owner;
+    userB = team.members[0];
+  });
+
+  test('Verify sending ephemeral text message in 1:1', {tag: ['@TC-657', '@regression']}, async ({createPage}) => {
+    const [userAPage, userBPage] = await Promise.all([
+      createPage(withLogin(userA), withConnectedUser(userB)),
+      createPage(withLogin(userB), withConnectedUser(userA)),
+    ]);
+    const userAPages = PageManager.from(userAPage).webapp.pages;
+    const userBPages = PageManager.from(userBPage).webapp.pages;
+
+    await userAPages.conversation().enableSelfDeletingMessages();
+    await userAPages.conversation().sendMessage('Gone in 10s');
+    await expect(userBPages.conversation().getMessage({content: 'Gone in 10s'})).toBeVisible();
+
+    await userBPage.waitForTimeout(10_000); // Wait for 10s so the message is deleted
+    await expect(userAPages.conversation().getMessage({content: 'Gone in 10s'})).not.toBeVisible();
+    await expect(userBPages.conversation().getMessage({content: 'Gone in 10s'})).not.toBeVisible();
+  });
+
+  test('Verify sending ephemeral text message in group', {tag: ['@TC-658', '@regression']}, async ({createPage}) => {
+    const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+    const userAPages = PageManager.from(userAPage).webapp.pages;
+    const userBPages = PageManager.from(userBPage).webapp.pages;
+
+    await createGroup(userAPages, 'Test Group', [userB]);
+    await userBPages.conversationList().openConversation('Test Group');
+
+    await userAPages.conversation().enableSelfDeletingMessages();
+    await userAPages.conversation().sendMessage('Gone in 10s');
+    await expect(userBPages.conversation().getMessage({content: 'Gone in 10s'})).toBeVisible();
+
+    await userBPage.waitForTimeout(10_000); // Wait for 10s so the message is deleted
+    await expect(userAPages.conversation().getMessage({content: 'Gone in 10s'})).not.toBeVisible();
+    await expect(userBPages.conversation().getMessage({content: 'Gone in 10s'})).not.toBeVisible();
+  });
+
+  test(
+    'Verify timer is applied to all messages until turning it off in 1:1',
+    {tag: ['@TC-662', '@regression']},
+    async ({createPage}) => {
+      const page = await createPage(withLogin(userA), withConnectedUser(userB));
+      const pages = PageManager.from(page).webapp.pages;
+
+      await pages.conversation().enableSelfDeletingMessages();
+      await pages.conversation().sendMessage('First Message');
+      await pages.conversation().sendMessage('Second Message');
+
+      await pages.conversation().disableSelfDeletingMessages();
+      await pages.conversation().sendMessage('Third Message');
+
+      const firstMessage = pages.conversation().getMessage({content: 'First Message'});
+      const secondMessage = pages.conversation().getMessage({content: 'Second Message'});
+      const thirdMessage = pages.conversation().getMessage({content: 'Third Message'});
+      await expect(firstMessage).toBeVisible();
+      await expect(secondMessage).toBeVisible();
+      await expect(thirdMessage).toBeVisible();
+
+      await page.waitForTimeout(10_000);
+      await expect(firstMessage).not.toBeVisible();
+      await expect(secondMessage).not.toBeVisible();
+      await expect(thirdMessage).toBeVisible(); // Third message should still be visible since the timer was turned off before sending it
+    },
+  );
+
+  test(
+    'Verify that message with previous timer are deleted on start-up when the timeout passed in 1:1',
+    {tag: ['@TC-664', '@regression']},
+    async ({context, createPage}) => {
+      let page = await createPage(context, withLogin(userA), withConnectedUser(userB));
+      let pages = PageManager.from(page).webapp.pages;
+
+      await pages.conversation().enableSelfDeletingMessages();
+      await pages.conversation().sendMessage('Test Message');
+      await expect(pages.conversation().getMessage({sender: userA})).toBeVisible(); // Ensure message was sent before closing the page
+
+      await page.close();
+      await new Promise(res => setTimeout(res, 10_000)); // Wait 10s before logging in again to ensure the message has been deleted by now
+
+      // Re-open page reusing the same context so the login is not happening on a new device
+      page = await createPage(context, withLogin(userA));
+      pages = PageManager.from(page).webapp.pages;
+      await pages.conversationList().openConversation(userB.fullName);
+
+      const selfDeletingMessage = pages.conversation().getMessage({sender: userA});
+      await expect(selfDeletingMessage).toBeVisible();
+      await expect(selfDeletingMessage).not.toContainText('Test Message');
+    },
+  );
+
+  test(
+    "Verify the message is not deleted for users that didn't read the message",
+    {tag: ['@TC-675', '@regression']},
+    async ({createPage}) => {
+      const [userAPage, userBPage] = await Promise.all([
+        createPage(withLogin(userA), withConnectedUser(userB)),
+        createPage(withLogin(userB), withConnectedUser(userA)),
+      ]);
+      const [userAPages, userBPages] = [userAPage, userBPage].map(page => PageManager.from(page).webapp.pages);
+      await createGroup(userAPages, 'Test Group', [userB]);
+
+      await userAPages.conversationList().openConversation('Test Group');
+      await userBPages.conversationList().openConversation(userA.fullName); // User B should not read the message sent into the group immediately
+
+      await userAPages.conversation().enableSelfDeletingMessages();
+      await userAPages.conversation().sendMessage('Test Message');
+      await expect(userAPages.conversation().getMessage({sender: userA})).toBeVisible();
+
+      await userBPage.waitForTimeout(10_000); // Wait 10s before user B opens the group chat
+
+      await userBPages.conversationList().openConversation('Test Group');
+      await expect(userBPages.conversation().getMessage({content: 'Test Message'})).toBeVisible();
+    },
+  );
+
+  test.describe('set globally in group conversation', () => {
+    let userAPages: PageManager['webapp']['pages'];
+    let userBPages: PageManager['webapp']['pages'];
+
+    test.beforeEach(async ({createPage}) => {
+      [userAPages, userBPages] = await Promise.all([
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
+      ]);
+      await createGroup(userAPages, 'Test Group', [userB]);
+
+      await userAPages.conversationList().openConversation('Test Group');
+      await userBPages.conversationList().openConversation('Test Group');
+
+      await userAPages.conversation().toggleGroupInformation();
+      await userAPages.conversationDetails().setSelfDeletingMessages('10 seconds');
+      await userAPages.conversation().toggleGroupInformation();
+    });
+
+    test('I want to set a global group conversation timer', {tag: ['@TC-3715', '@regression']}, async () => {
+      await userAPages.conversation().sendMessage('Message');
+      const message = userBPages.conversation().getMessage({content: 'Message'});
+      await expect(message).toBeAttached();
+
+      await new Promise(res => setTimeout(res, 10_000));
+      await expect(message).not.toBeAttached();
+    });
+
+    test('I want to see the current timer in conversation details', {tag: ['@TC-3716', '@regression']}, async () => {
+      await userBPages.conversation().toggleGroupInformation();
+      await expect(userBPages.conversationDetails().selfDeletingMessageButton).toContainText('10 seconds');
+    });
+
+    test(
+      'I want to see timed message disable in an input bar when global settings conversation options are set',
+      {tag: ['@TC-3718', '@regression']},
+      async () => {
+        await expect(userBPages.conversation().timerMessageButton).toBeDisabled();
+      },
+    );
+
+    test(
+      'I want to see the ephemeral indicator is updated in the input field if someone sets a global timer in conversation options',
+      {tag: ['@TC-3719', '@regression']},
+      async () => {
+        await expect(userBPages.conversation().timerMessageButton).toContainText('s10');
+      },
+    );
+
+    test(
+      'I want to see a system message that a global timer was set or changed or removed in conversation options',
+      {tag: ['@TC-3720', '@regression']},
+      async () => {
+        const userBSystemMessages = userBPages.conversation().systemMessages;
+        await expect(userBSystemMessages.getByText('set the message timer to 10 seconds')).toBeAttached();
+
+        await userAPages.conversation().toggleGroupInformation();
+        await userAPages.conversationDetails().setSelfDeletingMessages('Off');
+        await expect(userBSystemMessages.getByText('turned off the message timer')).toBeAttached();
+      },
+    );
+  });
+
+  test.describe('in search results', () => {
+    let searchResults: Locator;
+
+    test.beforeEach(async ({createPage}) => {
+      const [userAPages, userBPages] = await Promise.all([
+        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))).then(pm => pm.webapp.pages),
+      ]);
+
+      await userAPages.conversation().enableSelfDeletingMessages();
+      await userAPages.conversation().sendMessage('Test');
+      await expect(userBPages.conversation().getMessage({content: 'Test'})).toBeVisible();
+
+      await userBPages.conversation().searchButton.click();
+      await userBPages.collection().searchForMessages('Test');
+      searchResults = userBPages.collection().searchItems;
+    });
+
+    test('I want to see ephemeral messages in the search results', {tag: ['@TC-3717', '@regression']}, async () => {
+      await expect(searchResults).toHaveCount(1);
+      await expect(searchResults).toContainText('Test');
+    });
+
+    // WPB-21980 - Currently the message isn't removed from the search results after its specified lifetime
+    test.skip(
+      'I want to to see ephemeral messages disappear from search results when their timer runs out',
+      {tag: ['@TC-3731', '@regression']},
+      async () => {
+        await expect(searchResults).toHaveCount(1);
+
+        await new Promise(res => setTimeout(res, 10_000)); // Wait 10s for the message to expire
+
+        await expect(searchResults).toHaveCount(0);
+      },
+    );
+  });
+});
diff --git a/test/e2e_tests/test.fixtures.ts b/test/e2e_tests/test.fixtures.ts
index 3089139c30e..ae15d011e1a 100644
--- a/test/e2e_tests/test.fixtures.ts
+++ b/test/e2e_tests/test.fixtures.ts
@@ -22,6 +22,7 @@ import {test as baseTest, type BrowserContext, type Page} from '@playwright/test
 import {ApiManagerE2E} from './backend/apiManager.e2e';
 import {getUser, User} from './data/user';
 import {PageManager} from './pageManager';
+import {connectWithUser} from './utils/userActions';
 
 type PagePlugin = (page: Page) => void | Promise<void>;
 
@@ -31,12 +32,30 @@ type Fixtures = {
   pageManager: PageManager;
   /**
    * Create a new page within a new browser context - The context and it's pages will be removed after the test automatically
+   * @param ctx BrowserContext - optional browser context to reuse, if not provided, a new one will be created
    * @param setup Array of PagePlugins, effectively functions which will be applied to the page in the given order
    */
-  createPage: (...setup: PagePlugin[]) => Promise<Page>;
-  createUser: (options?: {disableTelemetry?: boolean}) => Promise<User>;
+  createPage: {(...setup: PagePlugin[]): Promise<Page>; (ctx: BrowserContext, ...setup: PagePlugin[]): Promise<Page>};
+  /**
+   * Create a new user
+   * Note: The created user will be deleted automatically once the test is finished
+   * @param options Options to set on the new user e.g. declining telemetry
+   */
+  createUser: (options?: Parameters<typeof createUser>[1]) => Promise<User>;
+  /**
+   * Creates a team and the associated owner, optionally adding members to it
+   * Note: The team and owner are automatically deleted when the test completes.
+   * @param options.withMembers Can either be the number of team members to create or an array of existing members to add to the team
+   * @returns an object containing the teams owner and an array of members. The size of the members array matches the number or array length passed to `withMembers`
+   */
+  createTeam: (
+    teamName: string,
+    options?: Parameters<typeof createUser>[1] & {withMembers?: number | User[]},
+  ) => Promise<{owner: User; members: User[]}>;
 };
 
+export {expect} from '@playwright/test';
+
 export const test = baseTest.extend<Fixtures>({
   api: async ({}, use) => {
     // Create a new instance of ApiManager for each test
@@ -49,12 +68,25 @@ export const test = baseTest.extend<Fixtures>({
   createPage: async ({browser}, use) => {
     const contexts: BrowserContext[] = [];
 
-    await use(async (...setup) => {
-      const context = await browser.newContext();
-      const page = await context.newPage();
-      contexts.push(context);
+    // Due to the function overload firstParam can be either a PagePlugin or a BrowserContext to reuse
+    await use(async (firstParam, ...plugins) => {
+      let context: BrowserContext;
+      let setupFns: PagePlugin[];
+
+      // Check if firstParam is a browser context or PagePlugin
+      if (typeof firstParam === 'function') {
+        // Create a new context, add it to the created contexts and treat firstParam as page plugin
+        context = await browser.newContext();
+        contexts.push(context);
+        setupFns = [firstParam, ...plugins];
+      } else {
+        // Otherwise reuse existing context if provided
+        context = firstParam;
+        setupFns = plugins;
+      }
 
-      for (const setupFn of setup) {
+      const page = await context.newPage();
+      for (const setupFn of setupFns) {
         await setupFn(page);
       }
 
@@ -68,21 +100,46 @@ export const test = baseTest.extend<Fixtures>({
     const users: User[] = [];
 
     await use(async options => {
-      const {disableTelemetry = true} = options ?? {};
-
-      const user = getUser();
-      await api.createPersonalUser(user);
-
-      if (disableTelemetry) {
-        await api.properties.putProperty({settings: {privacy: {telemetry_data_sharing: false}}}, user.token);
-      }
-
+      const user = await createUser(api, options);
       users.push(user);
       return user;
     });
 
     await Promise.all(users.map(user => api.deletePersonalUser(user)));
   },
+  createTeam: async ({api}, use) => {
+    const teamOwners: User[] = [];
+
+    await use(async (teamName, {withMembers, ...options} = {}) => {
+      const owner = await createUser(api, options);
+      const {teamId} = await api.auth.upgradeUserToTeamOwner(owner, teamName);
+
+      owner.teamId = teamId;
+      teamOwners.push(owner);
+
+      let members: User[] = [];
+      if (withMembers !== undefined) {
+        // Depending on the type of withMembers, either create the number of users or use the given array of users
+        members =
+          typeof withMembers === 'number'
+            ? await Promise.all(Array.from({length: withMembers}, () => createUser(api, options)))
+            : withMembers;
+
+        await Promise.all(
+          members.map(async member => {
+            const invitationId = await api.team.inviteUserToTeam(member.email, owner);
+            const invitationCode = await api.brig.getTeamInvitationCodeForEmail(owner.teamId, invitationId);
+            await api.team.acceptTeamInvitation(invitationCode, member);
+          }),
+        );
+      }
+
+      return {owner, members};
+    });
+
+    // Deletes each created team and the owner / members associated with it
+    await Promise.all(teamOwners.map(owner => api.team.deleteTeam(owner, owner.teamId)));
+  },
 });
 
 /** PagePlugin to log in as the given user */
@@ -94,11 +151,27 @@ export const withLogin =
     await pageManager.webapp.pages.login().login(await user);
   };
 
-/** PagePlugin to open a conversation with the given user */
-export const withConversation =
-  (user: Pick<User, 'fullName'>): PagePlugin =>
+/**
+ * PagePlugin to connect with the given user
+ * Note: This plugin only works if the users are in the same team
+ */
+export const withConnectedUser =
+  (user: User | Promise<User>): PagePlugin =>
   async page => {
-    await PageManager.from(page).webapp.pages.conversationList().openConversation(user.fullName);
+    const pageManager = PageManager.from(page);
+    await connectWithUser(pageManager, await user);
   };
 
-export {expect} from '@playwright/test';
+const createUser = async (api: ApiManagerE2E, options?: {disableTelemetry?: boolean}) => {
+  const {disableTelemetry = true} = options ?? {};
+
+  const user = getUser();
+  await api.createPersonalUser(user);
+
+  // Optionally decline to send telemetry via the api. This avoids the user being prompted for it in the UI upon first login
+  if (disableTelemetry) {
+    await api.properties.putProperty({settings: {privacy: {telemetry_data_sharing: false}}}, user.token);
+  }
+
+  return user;
+};
diff --git a/test/e2e_tests/utils/userActions.ts b/test/e2e_tests/utils/userActions.ts
index eaf220f1281..af146d19680 100644
--- a/test/e2e_tests/utils/userActions.ts
+++ b/test/e2e_tests/utils/userActions.ts
@@ -114,7 +114,7 @@ export const handleAppLockState = async (pageManager: PageManager, appLockPassCo
 export async function loginAndSetup(user: User, pageManager: PageManager) {
   const {modals, components} = pageManager.webapp;
   await pageManager.openMainPage();
-  await loginUser(user, pageManager); // Verwendet die bestehende loginUser-Funktion
+  await loginUser(user, pageManager);
   await modals.dataShareConsent().clickDecline();
   await components.conversationSidebar().isPageLoaded();
 }
@@ -143,6 +143,18 @@ export async function connectUsersManually(
   await userBPages.connectRequest().clickConnectButton();
 }
 
+/**
+ * Opens the connections tab, searches for the given user and starts a conversation with him
+ * Note: This util only works if both users are part of the same team.
+ */
+export async function connectWithUser(senderPageManager: PageManager, receiver: Pick<User, 'username'>) {
+  const {pages, modals, components} = senderPageManager.webapp;
+  await components.conversationSidebar().clickConnectButton();
+  await pages.startUI().searchInput.fill(receiver.username);
+  await pages.startUI().selectUser(receiver.username);
+  await modals.userProfile().clickStartConversation();
+}
+
 /**
  * Blocks a user from the conversation list
  * @param pageManager PageManager of the blocking user
diff --git a/yarn.lock b/yarn.lock
index 20a0963f863..cb6f3be56f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2086,6 +2086,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@cacheable/memory@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@cacheable/memory@npm:2.0.5"
+  dependencies:
+    "@cacheable/utils": "npm:^2.3.0"
+    "@keyv/bigmap": "npm:^1.1.0"
+    hookified: "npm:^1.12.2"
+    keyv: "npm:^5.5.4"
+  checksum: 10/29cb22cb62056072654f735330014588dfe62165bf187757223973841a8ccc77378e5c83d121e473590f63f664026364c6ac29e06ffe3bba729627d5b00f1401
+  languageName: node
+  linkType: hard
+
+"@cacheable/utils@npm:^2.3.0":
+  version: 2.3.1
+  resolution: "@cacheable/utils@npm:2.3.1"
+  dependencies:
+    hashery: "npm:^1.2.0"
+    keyv: "npm:^5.5.4"
+  checksum: 10/3693c9c999adfbed2ddc1a682e207964918de419eb8f210e159c2f12cb4ae7768c219900f2432aee248dd001f26cea6be5831239811aa0fede98d34f0a4c9846
+  languageName: node
+  linkType: hard
+
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -3077,6 +3099,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/balanced-match@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@isaacs/balanced-match@npm:4.0.1"
+  checksum: 10/102fbc6d2c0d5edf8f6dbf2b3feb21695a21bc850f11bc47c4f06aa83bd8884fde3fe9d6d797d619901d96865fdcb4569ac2a54c937992c48885c5e3d9967fe8
+  languageName: node
+  linkType: hard
+
+"@isaacs/brace-expansion@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@isaacs/brace-expansion@npm:5.0.0"
+  dependencies:
+    "@isaacs/balanced-match": "npm:^4.0.1"
+  checksum: 10/cf3b7f206aff12128214a1df764ac8cdbc517c110db85249b945282407e3dfc5c6e66286383a7c9391a059fc8e6e6a8ca82262fc9d2590bd615376141fbebd2d
+  languageName: node
+  linkType: hard
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -3880,10 +3918,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@keyv/serialize@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@keyv/serialize@npm:1.1.0"
-  checksum: 10/73b88b69e07847b67d443efcd4949955aa7ac0f998f68e6cfe9053307c1ea3caeabe3f6f1c6a99b1b32bb9a6698c8a5c452f96246fe77d98f1cba0c2faae4616
+"@keyv/bigmap@npm:^1.1.0":
+  version: 1.3.0
+  resolution: "@keyv/bigmap@npm:1.3.0"
+  dependencies:
+    hashery: "npm:^1.2.0"
+    hookified: "npm:^1.13.0"
+  peerDependencies:
+    keyv: ^5.5.4
+  checksum: 10/d4c0b6c56229455035380a0b213051bdda92bbe89c01d37dad3487f28421aa8fe563d93dc60dca29bc7c9f611319cf9d6cddc0e38bc80011ab0f7b6e9f0a5d6c
+  languageName: node
+  linkType: hard
+
+"@keyv/serialize@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@keyv/serialize@npm:1.1.1"
+  checksum: 10/e3b2cb1377863342acedd5ff785af3e69269bee9b44707c617d1c8bc14eeb5ac763159d6455903ffe92f143c2238e1e783c4f113f9c8910eacccf172894472da
   languageName: node
   linkType: hard
 
@@ -6826,14 +6876,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/api-client@npm:^27.89.2":
-  version: 27.89.2
-  resolution: "@wireapp/api-client@npm:27.89.2"
+"@wireapp/api-client@npm:^27.90.1-beta.17.457c85ad6":
+  version: 27.90.1-beta.18.5ce5ca523
+  resolution: "@wireapp/api-client@npm:27.90.1-beta.18.5ce5ca523"
   dependencies:
     "@aws-sdk/client-s3": "npm:3.908.0"
     "@aws-sdk/lib-storage": "npm:3.908.0"
-    "@wireapp/commons": "npm:^5.4.9"
-    "@wireapp/priority-queue": "npm:^2.1.16"
+    "@wireapp/commons": "npm:^5.4.10-beta.54.5ce5ca523"
+    "@wireapp/priority-queue": "npm:^2.1.17-beta.54.5ce5ca523"
     "@wireapp/protocol-messaging": "npm:1.53.0"
     axios: "npm:1.12.2"
     axios-retry: "npm:4.5.0"
@@ -6847,7 +6897,7 @@ __metadata:
     uuid: "npm:11.1.0"
     ws: "npm:8.18.1"
     zod: "npm:3.24.2"
-  checksum: 10/1298745d14c3e7566242a9d979fa059297cc00c72a6eafb91f3b0c4a069ce2dc6d61ad78a2633f10e1067cb1c2c672a081d144569e9da9ded5dd3b797ff85c30
+  checksum: 10/a325c44227eeafb9c09b4d378f49e5081979dc76b1222ebf28a5e5871fa799cb07746bd5b97add65e58643016e1639c6989a9419c6ecd417db8ff3ec8e225e08
   languageName: node
   linkType: hard
 
@@ -6862,10 +6912,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/avs@npm:10.2.17":
-  version: 10.2.17
-  resolution: "@wireapp/avs@npm:10.2.17"
-  checksum: 10/ac68345f919e4a7f62f6ccdee7be903cb567306588f43d93883c321e4813e1f4698ac12f5ad428dc6afb87d12367a6ff3aa0375838f63aaf21a70e46caf8e7c7
+"@wireapp/avs@npm:10.2.19":
+  version: 10.2.19
+  resolution: "@wireapp/avs@npm:10.2.19"
+  checksum: 10/3f5a4a66e629307963a5e3382f3e4d4acbbbc8699f98203f5bca12249912112549b80d0c980af2c9b000c499a06d7282a46b4f2a5274ffd6991a6ff5f31466da
   languageName: node
   linkType: hard
 
@@ -6888,6 +6938,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@wireapp/commons@npm:^5.4.10-beta.54.5ce5ca523":
+  version: 5.4.10-beta.54.5ce5ca523
+  resolution: "@wireapp/commons@npm:5.4.10-beta.54.5ce5ca523"
+  dependencies:
+    ansi-regex: "npm:5.0.1"
+    fs-extra: "npm:11.3.1"
+    logdown: "npm:3.3.1"
+    platform: "npm:1.3.6"
+  checksum: 10/b8c4316c090cac489079e2b7b2b945fbfae71187f774e68395c343053ac319595c3e02d4327858f78efe6dce9305ab6444e3f0da9f9d0d2295cc59ad998f9fbe
+  languageName: node
+  linkType: hard
+
 "@wireapp/copy-config@npm:2.3.4":
   version: 2.3.4
   resolution: "@wireapp/copy-config@npm:2.3.4"
@@ -6912,11 +6974,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/core@npm:46.46.3":
-  version: 46.46.3
-  resolution: "@wireapp/core@npm:46.46.3"
+"@wireapp/core@npm:^46.46.6-beta.9.457c85ad6":
+  version: 46.46.6-beta.9.457c85ad6
+  resolution: "@wireapp/core@npm:46.46.6-beta.9.457c85ad6"
   dependencies:
-    "@wireapp/api-client": "npm:^27.89.2"
+    "@wireapp/api-client": "npm:^27.90.1-beta.17.457c85ad6"
     "@wireapp/commons": "npm:^5.4.9"
     "@wireapp/core-crypto": "npm:9.1.2"
     "@wireapp/cryptobox": "npm:12.8.0"
@@ -6934,7 +6996,7 @@ __metadata:
     long: "npm:^5.2.0"
     uuid: "npm:9.0.1"
     zod: "npm:3.24.2"
-  checksum: 10/16833142d2e89cb5c452eeb272d767e2b9ad50ef462e76f686ff8518d5f5e67fce7db9230f56b5c36c46ae5405609f596a4160822d0b8e5f0769b97507b67735
+  checksum: 10/621e6bdcf444a89b5e15d9911d5f7da96f9711a10dd76739f63e50121341d1c4496029f793574ba1dabf542c8bb629a5e04dceb52b06b41082ab826bbac45272
   languageName: node
   linkType: hard
 
@@ -7030,6 +7092,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@wireapp/priority-queue@npm:^2.1.17-beta.54.5ce5ca523":
+  version: 2.1.17-beta.54.5ce5ca523
+  resolution: "@wireapp/priority-queue@npm:2.1.17-beta.54.5ce5ca523"
+  checksum: 10/507d201063039ccb5a84341ddc6cc89b76dafb4f9aecaa58c0eff96b6228c1f982e336c31207ed8b35ff5a79a94d8658b07e90bd32c6bca0461082af6bb320d0
+  languageName: node
+  linkType: hard
+
 "@wireapp/promise-queue@npm:2.4.9, @wireapp/promise-queue@npm:^2.4.9":
   version: 2.4.9
   resolution: "@wireapp/promise-queue@npm:2.4.9"
@@ -7525,15 +7594,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"argparse@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "argparse@npm:1.0.10"
-  dependencies:
-    sprintf-js: "npm:~1.0.2"
-  checksum: 10/c6a621343a553ff3779390bb5ee9c2263d6643ebcd7843227bdde6cc7adbed796eb5540ca98db19e3fd7b4714e1faa51551f8849b268bb62df27ddb15cbcd91e
-  languageName: node
-  linkType: hard
-
 "argparse@npm:^2.0.1":
   version: 2.0.1
   resolution: "argparse@npm:2.0.1"
@@ -7980,7 +8040,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"baseline-browser-mapping@npm:^2.8.25, baseline-browser-mapping@npm:^2.8.28":
+"baseline-browser-mapping@npm:^2.8.25":
   version: 2.8.28
   resolution: "baseline-browser-mapping@npm:2.8.28"
   bin:
@@ -7989,6 +8049,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"baseline-browser-mapping@npm:^2.8.31":
+  version: 2.8.31
+  resolution: "baseline-browser-mapping@npm:2.8.31"
+  bin:
+    baseline-browser-mapping: dist/cli.js
+  checksum: 10/aefad7523ab6e93a28d278c2faae08b934d6f8899f9b6868a50cccb2e2cbb12bad0f5eda3ccb70d7f2e2f9e58cc1973050523e867e6bb0793ab0c63e194956b6
+  languageName: node
+  linkType: hard
+
 "bazinga64@npm:5.10.0":
   version: 5.10.0
   resolution: "bazinga64@npm:5.10.0"
@@ -8230,13 +8299,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacheable@npm:^1.10.4":
-  version: 1.10.4
-  resolution: "cacheable@npm:1.10.4"
+"cacheable@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "cacheable@npm:2.2.0"
   dependencies:
-    hookified: "npm:^1.11.0"
-    keyv: "npm:^5.5.0"
-  checksum: 10/d802d6ee58433e294ab6589fa09356e9004695194526709fd256db64c6bc7e6e20dedfaa5ef5fb53b73018004f5089cf73563d6fbc6e4340b922d45dd024cbb9
+    "@cacheable/memory": "npm:^2.0.5"
+    "@cacheable/utils": "npm:^2.3.0"
+    hookified: "npm:^1.13.0"
+    keyv: "npm:^5.5.4"
+    qified: "npm:^0.5.2"
+  checksum: 10/dbb59d6414cb755ab164d6be7f380697b73478bce29f63396e50e47a250d92b5d093c7727d2e68d29bfd60830e9180752e3de770d6c04b53a04f6c02c5fc1eb9
   languageName: node
   linkType: hard
 
@@ -8784,10 +8856,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:3.46.0":
-  version: 3.46.0
-  resolution: "core-js@npm:3.46.0"
-  checksum: 10/82993ca487c6cbbf8bbf00e45eeb9705eb63dc2f9c90d7f35696733efbc3f4b52426e1f8dbef0f0b68ea16caa21e4f44cc5490e08120e1cad4a72b031ed8adaa
+"core-js@npm:3.47.0":
+  version: 3.47.0
+  resolution: "core-js@npm:3.47.0"
+  checksum: 10/c02dc6a091c7e6799e3527dc06a428c44bbcff7f8f6ee700ff818b90aa2ebaf1f17b0234146e692811da97cda5a39a6095ecadec9fd1a74b1135103eb0e96cb1
   languageName: node
   linkType: hard
 
@@ -8890,7 +8962,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -9692,14 +9764,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"emoji-picker-react@npm:4.15.1":
-  version: 4.15.1
-  resolution: "emoji-picker-react@npm:4.15.1"
+"emoji-picker-react@npm:4.15.2":
+  version: 4.15.2
+  resolution: "emoji-picker-react@npm:4.15.2"
   dependencies:
     flairup: "npm:1.0.0"
   peerDependencies:
     react: ">=16"
-  checksum: 10/8d7616116ec943b83218176d6d05730d5421e1de43be8231078b3a9f7e4d0b59a5276cb427cd535ddcefcb5e304f9888eba396a87136b177994b6cf7c48e0d36
+  checksum: 10/acda818894b17a353a2b7730194846ef6f875ad5f70f20d67959f34f4b53229b249e8ff7df93e1931e6162f4e454afc0285aa9dc058cb5cd777301adc9bd6ec2
   languageName: node
   linkType: hard
 
@@ -10451,7 +10523,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+"esprima@npm:^4.0.1":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
   bin:
@@ -10798,12 +10870,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^10.1.4":
-  version: 10.1.4
-  resolution: "file-entry-cache@npm:10.1.4"
+"file-entry-cache@npm:^11.1.0":
+  version: 11.1.1
+  resolution: "file-entry-cache@npm:11.1.1"
   dependencies:
-    flat-cache: "npm:^6.1.13"
-  checksum: 10/286fc7d632a7c62665baf8c794ab7aaa6ea30111da2f22bdb68b1b467e7393630737f637fe93298ef3d9d1ce149233fd739508a12c16c1555fbd85fe9d225ff0
+    flat-cache: "npm:^6.1.19"
+  checksum: 10/c71b7ef9ec2105a9c4206b3afb84ac32c46fe58803381a28c709a7911904d8aebfc8fb1520ba4967ce4187eabe88bd4d572d22c64a9d6b22be7de1baf7c08d06
   languageName: node
   linkType: hard
 
@@ -10922,14 +10994,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^6.1.13":
-  version: 6.1.13
-  resolution: "flat-cache@npm:6.1.13"
+"flat-cache@npm:^6.1.19":
+  version: 6.1.19
+  resolution: "flat-cache@npm:6.1.19"
   dependencies:
-    cacheable: "npm:^1.10.4"
+    cacheable: "npm:^2.2.0"
     flatted: "npm:^3.3.3"
-    hookified: "npm:^1.11.0"
-  checksum: 10/f06ef88ad89b87e213ea54f68581fe7e1e92f94283f08ee29332600e2de9e39a078fc5da159c94ba5681ad688a5d9e38966628e7e8dd451516cfb27c75e0b960
+    hookified: "npm:^1.13.0"
+  checksum: 10/6d920e3aded4fdc62932ff67dded965d213f4c57f8da25f2fac81376a8982c6684bc65e4fd31a008edfcbd41b3f48771ddf4cb84cd13e0ecf410d9a00dfd867b
   languageName: node
   linkType: hard
 
@@ -10978,6 +11050,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "foreground-child@npm:3.3.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.6"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10/427b33f997a98073c0424e5c07169264a62cda806d8d2ded159b5b903fdfc8f0a1457e06b5fc35506497acb3f1e353f025edee796300209ac6231e80edece835
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^4.0.0":
   version: 4.0.4
   resolution: "form-data@npm:4.0.4"
@@ -11395,7 +11477,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
+"glob@npm:^11.0.1":
+  version: 11.1.0
+  resolution: "glob@npm:11.1.0"
+  dependencies:
+    foreground-child: "npm:^3.3.1"
+    jackspeak: "npm:^4.1.1"
+    minimatch: "npm:^10.1.1"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^2.0.0"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10/da4501819633daff8822c007bb3f93d5c4d2cbc7b15a8e886660f4497dd251a1fb4f53a85fba1e760b31704eff7164aeb2c7a82db10f9f2c362d12c02fe52cf3
+  languageName: node
+  linkType: hard
+
+"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
   dependencies:
@@ -11638,6 +11736,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hashery@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "hashery@npm:1.2.0"
+  dependencies:
+    hookified: "npm:^1.13.0"
+  checksum: 10/0e52f5d522e8607ffc9317af937b13299a794de34db5634e54eba56db479af82cb28b75438af6e1fe8bbc400507b7bf903784df75752c2a8f4533fc9a85e3e61
+  languageName: node
+  linkType: hard
+
 "hasown@npm:^2.0.2":
   version: 2.0.2
   resolution: "hasown@npm:2.0.2"
@@ -11674,10 +11781,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hookified@npm:^1.11.0":
-  version: 1.12.0
-  resolution: "hookified@npm:1.12.0"
-  checksum: 10/c12ad1ef017a315f69d2c97837f75c81472752c12d31eb4f778ecbc45ecb7eee38df2a3502d8c7f9cd5604a2c90a104ea77017404456a1675ec69f729ccfbedf
+"hookified@npm:^1.12.2, hookified@npm:^1.13.0":
+  version: 1.13.0
+  resolution: "hookified@npm:1.13.0"
+  checksum: 10/d125d8df589b37f3ebf5e1bc66d5be2220c22fdac7ad27705a2d061f198e8ff905e9d71f665ca76ad288dc7d95543d49b1ebeab935ff007d2f7df99cfb9d4587
   languageName: node
   linkType: hard
 
@@ -11728,9 +11835,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:5.6.4":
-  version: 5.6.4
-  resolution: "html-webpack-plugin@npm:5.6.4"
+"html-webpack-plugin@npm:5.6.5":
+  version: 5.6.5
+  resolution: "html-webpack-plugin@npm:5.6.5"
   dependencies:
     "@types/html-minifier-terser": "npm:^6.0.0"
     html-minifier-terser: "npm:^6.0.2"
@@ -11745,7 +11852,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10/781074dd8bacf48236911462201fa440c5f79525665ce5de0c35f262a323765e103caab32a7466db262c4af3d98e869ae6a9b484e967345d85aff80d25a4ca79
+  checksum: 10/89e84f6ede068242348b2c2f09da67bf39a6b22d14399eaf16e399be05a4e2bb1f3f1c71ec03b7193aed96ebe2cf61d45a70565408b271661f7ea8635b237701
   languageName: node
   linkType: hard
 
@@ -12747,6 +12854,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jackspeak@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "jackspeak@npm:4.1.1"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+  checksum: 10/ffceb270ec286841f48413bfb4a50b188662dfd599378ce142b6540f3f0a66821dc9dcb1e9ebc55c6c3b24dc2226c96e5819ba9bd7a241bd29031b61911718c7
+  languageName: node
+  linkType: hard
+
 "jake@npm:^10.8.5":
   version: 10.8.7
   resolution: "jake@npm:10.8.7"
@@ -13316,18 +13432,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.13.1":
-  version: 3.14.2
-  resolution: "js-yaml@npm:3.14.2"
-  dependencies:
-    argparse: "npm:^1.0.7"
-    esprima: "npm:^4.0.0"
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: 10/172e0b6007b0bf0fc8d2469c94424f7dd765c64a047d2b790831fecef2204a4054eabf4d911eb73ab8c9a3256ab8ba1ee8d655b789bf24bf059c772acc2075a1
-  languageName: node
-  linkType: hard
-
 "js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
@@ -13576,12 +13680,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:^5.5.0":
-  version: 5.5.0
-  resolution: "keyv@npm:5.5.0"
+"keyv@npm:^5.5.4":
+  version: 5.5.4
+  resolution: "keyv@npm:5.5.4"
   dependencies:
-    "@keyv/serialize": "npm:^1.1.0"
-  checksum: 10/577dc09d8972669a331009c9b1f9e9da8d9090908377208e1b1583e38ce8d2de6f4999e83cd8a31f4bdcc258bd5973f1515bcee10f678a9b8aca378611ed9a65
+    "@keyv/serialize": "npm:^1.1.1"
+  checksum: 10/2ee2178657b3f220cc7130727a1f9e65d05f2115c924af82e6f53e2c8b0197795a55fe7d4e6041ba712a6748039e5a4f7f50ad708bffb8bcc407b0dd0678dfa4
   languageName: node
   linkType: hard
 
@@ -13771,6 +13875,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lexical@npm:0.38.2":
+  version: 0.38.2
+  resolution: "lexical@npm:0.38.2"
+  checksum: 10/5513183f9cffefa989b3caede8f37b100ee5ff3f7f872ae122c98d8143541b30ff3e77ee61277c013dc89e8aa8f8a90b6b9717e133ee8dc796759a31f0eb236a
+  languageName: node
+  linkType: hard
+
 "libsodium-sumo@npm:^0.7.0":
   version: 0.7.15
   resolution: "libsodium-sumo@npm:0.7.15"
@@ -13892,6 +14003,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loader-runner@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "loader-runner@npm:4.3.1"
+  checksum: 10/d77127497c3f91fdba351e3e91156034e6e590e9f050b40df6c38ac16c54b5c903f7e2e141e09fefd046ee96b26fb50773c695ebc0aa205a4918683b124b04ba
+  languageName: node
+  linkType: hard
+
 "loader-utils@npm:^1.1.0":
   version: 1.4.2
   resolution: "loader-utils@npm:1.4.2"
@@ -14482,6 +14600,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^10.1.1":
+  version: 10.1.1
+  resolution: "minimatch@npm:10.1.1"
+  dependencies:
+    "@isaacs/brace-expansion": "npm:^5.0.0"
+  checksum: 10/110f38921ea527022e90f7a5f43721838ac740d0a0c26881c03b57c261354fb9a0430e40b2c56dfcea2ef3c773768f27210d1106f1f2be19cde3eea93f26f45e
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -14979,12 +15106,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oidc-client-ts@npm:3.4.0":
-  version: 3.4.0
-  resolution: "oidc-client-ts@npm:3.4.0"
+"oidc-client-ts@npm:3.4.1":
+  version: 3.4.1
+  resolution: "oidc-client-ts@npm:3.4.1"
   dependencies:
     jwt-decode: "npm:^4.0.0"
-  checksum: 10/d6e4dd5e2f4cd7da0ede9cf1bca131ea9811f030706d5322409b476047746e3c8f2d117804eb488187cc3c2253f986f8a1e053ae2c943b525c6e4d2a1c1b8094
+  checksum: 10/9b02efa7eee9160741d38a7f31a7640a9b9843519abe2e1ee74f44cd7a6ac76c745428af73e32838b52c4780901ffd6223abdea9f130b38472ec310f91a82d0b
   languageName: node
   linkType: hard
 
@@ -16676,6 +16803,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qified@npm:^0.5.2":
+  version: 0.5.2
+  resolution: "qified@npm:0.5.2"
+  dependencies:
+    hookified: "npm:^1.13.0"
+  checksum: 10/390898fdae7463e46956a28990ec0fce708c1f3e60dd6f3a9d2c30d3551cf5d186083bed76146104c0037b9e02a4625078a334051b912122b1ada6c3c7604233
+  languageName: node
+  linkType: hard
+
 "qrcode-reader@npm:1.0.4":
   version: 1.0.4
   resolution: "qrcode-reader@npm:1.0.4"
@@ -17471,7 +17607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.43.1":
+"rollup@npm:^2.79.2":
   version: 2.79.2
   resolution: "rollup@npm:2.79.2"
   dependencies:
@@ -18014,13 +18150,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sprintf-js@npm:~1.0.2":
-  version: 1.0.3
-  resolution: "sprintf-js@npm:1.0.3"
-  checksum: 10/c34828732ab8509c2741e5fd1af6b767c3daf2c642f267788f933a65b1614943c282e74c4284f4fa749c264b18ee016a0d37a3e5b73aee446da46277d3a85daa
-  languageName: node
-  linkType: hard
-
 "ssri@npm:^10.0.0":
   version: 10.0.5
   resolution: "ssri@npm:10.0.5"
@@ -18360,9 +18489,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.25.0":
-  version: 16.25.0
-  resolution: "stylelint@npm:16.25.0"
+"stylelint@npm:16.26.0":
+  version: 16.26.0
+  resolution: "stylelint@npm:16.26.0"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
@@ -18377,7 +18506,7 @@ __metadata:
     debug: "npm:^4.4.3"
     fast-glob: "npm:^3.3.3"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^10.1.4"
+    file-entry-cache: "npm:^11.1.0"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
@@ -18404,7 +18533,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10/8c3b08ace7b9580d44b3f32c26cffe894b9ba77494e63704b6a91f9150f04d3583c198cb33df384a8e6a5ef37d0cfdf29e6ef29b41a2ea7c188ea98fe44efe9d
+  checksum: 10/6299a18634ad17f297159e8c2c57ddd6f868e16ee08e13462c1d1cf016fb4d1559bd5fd2269f9d1f15860c235e7ec7f00df7e76de434c7331707a2791d50a20b
   languageName: node
   linkType: hard
 
@@ -19756,7 +19885,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.102.1, webpack@npm:^5":
+"webpack@npm:5.103.0":
+  version: 5.103.0
+  resolution: "webpack@npm:5.103.0"
+  dependencies:
+    "@types/eslint-scope": "npm:^3.7.7"
+    "@types/estree": "npm:^1.0.8"
+    "@types/json-schema": "npm:^7.0.15"
+    "@webassemblyjs/ast": "npm:^1.14.1"
+    "@webassemblyjs/wasm-edit": "npm:^1.14.1"
+    "@webassemblyjs/wasm-parser": "npm:^1.14.1"
+    acorn: "npm:^8.15.0"
+    acorn-import-phases: "npm:^1.0.3"
+    browserslist: "npm:^4.26.3"
+    chrome-trace-event: "npm:^1.0.2"
+    enhanced-resolve: "npm:^5.17.3"
+    es-module-lexer: "npm:^1.2.1"
+    eslint-scope: "npm:5.1.1"
+    events: "npm:^3.2.0"
+    glob-to-regexp: "npm:^0.4.1"
+    graceful-fs: "npm:^4.2.11"
+    json-parse-even-better-errors: "npm:^2.3.1"
+    loader-runner: "npm:^4.3.1"
+    mime-types: "npm:^2.1.27"
+    neo-async: "npm:^2.6.2"
+    schema-utils: "npm:^4.3.3"
+    tapable: "npm:^2.3.0"
+    terser-webpack-plugin: "npm:^5.3.11"
+    watchpack: "npm:^2.4.4"
+    webpack-sources: "npm:^3.3.3"
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 10/0018e77d159da412aa8cc1c3ac1d7c0b44228d0f5ce3939b4f424c04feba69747d8490541bcf8143b358a64afbbd69daad95e573ec9c4a90a99bef55d51dd43e
+  languageName: node
+  linkType: hard
+
+"webpack@npm:^5":
   version: 5.102.1
   resolution: "webpack@npm:5.102.1"
   dependencies:
@@ -20028,11 +20195,11 @@ __metadata:
     "@types/webpack-bundle-analyzer": "npm:^4"
     "@types/webpack-env": "npm:1.18.8"
     "@types/wicg-file-system-access": "npm:^2023.10.7"
-    "@wireapp/avs": "npm:10.2.17"
+    "@wireapp/avs": "npm:10.2.19"
     "@wireapp/avs-debugger": "npm:0.0.7"
     "@wireapp/commons": "npm:5.4.9"
     "@wireapp/copy-config": "npm:2.3.4"
-    "@wireapp/core": "npm:46.46.3"
+    "@wireapp/core": "npm:^46.46.6-beta.9.457c85ad6"
     "@wireapp/eslint-config": "npm:3.0.7"
     "@wireapp/kalium-backup": "npm:0.0.4"
     "@wireapp/prettier-config": "npm:0.6.9"
@@ -20047,12 +20214,12 @@ __metadata:
     autoprefixer: "npm:10.4.22"
     babel-loader: "npm:10.0.0"
     babel-plugin-transform-import-meta: "npm:2.3.3"
-    baseline-browser-mapping: "npm:^2.8.28"
+    baseline-browser-mapping: "npm:^2.8.31"
     beautiful-react-hooks: "npm:5.0.3"
     browserslist: "npm:^4.28.0"
     classnames: "npm:2.5.1"
     copy-webpack-plugin: "npm:13.0.1"
-    core-js: "npm:3.46.0"
+    core-js: "npm:3.47.0"
     cross-env: "npm:7.0.3"
     css-loader: "npm:7.1.2"
     cssnano: "npm:7.1.2"
@@ -20062,12 +20229,12 @@ __metadata:
     dexie-encrypted: "npm:2.0.0"
     dotenv: "npm:16.4.7"
     dpdm: "npm:3.14.0"
-    emoji-picker-react: "npm:4.15.1"
+    emoji-picker-react: "npm:4.15.2"
     eslint: "npm:8.57.0"
     eslint-plugin-prettier: "npm:5.1.3"
     fake-indexeddb: "npm:6.2.5"
     generate-changelog: "npm:1.8.0"
-    html-webpack-plugin: "npm:5.6.4"
+    html-webpack-plugin: "npm:5.6.5"
     http-status-codes: "npm:2.3.0"
     husky: "npm:9.1.7"
     i18next-scanner: "npm:4.6.0"
@@ -20086,14 +20253,14 @@ __metadata:
     knockout: "npm:3.5.1"
     less: "npm:4.4.2"
     less-loader: "npm:12.3.0"
-    lexical: "npm:0.27.2"
+    lexical: "npm:0.38.2"
     libsodium-wrappers: "npm:0.7.15"
     linkify-it: "npm:5.0.0"
     lint-staged: "npm:15.5.0"
     long: "npm:5.3.2"
     markdown-it: "npm:14.0.0"
     murmurhash: "npm:2.0.1"
-    oidc-client-ts: "npm:3.4.0"
+    oidc-client-ts: "npm:3.4.1"
     os-browserify: "npm:0.3.0"
     path-browserify: "npm:1.0.1"
     path-to-regexp: "npm:8.3.0"
@@ -20129,7 +20296,7 @@ __metadata:
     sonner: "npm:^2.0.7"
     speakingurl: "npm:14.0.1"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.25.0"
+    stylelint: "npm:16.26.0"
     stylelint-config-idiomatic-order: "npm:10.0.0"
     svg-inline-loader: "npm:0.8.2"
     text-encoding: "npm:0.7.0"
@@ -20141,13 +20308,13 @@ __metadata:
     use-debounce: "npm:^10.0.6"
     uuid: "npm:11.1.0"
     webgl-utils.js: "npm:1.1.0"
-    webpack: "npm:5.102.1"
+    webpack: "npm:5.103.0"
     webpack-bundle-analyzer: "npm:^4.10.2"
     webpack-cli: "npm:6.0.1"
     webpack-dev-middleware: "npm:7.4.5"
     webpack-hot-middleware: "npm:2.26.1"
     webrtc-adapter: "npm:9.0.3"
-    workbox-webpack-plugin: "npm:7.3.0"
+    workbox-webpack-plugin: "npm:7.4.0"
     zod: "npm:^3.24.2"
     zustand: "npm:4.5.5"
   languageName: unknown
@@ -20160,28 +20327,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-background-sync@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-background-sync@npm:7.3.0"
+"workbox-background-sync@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-background-sync@npm:7.4.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.3.0"
-  checksum: 10/19b41ef814d8fe6cec71e3ed7a0552221b2fb27b3b07a2fedbb1292d130286f0f6f6e482a43bf91558a0bdfddc13feed653f9d94925c64338bc6ff0b2a244df8
+    workbox-core: "npm:7.4.0"
+  checksum: 10/dbd994d787d84bd43089a47fef8c1258c645edeade13f59ea013ea0fd4abaf39ab546984c5d144eb5372c994e90e02e7467ca26a51b629b20db5a472d45b20a5
   languageName: node
   linkType: hard
 
-"workbox-broadcast-update@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-broadcast-update@npm:7.3.0"
+"workbox-broadcast-update@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-broadcast-update@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/407ecea6e1042e58728cb220fcb64f5811a152af6a54e200dd51393df048feb64e2e89ef7aa539feac8ce8378caa3657b058c545b94afaf2e9a2242f58bbfc85
+    workbox-core: "npm:7.4.0"
+  checksum: 10/dc37f5679ef376085b70acab08edbbd75ad2ff35636e9b9ca750e2ca9020778d19010dd0f1fddd6c027085e878474c6c41265a2e8f3370571195768b55953580
   languageName: node
   linkType: hard
 
-"workbox-build@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-build@npm:7.3.0"
+"workbox-build@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-build@npm:7.4.0"
   dependencies:
     "@apideck/better-ajv-errors": "npm:^0.3.1"
     "@babel/core": "npm:^7.24.4"
@@ -20196,172 +20363,172 @@ __metadata:
     common-tags: "npm:^1.8.0"
     fast-json-stable-stringify: "npm:^2.1.0"
     fs-extra: "npm:^9.0.1"
-    glob: "npm:^7.1.6"
+    glob: "npm:^11.0.1"
     lodash: "npm:^4.17.20"
     pretty-bytes: "npm:^5.3.0"
-    rollup: "npm:^2.43.1"
+    rollup: "npm:^2.79.2"
     source-map: "npm:^0.8.0-beta.0"
     stringify-object: "npm:^3.3.0"
     strip-comments: "npm:^2.0.1"
     tempy: "npm:^0.6.0"
     upath: "npm:^1.2.0"
-    workbox-background-sync: "npm:7.3.0"
-    workbox-broadcast-update: "npm:7.3.0"
-    workbox-cacheable-response: "npm:7.3.0"
-    workbox-core: "npm:7.3.0"
-    workbox-expiration: "npm:7.3.0"
-    workbox-google-analytics: "npm:7.3.0"
-    workbox-navigation-preload: "npm:7.3.0"
-    workbox-precaching: "npm:7.3.0"
-    workbox-range-requests: "npm:7.3.0"
-    workbox-recipes: "npm:7.3.0"
-    workbox-routing: "npm:7.3.0"
-    workbox-strategies: "npm:7.3.0"
-    workbox-streams: "npm:7.3.0"
-    workbox-sw: "npm:7.3.0"
-    workbox-window: "npm:7.3.0"
-  checksum: 10/6f9fa5ba278da50b138b8af6661a69844e1c557fb58cc37d5ba1126747a490d684d9e85d97aaa3ddb445ccd1297cf3152d6087610cef66048704a7b65bf325c5
+    workbox-background-sync: "npm:7.4.0"
+    workbox-broadcast-update: "npm:7.4.0"
+    workbox-cacheable-response: "npm:7.4.0"
+    workbox-core: "npm:7.4.0"
+    workbox-expiration: "npm:7.4.0"
+    workbox-google-analytics: "npm:7.4.0"
+    workbox-navigation-preload: "npm:7.4.0"
+    workbox-precaching: "npm:7.4.0"
+    workbox-range-requests: "npm:7.4.0"
+    workbox-recipes: "npm:7.4.0"
+    workbox-routing: "npm:7.4.0"
+    workbox-strategies: "npm:7.4.0"
+    workbox-streams: "npm:7.4.0"
+    workbox-sw: "npm:7.4.0"
+    workbox-window: "npm:7.4.0"
+  checksum: 10/c1a95a3a8c0879ec26274b7f6035bd71b6239cf149594f1ec5f9c1b55c58e47ca058bc7fd222bd166d948e255a385444b238ed9e73c1a24e0da33471072f1c3c
   languageName: node
   linkType: hard
 
-"workbox-cacheable-response@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-cacheable-response@npm:7.3.0"
+"workbox-cacheable-response@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-cacheable-response@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/44cd7bc26e509ca96b1b84e3ff5964296efa645853f114f39789d21c0a214ca5fc047259910b303e220bb4052155cddc5639993fcee076fac496b4895ff17a15
+    workbox-core: "npm:7.4.0"
+  checksum: 10/49bad5d082473d71b8774ec90e7ab53e540369ecb2bb5ad04f146556e78982ae524bf61b209b599601782fffde9a775d33664dba659e629becbad05322c385fe
   languageName: node
   linkType: hard
 
-"workbox-core@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-core@npm:7.3.0"
-  checksum: 10/228fb7018a0568c329e21d47d84980f93ebfef9b1eb3f40ddc3516ca6ae58d51dc7ca4dddc829332775b59a3079e62d105c5e1c5c312805d177b963f8bf54393
+"workbox-core@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-core@npm:7.4.0"
+  checksum: 10/160bfbd8957fa59e72b7202caa111e7a099fb405719f7ba2fb489c7dbac0bddfc99fab10122a7b6053821dd89974dc9f9ddb19af574606634d392f89b1d8735f
   languageName: node
   linkType: hard
 
-"workbox-expiration@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-expiration@npm:7.3.0"
+"workbox-expiration@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-expiration@npm:7.4.0"
   dependencies:
     idb: "npm:^7.0.1"
-    workbox-core: "npm:7.3.0"
-  checksum: 10/83e021d700e521a65a89907679d1a580aacc0419428286910ec7c6b0a538326f71f05566434f666ebf6c9fbe819ef3ea81428df1d868f9ea92527afe5d11152d
+    workbox-core: "npm:7.4.0"
+  checksum: 10/5c2de6c769d5a5b848f000fbf3723f7eacafa5b5cedcd47a38e99df1ac6b927d19681ca2edc5c50b7802af03acda7499e64b04e25741c2114a2ccd62c2988e03
   languageName: node
   linkType: hard
 
-"workbox-google-analytics@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-google-analytics@npm:7.3.0"
+"workbox-google-analytics@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-google-analytics@npm:7.4.0"
   dependencies:
-    workbox-background-sync: "npm:7.3.0"
-    workbox-core: "npm:7.3.0"
-    workbox-routing: "npm:7.3.0"
-    workbox-strategies: "npm:7.3.0"
-  checksum: 10/a80a6ea7f04f30a741c4d577e07d8dd6d5c1e5d5c3f06a6b93909e959080602ea3dbe361c87ceb6cae481b2418e71646b5604fb682837595fdbca3ab0b224cd8
+    workbox-background-sync: "npm:7.4.0"
+    workbox-core: "npm:7.4.0"
+    workbox-routing: "npm:7.4.0"
+    workbox-strategies: "npm:7.4.0"
+  checksum: 10/2d42e25d113a5cf23dff10134af5bb94a81a2020a42a0562ae2cff3527798b4d8781f452601f8394ae5ca5f88ea7ea86bf1d1931720835608f9302394c232dea
   languageName: node
   linkType: hard
 
-"workbox-navigation-preload@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-navigation-preload@npm:7.3.0"
+"workbox-navigation-preload@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-navigation-preload@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/722dc3943afb26c97776bf6c0fb3b25c41e9d1b1dc8738296df7ba4ff3e27448e5a3ddf4a878c196928a85309d866341cb479e28f027b95d65627e97b53d3381
+    workbox-core: "npm:7.4.0"
+  checksum: 10/8cdd13a81b4890fe9d68ebe60d46ed78d0fe22850aa0ff5d521ca5928322bb609f504b2c4c4da69fa4a50fd447a0255c546e3ebc07898bcbd0c9acf580a9df7d
   languageName: node
   linkType: hard
 
-"workbox-precaching@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-precaching@npm:7.3.0"
+"workbox-precaching@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-precaching@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-    workbox-routing: "npm:7.3.0"
-    workbox-strategies: "npm:7.3.0"
-  checksum: 10/d14135c471a45de36438c40eed7cb7157cdb336d4216a775486c6307d1ac316794d64231c2e2d0a4c313bb4a4fec623ab77e391cc458b4f2afa64e2487acb2e8
+    workbox-core: "npm:7.4.0"
+    workbox-routing: "npm:7.4.0"
+    workbox-strategies: "npm:7.4.0"
+  checksum: 10/81bf4f2503603c82e9fa3c1244727fb121a823fc43235aeb2f77df83f90d3bf8fc288e83320f3421f8a7776e174b9e7c2a3294d78025f2696b6ca60d578dc33d
   languageName: node
   linkType: hard
 
-"workbox-range-requests@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-range-requests@npm:7.3.0"
+"workbox-range-requests@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-range-requests@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/23dcf16673fcaed322653f997d32bff0075aaa51d981722be26692a6f720d5dfa59b9576afd2151a6e772cdc0f82fe783a6cd59166f41776162647426640996e
+    workbox-core: "npm:7.4.0"
+  checksum: 10/f66fcf6d2f19b8125254b0aa3b1e68b9f85b8ed483256c6dd32118bebb2f6cb245a3aed680f313b7c4b7207203edf4dbf17d9e8b33330be399c7f64b8b42fac6
   languageName: node
   linkType: hard
 
-"workbox-recipes@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-recipes@npm:7.3.0"
+"workbox-recipes@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-recipes@npm:7.4.0"
   dependencies:
-    workbox-cacheable-response: "npm:7.3.0"
-    workbox-core: "npm:7.3.0"
-    workbox-expiration: "npm:7.3.0"
-    workbox-precaching: "npm:7.3.0"
-    workbox-routing: "npm:7.3.0"
-    workbox-strategies: "npm:7.3.0"
-  checksum: 10/d77d29bd8e9aac490a0b3417a04cb52375a922fb9169ea9196b53764b3eebd7e6b88af9d7560e1610720cacc529a1d45993a663cbd81639b5d4a5224731265c5
+    workbox-cacheable-response: "npm:7.4.0"
+    workbox-core: "npm:7.4.0"
+    workbox-expiration: "npm:7.4.0"
+    workbox-precaching: "npm:7.4.0"
+    workbox-routing: "npm:7.4.0"
+    workbox-strategies: "npm:7.4.0"
+  checksum: 10/dc3d5ebcfff70d4b0d2eca6e444725293581cffef1993de83701ccd50ce2a1eda333e26078844c4a2ee70aba7adbc3aa50e803060ced4dd3f83cbb36178d15ff
   languageName: node
   linkType: hard
 
-"workbox-routing@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-routing@npm:7.3.0"
+"workbox-routing@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-routing@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/0d729f9c5cfc5754404ac1f7b729c7740ddc806203792701ac642151fbec939b4aa0fb289eab2295e49180e8154ad9bb1380effb7e0f0362163b79db4291dba7
+    workbox-core: "npm:7.4.0"
+  checksum: 10/4adb156d902953b59988a55d8d92c57141c4cecdc042e6157208b5384ed3f9c453e90e57bc819582f8aa56706f01d5a171d4c8a4406bdef1d5db9d757516903e
   languageName: node
   linkType: hard
 
-"workbox-strategies@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-strategies@npm:7.3.0"
+"workbox-strategies@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-strategies@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-  checksum: 10/61ba672075ef8aaa70ad9221460dab80a7d8920e324e14137460f26ebe8b137e5589fb75c664e0efeaf4402e3d8435a9b1818f9a9c61f88863c0e0315af337e7
+    workbox-core: "npm:7.4.0"
+  checksum: 10/792a302d38e3401dd73e2d64dbb36a47bd7060cd6ea0f33151226ac19ef8a89d2987d3f4f8765e3645113917efcbadc52027887a53e181ad7a817acd6cd08139
   languageName: node
   linkType: hard
 
-"workbox-streams@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-streams@npm:7.3.0"
+"workbox-streams@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-streams@npm:7.4.0"
   dependencies:
-    workbox-core: "npm:7.3.0"
-    workbox-routing: "npm:7.3.0"
-  checksum: 10/031e6f8c8ee41c7ce2a92e0df80ec6d712ffcfc987f12137db36b6ae1d4b3f62abb795de66d79de8b2a192c6edb4624c3e51f688fd1618e599b2d734d111b3e2
+    workbox-core: "npm:7.4.0"
+    workbox-routing: "npm:7.4.0"
+  checksum: 10/45780d01685ed29db3daca009d5f5ca6853cd4b8d6e7feb6a3875e645e306d24fbc5bdc892a21912f6b3a1b1a2793003aff874cf1f8bac9dcab9d97dd5b5d941
   languageName: node
   linkType: hard
 
-"workbox-sw@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-sw@npm:7.3.0"
-  checksum: 10/b9a95f3c3290ecfb051d0d85b68e02671dd69ca775f2e0ef75a06d7cd48ec747c2ca0fdf0fc59fbe354a81248319450b43e0e34b1f0af6195af7978bba9e0746
+"workbox-sw@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-sw@npm:7.4.0"
+  checksum: 10/8cef35bd71b6fb97b7b90667be105fd1360f36b1019bc80b60a71d6e01c60ee5f4d9a5196246689f6c625746103a579f7caa30891a4e6593995cc8d4393b5b0d
   languageName: node
   linkType: hard
 
-"workbox-webpack-plugin@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-webpack-plugin@npm:7.3.0"
+"workbox-webpack-plugin@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-webpack-plugin@npm:7.4.0"
   dependencies:
     fast-json-stable-stringify: "npm:^2.1.0"
     pretty-bytes: "npm:^5.4.1"
     upath: "npm:^1.2.0"
     webpack-sources: "npm:^1.4.3"
-    workbox-build: "npm:7.3.0"
+    workbox-build: "npm:7.4.0"
   peerDependencies:
     webpack: ^4.4.0 || ^5.91.0
-  checksum: 10/4838ecee32aa0e87b7b91abe799cc3b54f83defac9a2007ef9358d1e7158558b4dd1f974b9556bd21c52398d2d209a44d376beebf8b6a7e9b6510e059f820019
+  checksum: 10/090cfd34b4fbc10b8184e68ec1099d793683ff4711eefc44995683fc88eb20c48f109d4d65c8a0912a54a1eed197965421ac3ef63629c7e5190691ff0d5d359e
   languageName: node
   linkType: hard
 
-"workbox-window@npm:7.3.0":
-  version: 7.3.0
-  resolution: "workbox-window@npm:7.3.0"
+"workbox-window@npm:7.4.0":
+  version: 7.4.0
+  resolution: "workbox-window@npm:7.4.0"
   dependencies:
     "@types/trusted-types": "npm:^2.0.2"
-    workbox-core: "npm:7.3.0"
-  checksum: 10/29bbfd8a04f692e759cb60c9a8b2e308e48e9cc6cf2bc66314486c354cba31d4833e410325c0ddac6b05317786a37acb805a88844532778b2121d3f913e77091
+    workbox-core: "npm:7.4.0"
+  checksum: 10/6be3fd08cad364e7be6dc65a29874536ba647e5e7a4096b12c4b3db6c320e8505f1dfd558b16a6fff6bb822b559d5e06eb438052ecbc1e91d58645b5f735c38a
   languageName: node
   linkType: hard