From 01f8b6a5085a3bf6202e0eaaf534a6a5142010ab Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 9 Apr 2013 21:49:54 +0000
Subject: [PATCH] SMTP: do not allow send as another user on Exchange 2003

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

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 7a8d2de9..36ece606 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -1283,7 +1283,10 @@ public abstract class ExchangeSession {
         convertResentHeader(mimeMessage, "Bcc");
         convertResentHeader(mimeMessage, "Message-Id");
 
-        mimeMessage.removeHeader("From");
+        // do not allow send as another user on Exchange 2003
+        if ("Exchange2003".equals(serverVersion)) {
+            mimeMessage.removeHeader("From");
+        }
 
         // remove visible recipients from list
         Set<String> visibleRecipients = new HashSet<String>();