Refactoring

app/src/main/java/eu/faircode/email/Core.java

@@ -2798,8 +2798,8 @@ class Core {
 
                         // No MX check
 
-                        List<Header> headers =
+                        boolean needsHeaders = EntityRule.needsHeaders(rules);
-                                (EntityRule.needsHeaders(rules) ? helper.getAllHeaders() : null);
+                        List<Header> headers = (needsHeaders ? helper.getAllHeaders() : null);
                         String body = parts.getHtml(context);
 
                         try {
@@ -3654,10 +3654,12 @@ class Core {
             }
         }
 
-        List<Header> headers =
+        boolean needsHeaders = EntityRule.needsHeaders(rules);
-                (EntityRule.needsHeaders(rules) ? helper.getAllHeaders() : null);
+        boolean needsBody = EntityRule.needsBody(rules);
-        String body =
+        if (needsHeaders || needsBody)
-                (EntityRule.needsBody(rules) ? helper.getMessageParts().getHtml(context) : null);
+            Log.i(folder.name + " needs headers=" + needsHeaders + " body=" + needsBody);
+        List<Header> headers = (needsHeaders ? helper.getAllHeaders() : null);
+        String body = (needsBody ? helper.getMessageParts().getHtml(context) : null);
 
         if (message == null) {
             Long sent = helper.getSent();