diff --git a/framework/core/src/Mail/FlarumLogTransport.php b/framework/core/src/Mail/FlarumLogTransport.php
new file mode 100644
index 000000000..c6bc0ab77
--- /dev/null
+++ b/framework/core/src/Mail/FlarumLogTransport.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Flarum\Mail;
+
+use Illuminate\Mail\Transport\LogTransport;
+use Psr\Log\LoggerInterface;
+use Swift_Mime_SimpleMessage;
+use Swift_Mime_SimpleMimeEntity;
+
+class FlarumLogTransport extends LogTransport
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
+    {
+        $this->beforeSendPerformed($message);
+
+        // Overriden to use info, so the log driver works in non-debug mode.
+        $this->logger->info($this->getMimeEntityString($message));
+
+        $this->sendPerformed($message);
+
+        return $this->numberOfRecipients($message);
+    }
+}
diff --git a/framework/core/src/Mail/LogDriver.php b/framework/core/src/Mail/LogDriver.php
index d2ef014b5..276fee895 100644
--- a/framework/core/src/Mail/LogDriver.php
+++ b/framework/core/src/Mail/LogDriver.php
@@ -11,7 +11,6 @@ namespace Flarum\Mail;
 
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Validation\Factory;
-use Illuminate\Mail\Transport\LogTransport;
 use Illuminate\Support\MessageBag;
 use Psr\Log\LoggerInterface;
 use Swift_Transport;
@@ -45,6 +44,6 @@ class LogDriver implements DriverInterface
 
     public function buildTransport(SettingsRepositoryInterface $settings): Swift_Transport
     {
-        return new LogTransport($this->logger);
+        return new FlarumLogTransport($this->logger);
     }
 }