diff --git a/src/kits/mail/MailAttachment.cpp b/src/kits/mail/MailAttachment.cpp
index be734bfb56..9c6a5d58ba 100644
--- a/src/kits/mail/MailAttachment.cpp
+++ b/src/kits/mail/MailAttachment.cpp
@@ -578,7 +578,7 @@ void
 BAttributedMailAttachment::SaveToDisk(BEntry *entry)
 {
 	BString path = "/tmp/";
-	char name[255] = "";
+	char name[B_FILE_NAME_LENGTH + 1] = "";
 	_data->FileName(name);
 	path << name;