diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 03f65b21e7..dd8eb79a1b 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -860,7 +860,7 @@ class Core {
         if (istore.hasCapability("UIDPLUS")) {
             // https://tools.ietf.org/html/rfc4315
             AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
-            if (uids != null && uids.length > 0 && uids[0].uid > 0) {
+            if (uids != null && uids.length > 0 && uids[0] != null && uids[0].uid > 0) {
                 newuid = uids[0].uid;
                 Log.i(folder.name + " appended uid=" + newuid);
             }