diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 73326915..05278b36 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -781,7 +781,7 @@ public class ExchangeSession {
                 String decodedPath = URIUtil.decode(attachment.href);
 
                 if ("message/rfc822".equals(mimeHeader.contentType)) {
-                    String messageAttachmentPath = decodedPath;
+                    String messageAttachmentPath = null;
 
                     // Get real attachment path from owa page content
                     GetMethod method = new GetMethod(URIUtil.encodePath(decodedPath));
@@ -797,6 +797,11 @@ public class ExchangeSession {
                         }
                     }
 
+                    // failover, exchange mail attachment
+                    if (messageAttachmentPath == null) {
+                       messageAttachmentPath = messageUrl + "/" + attachment.name;
+                    }
+
                     Message attachedMessage = getMessage(messageAttachmentPath);
                     attachedMessage.write(quotedOs);
                 } else {