diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
index 9d7f854e8..ada1e562c 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
@@ -375,10 +375,6 @@ public final class ChatManager extends Manager{
                 interceptor.getKey().processMessage(message);
             }
         }
-        // Ensure that messages being sent have a proper FROM value
-        if (message.getFrom() == null) {
-            message.setFrom(connection().getUser());
-        }
         connection().sendStanza(message);
     }