chore(deps): update tiptap monorepo to v3.31.3

refactor(module): register browser integration through context
Signed-off-by: Sebastian <krupinski01@gmail.com>
2026-09-05 03:05:19 +00:00 · 2026-08-31 22:55:11 -04:00 · 2026-08-31 22:55:11 -04:00 · 2026-08-29 19:13:11 -04:00 · 2026-08-29 16:21:18 -04:00 · 2026-08-28 22:29:22 -04:00
19 changed files with 792 additions and 308 deletions
@@ -440,7 +440,14 @@ class CompositionManager {
            ];
        }

-        $source = null;
+        // Reuse the synced remote draft (if any) so the provider can natively clean it up
+        $remoteEntity = $this->remoteEntityIdentifier($composed['remote']['entity'] ?? null);
+        $source = ($remoteEntity !== null
+            && $remoteEntity->provider() === $service->provider()
+            && (string)$remoteEntity->service() === (string)$service->identifier())
+            ? $remoteEntity
+            : null;
+
        $properties = $this->buildMessageProperties(
            service: $service,
            sender: $senderObject,
@@ -465,6 +472,8 @@ class CompositionManager {
            ];
        }

+        $this->compositionStore->compositionDiscard($tenantId, $userId, $identifier);
+
        return [
            'identifier' => $identifier,
            'disposition' => 'sent'
@@ -582,6 +591,7 @@ class CompositionManager {
            $deviceAttachmentsChanged = $uploads !== [];
            $documentAttachmentsChanged = count($failed) < count($documents);
            if ($deviceAttachmentsChanged || $documentAttachmentsChanged) {
+                $composed['revision'] = (int)($composed['revision'] ?? 0) + 1;
                $composed = $this->markRemoteDirty($composed);
                $compositionChanged = true;
            }
@@ -616,6 +626,7 @@ class CompositionManager {
            ];
        }
        if ($compositionChanged) {
+            $result['revision'] = (int)($composed['revision'] ?? 0);
            $event = new CompositionSavedEvent($tenantId, $userId, $composition, (int)($composed['revision'] ?? 0));
            $this->events->dispatch($event);
        }
@@ -774,8 +785,10 @@ class CompositionManager {
            }

            unset($composed['attachments'][$identifier]);
+            $composed['revision'] = (int)($composed['revision'] ?? 0) + 1;
            $composed = $this->markRemoteDirty($composed);
            $result['disposition'] = 'removed';
+            $result['revision'] = $composed['revision'];
            return $composed;
        };

