diff --git a/src/Symfony/Component/Messenger/Stamp/BusNameStamp.php b/src/Symfony/Component/Messenger/Stamp/BusNameStamp.php
index eee3f9e846..61c721458d 100644
--- a/src/Symfony/Component/Messenger/Stamp/BusNameStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/BusNameStamp.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @author Ryan Weaver <ryan@symfonycasts.com>
  */
-class BusNameStamp implements StampInterface
+final class BusNameStamp implements StampInterface
 {
     private $busName;
 
diff --git a/src/Symfony/Component/Messenger/Stamp/DelayStamp.php b/src/Symfony/Component/Messenger/Stamp/DelayStamp.php
index 0fc5597044..7badd7a4f3 100644
--- a/src/Symfony/Component/Messenger/Stamp/DelayStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/DelayStamp.php
@@ -16,7 +16,7 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @experimental in 4.3
  */
-class DelayStamp implements StampInterface
+final class DelayStamp implements StampInterface
 {
     private $delay;
 
diff --git a/src/Symfony/Component/Messenger/Stamp/DispatchAfterCurrentBusStamp.php b/src/Symfony/Component/Messenger/Stamp/DispatchAfterCurrentBusStamp.php
index 38222cbc3b..a166801f90 100644
--- a/src/Symfony/Component/Messenger/Stamp/DispatchAfterCurrentBusStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/DispatchAfterCurrentBusStamp.php
@@ -20,6 +20,6 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class DispatchAfterCurrentBusStamp implements StampInterface
+final class DispatchAfterCurrentBusStamp implements NonSendableStampInterface
 {
 }
diff --git a/src/Symfony/Component/Messenger/Stamp/HandledStamp.php b/src/Symfony/Component/Messenger/Stamp/HandledStamp.php
index 2002d08fdd..d890e5f21f 100644
--- a/src/Symfony/Component/Messenger/Stamp/HandledStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/HandledStamp.php
@@ -17,7 +17,11 @@ use Symfony\Component\Messenger\Handler\HandlerDescriptor;
  * Stamp identifying a message handled by the `HandleMessageMiddleware` middleware
  * and storing the handler returned value.
  *
+ * This is used by synchronous command buses expecting a return value and the retry logic
+ * to only execute handlers that didn't succeed.
+ *
  * @see \Symfony\Component\Messenger\Middleware\HandleMessageMiddleware
+ * @see \Symfony\Component\Messenger\HandleTrait
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  *
diff --git a/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php b/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
index 3296cde1d3..d0e2eae13f 100644
--- a/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/ReceivedStamp.php
@@ -25,7 +25,7 @@ use Symfony\Component\Messenger\Middleware\SendMessageMiddleware;
  *
  * @experimental in 4.3
  */
-final class ReceivedStamp implements StampInterface
+final class ReceivedStamp implements NonSendableStampInterface
 {
     private $transportName;
 
diff --git a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php
index 2895ad9b83..83ce1a3558 100644
--- a/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/RedeliveryStamp.php
@@ -19,7 +19,7 @@ use Symfony\Component\Messenger\Envelope;
  *
  * @experimental in 4.3
  */
-class RedeliveryStamp implements StampInterface
+final class RedeliveryStamp implements StampInterface
 {
     private $retryCount;
     private $senderClassOrAlias;
diff --git a/src/Symfony/Component/Messenger/Stamp/SentStamp.php b/src/Symfony/Component/Messenger/Stamp/SentStamp.php
index 3f1a8f7186..0aec68c74e 100644
--- a/src/Symfony/Component/Messenger/Stamp/SentStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/SentStamp.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @experimental in 4.3
  */
-final class SentStamp implements StampInterface
+final class SentStamp implements NonSendableStampInterface
 {
     private $senderClass;
     private $senderAlias;
diff --git a/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php b/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php
index c11574f6e7..32bdf8a301 100644
--- a/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/SentToFailureTransportStamp.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @experimental in 4.3
  */
-class SentToFailureTransportStamp implements StampInterface
+final class SentToFailureTransportStamp implements StampInterface
 {
     private $originalReceiverName;
 
diff --git a/src/Symfony/Component/Messenger/Stamp/TransportMessageIdStamp.php b/src/Symfony/Component/Messenger/Stamp/TransportMessageIdStamp.php
index b0b93ae188..603021ec08 100644
--- a/src/Symfony/Component/Messenger/Stamp/TransportMessageIdStamp.php
+++ b/src/Symfony/Component/Messenger/Stamp/TransportMessageIdStamp.php
@@ -18,7 +18,7 @@ namespace Symfony\Component\Messenger\Stamp;
  *
  * @experimental in 4.3
  */
-class TransportMessageIdStamp implements StampInterface
+final class TransportMessageIdStamp implements StampInterface
 {
     private $id;
 
diff --git a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
index eb99c0a3b0..ed4d2d4b4c 100644
--- a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
+++ b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
@@ -55,9 +55,8 @@ class EnvelopeTest extends TestCase
     {
         $envelope = new Envelope(new DummyMessage('dummy'), [
             new ReceivedStamp('transport1'),
-            new DelayStamp(5000),
-            new DummyExtendsDelayStamp(5000),
-            new DummyImplementsFooBarStampInterface(),
+            new DummyExtendsFooBarStamp(),
+            new DummyImplementsFooBarStamp(),
         ]);
 
         $envelope2 = $envelope->withoutStampsOfType(DummyNothingImplementsMeStampInterface::class);
@@ -66,12 +65,11 @@ class EnvelopeTest extends TestCase
         $envelope3 = $envelope2->withoutStampsOfType(ReceivedStamp::class);
         $this->assertEmpty($envelope3->all(ReceivedStamp::class));
 
-        $envelope4 = $envelope3->withoutStampsOfType(DelayStamp::class);
-        $this->assertEmpty($envelope4->all(DelayStamp::class));
-        $this->assertEmpty($envelope4->all(DummyExtendsDelayStamp::class));
+        $envelope4 = $envelope3->withoutStampsOfType(DummyImplementsFooBarStamp::class);
+        $this->assertEmpty($envelope4->all(DummyImplementsFooBarStamp::class));
+        $this->assertEmpty($envelope4->all(DummyExtendsFooBarStamp::class));
 
-        $envelope5 = $envelope4->withoutStampsOfType(DummyFooBarStampInterface::class);
-        $this->assertEmpty($envelope5->all(DummyImplementsFooBarStampInterface::class));
+        $envelope5 = $envelope3->withoutStampsOfType(DummyFooBarStampInterface::class);
         $this->assertEmpty($envelope5->all());
     }
 
@@ -118,15 +116,15 @@ class EnvelopeTest extends TestCase
     }
 }
 
-class DummyExtendsDelayStamp extends DelayStamp
-{
-}
 interface DummyFooBarStampInterface extends StampInterface
 {
 }
 interface DummyNothingImplementsMeStampInterface extends StampInterface
 {
 }
-class DummyImplementsFooBarStampInterface implements DummyFooBarStampInterface
+class DummyImplementsFooBarStamp implements DummyFooBarStampInterface
+{
+}
+class DummyExtendsFooBarStamp extends DummyImplementsFooBarStamp
 {
 }