diff --git a/README.md b/README.md
index 3d00de6..6dbe250 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,8 @@ To Contribute, checkout our [`CONTRIBUTING.md`](./CONTRIBUTING.md).
     * [Rust](#rust)
   * [Game Engines](#game-engines)
   * [Audio](#audio)
+  * [Messaging](#messaging)
+    * [Messaging Alternatives](#messaging-alternatives)
   * [Package Managers](#package-managers)
   * [Password Management](#password-management)
   * [Services and Utilities](#services-and-utilities)
@@ -63,7 +65,6 @@ To Contribute, checkout our [`CONTRIBUTING.md`](./CONTRIBUTING.md).
       * [Servers](#servers)
         * [Alternatives](#generic-social-media-server-alternatives)
       * [Clients](#clients)
-    * [Messaging](#messaging)
     * [Budgeting](#budgeting)
     * [Virtualization](#virtualization)
     * [VPN Software](#vpn-software)
@@ -449,6 +450,20 @@ Also, there is an advisory database of Rust slopware crates, which you can use i
 | [zrythm](https://www.zrythm.org) | [Ardour](https://ardour.org/) (opinions may vary whether it is a replacement or not) | [CLAUDE.md](https://github.com/zrythm/zrythm/blob/master/CLAUDE.md) in repository |
 | [FineTune](https://github.com/ronitsingh10/FineTune) | [BackgroundMusic](https://github.com/kyleneideck/BackgroundMusic) | Include [`CLAUDE.md`](https://github.com/ronitsingh10/FineTune/blob/20bbef22644a468f403cf9a011586ba2b0ed067f/.gitignore#L3) in the `.gitignore` |
 
+## Messaging
+
+| Name | Last Untainted Version or Commit ID | Tags and Evidence |
+|---|:---:|---|
+| [Mattermost](https://mattermost.com/) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![AI Functionality](./badges/ai-functionality-yellow.svg)](#ai-functionality) ([1](https://docs.mattermost.com/administration-guide/configure/agents-admin-guide.html))<br /> [![Vibecoded](./badges/vibecoded.svg)](#vibecoded) ([1](https://github.com/mattermost/mattermost/commit/e7f021de3683c72faf99fa82427304f3aae5bbf5)) |
+| [Telegram](https://telegram.org)      | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Vibecoded](./badges/vibecoded.svg)](#vibecoded) ([1](https://github.com/telegramdesktop/tdesktop/commit/983bd1a57bfd9a88bb0e17b51103c5e6cf1e3f24))|
+| [Zulip](https://zulip.com/)           | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![AI Functionality](./badges/ai-functionality-yellow.svg)](#ai-functionality) ([1](https://github.com/zulip/zulip/pull/32895)) |
+| [Sharkord](https://sharkord.com/)     | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) |, [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/Sharkord/sharkord/issues/85), [2](https://github.com/Sharkord/sharkord/blob/fd637b6f369b54f2726cd78603b6147d6fe45a29/.gitignore#L2)) |
+
+> [!Note]
+> ### Messaging alternatives
+> - [Delta Chat]
+> - [matrix]
+
 ## Package Managers
 
 | Name | Last Untainted Version or Commit ID | Tags and Evidence | Alternative(s) |
@@ -540,15 +555,6 @@ This is for both social media websites and apps.
 | [IceCubesApp for iOS](https://github.com/Dimillian/IceCubesApp) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/Dimillian/IceCubesApp/blob/main/CLAUDE.md)) |[Feditext](https://github.com/feditext/feditext) (an iOS fediverse app in beta), [wafrn-rn] |
 | [Bluesky Social App](https://github.com/misskey-dev/misskey/commit/2fa6ecc7efaaf9b9d189cdd3a3ebbb9171c86078) | [![Request for Help](./badges/request-for-help.svg)](#request-for-help) | [![Permissive AI policy](./badges/permissive-ai-policy-orange.svg)](#permissive-ai-policy) ([1](https://github.com/bluesky-social/social-app/blob/177bdcd2b7807c9980dab32e7a5664fc006df40b/CLAUDE.md))<br />[![Vibecoded](./badges/vibecoded.svg)](#vibecoded) ([1](https://github.com/bluesky-social/social-app/commit/8c4fc087f8119de5c007b71baaaf02089a346b38), [2](https://github.com/bluesky-social/social-app/commit/612a778361edc0314f92a0451abb98843e7bef9a), [3](https://github.com/bluesky-social/social-app/commit/1782a65174cbd22f01936f529f954e7a491b3fac)) | [wafrn-rn] |
 
-### Messaging
-
-| Name                                  | Alternative(s)         | Evidence                                                                                                                                                                                                                                                                               | Notes |
-|---------------------------------------|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|
-| [Mattermost](https://mattermost.com/) | [Delta Chat], [matrix] | [Distributes an "agents" plugin, with several LLM features](https://docs.mattermost.com/administration-guide/configure/agents-admin-guide.html), [core developers commit LLM-generated code](https://github.com/mattermost/mattermost/commit/e7f021de3683c72faf99fa82427304f3aae5bbf5) |
-| [Telegram](https://telegram.org)      | [Delta Chat], [matrix] | [`.cursor` folder in repository](https://github.com/telegramdesktop/tdesktop/commit/983bd1a57bfd9a88bb0e17b51103c5e6cf1e3f24)                                                                                                                                                          |
-| [Zulip](https://zulip.com/)           | [Delta Chat], [matrix] | [Integrated an LLM "topic summary" feature](https://github.com/zulip/zulip/pull/32895)                                                                                                                                                                                                 |
-| [Sharkord](https://sharkord.com/)     | [Delta Chat], [matrix] | [GitHub Copilot is mentioned in the `.gitignore`](https://github.com/Sharkord/sharkord/blob/fd637b6f369b54f2726cd78603b6147d6fe45a29/.gitignore#L2), [maintainer mentions using AI](https://github.com/Sharkord/sharkord/issues/85) |
-
 ### Unified Push Distributors
 | Name | Alternative(s) | Evidence |
 |---|---|---|