diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 102ba9220a..e9f4c99c89 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -419,7 +419,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvStoredTitle;
         private TextView tvSizeExTitle;
         private TextView tvLanguageTitle;
-        private TextView tvThreadTitle;
 
         private TextView tvSignedBy;
         private TextView tvSubmitter;
@@ -435,7 +434,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvStored;
         private TextView tvSizeEx;
         private TextView tvLanguage;
-        private TextView tvThread;
 
         private TextView tvSubjectEx;
         private TextView tvFlags;
@@ -831,7 +829,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvStoredTitle = vsBody.findViewById(R.id.tvStoredTitle);
             tvSizeExTitle = vsBody.findViewById(R.id.tvSizeExTitle);
             tvLanguageTitle = vsBody.findViewById(R.id.tvLanguageTitle);
-            tvThreadTitle = vsBody.findViewById(R.id.tvThreadTitle);
 
             tvSignedBy = vsBody.findViewById(R.id.tvSignedBy);
             tvSubmitter = vsBody.findViewById(R.id.tvSubmitter);
@@ -847,7 +844,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvStored = vsBody.findViewById(R.id.tvStored);
             tvSizeEx = vsBody.findViewById(R.id.tvSizeEx);
             tvLanguage = vsBody.findViewById(R.id.tvLanguage);
-            tvThread = vsBody.findViewById(R.id.tvThread);
 
             tvSubjectEx = vsBody.findViewById(R.id.tvSubjectEx);
             tvFlags = vsBody.findViewById(R.id.tvFlags);
@@ -1762,7 +1758,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvStoredTitle.setVisibility(View.GONE);
             tvSizeExTitle.setVisibility(View.GONE);
             tvLanguageTitle.setVisibility(View.GONE);
-            tvThreadTitle.setVisibility(View.GONE);
 
             tvSignedBy.setVisibility(View.GONE);
             tvSubmitter.setVisibility(View.GONE);
@@ -1778,7 +1773,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvStored.setVisibility(View.GONE);
             tvSizeEx.setVisibility(View.GONE);
             tvLanguage.setVisibility(View.GONE);
-            tvThread.setVisibility(View.GONE);
 
             tvSubjectEx.setVisibility(View.GONE);
             tvFlags.setVisibility(View.GONE);
@@ -2684,11 +2678,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvLanguage.setVisibility(showLanguage ? View.VISIBLE : View.GONE);
             tvLanguage.setText(message.language == null ? null : new Locale(message.language).getDisplayLanguage());
 
-            boolean show_thread = (show_addresses && (BuildConfig.DEBUG || debug));
-            tvThreadTitle.setVisibility(show_thread ? View.VISIBLE : View.GONE);
-            tvThread.setVisibility(show_thread ? View.VISIBLE : View.GONE);
-            tvThread.setText(message.thread);
-
             tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
             tvSubjectEx.setText(message.subject);
             boolean homoSubject = TextHelper.isSingleScript(message.subject);
@@ -2730,7 +2719,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     tvStored.setTextIsSelectable(false);
                     tvSizeEx.setTextIsSelectable(false);
                     tvLanguage.setTextIsSelectable(false);
-                    tvThread.setTextIsSelectable(false);
                     tvSubject.setTextIsSelectable(false);
                     tvFlags.setTextIsSelectable(false);
                     tvKeywordsEx.setTextIsSelectable(false);
@@ -2749,7 +2737,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     tvStored.setTextIsSelectable(tvStored.getVisibility() == View.VISIBLE);
                     tvSizeEx.setTextIsSelectable(tvSizeEx.getVisibility() == View.VISIBLE);
                     tvLanguage.setTextIsSelectable(tvLanguage.getVisibility() == View.VISIBLE);
-                    tvThread.setTextIsSelectable(tvThread.getVisibility() == View.VISIBLE);
                     tvSubjectEx.setTextIsSelectable(tvSubjectEx.getVisibility() == View.VISIBLE);
                     tvFlags.setTextIsSelectable(tvFlags.getVisibility() == View.VISIBLE);
                     tvKeywordsEx.setTextIsSelectable(tvKeywordsEx.getVisibility() == View.VISIBLE && keywords_header);
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index d369cf2b47..8a8ce1dae4 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -481,31 +481,6 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
 
-    <TextView
-        android:id="@+id/tvThreadTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:labelFor="@+id/tvThread"
-        android:text="@string/title_thread"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
-
-    <TextView
-        android:id="@+id/tvThread"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:text="123"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textIsSelectable="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
-        app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier_addresses"
         android:layout_width="wrap_content"
@@ -518,7 +493,7 @@
             tvCcTitle,tvBccTitle,
             tvIdentityTitle,
             tvSentTitle,tvReceivedTitle,tvStoredTitle,
-            tvSizeExTitle,tvLanguageTitle,tvThreadTitle" />
+            tvSizeExTitle,tvLanguageTitle" />
 
     <TextView
         android:id="@+id/tvSubjectEx"
@@ -531,7 +506,7 @@
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvThread" />
+        app:layout_constraintTop_toBottomOf="@id/tvLanguage" />
 
     <TextView
         android:id="@+id/tvFlags"