diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java
new file mode 100644
index 000000000..3ea9820a6
--- /dev/null
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java
@@ -0,0 +1,27 @@
+package com.fsck.k9.mailstore;
+
+
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.internet.MimeBodyPart;
+
+
+public class LocalBodyPart extends MimeBodyPart implements LocalPart {
+    private final String accountUuid;
+    private final long messagePartId;
+
+    public LocalBodyPart(String accountUuid, long messagePartId) throws MessagingException {
+        super();
+        this.accountUuid = accountUuid;
+        this.messagePartId = messagePartId;
+    }
+
+    @Override
+    public String getAccountUuid() {
+        return accountUuid;
+    }
+
+    @Override
+    public long getId() {
+        return messagePartId;
+    }
+}
diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
index d15fdec2e..708681241 100644
--- a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
@@ -686,7 +686,7 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
 
             String parentMimeType = parentPart.getMimeType();
             if (parentMimeType.startsWith("multipart/")) {
-                BodyPart bodyPart = new MimeBodyPart();
+                BodyPart bodyPart = new LocalBodyPart(getAccountUuid(), id);
                 ((Multipart) parentPart.getBody()).addBodyPart(bodyPart);
                 part = bodyPart;
             } else if (parentMimeType.startsWith("message/")) {
diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/LocalPart.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalPart.java
new file mode 100644
index 000000000..239595716
--- /dev/null
+++ b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalPart.java
@@ -0,0 +1,7 @@
+package com.fsck.k9.mailstore;
+
+
+public interface LocalPart {
+    String getAccountUuid();
+    long getId();
+}