@@ -80,8 +80,8 @@ final class CompositionController extends ControllerAbstract {
        if (!isset($data['action']) || !is_string($data['action'])) {
            throw new InvalidArgumentException('Invalid parameter: action must be a string');
        }
-        if (!in_array($data['action'], ['fresh', 'reply', 'forward'], true)) {
-            throw new InvalidArgumentException('Invalid parameter: action must be one of fresh, reply, forward');
+        if (!in_array($data['action'], ['fresh', 'reply', 'replyAll', 'forward'], true)) {
+            throw new InvalidArgumentException('Invalid parameter: action must be one of fresh, reply, replyAll, forward');
        }
        if (!isset($data['sender']) || !is_array($data['sender'])) {
            throw new InvalidArgumentException('Invalid parameter: sender must be an array');
@@ -89,8 +89,8 @@ final class CompositionController extends ControllerAbstract {
        if (!isset($data['message']) || !is_array($data['message'])) {
            throw new InvalidArgumentException('Invalid parameter: message must be an array');
        }
-        if (($data['action'] === 'reply' || $data['action'] === 'forward') && (!isset($data['source']) || !is_string($data['source']) || $data['source'] === '')) {
-            throw new InvalidArgumentException('Invalid parameter: source must be a non-empty string for reply or forward action');
+        if (($data['action'] === 'reply' || $data['action'] === 'replyAll' || $data['action'] === 'forward') && (!isset($data['source']) || !is_string($data['source']) || $data['source'] === '')) {
+            throw new InvalidArgumentException('Invalid parameter: source must be a non-empty string for reply, replyAll, or forward action');
        }

        return $this->compositionManager->stage($tenantId, $userId, $data['identifier'], $data['action'], $data['sender'], $data['message'], $data['source'] ?? null);
@@ -4,13 +4,14 @@ namespace KTXM\Mail;

 use KTXF\Event\DeliveryMode;
 use KTXF\Event\EventListenerRegistrarInterface;
-use KTXF\Module\ModuleBrowserInterface;
+use KTXF\Module\Configuration\BrowserModuleContextInterface;
+use KTXF\Module\Configuration\ModuleContextInterface;
 use KTXF\Module\ModuleInstanceAbstract;

 /**
 * Mail Module - Email Client
 */
-class Module extends ModuleInstanceAbstract implements ModuleBrowserInterface
+class Module extends ModuleInstanceAbstract
 {

    public function __construct(
@@ -79,16 +80,10 @@ class Module extends ModuleInstanceAbstract implements ModuleBrowserInterface
        ];
    }

-    public function registerBI(): array
+    public function configure(ModuleContextInterface $context): void
    {
-        return [
-            'handle' => $this->handle(),
-            'namespace' => 'Mail',
-            'version' => $this->version(),
-            'label' => $this->label(),
-            'author' => $this->author(),
-            'description' => $this->description(),
-            'boot' => 'static/module.mjs',
-        ];
+        if ($context instanceof BrowserModuleContextInterface) {
+            $context->registerModule($this, 'Mail', 'static/module.mjs');
+        }
    }
 }
@@ -795,49 +795,49 @@
      "license": "MIT"
    },
    "node_modules/@tiptap/core": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.29.0.tgz",
-      "integrity": "sha512-A/lrhKpOYtl0V5pmPS00Zps8pgBe1qDOoD9fzsumDSZ3HP8W398C959Jgru75PNFokAya9COPD3iaKP3NWF25g==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.31.3.tgz",
+      "integrity": "sha512-Cz50pvciQrxdSxgTkHOVz0uD0Yl/8Xt0QatGD6ILm47jW8EzyHR9RkUGs/D5IqzXKuVPntfw1ttaT926vXfiRg==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-blockquote": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.29.0.tgz",
-      "integrity": "sha512-k8NKHLEYOqre7guObZBeFM04CaTwmEceCmdIrIjd7H9KoHSbRODaBNved6j5G33x/FWMwIF/RQbE2BjWaFSgzA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.31.3.tgz",
+      "integrity": "sha512-fyY2XMbyDDDfOTQ1Qdrnqa1qwC9DWE4n7AfE0EKQI0G8MfLV8RaDlLDcOZDJ9JbMPY7/Gx7EjyK4NKxSW9n2hQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-bold": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.29.0.tgz",
-      "integrity": "sha512-BPUJvJ9sCsU3fxao5UJfDJrDuHhMn2hczZwZ9Qs4w1vkAeLGyOYbSejUTJdBYHLoexGiEwgnEeVeZN3C8GaI5g==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.31.3.tgz",
+      "integrity": "sha512-dIuYhKk8TitKU/FeDpoTeWZhU42YgDN5npgWNjAmMmRktPdoxnH3/wGSiwXlqZgJWjehN7kPWDePWpJeAImGpQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-bubble-menu": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.29.0.tgz",
-      "integrity": "sha512-aBNI8ebX76ObderRmu/PJ9Q2AGVEuhpg0TBvv2SNbHtmU5kNUMHQI8HxrxKFblJwETAmG6EJ3Ed/5jRxpJmrsg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bubble-menu/-/extension-bubble-menu-3.31.3.tgz",
+      "integrity": "sha512-EV6ZnwKc++2OM/OcD54n8s1B7C9LP7GKAtdEPwu0t3BYJf3sG8Ueoinf7SgGPO9oMPg96GneOkDNm1urMV167g==",
      "license": "MIT",
      "optional": true,
      "dependencies": {
@@ -848,67 +848,80 @@
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
+      }
+    },
+    "node_modules/@tiptap/extension-bullet-list": {
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.31.3.tgz",
+      "integrity": "sha512-qEyyoPapPef4LO8XKaN83bxtaNzkJ4kFn/IxLnEKd4BJ3Mvi4MH2yJYlyDqwFnMoev4pMA1zBHRAt/C0THRmZw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/extension-list": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-code": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.29.0.tgz",
-      "integrity": "sha512-Um0BlyunRJ8Fal288Jn7I2n15FRwQcTy3NnKBBrPz3ikwx+yZZ0n9xTozpLMSxXrTq6cRlxLkASp/9FFx9sX9A==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.31.3.tgz",
+      "integrity": "sha512-SzxOqchrD2AcN3uT67PjKmRFEMOU3vNNiwNaamZJUbZrI6Hmy+bvdHJrc3jrIddyyCrAtsnAfRI0cmorW1jGfg==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-code-block": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.29.0.tgz",
-      "integrity": "sha512-nKm1YSEiPVosjm4qeg6m+6SAKq82rKukAzE/g3M5eVs2OgEb4QIKQvQOmJ+zgGAnpb9Q/JIvcKsGGU1rn9Vnyw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.31.3.tgz",
+      "integrity": "sha512-nvknt4FhyJQjYcvxptmeUlFsIAc8ibua3E5BN4Pim374/9RWepH4cdE9X0/qUTtguHElLx0iKtSIY3rW2qGTFA==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-document": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.29.0.tgz",
-      "integrity": "sha512-folTlrwmUL+WSnojvfjZ951Gb25Pw8BxjXwhvXFuZXJ92qMfOcezA480kwFuu5nG8pPc/76ezQlz9a86Y5uQJw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.31.3.tgz",
+      "integrity": "sha512-EexgmqnyDNyGlISxo7SMrp5MygpJYmqD+0cY5jB6L1U6L4CpKKRWUt8OO1sWzEHDE1+TTvwt+WIFoIWAziOtEA==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-dropcursor": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.29.0.tgz",
-      "integrity": "sha512-IAY21q7KSXyCXN3u13kfpq0E8D2i3r9nSbsNYlLzkEv0Bpn+pWShZi05A0ubuothDNjdaMa96xaRY0f1y9gDZw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.31.3.tgz",
+      "integrity": "sha512-NWomSfu5CSC7VacnMSDzKT8qm66SzMfZwVPEtwY5bPpRTJgTiT1rNK0neDrrzfMN27MfylGyKWWf7Q5Qf8w/fg==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/extensions": "3.29.0"
+        "@tiptap/extensions": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-floating-menu": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.29.0.tgz",
-      "integrity": "sha512-/rFlN6T70HuT34kFvftKm56UX0IPff7vlII7Sqgs7DprKVYkItiU3lM7+AoeDRzCsWMg4z1yNHj70BPx7+EJ6Q==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-floating-menu/-/extension-floating-menu-3.31.3.tgz",
+      "integrity": "sha512-rd4VJ9PGSP9Eop8ZTEwaLZcMzMXLuJKe3hUNf58rq+zANpwM+9fI+vB7g9MAc3eXwUNDxNDVACFIL2oeBqpQ3A==",
      "license": "MIT",
      "optional": true,
      "funding": {
@@ -917,80 +930,80 @@
      },
      "peerDependencies": {
        "@floating-ui/dom": "^1.0.0",
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-gapcursor": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.29.0.tgz",
-      "integrity": "sha512-Jz0zwriGxPMuRjKo6x7WhPa/7pZn0dovyJu/GLarN4T+mMseGNXWwEBsLEKkuumsJVPDEPPFjX+rzEeaFKInPQ==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.31.3.tgz",
+      "integrity": "sha512-EBXKb1FrVStsNYCcRGtd9jmzveCvR+eqgg1rVqoONrqFK6U7bga6LN+1dMKroP1kliDVgveYkP3vRYxqw+rFqg==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/extensions": "3.29.0"
+        "@tiptap/extensions": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-hard-break": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.29.0.tgz",
-      "integrity": "sha512-8qKj0oeuU7IYoG73Lj3W4EC/JS/dFjN5iHmc4yodqppP6qs0o2zsF/2ipceGN/REZq5megPtxRgXu/nxQZ1NYg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.31.3.tgz",
+      "integrity": "sha512-QAdCvNO4+yW9ATwsrej11NTkDYFqPLIEQr3ARNrKOK1qaiS7A0fia2SEukb/hrkP3A6mbozhoQt2r2RGUf/DpQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-heading": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.29.0.tgz",
-      "integrity": "sha512-xWb3QEKo7cp9u6Vzi6oYKODra6jPwziHBv3fJAnxWpRldxtJqfyOVMikWJJFuDjmr+K0qyegzf206pMk+y0bDg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.31.3.tgz",
+      "integrity": "sha512-rk5VHMAeQcg06SLauN6EGdD2jc0O2qY8QkZYPd0LxNvLblw2BxBx+lxUQSYwLAT9Ie5914gKIK2YbRyO2Ts3ig==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-horizontal-rule": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.29.0.tgz",
-      "integrity": "sha512-u1OgncXkokIuUJQIh4jVQfYHL/6I8VnrokUcCud4eErWvgeLnCbNmVdih4kxIdfmvEyAxXjDwcqf4AB79TxuNg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.31.3.tgz",
+      "integrity": "sha512-YnHGy2KShRwvCseAmmxl9VP7R0qaj8QMp3DA6DJWZqp7r5gLGvDkAqhedxqqefqsE4Y43hjkBdjtB9Ce78LkIw==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-italic": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.29.0.tgz",
-      "integrity": "sha512-c8gF+zM7yXB9iGxtVCioYecjQ+A2fLlNa1XYBYbTobNhbUo8a11akbTkGNcCIgttwnzwEoI4mB6/PK4yjaQvVg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.31.3.tgz",
+      "integrity": "sha512-ibGvdvAPyfxBMUVNRI43eb9h2/Jka1MRG5GtnGqbcCX/2+Y/y0EOfFrPQPkuYphiWQYyu9+FzPKMB/pjuaLuKQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-link": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.29.0.tgz",
-      "integrity": "sha512-FuLDgE0k1dB4WCBTelw3re9BLmiurgXVSj3d3J4l3sunljyOs941RUU62b7pWP+ePNdGF7RgUMmMAB+58VZCIA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.31.3.tgz",
+      "integrity": "sha512-986wOQzTL9Zr5lf84LCLpm+YOms8A0K39/8DVoqRfebqcOe0/eq4bnztmAlfabOd+kJY92g3AgZERFUx/w+dcw==",
      "license": "MIT",
      "dependencies": {
        "linkifyjs": "^4.3.3"
@@ -1000,106 +1013,159 @@
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
+      }
+    },
+    "node_modules/@tiptap/extension-list": {
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.31.3.tgz",
+      "integrity": "sha512-LoveGnC0FVdCV4jUNBaG1ZA+KWE07+adzV3kGy6uUYFcJEjbVUHTnPDrBOob3IwOSO3sCwIkvQb6EVYeXn/4yg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
+      }
+    },
+    "node_modules/@tiptap/extension-list-item": {
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.31.3.tgz",
+      "integrity": "sha512-4QlKOriJJMvg95QJTEsy9BUYPBQ6UvJyb8WURRwdUtQUkkqb8h32lg/eyQUv2FzW9IT1AdUyNZfVaxH64kRfQA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/extension-list": "3.31.3"
+      }
+    },
+    "node_modules/@tiptap/extension-list-keymap": {
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.31.3.tgz",
+      "integrity": "sha512-If8UOEdDZbPJU6iYTvLtH6DOp2KBy6BKxg9UELL1AevVetGHEF/7lW8hP50Gn1tHMVpPRqmhSzVrJRpEJJgb/Q==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/extension-list": "3.31.3"
+      }
+    },
+    "node_modules/@tiptap/extension-ordered-list": {
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.31.3.tgz",
+      "integrity": "sha512-mp3g11NgA/PYu8rj7J7Ez3l4qBy6WfTSmHIG4PZvEGG5w2oUAIkgb9DU7nPPzjmeme27oazFYZw+AtZA0+u4tw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/ueberdosis"
+      },
+      "peerDependencies": {
+        "@tiptap/extension-list": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-paragraph": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.29.0.tgz",
-      "integrity": "sha512-OtGrkwzqlW+ehW+d2qrQ7VVcP9PbDeQmuT4Ec4yFjf3vR4QO8OVdVfeOcUq52PtkT3kYRxz9fzEiEvjqRm72yA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.31.3.tgz",
+      "integrity": "sha512-+iPku7wJfy5hbNDNLX8dveFtYVsZMmh7vztjuq8hT3mipSC4IByDehDbU8fzUCjfXiEzmI7mQn7c8LGmHULuzA==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-placeholder": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.29.0.tgz",
-      "integrity": "sha512-V2jb0kL/k3rygAtKmSPYxoyBMCQJtJikPYnxiCYuY7FI1ohmCrmhyhkVqJv0b0EPMNW8BMIqf6DgpKJ/ODmXgA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-placeholder/-/extension-placeholder-3.31.3.tgz",
+      "integrity": "sha512-9jYtR8ELEw7GVaruyrm4oFkPcjig9Q+crc+dpmarhBNXUmxagCdlhVzNwCJ2WJRzvBAtx59sEYqNTU38Wx8S3A==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/extensions": "3.29.0"
+        "@tiptap/extensions": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-strike": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.29.0.tgz",
-      "integrity": "sha512-VzasZkckrEXzmFQT9z3O95rUWy1b0RLFHAC6GUSQHxKk4TpP+Ujfn5+rqmPukMn0eScJyw1Y36jwfJc0VuNR+Q==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.31.3.tgz",
+      "integrity": "sha512-G29bhKttYwcKHT+BI6emWVFol3RO/gUXxQVcmr/iT8LXXy7j8J6HFUnsKM+Kg5YlP1rxMRgsa65dbrQVahZi0A==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-text": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.29.0.tgz",
-      "integrity": "sha512-AMsf2V7IiGvzbl+LqLLfyWzufazZxHuid1gOnEt3KwolQ9AO7p8WJgHld0PZLxNyEh4SaSqK7b3d3SM9sqrlTw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.31.3.tgz",
+      "integrity": "sha512-gdsWtF+taeaCu6V+5Ct10fGo0ACUy1GnYtbb+mcathBt8OqbT+Ws60p/yEmKesBDz2Hn+B5IcWy6+2BBZl5ZTg==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-text-align": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.29.0.tgz",
-      "integrity": "sha512-/1htV3teqRJ7i7trAuORDg62LV0CQ1qskbMcP3SB7grsw6H1G54zwdaJVXeiIXmQKDF7FoZgY7u/v/TJckthEw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.31.3.tgz",
+      "integrity": "sha512-26BJ7c28EyvHzJovNpuenKiIgfRI4KsT/OjBB00y58MyZ0kRXc6dwZVclw8y66clupKTLTWYCDUsy0P/xHj+cA==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extension-underline": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.29.0.tgz",
-      "integrity": "sha512-DSPTogdvxmoX/L0U5KgBC9jWffRvYkGiyh1tp28gn+QaARh4iJn79pAZpi1m1bEhal/0Mq5m4ukbiO7FWInwaA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.31.3.tgz",
+      "integrity": "sha512-HghdJaOwRqYzsAxqSyNyb+IWyOMcdCl8IoiBETA9BZCJAqdXzFLcuWp7CqCqJPam9dgkWosSoHqTCAO4nTBfpw==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0"
+        "@tiptap/core": "3.31.3"
      }
    },
    "node_modules/@tiptap/extensions": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.29.0.tgz",
