diff --git a/app/Models/Mailbox.php b/app/Models/Mailbox.php
index 1950bfd..6677b80 100644
--- a/app/Models/Mailbox.php
+++ b/app/Models/Mailbox.php
@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
+use App\Models\Concerns\HasUuid;
 use App\Services\Secrets\SecretCipher;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
 
 /**
  * One sending address.
@@ -16,7 +16,7 @@ use Illuminate\Support\Str;
  */
 class Mailbox extends Model
 {
-    use HasFactory;
+    use HasFactory, HasUuid;
 
     protected $fillable = [
         'key', 'address', 'display_name', 'username',
@@ -32,13 +32,6 @@ class Mailbox extends Model
         ];
     }
 
-    protected static function booted(): void
-    {
-        static::creating(function (self $box) {
-            $box->uuid ??= (string) Str::uuid();
-        });
-    }
-
     public static function findByKey(string $key): ?self
     {
         return static::query()->where('key', $key)->first();
diff --git a/database/factories/MailboxFactory.php b/database/factories/MailboxFactory.php
index b5dd450..2b2cbae 100644
--- a/database/factories/MailboxFactory.php
+++ b/database/factories/MailboxFactory.php
@@ -2,8 +2,10 @@
 
 namespace Database\Factories;
 
+use App\Models\Mailbox;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/** @extends Factory<Mailbox> */
 class MailboxFactory extends Factory
 {
     public function definition(): array
diff --git a/tests/Feature/Mail/MailboxModelTest.php b/tests/Feature/Mail/MailboxModelTest.php
index bbf9aa5..68c8780 100644
--- a/tests/Feature/Mail/MailboxModelTest.php
+++ b/tests/Feature/Mail/MailboxModelTest.php
@@ -39,3 +39,10 @@ it('finds a mailbox by its key', function () {
     expect(Mailbox::findByKey('billing'))->not->toBeNull()
         ->and(Mailbox::findByKey('gibtsnicht'))->toBeNull();
 });
+
+it('auto-assigns a uuid and routes by it', function () {
+    $box = Mailbox::factory()->create();
+
+    expect($box->uuid)->not->toBeNull()
+        ->and($box->getRouteKeyName())->toBe('uuid');
+});