diff --git a/app/src/main/java/eu/faircode/email/ActivityEml.java b/app/src/main/java/eu/faircode/email/ActivityEml.java
index 216617a687..fd2339ce4d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEml.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEml.java
@@ -96,10 +96,11 @@ public class ActivityEml extends ActivityBase {
                     for (MessageHelper.AttachmentPart apart : parts.getAttachmentParts()) {
                         if (sb.length() > 0)
                             sb.append("<br />");
-                        sb.append(
-                                apart.part.getContentType()).append(' ')
-                                .append(apart.disposition).append(' ')
-                                .append(apart.filename);
+                        sb.append(apart.part.getContentType());
+                        if (apart.disposition != null)
+                            sb.append(' ').append(apart.disposition);
+                        if (apart.filename != null)
+                            sb.append(' ').append(apart.filename);
                     }
                     result.parts = HtmlHelper.fromHtml(sb.toString());
 
@@ -128,7 +129,7 @@ public class ActivityEml extends ActivityBase {
                 tvParts.setText(result.parts);
                 tvBody.setText(result.body);
                 tvHtml.setText(result.html);
-                tvEml.setText(result.eml);
+                tvEml.setText(result.eml.substring(0, Math.min(10 * 1024, result.eml.length()))); // prevent ANR
                 grpEml.setVisibility(View.VISIBLE);
             }
 
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index 6823a11ece..41fc4f7b99 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -144,6 +144,7 @@
             android:layout_marginTop="3dp"
             android:text="Parts"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorParts" />