diff --git a/lib/Controller/OutboxController.php b/lib/Controller/OutboxController.php
index 86c84d4b8d..0399626205 100644
--- a/lib/Controller/OutboxController.php
+++ b/lib/Controller/OutboxController.php
@@ -177,7 +177,6 @@ public function createFromDraft(DraftsService $draftsService, int $id, int $send
 	 * @param string $body
 	 * @param string $editorBody
 	 * @param bool $isHtml
-	 * @param bool $failed
 	 * @param array $to i. e. [['label' => 'Linus', 'email' => 'tent@stardewvalley.com'], ['label' => 'Pierre', 'email' => 'generalstore@stardewvalley.com']]
 	 * @param array $cc
 	 * @param array $bcc
@@ -198,7 +197,6 @@ public function update(
 		bool $isHtml,
 		bool $smimeSign,
 		bool $smimeEncrypt,
-		bool $failed = false,
 		array $to = [],
 		array $cc = [],
 		array $bcc = [],
@@ -231,6 +229,10 @@ public function update(
 		$message->setSmimeEncrypt($smimeEncrypt);
 		$message->setRequestMdn($requestMdn);
 
+		// Reset the status to make it retryable.
+		$message->setFailed(false);
+		$message->setStatus(LocalMessage::STATUS_RAW);
+
 		if (!empty($smimeCertificateId)) {
 			$smimeCertificate = $this->smimeService->findCertificate($smimeCertificateId, $effectiveUserId);
 			$message->setSmimeCertificateId($smimeCertificate->getId());
diff --git a/tests/Unit/Controller/OutboxControllerTest.php b/tests/Unit/Controller/OutboxControllerTest.php
index ccf9044baf..bf243ec2e8 100644
--- a/tests/Unit/Controller/OutboxControllerTest.php
+++ b/tests/Unit/Controller/OutboxControllerTest.php
@@ -483,7 +483,6 @@ public function testUpdate(): void {
 			$message->isHtml(),
 			$message->getSmimeSign(),
 			$message->getSmimeEncrypt(),
-			false,
 			$to,
 			$cc,
 			[],
@@ -533,7 +532,6 @@ public function testUpdateMessageNotFound(): void {
 			$message->isHtml(),
 			$message->getSmimeSign(),
 			$message->getSmimeEncrypt(),
-			false,
 			$to,
 			$cc,
 			[],
@@ -588,7 +586,6 @@ public function testUpdateDbException(): void {
 			$message->isHtml(),
 			$message->getSmimeSign(),
 			$message->getSmimeEncrypt(),
-			false,
 			$to,
 			$cc,
 			[],
@@ -688,7 +685,6 @@ public function testUpdateValidateCertificateId(): void {
 			$message->isHtml(),
 			$message->getSmimeSign(),
 			$message->getSmimeEncrypt(),
-			false,
 			$to,
 			$cc,
 			[],