diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c7f687e915..f1281fff77 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4841,32 +4841,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     // Download body when needed
                     if (!next.content &&
                             prev.uid == null && next.uid != null && // once only
-                            properties.getValue("expanded", next.id)) {
-
-                        Bundle args = new Bundle();
-                        args.putLong("id", next.id);
-
-                        new SimpleTask<Void>() {
-                            @Override
-                            protected Void onExecute(Context context, Bundle args) {
-                                long id = args.getLong("id");
-
-                                DB db = DB.getInstance(context);
-                                EntityMessage message = db.message().getMessage(id);
-                                if (message == null || message.content)
-                                    return null;
-
-                                EntityOperation.queue(context, message, EntityOperation.BODY);
-
-                                return null;
-                            }
-
-                            @Override
-                            protected void onException(Bundle args, Throwable ex) {
-                                Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
-                            }
-                        }.execute(context, owner, args, "message:body");
-                    }
+                            properties.getValue("expanded", next.id))
+                        EntityOperation.queue(context, next, EntityOperation.BODY);
                 }
                 if (!Objects.equals(prev.msgid, next.msgid)) {
                     // debug info