diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 36680661f1..ff2da43e86 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -66,7 +66,6 @@ public class ActivityEML extends ActivityBase {
         final TextView tvFrom = findViewById(R.id.tvFrom);
         final TextView tvReplyTo = findViewById(R.id.tvReplyTo);
         final TextView tvCc = findViewById(R.id.tvCc);
-        final TextView tvBcc = findViewById(R.id.tvBcc);
         final TextView tvSubject = findViewById(R.id.tvSubject);
         final TextView tvHeaders = findViewById(R.id.tvHeaders);
         final TextView tvParts = findViewById(R.id.tvParts);
@@ -121,7 +120,6 @@ public class ActivityEML extends ActivityBase {
                     result.to = MessageHelper.formatAddresses(helper.getTo());
                     result.replyto = MessageHelper.formatAddresses(helper.getReply());
                     result.cc = MessageHelper.formatAddresses(helper.getCc());
-                    result.bcc = MessageHelper.formatAddresses(helper.getBcc());
                     result.subject = helper.getSubject();
                     result.headers = HtmlHelper.highlightHeaders(context, helper.getHeaders());
 
@@ -156,7 +154,6 @@ public class ActivityEML extends ActivityBase {
                 tvTo.setText(result.to);
                 tvReplyTo.setText(result.replyto);
                 tvCc.setText(result.cc);
-                tvBcc.setText(result.bcc);
                 tvSubject.setText(result.subject);
                 tvHeaders.setText(result.headers);
                 tvParts.setText(result.parts);
@@ -293,7 +290,6 @@ public class ActivityEML extends ActivityBase {
         String to;
         String replyto;
         String cc;
-        String bcc;
         String subject;
         Spanned headers;
         Spanned parts;
diff --git a/app/src/main/res/layout/activity_eml.xml b/app/src/main/res/layout/activity_eml.xml
index 1dbc67bade..cdc7957fe4 100644
--- a/app/src/main/res/layout/activity_eml.xml
+++ b/app/src/main/res/layout/activity_eml.xml
@@ -22,6 +22,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/title_from"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -43,6 +44,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/title_to"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvFrom" />
 
@@ -64,6 +66,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/title_reply_to"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvTo" />
 
@@ -85,6 +88,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/title_cc"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
@@ -100,27 +104,6 @@
                 app:layout_constraintStart_toEndOf="@id/tvCcTitle"
                 app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
 
-            <TextView
-                android:id="@+id/tvBccTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/title_bcc"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
-            <TextView
-                android:id="@+id/tvBcc"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:text="Bcc"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textIsSelectable="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/tvBccTitle"
-                app:layout_constraintTop_toBottomOf="@id/tvCc" />
-
             <TextView
                 android:id="@+id/tvSubject"
                 android:layout_width="0dp"
@@ -130,7 +113,7 @@
                 android:textIsSelectable="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvBcc" />
+                app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
             <View
                 android:id="@+id/vSeparatorHeaders"
@@ -147,6 +130,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
+                android:fontFamily="monospace"
                 android:text="Headers"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/include_message_headers.xml b/app/src/main/res/layout/include_message_headers.xml
index c203ca4131..b1d63dfaca 100644
--- a/app/src/main/res/layout/include_message_headers.xml
+++ b/app/src/main/res/layout/include_message_headers.xml
@@ -26,7 +26,6 @@
         android:text="Headers"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
-        android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />