diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 2e0e30784b..11c4f312c9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1683,6 +1683,12 @@ public class FragmentCompose extends FragmentBase {
     @Override
     public void onDestroyView() {
         adapter = null;
+
+        // ChipDrawable context leak
+        etTo.setText(null);
+        etCc.setText(null);
+        etBcc.setText(null);
+
         super.onDestroyView();
     }