From f720dfdd0491e74674e725abf7f4eb74abec7ec3 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Mon, 12 Aug 2024 15:44:29 +0200 Subject: [PATCH] chore: revert temporary horde mime workaround Signed-off-by: Richard Steinmetz --- lib/Service/MailTransmission.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/Service/MailTransmission.php b/lib/Service/MailTransmission.php index 92fc030aac..2990cdb2b9 100644 --- a/lib/Service/MailTransmission.php +++ b/lib/Service/MailTransmission.php @@ -141,12 +141,7 @@ public function sendMessage(Account $account, LocalMessage $localMessage): void // Send the message try { $mail->send($transport, false, false); - // FIXME: Fix encoding inconsistencies upstream and use stream=false instead - // - stream=false defaults to 7bit quoted-printable - // - stream=true defaults to 8bit - // However, the headers are taken from the base part and always indicate the 8bit - // encoding. - $localMessage->setRaw(stream_get_contents($mail->getRaw(true))); + $localMessage->setRaw($mail->getRaw(false)); } catch (Horde_Mime_Exception $e) { $this->logger->error($e->getMessage(), ['exception' => $e]); if (in_array($e->getCode(), self::RETRIABLE_CODES, true)) {