From 2fe8bf6ce78978b3b3f62039ab00a2e3e3ef4e9a Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Sun, 16 Jun 2013 21:40:31 +0000
Subject: [PATCH] IMAP: improve invalid message header test

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

diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index bb199e08..15ce75c7 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -1089,10 +1089,10 @@ public class DavExchangeSession extends ExchangeSession {
                     final String MS_HEADER = "Microsoft Mail Internet Headers Version 2.0";
                     if (messageHeaders.startsWith(MS_HEADER)) {
                         messageHeaders = messageHeaders.substring(MS_HEADER.length());
-                        if (messageHeaders.charAt(0) == '\r') {
+                        if (!messageHeaders.isEmpty() && messageHeaders.charAt(0) == '\r') {
                             messageHeaders = messageHeaders.substring(1);
                         }
-                        if (messageHeaders.charAt(0) == '\n') {
+                        if (!messageHeaders.isEmpty() && messageHeaders.charAt(0) == '\n') {
                             messageHeaders = messageHeaders.substring(1);
                         }
                     }