-      "integrity": "sha512-ltlrm8dDHIgeNj3cOLEdLFMPPVy3TYvWA8ftrrJ44C/L01MBmgFB1f/vkPFYYnAasb2BYyVG6HxAGcTQHo5jHw==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.31.3.tgz",
+      "integrity": "sha512-8sJNPGGUe8f3aDojcOW5cfVL7I5NrBbE0UWxG08qoi9Tea6qWbvQJsCR9tsrOapr/DaLr3kpbGZ9s1gEEfcNcA==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      }
    },
    "node_modules/@tiptap/pm": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.29.0.tgz",
-      "integrity": "sha512-4rr3HiZ8kbSNINuWXqKQJLv9fFMypCBN5gOwxoU+D4lEYVblkoM60fA1SlrI2BZVlZQmw2U38XKl5XMtUr55XQ==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.31.3.tgz",
+      "integrity": "sha512-sZime0SWsz/k62W2WvHx5Ig7G2h7kVhrrmnqy+wEgIHfDwEfOlelRjaWCiBCFlF7dxGUntJusCh9FxlLhni0Ag==",
      "license": "MIT",
      "dependencies": {
        "prosemirror-changeset": "^2.4.1",
@@ -1114,7 +1180,7 @@
        "prosemirror-state": "^1.4.4",
        "prosemirror-tables": "^1.8.5",
        "prosemirror-transform": "^1.12.0",
-        "prosemirror-view": "^1.41.9"
+        "prosemirror-view": "^1.42.3"
      },
      "funding": {
        "type": "github",
@@ -1122,124 +1188,58 @@
      }
    },
    "node_modules/@tiptap/starter-kit": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.29.0.tgz",
-      "integrity": "sha512-J3jTp3/WXnnL58TCtdMsfeQ2BeycFYrAib6Nbpjd9G0OLUBE7AILiH2HrobRQpvRbAUgD5SW+sBZYOonbWWqNg==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.31.3.tgz",
+      "integrity": "sha512-WKof9RewdmGHvWJ1wn0/HVNG2mV+HOgVRyJkKekuM9fgr6BZAAH/xZsWE1eon+94JnQ+KtK2ThydXQM/qc6b2A==",
      "license": "MIT",
      "dependencies": {
-        "@tiptap/core": "^3.29.0",
-        "@tiptap/extension-blockquote": "^3.29.0",
-        "@tiptap/extension-bold": "^3.29.0",
-        "@tiptap/extension-bullet-list": "^3.29.0",
-        "@tiptap/extension-code": "^3.29.0",
-        "@tiptap/extension-code-block": "^3.29.0",
-        "@tiptap/extension-document": "^3.29.0",
-        "@tiptap/extension-dropcursor": "^3.29.0",
-        "@tiptap/extension-gapcursor": "^3.29.0",
-        "@tiptap/extension-hard-break": "^3.29.0",
-        "@tiptap/extension-heading": "^3.29.0",
-        "@tiptap/extension-horizontal-rule": "^3.29.0",
-        "@tiptap/extension-italic": "^3.29.0",
-        "@tiptap/extension-link": "^3.29.0",
-        "@tiptap/extension-list": "^3.29.0",
-        "@tiptap/extension-list-item": "^3.29.0",
-        "@tiptap/extension-list-keymap": "^3.29.0",
-        "@tiptap/extension-ordered-list": "^3.29.0",
-        "@tiptap/extension-paragraph": "^3.29.0",
-        "@tiptap/extension-strike": "^3.29.0",
-        "@tiptap/extension-text": "^3.29.0",
-        "@tiptap/extension-underline": "^3.29.0",
-        "@tiptap/extensions": "^3.29.0",
-        "@tiptap/pm": "^3.29.0"
+        "@tiptap/core": "3.31.3",
+        "@tiptap/extension-blockquote": "3.31.3",
+        "@tiptap/extension-bold": "3.31.3",
+        "@tiptap/extension-bullet-list": "3.31.3",
+        "@tiptap/extension-code": "3.31.3",
+        "@tiptap/extension-code-block": "3.31.3",
+        "@tiptap/extension-document": "3.31.3",
+        "@tiptap/extension-dropcursor": "3.31.3",
+        "@tiptap/extension-gapcursor": "3.31.3",
+        "@tiptap/extension-hard-break": "3.31.3",
+        "@tiptap/extension-heading": "3.31.3",
+        "@tiptap/extension-horizontal-rule": "3.31.3",
+        "@tiptap/extension-italic": "3.31.3",
+        "@tiptap/extension-link": "3.31.3",
+        "@tiptap/extension-list": "3.31.3",
+        "@tiptap/extension-list-item": "3.31.3",
+        "@tiptap/extension-list-keymap": "3.31.3",
+        "@tiptap/extension-ordered-list": "3.31.3",
+        "@tiptap/extension-paragraph": "3.31.3",
+        "@tiptap/extension-strike": "3.31.3",
+        "@tiptap/extension-text": "3.31.3",
+        "@tiptap/extension-underline": "3.31.3",
+        "@tiptap/extensions": "3.31.3",
+        "@tiptap/pm": "3.31.3"
      },
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      }
    },
-    "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-bullet-list": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.29.0.tgz",
-      "integrity": "sha512-1045sC5CRn7KD0wluxZeksBwpm2k3LKBUOM3kNwExHAPSV4in4gdarYJ2/WCmIKsmyj2FzUcF4rbpLLSB/dBSg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/ueberdosis"
-      },
-      "peerDependencies": {
-        "@tiptap/extension-list": "3.29.0"
-      }
-    },
-    "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-list": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.29.0.tgz",
-      "integrity": "sha512-k0B/+nIkn4VvHSQ0kP+AzzAmgeOVxKMAdqG4a6qwxp/lR12aJGHlOP92KCjXV2RNPtuwDksJ1RIXrgxdf9WmJg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/ueberdosis"
-      },
-      "peerDependencies": {
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0"
-      }
-    },
-    "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-list-item": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.29.0.tgz",
-      "integrity": "sha512-JSz27OIDHWDL7uw28E4W3eaN3H1u+NzJQKZkNXo5Qsvvsx8m/YIQWO9XlhiL3V4TZMjfvlc94lUp5tKW5KwETw==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/ueberdosis"
-      },
-      "peerDependencies": {
-        "@tiptap/extension-list": "3.29.0"
-      }
-    },
-    "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-list-keymap": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.29.0.tgz",
-      "integrity": "sha512-g14QLZR9fmfJIL+X2R/cVTvQS0Mp7CoenA9PO+8adTjK7hCeB8hA3UAakMB4ekkElOXNOtb16e0wqulDcoqANg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/ueberdosis"
-      },
-      "peerDependencies": {
-        "@tiptap/extension-list": "3.29.0"
-      }
-    },
-    "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-ordered-list": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.29.0.tgz",
-      "integrity": "sha512-9TXUDFagkGeu6Bo8L0b2SAVAYrY2Xzd28MXwiDxYvDKMjEGWkkCUpMiEI5Qav3GnfFWLmS3jI8PgUjxIw9wLLQ==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/ueberdosis"
-      },
-      "peerDependencies": {
-        "@tiptap/extension-list": "3.29.0"
-      }
-    },
    "node_modules/@tiptap/vue-3": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/@tiptap/vue-3/-/vue-3-3.29.0.tgz",
-      "integrity": "sha512-OFESbEFlmDYPns5LrkyeKggis6tYICBvz+jrlVwxICCWJqWZJJvYb7y/uMtMCxFF1nAeGb8AFr8UhFrLaX5aiA==",
+      "version": "3.31.3",
+      "resolved": "https://registry.npmjs.org/@tiptap/vue-3/-/vue-3-3.31.3.tgz",
+      "integrity": "sha512-PNt0+rm7BXzhe/U+xlNnXBeJ6t9x2mE3902VXeIeEBxu5CrYLCJ0a5yHrof1jU3KwJrLOe/BtlGWjbq4qnTTfQ==",
      "license": "MIT",
      "funding": {
        "type": "github",
        "url": "https://github.com/sponsors/ueberdosis"
      },
      "optionalDependencies": {
-        "@tiptap/extension-bubble-menu": "^3.29.0",
-        "@tiptap/extension-floating-menu": "^3.29.0"
+        "@tiptap/extension-bubble-menu": "^3.31.3",
+        "@tiptap/extension-floating-menu": "^3.31.3"
      },
      "peerDependencies": {
        "@floating-ui/dom": "^1.0.0",
-        "@tiptap/core": "3.29.0",
-        "@tiptap/pm": "3.29.0",
+        "@tiptap/core": "3.31.3",
+        "@tiptap/pm": "3.31.3",
        "vue": "^3.0.0"
      }
    },
