diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 3d8ab565bd..6771f5b429 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2187,18 +2187,16 @@ class Core {
         if (fetch) {
             Log.i(folder.name + " fetching message id=" + message.id);
 
-            // Fetch on demand to prevent OOM
-
-            //FetchProfile fp = new FetchProfile();
+            FetchProfile fp = new FetchProfile();
             //fp.add(FetchProfile.Item.ENVELOPE);
             //fp.add(FetchProfile.Item.FLAGS);
-            //fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
+            fp.add(FetchProfile.Item.CONTENT_INFO); // body structure
             //fp.add(UIDFolder.FetchProfileItem.UID);
             //fp.add(IMAPFolder.FetchProfileItem.HEADERS);
             //fp.add(IMAPFolder.FetchProfileItem.MESSAGE);
             //fp.add(FetchProfile.Item.SIZE);
             //fp.add(IMAPFolder.FetchProfileItem.INTERNALDATE);
-            //ifolder.fetch(new Message[]{imessage}, fp);
+            ifolder.fetch(new Message[]{imessage}, fp);
 
             MessageHelper helper = new MessageHelper(imessage);
             MessageHelper.MessageParts parts = helper.getMessageParts();