From ea41edbfcb3734af68cb42400e285fc1d2441de2 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Fri, 22 May 2026 16:11:28 -0700
Subject: [PATCH] Updated/fixed `gam <UserTypeEntity> forward message|thread`

---
 src/gam/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index e1f5b44a..0b9aea3c 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -74701,15 +74701,15 @@ def forwardMessagesThreads(users, entityType):
             msgSubject = f"Fwd: {_decodeHeader(message['Subject'])}"
           else:
             msgSubject = f"Subject: {subject}"
-          for header in ['To', 'Cc', 'Bcc', 'Subject']:
-            if header in message:
-              del message[header]
           if addOriginalFieldsToSubject:
             msgSubject += ' (Original'
             for header in ['From', 'To', 'Date']:
               if header in message:
                 msgSubject += f' {header}: {message[header]}'
             msgSubject += ')'
+          for header in ['To', 'Cc', 'Bcc', 'Subject']:
+            if header in message:
+              del message[header]
           message['To'] = msgTo
           message['Subject'] = msgSubject
           try: