From d8aceb0edb64c31bfc7be5e3104580d2efe5a9df Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 20 Jun 2013 20:55:41 +0000
Subject: [PATCH] IMAP: new header fix, do not rely on messageheaders attribute
 on full headers request, load message

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2152 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/imap/ImapConnection.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index c331e26c..96b0d911 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -861,6 +861,10 @@ public class ImapConnection extends AbstractConnection {
                             baos.write(message.contentClass.getBytes("UTF-8"));
                             baos.write(13);
                             baos.write(10);
+                        } else if (requestedHeaders == null) {
+                            // load message and write all headers
+                            partOutputStream = new PartOutputStream(baos, true, false, startIndex, maxSize);
+                            partInputStream = messageWrapper.getRawInputStream();
                         } else {
                             Enumeration headerEnumeration = messageWrapper.getMatchingHeaderLines(requestedHeaders);
                             while (headerEnumeration.hasMoreElements()) {
@@ -927,7 +931,7 @@ public class ImapConnection extends AbstractConnection {
                     buffer.append(" {").append(baos.size()).append('}');
                     sendClient(buffer.toString());
                     // log content if less than 2K
-                    if (LOGGER.isDebugEnabled() /*&& baos.size() < 2048*/) {
+                    if (LOGGER.isDebugEnabled() && baos.size() < 2048) {
                         LOGGER.debug(new String(baos.toByteArray(), "UTF-8"));
                     }
                     os.write(baos.toByteArray());