diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index f34558150f..ce9c2a16d4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -218,11 +218,11 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         private void onShare(EntityAttachment attachment) {
             // https://developer.android.com/reference/android/support/v4/content/FileProvider
             File file = attachment.getFile(context);
-            final Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+            Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
             Log.i("uri=" + uri);
 
             // Build intent
-            final Intent intent = new Intent(Intent.ACTION_VIEW);
+            Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.setDataAndType(uri, attachment.type);
             intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             if (!TextUtils.isEmpty(attachment.name))
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index fc11a73301..5bc138f034 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -113,11 +113,11 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
                 File file = attachment.getFile(context);
 
                 // https://developer.android.com/reference/android/support/v4/content/FileProvider
-                final Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
                 Log.i("uri=" + uri);
 
                 // Build intent
-                final Intent intent = new Intent(Intent.ACTION_VIEW);
+                Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setDataAndType(uri, attachment.type);
                 intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                 if (!TextUtils.isEmpty(attachment.name))