.github/labeler-config-srvaroa.yml

@@ -28,9 +28,6 @@ labels:
   - label: "style"
     title: '^style:.*'
 
-  - label: "Documentation"
-    title: '^docs:.*'
-
   - label: 'API'
     title: '.*openapi.*'
 
@@ -43,33 +40,32 @@ labels:
 
   - label: 'Front End'
     files:
-      - 'stirling-pdf/src/main/resources/templates/.*'
-      - 'proprietary/src/main/resources/templates/.*'
-      - 'stirling-pdf/src/main/resources/static/.*'
-      - 'proprietary/src/main/resources/static/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/.*'
+      - 'stirling-pdf/src/main/resources/templates/**/*'
+      - 'proprietary/src/main/resources/templates/**/*'
+      - 'stirling-pdf/src/main/resources/static/**/*'
+      - 'proprietary/src/main/resources/static/**/*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/**/*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/UI/**/*'
 
   - label: 'Java'
     files:
-      - 'common/src/main/java/.*.java'
-      - 'proprietary/src/main/java/.*.java'
-      - 'stirling-pdf/src/main/java/.*.java'
+      - 'common/src/main/java/**/*.java'
+      - 'proprietary/src/main/java/**/*.java'
+      - 'stirling-pdf/src/main/java/**/*.java'
 
   - label: 'Back End'
     files:
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/**/*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/**/*'
       - 'stirling-pdf/src/main/resources/settings.yml.template'
       - 'stirling-pdf/src/main/resources/application.properties'
       - 'stirling-pdf/src/main/resources/banner.txt'
       - 'scripts/png_to_webp.py'
       - 'split_photos.py'
-      - 'application.properties'
 
   - label: 'Security'
     files:
-      - 'proprietary/src/main/java/stirling/software/proprietary/security/.*'
+      - 'proprietary/src/main/java/stirling/software/proprietary/security/**/*'
       - 'scripts/download-security-jar.sh'
       - '.github/workflows/dependency-review.yml'
       - '.github/workflows/scorecards.yml'
@@ -78,17 +74,18 @@ labels:
     files:
       - 'stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java'
       - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/.*'
-      - 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/.*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/**/*'
+      - 'stirling-pdf/src/main/java/stirling/software/SPDF/model/api/**/*'
       - 'scripts/png_to_webp.py'
       - 'split_photos.py'
       - '.github/workflows/swagger.yml'
 
   - label: 'Documentation'
     files:
-      - '.*.md'
+      - '**/*.md'
       - 'scripts/counter_translation.py'
       - 'scripts/ignore_translation.toml'
+    title: '^docs:.*'
 
   - label: 'Docker'
     files:
@@ -107,9 +104,9 @@ labels:
 
   - label: 'Devtools'
     files:
-      - '.devcontainer/.*'
+      - '.devcontainer/**/*'
       - 'Dockerfile.dev'
-      - '.vscode/.*'
+      - '.vscode/**/*'
       - '.editorconfig'
       - '.pre-commit-config'
       - '.github/workflows/pre_commit.yml'
@@ -117,19 +114,19 @@ labels:
 
   - label: 'Test'
     files:
-      - 'common/src/test/.*'
-      - 'proprietary/src/test/.*'
-      - 'stirling-pdf/src/test/.*'
-      - 'testing/.*'
+      - 'common/src/test/**/*'
+      - 'proprietary/src/test/**/*'
+      - 'stirling-pdf/src/test/**/*'
+      - 'testing/**/*'
       - '.github/workflows/scorecards.yml'
 
   - label: 'Github'
     files:
-      - '.github/.*'
+      - '.github/**/*'
 
   - label: 'Gradle'
     files:
-      - 'gradle/.*'
+      - 'gradle/**/*'
       - 'gradlew'
       - 'gradlew.bat'
       - 'settings.gradle'

.github/labels.yml

@@ -137,41 +137,4 @@
   description: "Reverts a previous commit"
 - name: "style"
   color: "FFA500"
