diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
index 6cf6825fe..65661738b 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
@@ -1710,7 +1710,7 @@ public class ImapStore extends RemoteStore {
                         break;
                     }
                 }
-                part.setBody(mp);
+                MimeMessageHelper.setBody(part, mp);
             } else {
                 /*
                  * This is a body. We need to add as much information as we can find out about