diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c2a6665e66..61797cfa84 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3245,7 +3245,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             !EntityFolder.OUTBOX.equals(message.folderType)
                             ? View.VISIBLE : View.GONE);
 
-                    boolean reformatted_hint = prefs.getBoolean("reformatted_hint", true);
+                    boolean reformatted_hint = prefs.getBoolean("reformatted_hint", hasWebView);
                     tvReformatted.setVisibility(reformatted_hint ? View.VISIBLE : View.GONE);
 
                     boolean signed_data = args.getBoolean("signed_data");
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
index f33a7f4435..ba31e25e40 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
@@ -1158,6 +1158,9 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
                             if ("external_storage".equals(key))
                                 continue;
 
+                            if ("reformatted_hint".equals(key))
+                                continue;
+
                             Object value = jsetting.get("value");
                             String type = jsetting.optString("type");
                             Log.i("Setting name=" + key + " value=" + value + " type=" + type);