diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b0ccb36af2..777a4c17fb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5018,6 +5018,8 @@ public class FragmentCompose extends FragmentBase {
                     db.beginTransaction();
 
                     db.attachment().setName(id, name);
+                    db.attachment().setWarning(id, name.length() < 60
+                            ? null : context.getString(R.string.title_attachment_filename));
 
                     db.setTransactionSuccessful();
                 } finally {