diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index f4c1a76b..83e3ec41 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -1041,7 +1041,8 @@ public class ExchangeSession {
                     }
                 }
 
-            } else if ("text/plain".equalsIgnoreCase(mimeHeader.contentType)) {
+            } else if (mimeHeader.contentType == null ||
+                    "text/plain".equalsIgnoreCase(mimeHeader.contentType)) {
                 currentBody = body;
             }
             if (currentBody != null) {