diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3451080060..549235afe7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6601,17 +6601,24 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-            Bundle args = getArguments();
-
             final Context context = getContext();
+            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
             View dview = LayoutInflater.from(context).inflate(R.layout.dialog_print, null);
+            CheckBox cbHeader = dview.findViewById(R.id.cbHeader);
             CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
+            cbHeader.setChecked(prefs.getBoolean("print_html_header", true));
+            cbHeader.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    prefs.edit().putBoolean("print_html_header", isChecked).apply();
+                }
+            });
+
             cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                     prefs.edit().putBoolean("print_html_confirmed", isChecked).apply();
                 }
             });
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a9c3e8ccde..807afd5668 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7133,7 +7133,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     return null;
 
                 Document document = JsoupEx.parse(file);
-                HtmlHelper.truncate(document, false);
                 HtmlHelper.embedInlineImages(context, id, document, true);
 
                 // Prevent multiple pages for Microsoft Office
@@ -7141,88 +7140,92 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (section == null)
                     section = document.body();
 
-                Element header = document.createElement("p");
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                boolean print_html_header = prefs.getBoolean("print_html_header", true);
+                if (print_html_header) {
+                    Element header = document.createElement("p");
 
-                if (message.from != null && message.from.length > 0) {
-                    Element span = document.createElement("span");
-                    Element strong = document.createElement("strong");
-                    strong.text(context.getString(R.string.title_from));
-                    span.appendChild(strong);
-                    span.appendText(" " + MessageHelper.formatAddresses(message.from));
-                    span.appendElement("br");
-                    header.appendChild(span);
-                }
+                    if (message.from != null && message.from.length > 0) {
+                        Element span = document.createElement("span");
+                        Element strong = document.createElement("strong");
+                        strong.text(context.getString(R.string.title_from));
+                        span.appendChild(strong);
+                        span.appendText(" " + MessageHelper.formatAddresses(message.from));
+                        span.appendElement("br");
+                        header.appendChild(span);
+                    }
 
-                if (message.to != null && message.to.length > 0) {
-                    Element span = document.createElement("span");
-                    Element strong = document.createElement("strong");
-                    strong.text(context.getString(R.string.title_to));
-                    span.appendChild(strong);
-                    span.appendText(" " + MessageHelper.formatAddresses(message.to));
-                    span.appendElement("br");
-                    header.appendChild(span);
-                }
+                    if (message.to != null && message.to.length > 0) {
+                        Element span = document.createElement("span");
+                        Element strong = document.createElement("strong");
+                        strong.text(context.getString(R.string.title_to));
+                        span.appendChild(strong);
+                        span.appendText(" " + MessageHelper.formatAddresses(message.to));
+                        span.appendElement("br");
+                        header.appendChild(span);
+                    }
 
-                if (message.cc != null && message.cc.length > 0) {
-                    Element span = document.createElement("span");
-                    Element strong = document.createElement("strong");
-                    strong.text(context.getString(R.string.title_cc));
-                    span.appendChild(strong);
-                    span.appendText(" " + MessageHelper.formatAddresses(message.cc));
-                    span.appendElement("br");
-                    header.appendChild(span);
-                }
+                    if (message.cc != null && message.cc.length > 0) {
+                        Element span = document.createElement("span");
+                        Element strong = document.createElement("strong");
+                        strong.text(context.getString(R.string.title_cc));
+                        span.appendChild(strong);
+                        span.appendText(" " + MessageHelper.formatAddresses(message.cc));
+                        span.appendElement("br");
+                        header.appendChild(span);
+                    }
 
-                if (message.received != null) {
-                    DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.LONG, SimpleDateFormat.LONG);
+                    if (message.received != null) {
+                        DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.LONG, SimpleDateFormat.LONG);
 
-                    Element span = document.createElement("span");
-                    Element strong = document.createElement("strong");
-                    strong.text(context.getString(R.string.title_received));
-                    span.appendChild(strong);
-                    span.appendText(" " + DTF.format(message.received));
-                    span.appendElement("br");
-                    header.appendChild(span);
-                }
+                        Element span = document.createElement("span");
+                        Element strong = document.createElement("strong");
+                        strong.text(context.getString(R.string.title_received));
+                        span.appendChild(strong);
+                        span.appendText(" " + DTF.format(message.received));
+                        span.appendElement("br");
+                        header.appendChild(span);
+                    }
 
