From ad6711ccb13ceb9a842c9e64a33a96f2bcc307e7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 29 Dec 2018 07:20:09 +0000
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/Helper.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 3ec20f54ff..dd3fae283b 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -568,8 +568,11 @@ public class Helper {
 
     static String canonicalAddress(String address) {
         String[] a = address.split("@");
-        if (a.length > 0)
-            a[0] = a[0].split("\\+")[0];
+        if (a.length > 0) {
+            String[] extra = a[0].split("\\+");
+            if (extra.length > 0)
+                a[0] = extra[0];
+        }
         return TextUtils.join("@", a);
     }