From 4381314f6f8af78562a8670efcafcdcce9f0717e Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 24 Nov 2020 21:50:57 +0100
Subject: [PATCH] preload email_log.mailbox

---
 app/models.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/models.py b/app/models.py
index beefdac0..996ccdaa 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1351,12 +1351,7 @@ class EmailLog(db.Model, ModelMixin):
     forward = db.relationship(Contact)
 
     contact = db.relationship(Contact, backref="email_logs")
-
-    @property
-    def mailbox(self) -> Optional["Mailbox"]:
-        if self.mailbox_id:
-            return Mailbox.get(self.mailbox_id)
-        return None
+    mailbox = db.relationship("Mailbox", lazy="joined", foreign_keys=[mailbox_id])
 
     def bounced_mailbox(self) -> str:
         if self.bounced_mailbox_id: