Added option to skip printing header

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();
                 }
             });

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,6 +7140,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (section == null)
                     section = document.body();
 
+                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) {
@@ -7221,8 +7223,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     if (hasAttachments)
                         section.appendChild(footer);
+                }
 
-                return new String[]{message.subject, document.html()};
+                return new String[]{message.subject, section.html()};
             }
 
             @Override

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>

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>