From b53cc94310df0ac5b9b2c42d0110ac1da471a270 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 25 Aug 2020 12:46:32 +0200
Subject: [PATCH] set "X-SimpleLogin-Type" header for reply phase

---
 email_handler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/email_handler.py b/email_handler.py
index 9f1b9f63..9664a937 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -108,6 +108,9 @@ from app.utils import random_string
 from init_app import load_pgp_public_keys
 from server import create_app, create_light_app
 
+# forward or reply
+_DIRECTION = "X-SimpleLogin-Type"
+
 _IP_HEADER = "X-SimpleLogin-Client-IP"
 _MAILBOX_ID_HEADER = "X-SimpleLogin-Mailbox-ID"
 _EMAIL_LOG_ID_HEADER = "X-SimpleLogin-EmailLog-ID"
@@ -489,7 +492,7 @@ async def forward_email_to_mailbox(
             return False, "421 SL E12 Retry later"
 
     # add custom header
-    add_or_replace_header(msg, "X-SimpleLogin-Type", "Forward")
+    add_or_replace_header(msg, _DIRECTION, "Forward")
 
     # remove reply-to & sender header if present
     delete_header(msg, "Reply-To")
@@ -684,6 +687,7 @@ async def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> (boo
         _MESSAGE_ID,
         make_msgid(str(email_log.id), get_email_domain_part(alias.email)),
     )
+    add_or_replace_header(msg, _DIRECTION, "Reply")
     # Received-SPF is injected by postfix-policyd-spf-python can reveal user original email
     delete_header(msg, "Received-SPF")