diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index 90e65259..8eb8d29a 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -241,7 +241,7 @@ public class EwsExchangeSession extends ExchangeSession {
         message.read = response.getBoolean(Field.get("read").getResponseName());
         message.junk = response.getBoolean(Field.get("junk").getResponseName());
         message.flagged = "2".equals(response.get(Field.get("flagStatus").getResponseName()));
-        message.draft = "9".equals(response.get(Field.get("messageFlags").getResponseName())) || "8".equals(response.get(Field.get("messageFlags").getResponseName()));
+        message.draft = (response.getInt(Field.get("messageFlags").getResponseName()) & 8) != 0;
         String lastVerbExecuted = response.get(Field.get("lastVerbExecuted").getResponseName());
         message.answered = "102".equals(lastVerbExecuted) || "103".equals(lastVerbExecuted);
         message.forwarded = "104".equals(lastVerbExecuted);
diff --git a/src/test/davmail/AbstractDavMailTestCase.java b/src/test/davmail/AbstractDavMailTestCase.java
index 9139556b..e69a446e 100644
--- a/src/test/davmail/AbstractDavMailTestCase.java
+++ b/src/test/davmail/AbstractDavMailTestCase.java
@@ -78,7 +78,7 @@ public class AbstractDavMailTestCase extends TestCase {
     protected MimeMessage createMimeMessage() throws MessagingException {
         MimeMessage mimeMessage = new MimeMessage((Session) null);
         mimeMessage.addHeader("To", "test@test.local");
-        mimeMessage.setText("Test message");
+        mimeMessage.setText("Test message\n");
         mimeMessage.setSubject("Test subject");
         return mimeMessage;
     }
diff --git a/src/test/davmail/exchange/TestExchangeSessionMessage.java b/src/test/davmail/exchange/TestExchangeSessionMessage.java
index c4ab16b4..7aeb8dd0 100644
--- a/src/test/davmail/exchange/TestExchangeSessionMessage.java
+++ b/src/test/davmail/exchange/TestExchangeSessionMessage.java
@@ -77,7 +77,7 @@ public class TestExchangeSessionMessage extends AbstractExchangeSessionTestCase
         MimeMessage mimeMessage = new MimeMessage(null, new SharedByteArrayInputStream(content));
         assertTrue(mimeMessage.getHeader("To")[0].indexOf("test@test.local") >= 0);
         assertEquals("Test subject", mimeMessage.getSubject());
-        assertEquals("Test message", mimeMessage.getContent());
+        assertEquals("Test message\n", mimeMessage.getContent());
     }
 
     public void testProcessMessage() throws IOException, MessagingException {