diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
index fc867b61a..a7d5bc59b 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java
@@ -16,6 +16,7 @@ import com.fsck.k9.mail.internet.MimeHeader;
 import com.fsck.k9.mail.internet.MimeMultipart;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.internet.Viewable;
+import com.fsck.k9.provider.AttachmentProvider;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -495,7 +496,10 @@ public class LocalMessageExtractor {
             } catch (NumberFormatException e) { /* ignore */ }
         }
 
-        Uri uri = Uri.parse("dummy://this.needs.fixing"); //FIXME
+        LocalPart localPart = (LocalPart) part;
+        String accountUuid = localPart.getAccountUuid();
+        long messagePartId = localPart.getId();
+        Uri uri = AttachmentProvider.getAttachmentUri(accountUuid, messagePartId);
 
         return new AttachmentViewInfo(mimeType, name, size, uri, firstClassAttachment, part);
     }
diff --git a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java
index 579861b6b..8a996e729 100644
--- a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java
+++ b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java
@@ -52,9 +52,9 @@ public class AttachmentProvider extends ContentProvider {
     }
 
 
-    public static Uri getAttachmentUri(Account account, long id) {
+    public static Uri getAttachmentUri(String accountUuid, long id) {
         return CONTENT_URI.buildUpon()
-                .appendPath(account.getUuid())
+                .appendPath(accountUuid)
                 .appendPath(Long.toString(id))
                 .appendPath(FORMAT_RAW)
                 .build();