From e54d35a9d73c22495d5369890cbff6a1c54ae50f Mon Sep 17 00:00:00 2001 From: Zichao Lin Date: Wed, 24 Jul 2024 16:07:24 +0800 Subject: [PATCH] fix: RFC822 `From` and `To` --- main.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index f4a16b0..5758a52 100644 --- a/main.py +++ b/main.py @@ -115,11 +115,8 @@ def forward_emails(account_config, emails, logger): to_name, to_address = parseaddr(original_msg['To']) to_name = decode_mime_words(to_name) msg = MIMEMultipart('mixed') - if provider_in(account_config['email'], ["yandex.com", "mail.ru", "internet.ru", "bk.ru", "inbox.ru", "list.ru"]): - msg['From'] = f"Forwarder <{account_config['email']}>" - else: - msg['From'] = f"{from_name} ({from_address}) via Forwarder <{account_config['email']}>" - msg['To'] = f"{to_name} ({to_address}) via Forwarder <{recipient}>" + msg['From'] = f'"{from_name} ({from_address}) via Forwarder" <{account_config["email"]}>' + msg['To'] = f'"{to_name} ({to_address}) via Forwarder" <{recipient}>' original_subject = decode_mime_words(original_msg['Subject']) msg['Subject'] = original_subject