-                if (!TextUtils.isEmpty(message.subject)) {
-                    Element span = document.createElement("span");
-                    span.appendText(message.subject);
-                    span.appendElement("br");
-                    header.appendChild(span);
-                }
+                    if (!TextUtils.isEmpty(message.subject)) {
+                        Element span = document.createElement("span");
+                        span.appendText(message.subject);
+                        span.appendElement("br");
+                        header.appendChild(span);
+                    }
 
-                if (headers && message.headers != null) {
-                    header.appendElement("hr");
-                    Element pre = document.createElement("pre");
-                    pre.text(message.headers);
-                    header.appendChild(pre);
-                }
+                    if (headers && message.headers != null) {
+                        header.appendElement("hr");
+                        Element pre = document.createElement("pre");
+                        pre.text(message.headers);
+                        header.appendChild(pre);
+                    }
 
-                header.appendElement("hr").appendElement("br");
+                    header.appendElement("hr").appendElement("br");
 
-                section.prependChild(header);
+                    section.prependChild(header);
 
-                boolean hasAttachments = false;
-                Element footer = document.createElement("p");
-                footer.appendElement("br").appendElement("hr");
-                for (EntityAttachment attachment : attachments)
-                    if (attachment.isAttachment()) {
-                        hasAttachments = true;
-                        Element strong = document.createElement("strong");
-                        strong.text(context.getString(R.string.title_attachment));
-                        footer.appendChild(strong);
-                        if (!TextUtils.isEmpty(attachment.name))
-                            footer.appendText(" " + attachment.name);
-                        if (attachment.size != null)
-                            footer.appendText(" " + Helper.humanReadableByteCount(attachment.size));
-                        footer.appendElement("br");
-                    }
+                    boolean hasAttachments = false;
+                    Element footer = document.createElement("p");
+                    footer.appendElement("br").appendElement("hr");
+                    for (EntityAttachment attachment : attachments)
+                        if (attachment.isAttachment()) {
+                            hasAttachments = true;
+                            Element strong = document.createElement("strong");
+                            strong.text(context.getString(R.string.title_attachment));
+                            footer.appendChild(strong);
+                            if (!TextUtils.isEmpty(attachment.name))
+                                footer.appendText(" " + attachment.name);
+                            if (attachment.size != null)
+                                footer.appendText(" " + Helper.humanReadableByteCount(attachment.size));
+                            footer.appendElement("br");
+                        }
 
-                if (hasAttachments)
-                    section.appendChild(footer);
+                    if (hasAttachments)
+                        section.appendChild(footer);
+                }
 
-                return new String[]{message.subject, document.html()};
+                return new String[]{message.subject, section.html()};
             }
 
             @Override
diff --git a/app/src/main/res/layout/dialog_print.xml b/app/src/main/res/layout/dialog_print.xml
index 8df22ed50b..3334e2351e 100644
--- a/app/src/main/res/layout/dialog_print.xml
+++ b/app/src/main/res/layout/dialog_print.xml
@@ -31,6 +31,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
 
+        <CheckBox
+            android:id="@+id/cbHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_print_header"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvRemark" />
+
         <CheckBox
             android:id="@+id/cbNotAgain"
             android:layout_width="wrap_content"
@@ -39,6 +49,6 @@
             android:text="@string/title_no_ask_again"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvRemark" />
+            app:layout_constraintTop_toBottomOf="@id/cbHeader" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3c0555ee6a..ba4dc019dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -836,6 +836,7 @@
     <string name="title_event">Add to calendar</string>
     <string name="title_pin">Add shortcut</string>
     <string name="title_print">Print</string>
+    <string name="title_print_header">Print header</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_raw_save">Save raw message</string>
     <string name="title_raw_send">Send as attachment</string>