From 64c6868d1cba879f1d3bd0a29446f7053d76e3d3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:08:21 +0200
Subject: [PATCH] Rule move: removed $email$ to prevent security problems

---
 FAQ.md                                              | 1 -
 app/src/main/java/eu/faircode/email/EntityRule.java | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 85f53e1e9f..c74b16cf15 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -2594,7 +2594,6 @@ A *move* action can optionally create subfolders (since version 1.1966) to move
 ```
 $month$
 $year$
-$email$
 $domain$
 ```
 
diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 18396ea6a8..248d2eb7d3 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -627,16 +627,13 @@ public class EntityRule {
             create = create.replace("$year$", year);
             create = create.replace("$month$", month);
 
-            String email = null;
             String domain = null;
             if (message.from != null &&
                     message.from.length > 0 &&
                     message.from[0] instanceof InternetAddress) {
                 InternetAddress from = (InternetAddress) message.from[0];
-                email = from.getAddress();
-                domain = UriHelper.getEmailDomain(email);
+                domain = UriHelper.getEmailDomain(from.getAddress());
             }
-            create = create.replace("$email$", email == null ? "" : email);
             create = create.replace("$domain$", domain == null ? "" : domain);
 
             String name = folder.name + (folder.separator == null ? "" : folder.separator) + create;