diff --git a/app/src/main/java/eu/faircode/email/EntityAnswer.java b/app/src/main/java/eu/faircode/email/EntityAnswer.java
index a49e365247..18e8fde4cf 100644
--- a/app/src/main/java/eu/faircode/email/EntityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/EntityAnswer.java
@@ -71,6 +71,7 @@ public class EntityAnswer implements Serializable {
         }
 
         if (fullName != null) {
+            fullName = fullName.trim();
             if (fullName.startsWith("\""))
                 fullName = fullName.substring(1);
             if (fullName.endsWith("\""))
@@ -80,13 +81,12 @@ public class EntityAnswer implements Serializable {
         String first = fullName;
         String last = null;
         if (fullName != null) {
-            fullName = fullName.trim();
-            int c = fullName.lastIndexOf(",");
+            int c = fullName.lastIndexOf(',');
             if (c > 0) {
                 last = fullName.substring(0, c).trim();
                 first = fullName.substring(c + 1).trim();
             } else {
-                c = fullName.lastIndexOf(" ");
+                c = fullName.lastIndexOf(' ');
                 if (c > 0) {
                     first = fullName.substring(0, c).trim();
                     last = fullName.substring(c + 1).trim();