fix: Keep raw message on smtp/mime failure

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

Author: kesselb

lib/Service/MailTransmission.php

@@ -14,6 +14,7 @@
 use Horde_Imap_Client_Data_Fetch;
 use Horde_Imap_Client_Fetch_Query;
 use Horde_Imap_Client_Ids;
+use Horde_Mail_Exception;
 use Horde_Mail_Rfc822_Address;
 use Horde_Mail_Rfc822_List;
 use Horde_Mail_Transport_Null;
@@ -51,6 +52,7 @@
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\EventDispatcher\IEventDispatcher;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 class MailTransmission implements IMailTransmission {
 	private const RETRIABLE_CODES = [
@@ -172,13 +174,19 @@ public function sendMessage(Account $account, LocalMessage $localMessage): void
 				$localMessage->setStatus(LocalMessage::STATUS_SMPT_SEND_FAIL);
 				return;
 			}
+
+			try {
+				$localMessage->setRaw($mail->getRaw(false));
+			} catch (Throwable) {
+				// Having the raw message is nice for troubleshooting, but should not fail hard.
+			}
 			$localMessage->setStatus(LocalMessage::STATUS_ERROR);
 			return;
 		} finally {
 			if ($transport instanceof Horde_Mail_Transport_Smtphorde) {
 				try {
 					$transport->getSMTPObject()->logout();
-				} catch (\Throwable $e) {
+				} catch (Throwable) {
 					// Handle silently as this is a resource usage optimization
 				}
 			}