enabled "open in external mailer" for msg. enabled long attachment fi…

…le names. issue #1986
jlawyerorg · Sep 22, 2023 · b5eec8f · b5eec8f
1 parent 7e680ca
commit b5eec8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/ArchiveFilePanel.java
@@ -3555,7 +3555,7 @@ public void showDocumentsPopup(MouseEvent evt) {
         if (selectedDocs.size() == 1) {
 
             ArchiveFileDocumentsBean value = selectedDocs.get(0);
-            if (value.getName().toLowerCase().endsWith(".eml")) {
+            if (value.getName().toLowerCase().endsWith(".eml") || value.getName().toLowerCase().endsWith(".msg")) {
                 this.mnuOpenInExternalMailer.setEnabled(true);
             }
 

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/MailContentUI.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/MailContentUI.java
@@ -1321,9 +1321,9 @@ public static void setOutlookMessageImpl(MailContentUI contentUI, OutlookMessage
 
         List<OutlookFileAttachment> attachments = msg.fetchTrueAttachments();
         for (OutlookFileAttachment att : attachments) {
-            String attFileName=att.getFilename();
+            String attFileName=att.getLongFilename();
             if(StringUtils.isEmpty(attFileName))
-                attFileName=att.getLongFilename();
+                attFileName=att.getFilename();
             if(!StringUtils.isEmpty(attFileName))
                 ((DefaultListModel) lstAttachments.getModel()).addElement(attFileName);
         }