diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 6fd6372973..3a9451044d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -164,6 +164,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
 
     private SwitchCompat swContrast;
     private SwitchCompat swHyphenation;
+    private TextView tvHyphenationHint;
     private Spinner spDisplayFont;
     private SwitchCompat swMonospacedPre;
     private SwitchCompat swTextSeparators;
@@ -327,6 +328,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swOverrideWidth = view.findViewById(R.id.swOverrideWidth);
         swContrast = view.findViewById(R.id.swContrast);
         swHyphenation = view.findViewById(R.id.swHyphenation);
+        tvHyphenationHint = view.findViewById(R.id.tvHyphenationHint);
         spDisplayFont = view.findViewById(R.id.spDisplayFont);
         swMonospacedPre = view.findViewById(R.id.swMonospacedPre);
         swTextSeparators = view.findViewById(R.id.swTextSeparators);
@@ -1161,6 +1163,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         });
 
         swHyphenation.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? View.GONE : View.VISIBLE);
+        tvHyphenationHint.setVisibility(Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? View.GONE : View.VISIBLE);
         swHyphenation.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index cea3246657..4b643d1925 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1717,6 +1717,18 @@
                     app:layout_constraintTop_toBottomOf="@id/tvOverrideWidthHint"
                     app:switchPadding="12dp" />
 
+                <TextView
+                    android:id="@+id/tvContrastHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_placeholders_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swContrast" />
+
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swHyphenation"
                     android:layout_width="0dp"
@@ -1725,9 +1737,21 @@
                     android:text="@string/title_advanced_hyphenation"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swContrast"
+                    app:layout_constraintTop_toBottomOf="@id/tvContrastHint"
                     app:switchPadding="12dp" />
 
+                <TextView
+                    android:id="@+id/tvHyphenationHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_placeholders_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swHyphenation" />
+
                 <TextView
                     android:id="@+id/tvDisplayFont"
                     android:layout_width="0dp"
@@ -1739,7 +1763,7 @@
                     android:textColor="?android:attr/textColorPrimary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swHyphenation" />
+                    app:layout_constraintTop_toBottomOf="@id/tvHyphenationHint" />
 
                 <Spinner
                     android:id="@+id/spDisplayFont"
@@ -1785,6 +1809,18 @@
                     app:layout_constraintTop_toBottomOf="@id/tvMonospacedPreHint"
                     app:switchPadding="12dp" />
 
+                <TextView
+                    android:id="@+id/tvTextSeparatorsHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_placeholders_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swTextSeparators" />
+
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swCollapseQuotes"
                     android:layout_width="0dp"
@@ -1793,9 +1829,21 @@
                     android:text="@string/title_advanced_collapse_quotes"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swTextSeparators"
+                    app:layout_constraintTop_toBottomOf="@id/tvTextSeparatorsHint"
                     app:switchPadding="12dp" />
 
+                <TextView
+                    android:id="@+id/tvCollapseQuotesHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_placeholders_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swCollapseQuotes" />
+
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swImagesPlaceholders"
                     android:layout_width="0dp"
@@ -1805,7 +1853,7 @@
                     android:text="@string/title_advanced_image_placeholders"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swCollapseQuotes"
+                    app:layout_constraintTop_toBottomOf="@id/tvCollapseQuotesHint"
                     app:switchPadding="12dp" />
 
                 <TextView