From 93cf6156cce7a23c897ff61dbcb625cadb93d536 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 17 Mar 2010 21:03:24 +0000
Subject: [PATCH] IMAP: fixes to improve JavaMail support

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

diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index 6757586c..e5f5cef4 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -570,7 +570,7 @@ public class ImapConnection extends AbstractConnection {
                     os.write(baos.toByteArray());
                     os.flush();
                     buffer.setLength(0);
-                } else if (param.startsWith("BODY[]") || param.startsWith("BODY.PEEK[]") || "BODY.PEEK[TEXT]".equals(param)) {
+                } else if (param.startsWith("BODY[]") || param.startsWith("BODY.PEEK[]") || param.startsWith("BODY[TEXT]") || "BODY.PEEK[TEXT]".equals(param)) {
                     // parse buffer size
                     int startIndex = 0;
                     int ltIndex = param.indexOf('<');
@@ -820,14 +820,15 @@ public class ImapConnection extends AbstractConnection {
                 }
                 buffer.append(')');
             } else {
-                buffer.append(" ()");
+                buffer.append(" NIL");
             }
         }
         appendBodyStructureValue(buffer, bodyPart.getContentID());
         appendBodyStructureValue(buffer, bodyPart.getDescription());
         appendBodyStructureValue(buffer, bodyPart.getEncoding());
         appendBodyStructureValue(buffer, bodyPart.getSize());
-        appendBodyStructureValue(buffer, bodyPart.getLineCount());
+		// line count not implemented in JavaMail, return 0
+        appendBodyStructureValue(buffer, 0);
         buffer.append(')');
     }