@@ -3155,9 +3155,9 @@
      }
    },
    "node_modules/prosemirror-view": {
-      "version": "1.42.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.42.1.tgz",
-      "integrity": "sha512-rRqzZnRgkyh69XoOMrfFJHwauHscLBmHbq772kwbic1ymQAM8gXjzEbJse5j1ep2UO2HRIAQL0bY3kZ/RoqjVw==",
+      "version": "1.42.3",
+      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.42.3.tgz",
+      "integrity": "sha512-oTN7EtH+CpwxU9NrwEYWd0UZ4JUx7l048l5A2Xppm4p/60isZYLnth9QVQmC3VRIvdrIWCxwZSd+Uz791G31/w==",
      "license": "MIT",
      "dependencies": {
        "prosemirror-model": "^1.25.8",
@@ -12,6 +12,7 @@ import type { CollectionObject, MessageAddressObject } from '@MailManager/models
 import { useMailOperationsStore } from '@/stores/mailOperationsStore'
 import { useMailCompositionStore } from '@/stores/mailCompositionStore'
 import { ComposerMode } from '@/types/composer'
+import type { ComposerFormat } from '@/types/composer'
 import { documentsSelectorComponent } from '@/services/documentsSelector'
 import ComposerToolbar from '@/components/composer/ComposerToolbar.vue'
 import ComposerSender from '@/components/composer/ComposerSender.vue'
@@ -48,6 +49,8 @@ const {
 // State
 const showCc = ref(false)
 const showBcc = ref(false)
+const format = ref<ComposerFormat>('rich')
+const textEdited = ref(false)
 const applyingDraftToEditor = ref(false)
 const showDocumentSelector = ref(false)
 const showCloseDialog = ref(false)
@@ -85,6 +88,14 @@ const subject = computed({

 const attachments = computed(() => activeDraft.value?.attachments ?? {})

+const text = computed({
+  get: () => activeDraft.value?.message.body.text ?? '',
+  set: value => {
+    textEdited.value = true
+    compositionStore.updateBody({ text: value, html: textToHtml(value) })
+  },
+})
+
 // Initialize Tiptap editor
 const editor = useEditor({
  extensions: [
@@ -118,6 +129,8 @@ watch(
    compositionStore.openDraft(props.mode, props.source)
    showCc.value = (activeDraft.value?.message.cc.length ?? 0) > 0
    showBcc.value = (activeDraft.value?.message.bcc.length ?? 0) > 0
+    format.value = 'rich'
+    textEdited.value = false

    applyingDraftToEditor.value = true
    currentEditor.commands.setContent(activeDraft.value?.message.body.html || '')
@@ -249,6 +262,42 @@ const toggleLink = () => {
 const isActive = (name: string, attrs?: any) => {
  return editor.value?.isActive(name, attrs) || false
 }
+
+const toggleFormat = () => {
+  if (format.value === 'rich') {
+    if (editor.value) {
+      compositionStore.updateBody({
+        html: activeDraft.value?.message.body.html ?? '',
+        text: editor.value.getText(),
+      })
+    }
+    textEdited.value = false
+    format.value = 'plain'
+    return
+  }
+
+  format.value = 'rich'
+  if (textEdited.value && editor.value) {
+    applyingDraftToEditor.value = true
+    editor.value.commands.setContent(activeDraft.value?.message.body.html || '')
+    applyingDraftToEditor.value = false
+  }
+}
+
+function textToHtml(text: string): string {
+  if (!text) {
+    return ''
+  }
+
+  return text
+    .split(/\r?\n/)
+    .map(line => `<p>${escapeHtml(line) || '<br>'}</p>`)
+    .join('')
+}
+
+function escapeHtml(value: string): string {
+  return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+}
 </script>

 <template>
@@ -297,6 +346,8 @@ const isActive = (name: string, attrs?: any) => {

      <ComposerEditor
        :editor="editor"
+        :format="format"
+        :text="text"
        :is-bold-active="isActive('bold')"
        :is-italic-active="isActive('italic')"
        :is-underline-active="isActive('underline')"
@@ -309,6 +360,8 @@ const isActive = (name: string, attrs?: any) => {
        @bullet-list="toggleBulletList"
        @ordered-list="toggleOrderedList"
        @link="toggleLink"
+        @toggle-format="toggleFormat"
+        @update:text="text = $event"
        @attach-from-device="handleAttachFromDevice"
        @attach-from-documents="handleAttachFromDocuments"
      />
@@ -16,12 +16,14 @@ interface Props {
  selectionMode?: boolean
  selectedCollection?: CollectionObject | null
  loading?: boolean
+  searchActive?: boolean
 }

 const props = withDefaults(defineProps<Props>(), {
  loading: false,
  selectionList: () => [],
  selectionMode: false,
+  searchActive: false,
 })

 // Emits
@@ -372,10 +374,10 @@ onBeforeUnmount(() => {

    <!-- Empty state -->
    <div v-else-if="messages.length === 0" class="pa-8 text-center">
-      <v-icon size="64" color="grey-lighten-1">mdi-email-outline</v-icon>
+      <v-icon size="64" color="grey-lighten-1">{{ searchActive ? 'mdi-email-search-outline' : 'mdi-email-outline' }}</v-icon>
      <div class="text-h6 mt-4 text-medium-emphasis">No messages</div>
      <div class="text-body-2 text-medium-emphasis">
-        This folder is empty
+        {{ searchActive ? 'No messages match your search' : 'This folder is empty' }}
      </div>
    </div>

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
-import { useUser } from '@KTXC'
+import { usePreviewStore, useUser } from '@KTXC'
 import { useMailUiStore } from '@/stores/mailUiStore'
 import type { EntityObject, MessageObject } from '@MailManager/models'
 import { SecurityLevel } from '@/utile/emailSanitizer'
@@ -19,6 +19,7 @@ const props = defineProps<{
 // Emits
 const emit = defineEmits<{
  reply: [entity: EntityObject]
+  replyAll: [entity: EntityObject]
  forward: [entity: EntityObject]
  move: [entity: EntityObject]
  delete: [entity: EntityObject]
@@ -28,6 +29,7 @@ const emit = defineEmits<{

 // User settings
 const { getSetting } = useUser()
+const previewStore = usePreviewStore()
 const mailUiStore = useMailUiStore()

 // Security overrides
@@ -64,6 +66,7 @@ const effectiveSecurityLevel = computed(() => {
 // Preview state
 const previewDialog = computed(() => mediaViewerComponent('dialog'))
 const previewItems = computed<MediaViewerItem[]>(() => {
+  if (!previewStore.availability.storage) return []
  const attachments = message.value?.attachments ?? []
  const items: MediaViewerItem[] = []
  attachments.forEach((attachment, index) => {
@@ -107,6 +110,12 @@ const handleReply = () => {
  }
 }

+const handleReplyAll = () => {
+  if (props.entity) {
+    emit('replyAll', props.entity)
+  }
+}
+
 const handleForward = () => {
  if (props.entity) {
    emit('forward', props.entity)
@@ -152,7 +161,7 @@ const handlePreview = (index: number) => {

 const handleViewerRetrieve = (item: MediaViewerItem): Promise<Blob> => {
  if (!props.entity) return Promise.reject(new Error('No message selected'))
-  return mailUiStore.attachmentBlob(props.entity, item.meta.attachment)
+  return mailUiStore.attachmentPreviewBlob(props.entity, item.meta.attachment, 'fullscreen')
 }

 const handleViewerDownload = (item: MediaViewerItem) => {
@@ -176,6 +185,7 @@ const handleViewerDownload = (item: MediaViewerItem) => {
        :security-level="effectiveSecurityLevel"
        :is-security-overridden="overrideSecurityLevel !== null"
        @reply="handleReply"
+        @reply-all="handleReplyAll"
        @forward="handleForward"
        @move="handleMove"
        @delete="handleDelete"
@@ -9,6 +9,14 @@ defineProps({
    type: Object as PropType<Editor | null>,
    default: null,
  },
+  format: {
+    type: String as PropType<'rich' | 'plain'>,
+    required: true,
+  },
+  text: {
+    type: String,
+    default: '',
+  },
  isBoldActive: {
    type: Boolean,
    required: true,
@@ -42,6 +50,8 @@ const emit = defineEmits<{
  bulletList: []
  orderedList: []
  link: []
+  toggleFormat: []
+  'update:text': [value: string]
  attachFromDevice: [files: File[]]
  attachFromDocuments: []
 }>()
@@ -66,68 +76,84 @@ function handleFileChange(event: Event) {

 <template>
  <v-toolbar density="compact" elevation="0" class="editor-toolbar">
-    <v-btn
-      icon
-      size="small"
-      :class="{ 'v-btn--active': isBoldActive }"
-      @click="$emit('bold')"
-    >
-      <v-icon>mdi-format-bold</v-icon>
-      <v-tooltip activator="parent" location="bottom">Bold</v-tooltip>
-    </v-btn>
+    <template v-if="format === 'rich'">
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isBoldActive }"
+        @click="$emit('bold')"
+      >
+        <v-icon>mdi-format-bold</v-icon>
+        <v-tooltip activator="parent" location="bottom">Bold</v-tooltip>
+      </v-btn>
+
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isItalicActive }"
+        @click="$emit('italic')"
+      >
+        <v-icon>mdi-format-italic</v-icon>
+        <v-tooltip activator="parent" location="bottom">Italic</v-tooltip>
+      </v-btn>
+
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isUnderlineActive }"
+        @click="$emit('underline')"
+      >
+        <v-icon>mdi-format-underline</v-icon>
+        <v-tooltip activator="parent" location="bottom">Underline</v-tooltip>
+      </v-btn>
+
+      <v-divider vertical class="mx-2" />
+
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isBulletListActive }"
+        @click="$emit('bulletList')"
+      >
+        <v-icon>mdi-format-list-bulleted</v-icon>
+        <v-tooltip activator="parent" location="bottom">Bullet List</v-tooltip>
+      </v-btn>
+
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isOrderedListActive }"
+        @click="$emit('orderedList')"
+      >
+        <v-icon>mdi-format-list-numbered</v-icon>
+        <v-tooltip activator="parent" location="bottom">Numbered List</v-tooltip>
+      </v-btn>
+
+      <v-divider vertical class="mx-2" />
+
+      <v-btn
+        icon
+        size="small"
+        :class="{ 'v-btn--active': isLinkActive }"
+        @click="$emit('link')"
+      >
+        <v-icon>mdi-link</v-icon>
+        <v-tooltip activator="parent" location="bottom">Link</v-tooltip>
+      </v-btn>
+
+      <v-divider vertical class="mx-2" />
+    </template>

    <v-btn
      icon
      size="small"
-      :class="{ 'v-btn--active': isItalicActive }"
-      @click="$emit('italic')"
+      :class="{ 'v-btn--active': format === 'plain' }"
+      @click="$emit('toggleFormat')"
    >
-      <v-icon>mdi-format-italic</v-icon>
-      <v-tooltip activator="parent" location="bottom">Italic</v-tooltip>
-    </v-btn>
-
-    <v-btn
-      icon
-      size="small"
-      :class="{ 'v-btn--active': isUnderlineActive }"
-      @click="$emit('underline')"
-    >
-      <v-icon>mdi-format-underline</v-icon>
-      <v-tooltip activator="parent" location="bottom">Underline</v-tooltip>
-    </v-btn>
-
-    <v-divider vertical class="mx-2" />
-
-    <v-btn
-      icon
-      size="small"
-      :class="{ 'v-btn--active': isBulletListActive }"
-      @click="$emit('bulletList')"
-    >
-      <v-icon>mdi-format-list-bulleted</v-icon>
-      <v-tooltip activator="parent" location="bottom">Bullet List</v-tooltip>
-    </v-btn>
-
-    <v-btn
-      icon
-      size="small"
-      :class="{ 'v-btn--active': isOrderedListActive }"
-      @click="$emit('orderedList')"
-    >
-      <v-icon>mdi-format-list-numbered</v-icon>
-      <v-tooltip activator="parent" location="bottom">Numbered List</v-tooltip>
-    </v-btn>
-
-    <v-divider vertical class="mx-2" />
-
-    <v-btn
-      icon
-      size="small"
-      :class="{ 'v-btn--active': isLinkActive }"
-      @click="$emit('link')"
-    >
-      <v-icon>mdi-link</v-icon>
-      <v-tooltip activator="parent" location="bottom">Link</v-tooltip>
+      <v-icon>{{ format === 'plain' ? 'mdi-format-text' : 'mdi-code-tags' }}</v-icon>
+      <v-tooltip activator="parent" location="bottom">
+        {{ format === 'plain' ? 'Rich Text' : 'Plain Text' }}
+      </v-tooltip>
    </v-btn>

    <v-spacer />
@@ -154,7 +180,17 @@ function handleFileChange(event: Event) {
  <v-divider />

  <div class="editor-container">
-    <EditorContent :editor="editor ?? undefined" />
+    <EditorContent v-if="format === 'rich'" :editor="editor ?? undefined" />
+    <v-textarea
+      v-else
+      :model-value="text"
+      variant="plain"
+      auto-grow
+      hide-details
+      placeholder="Write your message..."
+      class="text-editor pa-4"
+      @update:model-value="$emit('update:text', $event)"
+    />
  </div>
 </template>

@@ -179,6 +215,11 @@ function handleFileChange(event: Event) {
  color: rgb(var(--v-theme-primary));
 }

+.text-editor :deep(textarea) {
+  min-height: 300px;
+  font-family: inherit;
+}
+
 :deep(.tiptap-editor) {
  outline: none;
  min-height: 300px;
@@ -30,7 +30,7 @@ defineEmits<{
    </v-btn>

    <v-toolbar-title>
-      {{ mode === ComposerMode.Reply ? 'Reply' : mode === ComposerMode.Forward ? 'Forward' : 'New Message' }}
+      {{ mode === ComposerMode.Reply ? 'Reply' : mode === ComposerMode.ReplyAll ? 'Reply All' : mode === ComposerMode.Forward ? 'Forward' : 'New Message' }}
    </v-toolbar-title>

    <v-spacer />
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
+import { usePreviewStore } from '@KTXC'
 import RecipientDetails from '@/components/common/RecipientDetails.vue'
 import { formatFileSize } from '@/utile/format'
 import { mediaViewerCanDisplay, mediaViewerComponent } from '@/services/mediaViewer'
@@ -27,7 +28,9 @@ const emit = defineEmits<{
 }>()

 const mailUiStore = useMailUiStore()
-const previewPopover = computed(() => mediaViewerComponent('popover'))
+const previewStore = usePreviewStore()
+const previewsAvailable = computed(() => previewStore.availability.storage)
+const previewPopover = computed(() => previewsAvailable.value ? mediaViewerComponent('popover') : null)

 const message = computed(() => {
  return props.entity?.properties ?? null
@@ -48,7 +51,7 @@ const attachmentItems = computed<AttachmentItem[]>(() =>
 )

 const isPreviewable = (attachment: MessagePartInterface): boolean => {
-  return mediaViewerCanDisplay(attachment.type)
+  return previewsAvailable.value && mediaViewerCanDisplay(attachment.type)
 }

 const handleAttachmentClick = (attachment: MessagePartInterface, index: number): void => {
@@ -61,7 +64,7 @@ const handleAttachmentClick = (attachment: MessagePartInterface, index: number):

 const handleViewerRetrieve = (item: AttachmentItem): Promise<Blob> => {
  if (!props.entity) return Promise.reject(new Error('No message selected'))
-  return mailUiStore.attachmentBlob(props.entity, item.meta.attachment)
+  return mailUiStore.attachmentPreviewBlob(props.entity, item.meta.attachment, 'inline')
 }

 // Format date for display
@@ -13,6 +13,7 @@ const props = defineProps<Props>()

 const emit = defineEmits<{
  reply: []
+  replyAll: []
  forward: []
  move: []
  delete: []
@@ -47,7 +48,7 @@ const currentSecurityLevel = computed(() => {
    <v-btn
      icon="mdi-reply-all"
      variant="text"
-      @click="emit('reply')"
+      @click="emit('replyAll')"
    >
      <v-icon>mdi-reply-all</v-icon>
      <v-tooltip activator="parent" location="bottom">Reply All</v-tooltip>
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, unref } from 'vue'
+import { computed, onMounted, ref, unref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useDisplay } from 'vuetify'
 import { useModuleStore } from '@KTXC'
@@ -41,6 +41,8 @@ const {
  loading,
  selectedMessage,
  currentMessages,
+  searchResults,
+  searching,
 } = storeToRefs(mailOperationsStore)

 const {
@@ -74,21 +76,19 @@ const {
 // Complex store/composable objects accessed directly (not simple refs)
 const { mailSync, entitiesStore } = mailOperationsStore

-// Message search (filters the current message list by subject/sender)
+// Message search — debounced server-side search of the selected folder
 const searchQuery = ref('')

-const filteredMessages = computed(() => {
-  const query = (searchQuery.value ?? '').trim().toLowerCase()
-  if (!query) return currentMessages.value
+watch(searchQuery, query => mailOperationsStore.searchMessages(query))

-  return currentMessages.value.filter((message: EntityObject) => {
-    const subject = (message.properties.subject || '').toLowerCase()
-    const fromLabel = (message.properties.from?.label || '').toLowerCase()
-    const fromAddress = (message.properties.from?.address || '').toLowerCase()
-    return subject.includes(query) || fromLabel.includes(query) || fromAddress.includes(query)
-  })
+// Reset the search box when the folder changes so it doesn't show a stale
+// query for a folder whose results are no longer being filtered.
+watch(selectedFolder, () => {
+  searchQuery.value = ''
 })

+const filteredMessages = computed(() => searchResults.value ?? currentMessages.value)
+
 const lastSyncLabel = computed(() => {
  const lastSync = unref(unref(mailSync.lastSync))

@@ -167,6 +167,8 @@ const handleMessageComposeFresh = () => mailUiStore.openComposer()

 const handleMessageComposeReply = (message: EntityObject) => mailUiStore.openComposer(message, ComposerMode.Reply)

+const handleMessageComposeReplyAll = (message: EntityObject) => mailUiStore.openComposer(message, ComposerMode.ReplyAll)
+
 const handleMessageComposeForward = (message: EntityObject) => mailUiStore.openComposer(message, ComposerMode.Forward)

 const handleMessageComposeClose = () => mailUiStore.closeComposer()
@@ -250,6 +252,7 @@ const handleMessageSelectionDelete = () => mailUiStore.deleteSelectedMessages()
        variant="outlined"
        placeholder="Search messages..."
        prepend-inner-icon="mdi-magnify"
+        :loading="searching"
        hide-details
        single-line
        clearable
@@ -308,6 +311,7 @@ const handleMessageSelectionDelete = () => mailUiStore.deleteSelectedMessages()
              :selection-list="selectionList"
              :selection-mode="selectionMode"
              :loading="loading"
+              :search-active="searchResults !== null"
              @open="handleMessageOpen"
              @reply="handleMessageComposeReply"
              @forward="handleMessageComposeForward"
@@ -339,6 +343,7 @@ const handleMessageSelectionDelete = () => mailUiStore.deleteSelectedMessages()
              :entity="selectedMessage"
              @compose="handleMessageComposeFresh"
              @reply="handleMessageComposeReply"
+              @reply-all="handleMessageComposeReplyAll"
              @forward="handleMessageComposeForward"
              @move="handleMessageMove"
              @delete="handleMessageDelete"
@@ -118,7 +118,8 @@ export const useMailCompositionStore = defineStore('mailCompositionStore', () =>
      return
    }

-    activeDraft.value = buildDraft(mode, sender, source)
+    const ownAddresses = senderIdentities.value.map(identity => identity.address)
+    activeDraft.value = buildDraft(mode, sender, source, ownAddresses)
    activeDraft.value.action = mode

    stageDraft()
@@ -380,6 +381,10 @@ export const useMailCompositionStore = defineStore('mailCompositionStore', () =>
        source: attachment.source,
      }
    })
+
+    if (response.revision !== undefined) {
+      activeDraft.value.revision = response.revision
+    }
  }

  async function addAttachmentsFromDocuments(items: { identifier: string; name: string; mimeType?: string; size?: number }[]) {
@@ -432,6 +437,10 @@ export const useMailCompositionStore = defineStore('mailCompositionStore', () =>
      }
    })

+    if (response.revision !== undefined) {
+      activeDraft.value.revision = response.revision
+    }
+
    if (response.failed?.length) {
      mailUiStore.notify(
        response.failed.length === 1
@@ -462,8 +471,11 @@ export const useMailCompositionStore = defineStore('mailCompositionStore', () =>
    if (response.disposition === 'error') {
      console.error('[Mail][Composer] Failed to remove attachment:', response.error)
    }
-    
+
    delete activeDraft.value.attachments[attachment.identifier]
+    if (response.revision !== undefined) {
+      activeDraft.value.revision = response.revision
+    }
  }

  function queueSave(immediate: boolean) {
@@ -547,9 +559,9 @@ export const useMailCompositionStore = defineStore('mailCompositionStore', () =>
  }
 })

-function buildDraft(mode: ComposerMode, sender: ComposerSenderIdentity, source?: EntityObject | MessageAddressObject | null): ComposerDraft {
+function buildDraft(mode: ComposerMode, sender: ComposerSenderIdentity, source: EntityObject | MessageAddressObject | null | undefined, ownAddresses: string[]): ComposerDraft {
  const composition = createIdentifier()
-  const freshMessage = buildMessage(mode, source)
+  const freshMessage = buildMessage(mode, source, ownAddresses)
  const freshAttachments = buildAttachments(composition, mode, source)
  const sourceIdentifier = source instanceof EntityObject ? source.identifier : null
  return {
@@ -565,7 +577,7 @@ function buildDraft(mode: ComposerMode, sender: ComposerSenderIdentity, source?:
  }
 }

-function buildMessage(mode: ComposerMode, source: EntityObject | MessageAddressObject | null | undefined): ComposerDraftMessage {
+function buildMessage(mode: ComposerMode, source: EntityObject | MessageAddressObject | null | undefined, ownAddresses: string[] = []): ComposerDraftMessage {
  
  if (!source) {
    return emptyMessage()
@@ -592,12 +604,28 @@ function buildMessage(mode: ComposerMode, source: EntityObject | MessageAddressO
  const sentAt = sourceMessage.sent || source.created || ''
  const sentLabel = sentAt ? new Date(sentAt).toLocaleString() : 'an unknown time'

-  if (mode === ComposerMode.Reply) {
+  if (mode === ComposerMode.Reply || mode === ComposerMode.ReplyAll) {
    const replyToAddr = sourceMessage.replyTo?.[0] ?? sourceMessage.from ?? null
    const replyToAddress = replyToAddr?.address || ''
+    const to: MessageAddressInterface[] = replyToAddress ? [{ address: replyToAddress, label: replyToAddr?.label }] : []
+
+    let cc: MessageAddressInterface[] = []
+    if (mode === ComposerMode.ReplyAll) {
+      const excluded = new Set([replyToAddress.toLowerCase(), ...ownAddresses.map(addr => addr.toLowerCase())])
+      const seen = new Set<string>()
+      cc = [...(sourceMessage.to || []), ...(sourceMessage.cc || [])].filter(recipient => {
+        const address = recipient.address?.toLowerCase() || ''
+        if (!address || excluded.has(address) || seen.has(address)) {
+          return false
+        }
+        seen.add(address)
+        return true
+      })
+    }
+
    return {
-      to: replyToAddress ? [{ address: replyToAddress, label: replyToAddr?.label }] : [],
-      cc: [],
+      to,
+      cc,
      bcc: [],
      subject: /^Re:/i.test(originalSubject) ? originalSubject : `Re: ${originalSubject}`,
      body: {
@@ -620,7 +648,7 @@ function buildMessage(mode: ComposerMode, source: EntityObject | MessageAddressO
 }

 function buildAttachments(composition: string, mode: ComposerMode, source?: EntityObject | MessageAddressObject | null): Record<string, ComposerDraftAttachment> {
-  if (mode === ComposerMode.Fresh || mode === ComposerMode.Reply || !(source instanceof EntityObject)) {
+  if (mode === ComposerMode.Fresh || mode === ComposerMode.Reply || mode === ComposerMode.ReplyAll || !(source instanceof EntityObject)) {
    return {}
  }

@@ -4,7 +4,8 @@ import { useCollectionsStore } from '@MailManager/stores/collectionsStore'
 import { useEntitiesStore } from '@MailManager/stores/entitiesStore'
 import { useServicesStore } from '@MailManager/stores/servicesStore'
 import { useMailSync } from '@MailManager/composables/useMailSync'
-import type { ServiceIdentifier, CollectionIdentifier, EntityIdentifier } from '@MailManager/types/common'
+import type { ServiceIdentifier, CollectionIdentifier, EntityIdentifier, ListFilter } from '@MailManager/types/common'
+import { ListFilterComparisonOperator, ListFilterConjunctionOperator } from '@MailManager/types/common'
 import type { EntityTransmitRequest, EntityBlobSelector } from '@MailManager/types/entity'
 import type { MessageAddressInterface, MessageInterface, MessagePartInterface } from '@MailManager/types/message'
 import { ServiceObject, type CollectionObject, type EntityObject } from '@MailManager/models'
@@ -50,6 +51,8 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {

  const selectedFolder = shallowRef<CollectionObject | null>(null)
  const selectedMessage = shallowRef<EntityObject | null>(null)
+  const searchResults = shallowRef<EntityObject[] | null>(null)
+  const searching = ref(false)
  const composerSaving = ref(false)
  const composerSending = ref(false)
  const composerLastSaved = ref<Date | null>(null)
@@ -293,6 +296,7 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
  }

  async function selectFolder(folder: CollectionObject | null) {
+    clearSearch()
    selectedFolder.value = folder
    selectedMessage.value = null

@@ -307,6 +311,67 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
    _updateSyncSources()
  }

+  const SEARCH_DEBOUNCE_MS = 300
+  let searchDebounceTimer: ReturnType<typeof setTimeout> | null = null
+  // Monotonic token so out-of-order/stale search responses are discarded.
+  let searchToken = 0
+
+  /**
+   * Debounced server-side search of the selected folder. Clearing the query
+   * (or the folder) reverts the message list back to `currentMessages`.
+   */
+  function searchMessages(query: string) {
+    const trimmed = (query ?? '').trim()
+
+    if (searchDebounceTimer) {
+      clearTimeout(searchDebounceTimer)
+      searchDebounceTimer = null
+    }
+
+    if (!trimmed || !selectedFolder.value) {
+      searchToken++
+      searchResults.value = null
+      searching.value = false
+      return
+    }
+
+    const folder = selectedFolder.value
+    // 'from'/'to'/'subject'/'body' are the attributes both IMAP and JMAP
+    // backends whitelist for entity search (see their entityListFilter
+    // capability); OR them together for a single-box search.
+    const filter: ListFilter = {
+      from: [trimmed, ListFilterComparisonOperator.LIKE],
+      to: [trimmed, ListFilterComparisonOperator.LIKE, ListFilterConjunctionOperator.OR],
+      subject: [trimmed, ListFilterComparisonOperator.LIKE, ListFilterConjunctionOperator.OR],
+      body: [trimmed, ListFilterComparisonOperator.LIKE, ListFilterConjunctionOperator.OR],
+    }
+    searching.value = true
+    const token = ++searchToken
+
+    searchDebounceTimer = setTimeout(async () => {
+      try {
+        const results = await entitiesStore.list([folder.identifier], filter)
+        if (token !== searchToken) return
+        searchResults.value = Object.values(results)
+      } catch (error) {
+        if (token === searchToken) searchResults.value = []
+        console.error('[Mail][Operations] Failed to search messages:', error)
+      } finally {
+        if (token === searchToken) searching.value = false
+      }
+    }, SEARCH_DEBOUNCE_MS)
+  }
+
+  function clearSearch() {
+    if (searchDebounceTimer) {
+      clearTimeout(searchDebounceTimer)
+      searchDebounceTimer = null
+    }
+    searchToken++
+    searchResults.value = null
+    searching.value = false
+  }
+
  function selectMessage(entity: EntityObject | null) {
    selectedMessage.value = entity
  }
@@ -575,6 +640,24 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
    return blob
  }

+  async function attachmentPreviewBlob(
+    entity: EntityObject,
+    part: MessagePartInterface,
+    variant: 'inline' | 'fullscreen' = 'inline',
+  ): Promise<Blob> {
+    return entitiesStore.preview({
+      target: entity.identifier,
+      part: {
+        blobId: part.blobId ?? undefined,
+        partId: part.partId ?? undefined,
+        cid: part.cid ?? undefined,
+        type: part.type || 'application/octet-stream',
+        size: part.size ?? null,
+      },
+      variant,
+    })
+  }
+
  // ── Exports ───────────────────────────────────────────────────────────────

  return {
@@ -587,6 +670,8 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
    // State
    loading,
    selectedMessage,
+    searchResults,
+    searching,
    composerSaving,
    composerSending,
    composerLastSaved,
@@ -602,6 +687,8 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
    retrieveService,
    selectFolder,
    selectMessage,
+    searchMessages,
+    clearSearch,
    createFolder,
    saveComposerDraft,
    sendComposerMessage,
@@ -612,6 +699,7 @@ export const useMailOperationsStore = defineStore('mailOperationsStore', () => {
    moveMessages,
    downloadMessage,
    attachmentBlob,
+    attachmentPreviewBlob,
    moveFolder,
    renameFolder,
    isServiceFolderLoading,
@@ -714,6 +714,14 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
    return mailOperationsStore.attachmentBlob(entity, part)
  }

+  function attachmentPreviewBlob(
+    entity: EntityObject,
+    part: Parameters<typeof mailOperationsStore.attachmentPreviewBlob>[1],
+    variant: 'inline' | 'fullscreen' = 'inline',
+  ) {
+    return mailOperationsStore.attachmentPreviewBlob(entity, part, variant)
+  }
+
  return {
    sidebarVisible,
    settingsDialogVisible,
@@ -763,6 +771,7 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
    moveMessages,
    downloadMessage,
    attachmentBlob,
+    attachmentPreviewBlob,
    messageSelectionModeActivate,
    messageSelectionModeDeactivate,
    messageSelectionToggleOne,
@@ -788,4 +797,4 @@ export const useMailUiStore = defineStore('mailUiStore', () => {
    confirmDeleteFolder,
    flagSelectedMessages,
  }
-})
+})
@@ -5,9 +5,13 @@ import type { MessageAddressInterface } from "@MailManager/types/message"
 export enum ComposerMode {
  Fresh = 'fresh',
  Reply = 'reply',
+  ReplyAll = 'replyAll',
  Forward = 'forward',
 }

+/** Body editing format: rich (Tiptap/HTML) or plain text. */
+export type ComposerFormat = 'rich' | 'plain'
+
 export interface ComposerDraftAttachment {
  identifier: string
  composition: string
@@ -111,6 +111,7 @@ export interface CompositionAttachmentAddResponse {
    message: string
  }
  composition: string
+  revision?: number
  attachments: Record<string, CompositionAttachmentInterface>
  failed?: {
    identifier: string
@@ -131,4 +132,5 @@ export interface CompositionAttachmentRemoveResponse {
  }
  composition: string
  identifier: string
+  revision?: number
 }
@@ -187,6 +187,7 @@ final class CompositionManagerTest extends TestCase {
        $this->assertSame('added', $result['disposition']);
        $this->assertCount(1, $result['attachments']);
        $this->assertSame([], $result['failed']);
+        $this->assertSame(1, $result['revision']);

        $attachment = $result['attachments']['attach-1'];
        $this->assertSame('documents', $attachment['origin']);
@@ -196,11 +197,58 @@ final class CompositionManagerTest extends TestCase {
        $this->assertSame(strlen('hello world'), $attachment['size']);

        $snapshot = $this->compositionStore->compositionFetch(self::TENANT_ID, self::USER_ID, $compositionId);
+        $this->assertSame(1, $snapshot['revision']);
        $this->assertSame('dirty', $snapshot['remote']['status']);
        $this->assertNull($snapshot['remote']['entity']);
        $this->assertNull($snapshot['remote']['error']);
    }

+    public function testAttachmentAddIncrementsRevisionOnSubsequentAdd(): void {
+        $compositionId = $this->stageEmptyComposition();
+        $documentsManager = $this->createStub(\KTXM\DocumentsManager\Manager::class);
+        $documentsManager->method('entityFetchBulk')->willReturn([
+            $this->makeEntity('default:personal:root:doc1', 'hello.txt', 'text/plain'),
+            $this->makeEntity('default:personal:root:doc2', 'world.txt', 'text/plain'),
+        ]);
+        $documentsManager->method('entityReadStream')->willReturnCallback(
+            fn(): mixed => $this->makeStream('hello world'),
+        );
+        $manager = $this->makeManager($documentsManager);
+
+        $manager->attachmentAdd(self::TENANT_ID, self::USER_ID, $compositionId, [
+            'identifier' => 'attach-1',
+            'origin' => 'documents',
+            'source' => 'default:personal:root:doc1',
+        ]);
+        $result = $manager->attachmentAdd(self::TENANT_ID, self::USER_ID, $compositionId, [
+            'identifier' => 'attach-2',
+            'origin' => 'documents',
+            'source' => 'default:personal:root:doc2',
+        ]);
+
+        $this->assertSame(2, $result['revision']);
+    }
+
+    public function testAttachmentAddDoesNotChangeRevisionWhenNothingIsAdded(): void {
+        $compositionId = $this->stageEmptyComposition();
+        $documentsManager = $this->createStub(\KTXM\DocumentsManager\Manager::class);
+        // documents_manager unavailable means the sourced attachment fails
+        // entirely, so no attachment is actually added to the composition.
+        $manager = $this->makeManager($documentsManager, documentsModuleEnabled: false);
+
+        $result = $manager->attachmentAdd(self::TENANT_ID, self::USER_ID, $compositionId, [
+            'identifier' => 'attach-1',
+            'origin' => 'documents',
+            'source' => 'default:personal:root:doc1',
+        ]);
+
+        $this->assertSame('error', $result['disposition']);
+        $this->assertArrayNotHasKey('revision', $result);
+
+        $snapshot = $this->compositionStore->compositionFetch(self::TENANT_ID, self::USER_ID, $compositionId);
+        $this->assertArrayNotHasKey('revision', $snapshot);
+    }
+
    public function testAttachmentAddFromDocumentsPartialFailure(): void {
        $compositionId = $this->stageEmptyComposition();
        $documentsManager = $this->createStub(\KTXM\DocumentsManager\Manager::class);
@@ -285,6 +333,45 @@ final class CompositionManagerTest extends TestCase {
        $this->assertStringContainsString('not installed or enabled', $result['failed'][0]['message']);
    }

+    public function testAttachmentRemoveIncrementsRevision(): void {
+        $compositionId = $this->stageEmptyComposition();
+        $documentsManager = $this->createStub(\KTXM\DocumentsManager\Manager::class);
+        $documentsManager->method('entityFetchBulk')->willReturn([
+            $this->makeEntity('default:personal:root:doc1', 'hello.txt', 'text/plain'),
+        ]);
+        $documentsManager->method('entityReadStream')->willReturn($this->makeStream('hello world'));
+        $manager = $this->makeManager($documentsManager);
+
+        $added = $manager->attachmentAdd(self::TENANT_ID, self::USER_ID, $compositionId, [
+            'identifier' => 'attach-1',
+            'origin' => 'documents',
+            'source' => 'default:personal:root:doc1',
+        ]);
+        $this->assertSame(1, $added['revision']);
+
+        $result = $manager->attachmentRemove(self::TENANT_ID, self::USER_ID, $compositionId, 'attach-1');
+
+        $this->assertSame('removed', $result['disposition']);
+        $this->assertSame(2, $result['revision']);
+
+        $snapshot = $this->compositionStore->compositionFetch(self::TENANT_ID, self::USER_ID, $compositionId);
+        $this->assertSame(2, $snapshot['revision']);
+        $this->assertArrayNotHasKey('attach-1', $snapshot['attachments']);
+        $this->assertSame('dirty', $snapshot['remote']['status']);
+    }
+
+    public function testAttachmentRemoveNotFoundDoesNotChangeRevision(): void {
+        $compositionId = $this->stageEmptyComposition();
+        $documentsManager = $this->createStub(\KTXM\DocumentsManager\Manager::class);
+        $manager = $this->makeManager($documentsManager);
+
+        $result = $manager->attachmentRemove(self::TENANT_ID, self::USER_ID, $compositionId, 'missing-attachment');
+
+        $this->assertSame('error', $result['disposition']);
+        $this->assertSame('attachment_not_found', $result['error']['type']);
+        $this->assertArrayNotHasKey('revision', $result);
+    }
+
    private function makeManager(
        Stub $documentsManager,
        bool $documentsModuleEnabled = true,
@@ -12,6 +12,8 @@ use KTXF\Mail\Entity\EntityMutableInterface;
 use KTXF\Mail\Object\MessagePropertiesMutableInterface;
 use KTXF\Mail\Service\ServiceBaseInterface;
 use KTXF\Mail\Service\ServiceEntityMutableInterface;
+use KTXF\Mail\Service\ServiceEntitySubmitInterface;
+use KTXF\Mail\Submission\EntitySubmitResult;
 use KTXF\Resource\Filter\IFilter;
 use KTXF\Resource\Identifier\CollectionIdentifier;
 use KTXF\Resource\Identifier\EntityIdentifier;
@@ -257,6 +259,133 @@ final class CompositionSynchronizationTest extends TestCase {
        ));
    }

+    public function testSendPurgesLocalCompositionOnSuccess(): void {
+        $this->stageComposition();
+        $properties = $this->createStub(MessagePropertiesMutableInterface::class);
+        $service = $this->submitService($properties);
+        $service->method('entitySubmit')->willReturn(new EntitySubmitResult(EntitySubmitResult::DISPOSITION_SENT));
+
+        $mailManager = $this->createStub(\KTXM\MailManager\Manager::class);
+        $mailManager->method('serviceFindByAddress')->willReturn($service);
+
+        $result = $this->compositionManager($mailManager)->send(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+            ['address' => 'sender@example.com'],
+            ['subject' => 'Sent draft'],
+            [],
+        );
+
+        $this->assertSame('sent', $result['disposition']);
+        $this->assertNull($this->compositionStore->compositionFetch(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+        ));
+    }
+
+    public function testSendReusesSyncedRemoteDraftAsSubmissionSource(): void {
+        $this->stageComposition('provider:service:drafts:remote-1');
+        $properties = $this->createStub(MessagePropertiesMutableInterface::class);
+        $service = $this->createMockForIntersectionOfInterfaces([
+            ServiceBaseInterface::class,
+            ServiceEntitySubmitInterface::class,
+        ]);
+        $entity = $this->createStub(EntityMutableInterface::class);
+        $entity->method('getProperties')->willReturn($properties);
+        $service->method('provider')->willReturn('provider');
+        $service->method('identifier')->willReturn('service');
+        $service->method('getEnabled')->willReturn(true);
+        $service->method('entityFresh')->willReturn($entity);
+        $service->expects($this->once())
+            ->method('entitySubmit')
+            ->with(
+                $this->anything(),
+                $this->callback(static fn(?EntityIdentifier $source): bool => $source !== null
+                    && (string)$source === 'provider:service:drafts:remote-1'),
+                $properties,
+            )
+            ->willReturn(new EntitySubmitResult(EntitySubmitResult::DISPOSITION_SENT));
+
+        $mailManager = $this->createStub(\KTXM\MailManager\Manager::class);
+        $mailManager->method('serviceFindByAddress')->willReturn($service);
+
+        $result = $this->compositionManager($mailManager)->send(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+            ['address' => 'sender@example.com'],
+            ['subject' => 'Sent draft'],
+            [],
+        );
+
+        $this->assertSame('sent', $result['disposition']);
+    }
+
+    public function testSendIgnoresRemoteDraftBelongingToAnotherService(): void {
+        $this->stageComposition('provider:other-service:drafts:remote-1');
+        $properties = $this->createStub(MessagePropertiesMutableInterface::class);
+        $service = $this->createMockForIntersectionOfInterfaces([
+            ServiceBaseInterface::class,
+            ServiceEntitySubmitInterface::class,
+        ]);
+        $entity = $this->createStub(EntityMutableInterface::class);
+        $entity->method('getProperties')->willReturn($properties);
+        $service->method('provider')->willReturn('provider');
+        $service->method('identifier')->willReturn('service');
+        $service->method('getEnabled')->willReturn(true);
+        $service->method('entityFresh')->willReturn($entity);
+        $service->expects($this->once())
+            ->method('entitySubmit')
+            ->with($this->anything(), $this->isNull(), $properties)
+            ->willReturn(new EntitySubmitResult(EntitySubmitResult::DISPOSITION_SENT));
+
+        $mailManager = $this->createStub(\KTXM\MailManager\Manager::class);
+        $mailManager->method('serviceFindByAddress')->willReturn($service);
+
+        $result = $this->compositionManager($mailManager)->send(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+            ['address' => 'sender@example.com'],
+            ['subject' => 'Sent draft'],
+            [],
+        );
+
+        $this->assertSame('sent', $result['disposition']);
+    }
+
+    public function testSendFailureKeepsLocalComposition(): void {
+        $this->stageComposition();
+        $properties = $this->createStub(MessagePropertiesMutableInterface::class);
+        $service = $this->submitService($properties);
+        $service->method('entitySubmit')->willReturn(new EntitySubmitResult(
+            EntitySubmitResult::DISPOSITION_ERROR,
+            errorMessage: 'Transport unavailable',
+        ));
+
+        $mailManager = $this->createStub(\KTXM\MailManager\Manager::class);
+        $mailManager->method('serviceFindByAddress')->willReturn($service);
+
+        $result = $this->compositionManager($mailManager)->send(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+            ['address' => 'sender@example.com'],
+            ['subject' => 'Keep this draft'],
+            [],
+        );
+
+        $this->assertSame('error', $result['disposition']);
+        $this->assertSame('Transport unavailable', $result['error']['message']);
+        $this->assertNotNull($this->compositionStore->compositionFetch(
+            self::TENANT_ID,
+            self::USER_ID,
+            self::COMPOSITION_ID,
+        ));
+    }
+
    private function stageComposition(?string $remoteEntity = null): void {
        $saveComposition = static fn(): array => [
            'identifier' => self::COMPOSITION_ID,
@@ -292,6 +421,20 @@ final class CompositionSynchronizationTest extends TestCase {
        return $service;
    }

+    private function submitService(MessagePropertiesMutableInterface $properties): ServiceBaseInterface&ServiceEntitySubmitInterface&Stub {
+        $service = $this->createStubForIntersectionOfInterfaces([
+            ServiceBaseInterface::class,
+            ServiceEntitySubmitInterface::class,
+        ]);
+        $entity = $this->createStub(EntityMutableInterface::class);
+        $entity->method('getProperties')->willReturn($properties);
+        $service->method('provider')->willReturn('provider');
+        $service->method('identifier')->willReturn('service');
+        $service->method('getEnabled')->willReturn(true);
+        $service->method('entityFresh')->willReturn($entity);
+        return $service;
+    }
+
    private function compositionManager(\KTXM\MailManager\Manager $mailManager): CompositionManager {
        return new CompositionManager(
            container: $this->createStub(ContainerInterface::class),
Author	SHA1	Message	Date
Sebastian	6c6c6cef92	chore(deps): update tiptap monorepo to v3.31.3 Build Test / test (pull_request) Successful in 50s Details JS Unit Tests / test (pull_request) Successful in 51s Details PHP Integration Tests / Integration Tests (pull_request) Failing after 59s Details PHP Unit Tests / test (pull_request) Failing after 1m8s Details	2026-09-05 03:05:19 +00:00
Sebastian	5c9e13f87b	refactor(module): register browser integration through context Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-31 22:55:11 -04:00
Sebastian	9508106d4f	feat(preview): disable attachment previews when unavailable Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-31 22:55:11 -04:00
Sebastian	da1e8e52b0	feat: use new variant type Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-29 19:13:11 -04:00
Sebastian	74d3654515	feat: implement attachment preview Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-29 16:21:18 -04:00
Sebastian	704e01fece	feat: implement format toggle Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-28 22:29:22 -04:00
Sebastian	45cb0bd817	feat: wire mailbox search to server-side filtering Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-28 21:36:55 -04:00
Sebastian	33c44d62db	feat(core): add CLI management for tenant system stores Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-28 21:23:50 -04:00
Sebastian	a5eb104bd7	fix: reuse synced remote draft when sending a composition Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-25 22:39:33 -04:00
Sebastian	03862ed0cf	fix: purge local composition after successful send Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-25 22:14:57 -04:00
Sebastian	0c7f103353	fix: increment composition revision on attachment add and remove Signed-off-by: Sebastian <krupinski01@gmail.com>	2026-08-25 22:10:19 -04:00