diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6de57c99ef..e53265f1f5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -749,7 +749,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             private String body = null;
 
             @Override
-            protected Spanned onLoad(final Context context, final Bundle args) throws Throwable {
+            protected Spanned onLoad(final Context context, final Bundle args) {
                 TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
                 if (body == null)
                     try {
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index bae160e2ff..7de3459b3e 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -92,11 +92,7 @@ public class EntityAttachment {
             out.write(body == null ? "" : body);
         } finally {
             if (out != null)
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    Log.e(Helper.TAG, e + "\n" + Log.getStackTraceString(e));
-                }
+                out.close();
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index 7cffb63075..2d70654db7 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -165,11 +165,7 @@ public class EntityMessage implements Serializable {
             out.write(body == null ? "" : body);
         } finally {
             if (out != null)
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    Log.e(Helper.TAG, e + "\n" + Log.getStackTraceString(e));
-                }
+                out.close();
         }
     }