diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a4b065320f..1f759090f1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2642,6 +2642,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     .appendElement("em")
                                     .text(context.getString(R.string.title_truncated));
 
+                        boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false);
+                        if (Boolean.TRUE.equals(message.plain_only) && monospaced_pre)
+                            HtmlHelper.restorePre(document);
+
                         HtmlHelper.guessSchemes(document);
                         HtmlHelper.autoLink(document);
 
@@ -4633,11 +4637,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                     boolean overview_mode = prefs.getBoolean("overview_mode", false);
                     boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
+                    boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false);
 
                     long id = args.getLong("id");
                     File file = EntityMessage.getFile(context, id);
                     Document document = JsoupEx.parse(file);
 
+                    if (Boolean.TRUE.equals(message.plain_only) && monospaced_pre)
+                        HtmlHelper.restorePre(document);
                     HtmlHelper.cleanup(document);
                     HtmlHelper.setViewport(document, overview_mode);
                     HtmlHelper.embedInlineImages(context, message.id, document, true);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a81beb1815..0cb0b8fa40 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8689,6 +8689,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     return null;
 
                 Document document = JsoupEx.parse(file);
+
+                boolean monospaced_pre = prefs.getBoolean("monospaced_pre", false);
+                if (Boolean.TRUE.equals(message.plain_only) && monospaced_pre)
+                    HtmlHelper.restorePre(document);
+
                 HtmlHelper.embedInlineImages(context, id, document, true);
 
                 // onPageFinished will not be called if not all images can be loaded
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 72c7355352..4ab739816a 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1951,6 +1951,12 @@ public class HtmlHelper {
         return sb.toString();
     }
 
+    static void restorePre(Document document) {
+        document.select("div[x-plain=true]")
+                .tagName("pre")
+                .removeAttr("x-plain");
+    }
+
     static void removeTrackingPixels(Context context, Document document) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean disconnect_images = prefs.getBoolean("disconnect_images", false);