From dcea0ce4a9c750b9e07b3be8906fe541ea54d72d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 6 Feb 2019 18:40:12 +0000
Subject: [PATCH] Fixed occasional wrong message text

---
 .../eu/faircode/email/AdapterMessage.java     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 0780e37bca..5272fde58c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1470,8 +1470,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private SimpleTask<SpannableStringBuilder> bodyTask = new SimpleTask<SpannableStringBuilder>() {
-            private String body = null;
-
             @Override
             protected void onPreExecute(Bundle args) {
                 TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
@@ -1484,14 +1482,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             protected SpannableStringBuilder onExecute(Context context, final Bundle args) {
                 DB db = DB.getInstance(context);
                 TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
-                if (body == null)
-                    try {
-                        body = Helper.readText(EntityMessage.getFile(context, message.id));
-                    } catch (IOException ex) {
-                        Log.e(ex);
-                        body = "";
-                        db.message().setMessageContent(message.id, false, null);
-                    }
+
+                String body;
+                try {
+                    body = Helper.readText(EntityMessage.getFile(context, message.id));
+                } catch (IOException ex) {
+                    Log.e(ex);
+                    db.message().setMessageContent(message.id, false, null);
+                    return null;
+                }
 
                 Spanned html = decodeHtml(context, message, body);