diff --git a/src/com/android/email/mail/store/LocalStore.java b/src/com/android/email/mail/store/LocalStore.java
index 091981315..cdd4c1171 100644
--- a/src/com/android/email/mail/store/LocalStore.java
+++ b/src/com/android/email/mail/store/LocalStore.java
@@ -1077,7 +1077,11 @@ public class LocalStore extends Store implements Serializable {
                         MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA), ',');
 
             String name = MimeUtility.getHeaderParameter(attachment.getContentType(), "name");
-
+            String contentDisposition = MimeUtility.unfoldAndDecode(attachment.getDisposition());
+            if (name == null && contentDisposition != null)
+            {
+              name = MimeUtility.getHeaderParameter(contentDisposition, "filename");
+            }
             if (attachmentId == -1) {
                 ContentValues cv = new ContentValues();
                 cv.put("message_id", messageId);