diff --git a/app/src/main/java/eu/faircode/email/ActivityAMP.java b/app/src/main/java/eu/faircode/email/ActivityAMP.java
index 26cdf0205d..c175bca70e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAMP.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java
@@ -30,6 +30,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -176,6 +177,11 @@ public class ActivityAMP extends ActivityBase {
         Uri uri = getIntent().getData();
         Log.i("AMP uri=" + uri);
 
+        String subject = getIntent().getStringExtra("subject");
+        if (TextUtils.isEmpty(subject))
+            subject = "AMP";
+        getSupportActionBar().setSubtitle(subject);
+
         Bundle args = new Bundle();
         args.putParcelable("uri", uri);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 60eae1a634..6686212d95 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4832,10 +4832,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onExecuted(Bundle args, EntityAttachment attachment) {
+                    if (attachment == null)
+                        return;
+
                     File file = attachment.getFile(context);
                     Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
                     context.startActivity(new Intent(context, ActivityAMP.class)
-                            .setData(uri));
+                            .setData(uri)
+                            .putExtra("subject", message.subject));
                 }
 
                 @Override