diff --git a/app/src/main/java/eu/faircode/email/FixedImageButton.java b/app/src/main/java/eu/faircode/email/FixedImageButton.java
index 6c38a9bdac..e10fbca74c 100644
--- a/app/src/main/java/eu/faircode/email/FixedImageButton.java
+++ b/app/src/main/java/eu/faircode/email/FixedImageButton.java
@@ -48,8 +48,8 @@ public class FixedImageButton extends AppCompatImageButton {
             super.onDraw(canvas);
         } catch (RuntimeException ex) {
             Log.e(new Throwable(Helper.getViewName(this), ex));
-            Context context = getContext();
-            Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
+
+            Drawable d = getContext().getDrawable(R.drawable.twotone_broken_image_24);
             Rect b = getDrawable().getBounds();
             int px = Math.min(b.width(), b.height());
             d.setBounds(0, 0, px, px);
diff --git a/app/src/main/java/eu/faircode/email/FixedImageView.java b/app/src/main/java/eu/faircode/email/FixedImageView.java
index e62f4499eb..1d7f704e71 100644
--- a/app/src/main/java/eu/faircode/email/FixedImageView.java
+++ b/app/src/main/java/eu/faircode/email/FixedImageView.java
@@ -24,7 +24,6 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -49,8 +48,8 @@ public class FixedImageView extends androidx.appcompat.widget.AppCompatImageView
             super.onDraw(canvas);
         } catch (RuntimeException ex) {
             Log.e(new Throwable(Helper.getViewName(this), ex));
-            Context context = getContext();
-            Drawable d = context.getDrawable(R.drawable.twotone_broken_image_24);
+
+            Drawable d = getContext().getDrawable(R.drawable.twotone_broken_image_24);
             Rect b = getDrawable().getBounds();
             int px = Math.min(b.width(), b.height());
             d.setBounds(0, 0, px, px);