From 0d2b52809e69bdeadabbfb928a7bdd806d8cb7a6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 25 Jul 2025 09:56:11 +0200
Subject: [PATCH] Added create folder place holders for 'to' address

---
 .../java/eu/faircode/email/EntityRule.java    | 43 +++++++++++++------
 .../java/eu/faircode/email/UriHelper.java     | 11 +++++
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index f25726b632..19cf03ceeb 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -865,24 +865,41 @@ public class EntityRule {
             create = create.replace("$week$", week);
             create = create.replace("$day$", day);
 
-            String user = null;
-            String extra = null;
-            String domain = null;
+            String fromUser = null;
+            String fromExtra = null;
+            String fromDomain = null;
             if (message.from != null &&
                     message.from.length > 0 &&
                     message.from[0] instanceof InternetAddress) {
                 InternetAddress from = (InternetAddress) message.from[0];
-                user = UriHelper.getEmailUser(from.getAddress());
-                domain = UriHelper.getEmailDomain(from.getAddress());
-                if (user != null) {
-                    int plus = user.indexOf('+');
-                    if (plus > 0)
-                        extra = user.substring(plus + 1);
-                }
+                fromUser = UriHelper.getEmailUser(from.getAddress());
+                fromExtra = UriHelper.getEmailExtra(from.getAddress());
+                fromDomain = UriHelper.getEmailDomain(from.getAddress());
+            }
+
+            String toUser = null;
+            String toExtra = null;
+            String toDomain = null;
+            if (message.to != null &&
+                    message.to.length > 0 &&
+                    message.to[0] instanceof InternetAddress) {
+                InternetAddress to = (InternetAddress) message.to[0];
+                toUser = UriHelper.getEmailUser(to.getAddress());
+                toExtra = UriHelper.getEmailExtra(to.getAddress());
+                toDomain = UriHelper.getEmailDomain(to.getAddress());
             }
-            create = create.replace("$user$", user == null ? "" : user);
-            create = create.replace("$extra$", extra == null ? "" : extra);
-            create = create.replace("$domain$", domain == null ? "" : domain);
+
+            create = create.replace("$user$", fromUser == null ? "" : fromUser);
+            create = create.replace("$extra$", fromExtra == null ? "" : fromExtra);
+            create = create.replace("$domain$", fromDomain == null ? "" : fromDomain);
+
+            create = create.replace("$user:from$", fromUser == null ? "" : fromUser);
+            create = create.replace("$extra:from$", fromExtra == null ? "" : fromExtra);
+            create = create.replace("$domain:from$", fromDomain == null ? "" : fromDomain);
+
+            create = create.replace("$user:to$", toUser == null ? "" : toUser);
+            create = create.replace("$extra:to$", toExtra == null ? "" : toExtra);
+            create = create.replace("$domain:to$", toDomain == null ? "" : toDomain);
 
             if (create.contains("$group$")) {
                 EntityContact local = null;
diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 5414ab9a2c..fb3a90788d 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -187,6 +187,17 @@ public class UriHelper {
         return null;
     }
 
+    static String getEmailExtra(String email) {
+        if (TextUtils.isEmpty(email))
+            return null;
+
+        int plus = email.indexOf('+');
+        if (plus < 0)
+            return null;
+
+        return email.substring(plus + 1);
+    }
+
     static String getEmailDomain(String address) {
         if (address == null)
             return null;