From 1babc6865585e33fd79bf08be369ae58c739bb93 Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Wed, 17 Dec 2025 14:38:57 -0600
Subject: [PATCH] fix

---
 worker.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/worker.py b/worker.py
index b20a62b..a99cf53 100755
--- a/worker.py
+++ b/worker.py
@@ -516,6 +516,13 @@ def process_message(message_body: dict, receive_count: int) -> bool:
             log(f"⚠ Parsing/Logic Error: {e}. Sending original.", 'WARNING')
             from_addr_final = from_addr
 
+        # Neu: Original-Body extrahieren (für OOO und Forward)
+        try:
+            original_body = str(parsed.get_payload(decode=True))
+        except Exception as e:
+            log(f"⚠ Error extracting original body: {e}. Using empty body.", 'WARNING')
+            original_body = ""
+
         # 5. OOO & FORWARD LOGIC (neu, vor SMTP-Versand)
         if rules_table and not is_ses_bounce_or_autoreply(parsed):  # Vermeide Loops bei Bounces/Auto-Replies
             for recipient in recipients:
@@ -529,7 +536,6 @@ def process_message(message_body: dict, receive_count: int) -> bool:
                         sender = parsed.get('From')  # Original-Sender
                         
                         reply_subject = f"Out of Office: {subject}"
-                        original_body = str(parsed.get_payload(decode=True))  # Original für Quote
 
                         if content_type == 'html':
                             reply_body = {'Html': {'Data': f"<p>{ooo_msg}</p><br><blockquote>Original Message:<br>Subject: {parsed.get('Subject')}<br>From: {sender}<br><br>{original_body}</blockquote>"}}