diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 0641a9d3..37573c08 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -1154,10 +1154,7 @@ public abstract class ExchangeSession {
         convertResentHeader(mimeMessage, "Bcc");
         convertResentHeader(mimeMessage, "Message-Id");
 
-        // fix From header for Exchange 2007
-        if (!"Exchange2003".equals(serverVersion)) {
-            mimeMessage.removeHeader("From");
-        }
+        mimeMessage.removeHeader("From");
 
         // remove visible recipients from list
         Set<String> visibleRecipients = new HashSet<String>();