diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index b872b0064f..0bea61339d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -313,7 +313,6 @@ public class FragmentMessage extends FragmentEx {
                 }
 
                 FragmentMessage.this.message = message;
-                getActivity().invalidateOptionsMenu();
                 setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
 
                 if (savedInstanceState == null) {
@@ -339,6 +338,8 @@ public class FragmentMessage extends FragmentEx {
                     }
                 }
 
+                getActivity().invalidateOptionsMenu();
+
                 Bundle args = new Bundle();
                 args.putLong("id", message.id);
 
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 05f5f087c0..fab56fd81b 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -14,6 +14,7 @@
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
+        android:freezesText="true"
         android:text="From"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textIsSelectable="true"
@@ -38,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
+        android:freezesText="true"
         android:maxLines="1"
         android:text="Time"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -63,6 +65,7 @@
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
+        android:freezesText="true"
         android:text="To"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
@@ -76,6 +79,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:freezesText="true"
         android:text="Subject"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textIsSelectable="true"
@@ -119,6 +123,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:freezesText="true"
         android:text="Reply to"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
@@ -142,6 +147,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:freezesText="true"
         android:text="Cc"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
@@ -165,6 +171,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:freezesText="true"
         android:text="Bcc"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textIsSelectable="true"
@@ -202,6 +209,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:layout_marginStart="6dp"
+        android:freezesText="true"
         android:text="error"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"