-  description: "Changes that do not affect the meaning of the code (formatting, etc.)"
-- name: "admin"
-  color: "195055"
-- name: "codex"
-  color: "ededed"
-  description: null
-- name: "Github"
-  color: "0052CC"
-- name: "github_actions"
-  color: "000000"
-  description: "Pull requests that update GitHub Actions code"
-- name: "needs-changes"
-  color: "A65A86"
-- name: "on-hold"
-  color: "2526F9"
-- name: "python"
-  color: "2b67c6"
-  description: "Pull requests that update Python code"
-- name: "size:L"
-  color: "eb9500"
-  description: "This PR changes 100-499 lines ignoring generated files."
-- name: "size:M"
-  color: "ebb800"
-  description: "This PR changes 30-99 lines ignoring generated files."
-- name: "size:S"
-  color: "77b800"
-  description: "This PR changes 10-29 lines ignoring generated files."
-- name: "size:XL"
-  color: "ff823f"
-  description: "This PR changes 500-999 lines ignoring generated files."
-- name: "size:XS"
-  color: "00ff00"
-  description: "This PR changes 0-9 lines ignoring generated files."
-- name: "size:XXL"
-  color: "ffb8b8"
-  description: "This PR changes 1000+ lines ignoring generated files."
-- name: "to research"
-  color: "FBCA04"
+  description: "Changes that do not affect the meaning of the code (formatting, etc.)"

.github/workflows/build.yml

@@ -21,7 +21,6 @@ jobs:
       fail-fast: false
       matrix:
         jdk-version: [17, 21]
-        spring-security: [true, false]
 
     steps:
       - name: Harden Runner
@@ -38,41 +37,56 @@ jobs:
           java-version: ${{ matrix.jdk-version }}
           distribution: "temurin"
 
-      - name: Build with Gradle and spring security ${{ matrix.spring-security }}
+      - name: Build with Gradle and no spring security
         run: ./gradlew clean build
         env:
-          DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
+          DISABLE_ADDITIONAL_FEATURES: true
+
+      - name: Build with Gradle and with spring security
+        run: ./gradlew clean build
+        env:
+          DISABLE_ADDITIONAL_FEATURES: false
 
       - name: Check Test Reports Exist
         id: check-reports
         if: always()
         run: |
-          declare -a dirs=(
-            "stirling-pdf/build/reports/tests/"
-            "stirling-pdf/build/test-results/"
-            "common/build/reports/tests/"
-            "common/build/test-results/"
-            "proprietary/build/reports/tests/"
-            "proprietary/build/test-results/"
-          )
           missing_reports=()
