diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 4ae06b49..fe2302c3 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -910,7 +910,8 @@ public class ExchangeSession {
                             attachment = attachmentsMap.get(partHeader.name + ".eml");
                         }
                         // try to get attachment by index, only if no name found
-                        if (attachment == null && partHeader.name == null) {
+                        // or attachment renamed to winmail.dat by Exchange
+                        if (attachment == null && (partHeader.name == null || "winmail.dat".equals(partHeader.name))) {
                             attachment = attachmentsMap.get(String.valueOf(attachmentIndex));
                         }
                         // try to get by index if attachment renamed to application