From 44e4ebf07c5c6cb1cb7f9e69279aa5436d3fb1e0 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Fri, 9 Nov 2007 11:03:30 +0000
Subject: [PATCH] Adjust attachment index after refactoring

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

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index fc8f250d..2a69604b 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -887,10 +887,10 @@ public class ExchangeSession {
 
                 // detect part boundary start
                 if (line.equals(mimeHeader.boundary)) {
-                    Attachment currentAttachment = null;
+                    Attachment currentAttachment;
                     String currentAttachmentName = null;
-                    if (attachmentIndex < attachments.size()) {
-                        currentAttachment = attachments.get(attachmentIndex);
+                    if (attachmentIndex > 0 && attachmentIndex <= attachments.size()) {
+                        currentAttachment = attachments.get(attachmentIndex - 1);
                         currentAttachmentName = currentAttachment.name;
                     }