From 7d5d47356350ac96291ed76de158ff8df3e70407 Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Sat, 24 Jan 2009 19:35:57 +0000
Subject: [PATCH] Fix for Issue 238

Only fixes display of attachment filenames for newly downloaded
messages.  Will not correct display for message already in the
LocalStore.
---
 src/com/android/email/mail/store/LocalStore.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);