diff --git a/app/src/main/java/eu/faircode/email/ActivityEml.java b/app/src/main/java/eu/faircode/email/ActivityEml.java
index 49bbf19f70..97c673a9a3 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEml.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEml.java
@@ -39,14 +39,20 @@ public class ActivityEml extends ActivityBase {
         final TextView tvEml = findViewById(R.id.tvEml);
         final ContentLoadingProgressBar pbWait = findViewById(R.id.pbWait);
         final Group grpEml = findViewById(R.id.grpEml);
-        grpEml.setVisibility(View.GONE);
-        pbWait.setVisibility(View.VISIBLE);
 
-        Log.logExtras(getIntent());
-        Log.i("EML uri=" + getIntent().getData());
+        grpEml.setVisibility(View.GONE);
+
+        Uri uri = getIntent().getData();
+        if (uri == null) {
+            pbWait.setVisibility(View.GONE);
+            return;
+        } else
+            pbWait.setVisibility(View.VISIBLE);
+
+        Log.i("EML uri=" + uri);
 
         Bundle args = new Bundle();
-        args.putParcelable("uri", getIntent().getData());
+        args.putParcelable("uri", uri);
 
         new SimpleTask<Result>() {
             @Override
@@ -77,7 +83,7 @@ public class ActivityEml extends ActivityBase {
                     MessageHelper.MessageParts parts = helper.getMessageParts();
 
                     StringBuilder sb = new StringBuilder();
-                    for (MessageHelper.AttachmentPart apart : parts.getRawAttachments()) {
+                    for (MessageHelper.AttachmentPart apart : parts.getAttachmentParts()) {
                         if (sb.length() > 0)
                             sb.append("<br />");
                         sb.append(
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ba13a6bcdf..cb85e7676b 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -626,7 +626,7 @@ public class MessageHelper {
             return result;
         }
 
-        List<AttachmentPart> getRawAttachments() {
+        List<AttachmentPart> getAttachmentParts() {
             return attachments;
         }