From fb3a4bfb637ddb2f6d83515c3c831a84b1d4f8f6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 10 Feb 2019 14:13:23 +0000
Subject: [PATCH] Simplification

---
 .../main/java/eu/faircode/email/AdapterMessage.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 138fd2fd0f..31b07e02fa 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -871,6 +871,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 if (show_html)
                     onShowHtmlConfirmed(message);
                 else {
+                    Spanned body = properties.getBody(message.id);
+                    tvBody.setText(body);
+                    tvBody.setMovementMethod(null);
+
                     Bundle args = new Bundle();
                     args.putSerializable("message", message);
                     bodyTask.execute(context, owner, args, "message:body");
@@ -1470,14 +1474,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private SimpleTask<SpannableStringBuilder> bodyTask = new SimpleTask<SpannableStringBuilder>() {
-            @Override
-            protected void onPreExecute(Bundle args) {
-                TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
-                Spanned body = properties.getBody(message.id);
-                tvBody.setText(body);
-                tvBody.setMovementMethod(null);
-            }
-
             @Override
             protected SpannableStringBuilder onExecute(Context context, final Bundle args) {
                 DB db = DB.getInstance(context);