From ff7497f261cc9f1ea839ac8851bc482f7c8f4807 Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Sun, 24 Apr 2022 09:04:37 +0200
Subject: [PATCH] bugfix

---
 pom.xml                                                    | 2 +-
 src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index adf9ddd..684028d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>Widerhall</artifactId>
-    <version>0.2.39</version>
+    <version>0.2.40</version>
     <build>
         <plugins>
             <plugin>
diff --git a/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java b/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
index 7f0a043..670d3df 100644
--- a/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
+++ b/src/main/java/de/srsoftware/widerhall/mail/SmtpClient.java
@@ -36,7 +36,7 @@ public class SmtpClient {
         if (session == null) login();
         MimeMessage forward = new MimeMessage(session);
         var oldSender = message.getFrom()[0].toString();
-        if (newSender != null){
+        { // drop old (from ... comment)
             var pos = subject.indexOf(" (from ");
             while (pos > 0){
                 var end = subject.indexOf(')',pos);
@@ -44,6 +44,8 @@ public class SmtpClient {
                 subject = (subject.substring(0,pos)+subject.substring(end+1)).trim();
                 pos = subject.indexOf(" (from ");
             }
+        }
+        if (newSender != null){
             forward.setFrom(newSender);
             forward.setSubject(subject+" (from "+oldSender+")");
         } else {