diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 64897208..9e48d8c8 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -1291,7 +1291,7 @@ public abstract class ExchangeSession {
         convertResentHeader(mimeMessage, "Message-Id");
 
         // do not allow send as another user on Exchange 2003
-        if ("Exchange2003".equals(serverVersion)) {
+        if ("Exchange2003".equals(serverVersion) || Settings.getBooleanProperty("davmail.smtpStripFrom", false)) {
             mimeMessage.removeHeader("From");
         }