diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8c50e1232d..1a3be1d78a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -746,7 +746,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             protected Spanned onLoad(final Context context, final Bundle args) throws Throwable {
                 TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
                 if (body == null)
-                    body = message.read(context);
+                    try {
+                        body = message.read(context);
+                    } catch (IOException ex) {
+                        Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
+                        body = ex.toString();
+                        DB.getInstance(context).message().setMessageContent(message.id, false, null);
+                    }
                 return decodeHtml(message, body);
             }
 
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index c3bab751c1..59954843d4 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -98,7 +98,13 @@ public class ViewModelBrowse extends ViewModel {
                     boolean match = false;
                     String find = state.search.toLowerCase();
                     EntityMessage message = db.message().getMessage(state.messages.get(i));
-                    String body = (message.content ? message.read(state.context) : null);
+                    String body = null;
+                    if (message.content)
+                        try {
+                            body = message.read(state.context);
+                        } catch (IOException ex) {
+                            Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
+                        }
 
                     if (message.from != null)
                         for (int j = 0; j < message.from.length && !match; j++)