diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index c3b6dc79ee..686514f66c 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -1337,6 +1337,8 @@ public class EntityRule {
             boolean regex = false;
             if (block_domain) {
                 String domain = UriHelper.getEmailDomain(sender);
+                if (domain != null)
+                    domain = domain.trim();
                 if (!TextUtils.isEmpty(domain) && !domains.contains(domain)) {
                     String parent = UriHelper.getParentDomain(context, domain);
                     if (parent != null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
index bd5ce76159..49cd4200fa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogJunk.java
@@ -342,6 +342,8 @@ public class FragmentDialogJunk extends FragmentDialogBase {
             for (Address from : froms) {
                 String email = ((InternetAddress) from).getAddress();
                 String domain = UriHelper.getEmailDomain(email);
+                if (domain != null)
+                    domain = domain.trim();
                 if (TextUtils.isEmpty(domain) || domains.contains(domain))
                     continue;
                 String parent = UriHelper.getParentDomain(context, domain);