diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e42c94b56..e9c82bf9e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -211,6 +211,7 @@
             android:name=".ActivityCompose"
             android:exported="true"
             android:launchMode="singleTask"
+            android:taskAffinity="eu.faircode.email.compose"
             android:parentActivityName=".ActivityView">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />