diff --git a/tests/test_outbox.py b/tests/test_outbox.py
index b5c006e..7a978a1 100644
--- a/tests/test_outbox.py
+++ b/tests/test_outbox.py
@@ -1,8 +1,15 @@
+from unittest import mock
+from uuid import uuid4
+
 import httpx
 import respx
 from fastapi.testclient import TestClient
 
+from app import activitypub as ap
 from app import models
+from app import webfinger
+from app.actor import LOCAL_ACTOR
+from app.ap_object import RemoteObject
 from app.config import generate_csrf_token
 from app.database import Session
 from tests import factories
@@ -14,7 +21,7 @@ def test_send_follow_request(
     client: TestClient,
     respx_mock: respx.MockRouter,
 ) -> None:
-    # Given a remote actor
+    # given a remote actor
     ra = factories.RemoteActorFactory(
         base_url="https://example.com",
         username="toto",
@@ -44,3 +51,99 @@ def test_send_follow_request(
     # And an outgoing activity was queued
     outgoing_activity = db.query(models.OutgoingActivity).one()
     assert outgoing_activity.outbox_object_id == outbox_object.id
+    assert outgoing_activity.recipient == ra.inbox_url
+
+
+def test_send_create_activity__no_followers_and_with_mention(
+    db: Session,
+    client: TestClient,
+    respx_mock: respx.MockRouter,
+) -> None:
+    # given a remote actor
+    ra = factories.RemoteActorFactory(
+        base_url="https://example.com",
+        username="toto",
+        public_key="pk",
+    )
+    respx_mock.get(ra.ap_id).mock(return_value=httpx.Response(200, json=ra.ap_actor))
+
+    with mock.patch.object(webfinger, "get_actor_url", return_value=ra.ap_id):
+        response = client.post(
+            "/admin/actions/new",
+            data={
+                "redirect_url": "http://testserver/",
+                "content": "hi @toto@example.com",
+                "visibility": ap.VisibilityEnum.PUBLIC.name,
+                "csrf_token": generate_csrf_token(),
+            },
+            cookies=generate_admin_session_cookies(),
+        )
+
+    # Then the server returns a 302
+    assert response.status_code == 302
+
+    # And the Follow activity was created in the outbox
+    outbox_object = db.query(models.OutboxObject).one()
+    assert outbox_object.ap_type == "Note"
+
+    # And an outgoing activity was queued
+    outgoing_activity = db.query(models.OutgoingActivity).one()
+    assert outgoing_activity.outbox_object_id == outbox_object.id
+    assert outgoing_activity.recipient == ra.inbox_url
+
+
+def test_send_create_activity__with_followers(
+    db: Session,
+    client: TestClient,
+    respx_mock: respx.MockRouter,
+) -> None:
+    # given a remote actor
+    ra = factories.RemoteActorFactory(
+        base_url="https://example.com",
+        username="toto",
+        public_key="pk",
+    )
+    respx_mock.get(ra.ap_id).mock(return_value=httpx.Response(200, json=ra.ap_actor))
+    actor = factories.ActorFactory.from_remote_actor(ra)
+
+    follow_id = uuid4().hex
+    follow_from_inbox = RemoteObject(
+        factories.build_follow_activity(
+            from_remote_actor=ra,
+            for_remote_actor=LOCAL_ACTOR,
+            outbox_public_id=follow_id,
+        )
+    )
+    inbox_object = factories.InboxObjectFactory.from_remote_object(
+        follow_from_inbox, actor
+    )
+
+    follower = factories.FollowerFactory(
+        inbox_object_id=inbox_object.id,
+        actor_id=actor.id,
+        ap_actor_id=actor.ap_id,
+    )
+
+    with mock.patch.object(webfinger, "get_actor_url", return_value=ra.ap_id):
+        response = client.post(
+            "/admin/actions/new",
+            data={
+                "redirect_url": "http://testserver/",
+                "content": "hi followers",
+                "visibility": ap.VisibilityEnum.PUBLIC.name,
+                "csrf_token": generate_csrf_token(),
+            },
+            cookies=generate_admin_session_cookies(),
+        )
+
+    # Then the server returns a 302
+    assert response.status_code == 302
+
+    # And the Follow activity was created in the outbox
+    outbox_object = db.query(models.OutboxObject).one()
+    assert outbox_object.ap_type == "Note"
+
+    # And an outgoing activity was queued
+    outgoing_activity = db.query(models.OutgoingActivity).one()
+    assert outgoing_activity.outbox_object_id == outbox_object.id
+    assert outgoing_activity.recipient == follower.actor.inbox_url