diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 93fd927bce..80187a03c8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -352,6 +352,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private ImageButton ibExpanderAddress;
 
+        private ImageView ivFlag;
         private ImageView ivPlain;
         private ImageView ivReceipt;
         private ImageView ivBrowsed;
@@ -532,6 +533,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             ibExpanderAddress = vsBody.findViewById(R.id.ibExpanderAddress);
 
+            ivFlag = vsBody.findViewById(R.id.ivFlag);
             ivPlain = vsBody.findViewById(R.id.ivPlain);
             ivReceipt = vsBody.findViewById(R.id.ivReceipt);
             ivBrowsed = vsBody.findViewById(R.id.ivBrowsed);
@@ -1220,6 +1222,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             grpAttachments.setVisibility(View.GONE);
             grpImages.setVisibility(View.GONE);
 
+            ivFlag.setVisibility(View.GONE);
             ivPlain.setVisibility(View.GONE);
             ivReceipt.setVisibility(View.GONE);
             ivBrowsed.setVisibility(View.GONE);
@@ -1570,6 +1573,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibExpanderAddress.setImageLevel(show_addresses ? 0 /* less */ : 1 /* more */);
             ibExpanderAddress.setContentDescription(context.getString(show_addresses ? R.string.title_accessibility_hide_addresses : R.string.title_accessibility_show_addresses));
 
+            if (message.language != null && language_detection) {
+                int resid = context.getResources().getIdentifier(
+                        "flag_" + message.language.toLowerCase(),
+                        "drawable", context.getPackageName());
+                if (resid == 0)
+                    ivFlag.setImageDrawable(null);
+                else
+                    ivFlag.setImageResource(resid);
+            }
+
+            ivFlag.setVisibility(show_addresses && message.language != null && language_detection ? View.VISIBLE : View.GONE);
             ivPlain.setVisibility(show_addresses && message.plain_only != null && message.plain_only ? View.VISIBLE : View.GONE);
             ivReceipt.setVisibility(show_addresses && message.receipt_request != null && message.receipt_request ? View.VISIBLE : View.GONE);
             ivBrowsed.setVisibility(show_addresses && message.ui_browsed ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index a5c8729b42..8e15acce3e 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -13,13 +13,22 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/ivFlag"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        android:layout_marginStart="6dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
+        app:srcCompat="@drawable/flag_nl" />
+
     <eu.faircode.email.ViewImageHint
         android:id="@+id/ivPlain"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
         android:contentDescription="@string/title_legend_plain_only"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/ivFlag"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/baseline_notes_24" />