diff --git a/packages/backend/server/src/core/mail/job.ts b/packages/backend/server/src/core/mail/job.ts
index fe6a412de1..bd2e08cd8e 100644
--- a/packages/backend/server/src/core/mail/job.ts
+++ b/packages/backend/server/src/core/mail/job.ts
@@ -175,7 +175,7 @@ export class MailJob {
       }
       return undefined;
     } catch (e) {
-      this.logger.error(`Failed to send mail [${name}] to [${to}]`, e);
+      this.logger.error(`Failed to send mail [${name}] to [${to}]`, e, props);
       // wait for a while before retrying
       const retryDelay = this.calculateRetryDelay(startTime);
       await sleep(retryDelay);
diff --git a/packages/backend/server/src/core/mail/sender.ts b/packages/backend/server/src/core/mail/sender.ts
index 70bf39007e..f9f96fe1f0 100644
--- a/packages/backend/server/src/core/mail/sender.ts
+++ b/packages/backend/server/src/core/mail/sender.ts
@@ -140,7 +140,11 @@ export class MailSender {
       return true;
     } catch (e) {
       metrics.mail.counter('failed_total').add(1, { name });
-      this.logger.error(`Failed to send mail [${name}].`, e);
+      this.logger.error(`Failed to send mail [${name}].`, e, {
+        subject: options.subject,
+        from: options.from,
+        to: options.to,
+      });
       return false;
     }
   }