From 60a24e5a64e7b96b99bb06c3d244c742099cbf48 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Fri, 9 Oct 2009 23:12:14 +0000
Subject: [PATCH] IMAP: send default BODYSTRUCTURE on MIME encoding error

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

diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index b2b69f78..62a8a5c7 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -649,6 +649,12 @@ public class ImapConnection extends AbstractConnection {
                 // no multipart, single body
                 appendBodyStructure(buffer, mimeMessage);
             }
+        } catch (UnsupportedEncodingException e) {
+            DavGatewayTray.warn(e);
+            // dump message in log
+            DavGatewayTray.debug(new BundleMessage("LOG_MESSAGE", new String(baos.toByteArray())));
+            // failover: send default bodystructure
+            buffer.append("(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL NIL ").append(baos.size()).append(" NIL)");
         } catch (MessagingException me) {
             DavGatewayTray.warn(me);
             // dump message in log