From af70807bf7280e218026bbfeb5e75ebab5459326 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Sun, 9 Jun 2013 22:31:42 +0000
Subject: [PATCH] IMAP: skip Microsoft Mail Internet Headers Version 2.0 in
 message headers field

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2139 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/dav/DavExchangeSession.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index b624e02c..ebc93d94 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -1086,6 +1086,10 @@ public class DavExchangeSession extends ExchangeSession {
             try {
                 String messageHeaders = getItemProperty(permanentUrl, "messageheaders");
                 if (messageHeaders != null) {
+                    final String MS_HEADER = "Microsoft Mail Internet Headers Version 2.0\r\n";
+                    if (messageHeaders.startsWith(MS_HEADER)) {
+                        messageHeaders = messageHeaders.substring(MS_HEADER.length());
+                    }
                     // workaround for messages in Sent folder
                     if (messageHeaders.indexOf("From:") < 0) {
                         String from = getItemProperty(permanentUrl, "from");