-          for dir in "${dirs[@]}"; do
-            if [ ! -d "$dir" ]; then
-              missing_reports+=("$dir")
-            fi
-          done
+          
+          # Check for required test report directories
+          if [ ! -d "stirling-pdf/build/reports/tests/" ]; then
+            missing_reports+=("stirling-pdf/build/reports/tests/")
+          fi
+          if [ ! -d "stirling-pdf/build/test-results/" ]; then
+            missing_reports+=("stirling-pdf/build/test-results/")
+          fi
+          if [ ! -d "common/build/reports/tests/" ]; then
+            missing_reports+=("common/build/reports/tests/")
+          fi
+          if [ ! -d "common/build/test-results/" ]; then
+            missing_reports+=("common/build/test-results/")
+          fi
+          if [ ! -d "proprietary/build/reports/tests/" ]; then
+            missing_reports+=("proprietary/build/reports/tests/")
+          fi
+          if [ ! -d "proprietary/build/test-results/" ]; then
+            missing_reports+=("proprietary/build/test-results/")
+          fi
+          
+          # Fail if any required reports are missing
           if [ ${#missing_reports[@]} -gt 0 ]; then
             echo "ERROR: The following required test report directories are missing:"
             printf '%s\n' "${missing_reports[@]}"
             exit 1
           fi
+          
           echo "All required test report directories are present"
 
       - name: Upload Test Reports
-        if: always()
+        if: steps.check-reports.outcome == 'success'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
+          name: test-reports-jdk-${{ matrix.jdk-version }}
           path: |
             stirling-pdf/build/reports/tests/
             stirling-pdf/build/test-results/
@@ -84,7 +98,6 @@ jobs:
             proprietary/build/test-results/
             proprietary/build/reports/problems/
           retention-days: 3
-          if-no-files-found: warn
 
   check-licence:
     runs-on: ubuntu-latest

.github/workflows/licenses-update.yml

@@ -78,7 +78,7 @@ jobs:
           title: "Update 3rd Party Licenses"
           body: |
             Auto-generated by ${{ steps.setup-bot.outputs.app-slug }}[bot]
-          labels: Licenses,github-actions
+          labels: licenses,github-actions
           draft: false
           delete-branch: true
           sign-commits: true

common/src/main/java/stirling/software/common/util/EmlToPdf.java

@@ -46,10 +46,12 @@ import stirling.software.common.model.api.converters.EmlToPdfRequest;
 @Slf4j
 @UtilityClass
 public class EmlToPdf {
+
     private static final class StyleConstants {
         // Font and layout constants
         static final int DEFAULT_FONT_SIZE = 12;
-        static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
+        static final String DEFAULT_FONT_FAMILY =
+                "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif";
         static final float DEFAULT_LINE_HEIGHT = 1.4f;
         static final String DEFAULT_ZOOM = "1.0";
 
@@ -70,15 +72,20 @@ public class EmlToPdf {
         static final int EML_CHECK_LENGTH = 8192;
         static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
 
-        private StyleConstants() {}
+        private StyleConstants() {
+            // Utility class - prevent instantiation
+        }
     }
 
     private static final class MimeConstants {
         static final Pattern MIME_ENCODED_PATTERN =
                 Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-        static final String ATTACHMENT_MARKER = "@";
+        static final String PAPERCLIP_EMOJI = "\uD83D\uDCCE"; // 📎
+        static final String ATTACHMENT_ICON_PLACEHOLDER = "icon";
 
-        private MimeConstants() {}
+        private MimeConstants() {
+            // Utility class - prevent instantiation
+        }
     }
 
     private static final class FileSizeConstants {
@@ -86,7 +93,9 @@ public class EmlToPdf {
         static final long BYTES_IN_MB = BYTES_IN_KB * 1024L;
         static final long BYTES_IN_GB = BYTES_IN_MB * 1024L;
 
-        private FileSizeConstants() {}
+        private FileSizeConstants() {
+            // Utility class - prevent instantiation
+        }
     }
 
     // Cached Jakarta Mail availability check
@@ -95,15 +104,8 @@ public class EmlToPdf {
     private static boolean isJakartaMailAvailable() {
         if (jakartaMailAvailable == null) {
             try {
-                // Check for core Jakarta Mail classes
                 Class.forName("jakarta.mail.internet.MimeMessage");
                 Class.forName("jakarta.mail.Session");
-                Class.forName("jakarta.mail.internet.MimeUtility");
-                Class.forName("jakarta.mail.internet.MimePart");
-                Class.forName("jakarta.mail.internet.MimeMultipart");
-                Class.forName("jakarta.mail.Multipart");
-                Class.forName("jakarta.mail.Part");
-
                 jakartaMailAvailable = true;
                 log.debug("Jakarta Mail libraries are available");
             } catch (ClassNotFoundException e) {
@@ -170,7 +172,7 @@ public class EmlToPdf {
         }
     }
 
-    private static void validateEmlInput(byte[] emlBytes) {
+    private static void validateEmlInput(byte[] emlBytes) throws IOException {
         if (emlBytes == null || emlBytes.length == 0) {
             throw new IllegalArgumentException("EML file is empty or null");
         }
@@ -206,6 +208,7 @@ public class EmlToPdf {
                     disableSanitize);
         } catch (IOException | InterruptedException e) {
             log.warn("Initial HTML to PDF conversion failed, trying with simplified HTML");
+            // Try with simplified HTML
             String simplifiedHtml = simplifyHtmlContent(htmlContent);
             return FileToPdf.convertHtmlToPdf(
                     weasyprintPath,
@@ -256,7 +259,7 @@ public class EmlToPdf {
         html.append("<html><head><meta charset=\"UTF-8\">\n");
         html.append("<title>").append(escapeHtml(subject)).append("</title>\n");
         html.append("<style>\n");
-        appendEnhancedStyles(html);
+        appendEnhancedStyles(html, request);
         html.append("</style>\n");
         html.append("</head><body>\n");
 
@@ -295,7 +298,7 @@ public class EmlToPdf {
             html.append("<h3>Attachments</h3>\n");
             html.append(attachmentInfo);
 
-            // Add a status message about attachment inclusion
+            // Add status message about attachment inclusion
             if (request != null && request.isIncludeAttachments()) {
                 html.append("<div class=\"attachment-inclusion-note\">\n");
                 html.append(
@@ -313,7 +316,7 @@ public class EmlToPdf {
 
         // Show advanced features status if requested
         assert request != null;
-        if (request.getFileInput().isEmpty()) {
+        if (request != null && request.getFileInput().isEmpty()) {
             html.append("<div class=\"advanced-features-notice\">\n");
             html.append(
                     "<p><em>Note: Some advanced features require Jakarta Mail dependencies.</em></p>\n");
@@ -337,10 +340,8 @@ public class EmlToPdf {
                     sessionClass.getMethod("getDefaultInstance", Properties.class);
             Object session = getDefaultInstance.invoke(null, new Properties());
 
-            // Cast the session object to the proper type for the constructor
-            Class<?>[] constructorArgs = new Class<?>[] {sessionClass, InputStream.class};
             Constructor<?> mimeMessageConstructor =
-                    mimeMessageClass.getConstructor(constructorArgs);
+                    mimeMessageClass.getConstructor(sessionClass, InputStream.class);
             Object message =
                     mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
 
@@ -487,7 +488,7 @@ public class EmlToPdf {
         attachmentInfo
                 .append("<div class=\"attachment-item\">")
                 .append("<span class=\"attachment-icon\">")
-                .append(MimeConstants.ATTACHMENT_MARKER)
+                .append(MimeConstants.ATTACHMENT_ICON_PLACEHOLDER)
                 .append("</span> ")
                 .append("<span class=\"attachment-name\">")
                 .append(escapeHtml(filename))
@@ -650,10 +651,6 @@ public class EmlToPdf {
     }
 
     private static String processEmailHtmlBody(String htmlBody) {
-        return processEmailHtmlBody(htmlBody, null);
-    }
-
-    private static String processEmailHtmlBody(String htmlBody, EmailContent emailContent) {
         if (htmlBody == null) return "";
 
         String processed = htmlBody;
@@ -662,83 +659,10 @@ public class EmlToPdf {
         processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
         processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
 
-        // Process inline images (cid: references) if we have email content with attachments
-        if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
-            processed = processInlineImages(processed, emailContent);
-        }
-
         return processed;
     }
 
-    private static String processInlineImages(String htmlContent, EmailContent emailContent) {
-        if (htmlContent == null || emailContent == null) return htmlContent;
-
-        // Create a map of Content-ID to attachment data
-        Map<String, EmailAttachment> contentIdMap = new HashMap<>();
-        for (EmailAttachment attachment : emailContent.getAttachments()) {
-            if (attachment.isEmbedded()
-                    && attachment.getContentId() != null
-                    && attachment.getData() != null) {
-                contentIdMap.put(attachment.getContentId(), attachment);
-            }
-        }
-
-        if (contentIdMap.isEmpty()) return htmlContent;
-
-        // Pattern to match cid: references in img src attributes
-        Pattern cidPattern =
-                Pattern.compile(
-                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                        Pattern.CASE_INSENSITIVE);
-        Matcher matcher = cidPattern.matcher(htmlContent);
-
-        StringBuffer result = new StringBuffer();
-        while (matcher.find()) {
-            String contentId = matcher.group(1);
-            EmailAttachment attachment = contentIdMap.get(contentId);
-
-            if (attachment != null && attachment.getData() != null) {
-                // Convert to data URI
-                String mimeType = attachment.getContentType();
-                if (mimeType == null || mimeType.isEmpty()) {
-                    // Try to determine MIME type from filename
-                    String filename = attachment.getFilename();
-                    if (filename != null) {
-                        if (filename.toLowerCase().endsWith(".png")) {
-                            mimeType = "image/png";
-                        } else if (filename.toLowerCase().endsWith(".jpg")
-                                || filename.toLowerCase().endsWith(".jpeg")) {
-                            mimeType = "image/jpeg";
-                        } else if (filename.toLowerCase().endsWith(".gif")) {
-                            mimeType = "image/gif";
-                        } else if (filename.toLowerCase().endsWith(".bmp")) {
-                            mimeType = "image/bmp";
-                        } else {
-                            mimeType = "image/png"; // fallback
-                        }
-                    } else {
-                        mimeType = "image/png"; // fallback
-                    }
-                }
-
-                String base64Data = Base64.getEncoder().encodeToString(attachment.getData());
-                String dataUri = "data:" + mimeType + ";base64," + base64Data;
-
-                // Replace the cid: reference with the data URI
-                String replacement =
-                        matcher.group(0).replaceFirst("cid:" + Pattern.quote(contentId), dataUri);
-                matcher.appendReplacement(result, Matcher.quoteReplacement(replacement));
-            } else {
-                // Keep original if attachment not found
-                matcher.appendReplacement(result, Matcher.quoteReplacement(matcher.group(0)));
-            }
-        }
-        matcher.appendTail(result);
-
-        return result.toString();
-    }
-
-    private static void appendEnhancedStyles(StringBuilder html) {
+    private static void appendEnhancedStyles(StringBuilder html, EmlToPdfRequest request) {
         int fontSize = StyleConstants.DEFAULT_FONT_SIZE;
         String textColor = StyleConstants.DEFAULT_TEXT_COLOR;
         String backgroundColor = StyleConstants.DEFAULT_BACKGROUND_COLOR;
@@ -920,7 +844,7 @@ public class EmlToPdf {
                         processMultipartAdvanced(messageContent, content, request);
                     }
                 } catch (Exception e) {
-                    log.warn("Error processing content: {}", e.getMessage());
+                    log.warn("Error processing multipart content: {}", e.getMessage());
                 }
             }
 
@@ -937,12 +861,6 @@ public class EmlToPdf {
     private static void processMultipartAdvanced(
             Object multipart, EmailContent content, EmlToPdfRequest request) {
         try {
-            // Enhanced multipart type checking
-            if (!isValidJakartaMailMultipart(multipart)) {
-                log.warn("Invalid Jakarta Mail multipart type: {}", multipart.getClass().getName());
-                return;
-            }
-
             Class<?> multipartClass = multipart.getClass();
             java.lang.reflect.Method getCount = multipartClass.getMethod("getCount");
             int count = (Integer) getCount.invoke(multipart);
@@ -963,11 +881,6 @@ public class EmlToPdf {
     private static void processPartAdvanced(
             Object part, EmailContent content, EmlToPdfRequest request) {
         try {
-            if (!isValidJakartaMailPart(part)) {
-                log.warn("Invalid Jakarta Mail part type: {}", part.getClass().getName());
-                return;
-            }
-
             Class<?> partClass = part.getClass();
             java.lang.reflect.Method isMimeType = partClass.getMethod("isMimeType", String.class);
             java.lang.reflect.Method getContent = partClass.getMethod("getContent");
@@ -1001,18 +914,10 @@ public class EmlToPdf {
                     String[] contentIdHeaders = (String[]) getHeader.invoke(part, "Content-ID");
                     if (contentIdHeaders != null && contentIdHeaders.length > 0) {
                         attachment.setEmbedded(true);
-                        // Store the Content-ID, removing angle brackets if present
-                        String contentId = contentIdHeaders[0];
-                        if (contentId.startsWith("<") && contentId.endsWith(">")) {
-                            contentId = contentId.substring(1, contentId.length() - 1);
-                        }
-                        attachment.setContentId(contentId);
                     }
 
-                    // Extract attachment data if attachments should be included OR if it's an
-                    // embedded image (needed for inline display)
-                    if ((request != null && request.isIncludeAttachments())
-                            || attachment.isEmbedded()) {
+                    // Extract attachment data only if attachments should be included
+                    if (request != null && request.isIncludeAttachments()) {
                         try {
                             Object attachmentContent = getContent.invoke(part);
                             byte[] attachmentData = null;
@@ -1033,23 +938,15 @@ public class EmlToPdf {
 
                             if (attachmentData != null) {
                                 // Check size limit (use default 10MB if request is null)
-                                long maxSizeMB =
-                                        request != null ? request.getMaxAttachmentSizeMB() : 10L;
+                                long maxSizeMB = request.getMaxAttachmentSizeMB();
                                 long maxSizeBytes = maxSizeMB * 1024 * 1024;
 
                                 if (attachmentData.length <= maxSizeBytes) {
                                     attachment.setData(attachmentData);
                                     attachment.setSizeBytes(attachmentData.length);
                                 } else {
-                                    // For embedded images, always include data regardless of size
-                                    // to ensure inline display works
-                                    if (attachment.isEmbedded()) {
-                                        attachment.setData(attachmentData);
-                                        attachment.setSizeBytes(attachmentData.length);
-                                    } else {
-                                        // Still show attachment info even if too large
-                                        attachment.setSizeBytes(attachmentData.length);
-                                    }
+                                    // Still show attachment info even if too large
+                                    attachment.setSizeBytes(attachmentData.length);
                                 }
                             }
                         } catch (Exception e) {
@@ -1085,7 +982,7 @@ public class EmlToPdf {
         html.append("<html><head><meta charset=\"UTF-8\">\n");
         html.append("<title>").append(escapeHtml(content.getSubject())).append("</title>\n");
         html.append("<style>\n");
-        appendEnhancedStyles(html);
+        appendEnhancedStyles(html, request);
         html.append("</style>\n");
         html.append("</head><body>\n");
 
@@ -1109,7 +1006,7 @@ public class EmlToPdf {
 
         html.append("<div class=\"email-body\">\n");
         if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
-            html.append(processEmailHtmlBody(content.getHtmlBody(), content));
+            html.append(processEmailHtmlBody(content.getHtmlBody()));
         } else if (content.getTextBody() != null && !content.getTextBody().trim().isEmpty()) {
             html.append("<div class=\"text-body\">");
             html.append(convertTextToHtml(content.getTextBody()));
@@ -1142,7 +1039,7 @@ public class EmlToPdf {
                             .append(uniqueId)
                             .append("\">")
                             .append("<span class=\"attachment-icon\">")
-                            .append(MimeConstants.ATTACHMENT_MARKER)
+                            .append(MimeConstants.PAPERCLIP_EMOJI)
                             .append("</span> ")
                             .append("<span class=\"attachment-name\">")
                             .append(escapeHtml(safeMimeDecode(attachment.getFilename())))
@@ -1308,24 +1205,24 @@ public class EmlToPdf {
             return;
         }
 
-        // 1. Find the screen position of all attachment markers
-        AttachmentMarkerPositionFinder finder = new AttachmentMarkerPositionFinder();
+        // 1. Find the screen position of all emoji anchors
+        EmojiPositionFinder finder = new EmojiPositionFinder();
         finder.setSortByPosition(true); // Process pages in order
         finder.getText(document);
-        List<MarkerPosition> markerPositions = finder.getPositions();
+        List<EmojiPosition> emojiPositions = finder.getPositions();
 
-        // 2. Warn if the number of markers and attachments don't match
-        if (markerPositions.size() != attachments.size()) {
+        // 2. Warn if the number of anchors and attachments don't match
+        if (emojiPositions.size() != attachments.size()) {
             log.warn(
-                    "Found {} attachment markers, but there are {} attachments. Annotation count may be incorrect.",
-                    markerPositions.size(),
+                    "Found {} emoji anchors, but there are {} attachments. Annotation count may be incorrect.",
+                    emojiPositions.size(),
                     attachments.size());
         }
 
-        // 3. Create an invisible annotation over each found marker
-        int annotationsToAdd = Math.min(markerPositions.size(), attachments.size());
+        // 3. Create an invisible annotation over each found emoji
+        int annotationsToAdd = Math.min(emojiPositions.size(), attachments.size());
         for (int i = 0; i < annotationsToAdd; i++) {
-            MarkerPosition position = markerPositions.get(i);
+            EmojiPosition position = emojiPositions.get(i);
             EmailAttachment attachment = attachments.get(i);
 
             if (attachment.getEmbeddedFilename() != null) {
@@ -1459,6 +1356,8 @@ public class EmlToPdf {
         }
     }
 
+    // MIME header decoding functionality for RFC 2047 encoded headers - moved to constants
+
     private static String decodeMimeHeader(String encodedText) {
         if (encodedText == null || encodedText.trim().isEmpty()) {
             return encodedText;
@@ -1547,73 +1446,13 @@ public class EmlToPdf {
         }
 
         try {
-            if (isJakartaMailAvailable()) {
-                // Use Jakarta Mail's MimeUtility for proper MIME decoding
-                Class<?> mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
-                Method decodeText = mimeUtilityClass.getMethod("decodeText", String.class);
-                return (String) decodeText.invoke(null, headerValue.trim());
-            } else {
-                // Fallback to basic MIME decoding
-                return decodeMimeHeader(headerValue.trim());
-            }
+            return decodeMimeHeader(headerValue.trim());
         } catch (Exception e) {
             log.warn("Failed to decode MIME header, using original: {}", headerValue, e);
             return headerValue;
         }
     }
 
-    private static boolean isValidJakartaMailPart(Object part) {
-        if (part == null) return false;
-
-        try {
-            // Check if the object implements jakarta.mail.Part interface
-            Class<?> partInterface = Class.forName("jakarta.mail.Part");
-            if (!partInterface.isInstance(part)) {
-                return false;
-            }
-
-            // Additional check for MimePart
-            try {
-                Class<?> mimePartInterface = Class.forName("jakarta.mail.internet.MimePart");
-                return mimePartInterface.isInstance(part);
-            } catch (ClassNotFoundException e) {
-                // MimePart not available, but Part is sufficient
-                return true;
-            }
-        } catch (ClassNotFoundException e) {
-            log.debug("Jakarta Mail Part interface not available for validation");
-            return false;
-        }
-    }
-
-    private static boolean isValidJakartaMailMultipart(Object multipart) {
-        if (multipart == null) return false;
-
-        try {
-            // Check if the object implements jakarta.mail.Multipart interface
-            Class<?> multipartInterface = Class.forName("jakarta.mail.Multipart");
-            if (!multipartInterface.isInstance(multipart)) {
-                return false;
-            }
-
-            // Additional check for MimeMultipart
-            try {
-                Class<?> mimeMultipartClass = Class.forName("jakarta.mail.internet.MimeMultipart");
-                if (mimeMultipartClass.isInstance(multipart)) {
-                    log.debug("Found MimeMultipart instance for enhanced processing");
-                    return true;
-                }
-            } catch (ClassNotFoundException e) {
-                log.debug("MimeMultipart not available, using base Multipart interface");
-            }
-
-            return true;
-        } catch (ClassNotFoundException e) {
-            log.debug("Jakarta Mail Multipart interface not available for validation");
-            return false;
-        }
-    }
-
     @Data
     public static class EmailContent {
         private String subject;
@@ -1658,13 +1497,15 @@ public class EmlToPdf {
     }
 
     @Data
-    public static class MarkerPosition {
+    public static class EmojiPosition {
         private int pageIndex;
         private float x;
         private float y;
         private String character;
 
-        public MarkerPosition(int pageIndex, float x, float y, String character) {
+        public EmojiPosition() {}
+
+        public EmojiPosition(int pageIndex, float x, float y, String character) {
             this.pageIndex = pageIndex;
             this.x = x;
             this.y = y;
@@ -1672,15 +1513,14 @@ public class EmlToPdf {
         }
     }
 
-    public static class AttachmentMarkerPositionFinder
-            extends org.apache.pdfbox.text.PDFTextStripper {
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
+    public static class EmojiPositionFinder extends org.apache.pdfbox.text.PDFTextStripper {
+        @Getter private final List<EmojiPosition> positions = new ArrayList<>();
         private int currentPageIndex;
-        protected boolean sortByPosition;
+        private boolean sortByPosition;
         private boolean isInAttachmentSection;
         private boolean attachmentSectionFound;
 
-        public AttachmentMarkerPositionFinder() {
+        public EmojiPositionFinder() throws IOException {
             super();
             this.currentPageIndex = 0;
             this.sortByPosition = false;
@@ -1723,18 +1563,24 @@ public class EmlToPdf {
                 isInAttachmentSection = false;
             }
 
-            // Only look for markers if we are in the attachment section
+            // Only look for emojis if we are in the attachment section
             if (isInAttachmentSection) {
-                String attachmentMarker = MimeConstants.ATTACHMENT_MARKER;
-                for (int i = 0; (i = string.indexOf(attachmentMarker, i)) != -1; i++) {
-                    if (i < textPositions.size()) {
+                // Look for paperclip emoji characters (U+1F4CE)
+                String paperclipEmoji = "\uD83D\uDCCE"; // 📎 Unicode representation
+
+                for (int i = 0; i < string.length(); i++) {
+                    // Check if we have a complete paperclip emoji at this position
+                    if (i < string.length() - 1
+                            && string.substring(i, i + 2).equals(paperclipEmoji)
+                            && i < textPositions.size()) {
+
                         org.apache.pdfbox.text.TextPosition textPosition = textPositions.get(i);
-                        MarkerPosition position =
-                                new MarkerPosition(
+                        EmojiPosition position =
+                                new EmojiPosition(
                                         currentPageIndex,
                                         textPosition.getXDirAdj(),
                                         textPosition.getYDirAdj(),
-                                        attachmentMarker);
+                                        paperclipEmoji);
                         positions.add(position);
                     }
                 }
@@ -1746,5 +1592,16 @@ public class EmlToPdf {
         public void setSortByPosition(boolean sortByPosition) {
             this.sortByPosition = sortByPosition;
         }
+
+        public boolean isSortByPosition() {
+            return sortByPosition;
+        }
+
+        public void reset() {
+            positions.clear();
+            currentPageIndex = 0;
+            isInAttachmentSection = false;
+            attachmentSectionFound = false;
+        }
     }
 }

stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.ApplicationProperties;
 
 @Service
@@ -141,7 +142,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Convert", "markdown-to-pdf");
         addEndpointToGroup("Convert", "pdf-to-csv");
         addEndpointToGroup("Convert", "pdf-to-markdown");
-        addEndpointToGroup("Convert", "eml-to-pdf");
 
         // Adding endpoints to "Security" group
         addEndpointToGroup("Security", "add-password");
@@ -265,7 +265,6 @@ public class EndpointConfiguration {
         addEndpointToGroup("Weasyprint", "html-to-pdf");
         addEndpointToGroup("Weasyprint", "url-to-pdf");
         addEndpointToGroup("Weasyprint", "markdown-to-pdf");
-        addEndpointToGroup("Weasyprint", "eml-to-pdf");
 
         // Pdftohtml dependent endpoints
         addEndpointToGroup("Pdftohtml", "pdf-to-html");