diff --git a/src/com/android/email/LegacyConversions.java b/src/com/android/email/LegacyConversions.java
index 7ded7bbaf..395134b69 100644
--- a/src/com/android/email/LegacyConversions.java
+++ b/src/com/android/email/LegacyConversions.java
@@ -512,8 +512,8 @@ public class LegacyConversions {
         final Base64Body body = new Base64Body(content);
         final MimeBodyPart bp = new MimeBodyPart(body, contentType);
         bp.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
-        bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "attachment;\n"
-                + "filename=\"" + filename + "\";"
+        bp.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "attachment;\n "
+                + (!TextUtils.isEmpty(filename) ? "filename=\"" + filename + "\";" : "")
                 + "size=" + contentSize);
         if (contentId != null) {
             bp.setHeader(MimeHeader.HEADER_CONTENT_ID, contentId);