diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
index 3e7a61aa46..6a2792da82 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -118,7 +118,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
     private ActiveMQPrefetchPolicy prefetchPolicy = new ActiveMQPrefetchPolicy();
     private RedeliveryPolicy redeliveryPolicy;
     private boolean disableTimeStampsByDefault = false;
-    private boolean onSendPrepareMessageBody = true;
     private boolean optimizedMessageDispatch = true;
     private boolean copyMessageOnSend = true;
     private boolean useCompression = false;
@@ -806,24 +805,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
         this.closeTimeout=closeTimeout;
     }
 
-
-    /**
-     * 
-     * @return Returns the onSendPrepareMessageBody.
-     */
-    public boolean isOnSendPrepareMessageBody() {
-        return onSendPrepareMessageBody;
-    }
-
-    /**
-     * 
-     * @param onSendPrepareMessageBody
-     *            The onSendPrepareMessageBody to set.
-     */
-    public void setOnSendPrepareMessageBody(boolean onSendPrepareMessageBody) {
-        this.onSendPrepareMessageBody = onSendPrepareMessageBody;
-    }
-
     /**
      * 
      * @return ConnectionInfo
diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index fd68aeda09..62eca3d86d 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -74,7 +74,6 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
     private RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
 
     private boolean disableTimeStampsByDefault = false;
-    private boolean onSendPrepareMessageBody = true;
     private boolean optimizedMessageDispatch = true;
     private boolean copyMessageOnSend = true;
     private boolean useCompression = false;
@@ -228,7 +227,6 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
             connection.setPassword(password);
             connection.setPrefetchPolicy(getPrefetchPolicy());
             connection.setDisableTimeStampsByDefault(isDisableTimeStampsByDefault());
-            connection.setOnSendPrepareMessageBody(isOnSendPrepareMessageBody());
             connection.setOptimizedMessageDispatch(isOptimizedMessageDispatch());
             connection.setCopyMessageOnSend(isCopyMessageOnSend());
             connection.setUseCompression(isUseCompression());
@@ -413,7 +411,6 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
         props.setProperty("copyMessageOnSend", Boolean.toString(isCopyMessageOnSend()));
         props.setProperty("disableTimeStampsByDefault", Boolean.toString(isDisableTimeStampsByDefault()));
         props.setProperty("objectMessageSerializationDefered", Boolean.toString(isObjectMessageSerializationDefered()));
-        props.setProperty("onSendPrepareMessageBody", Boolean.toString(isOnSendPrepareMessageBody()));
         props.setProperty("optimizedMessageDispatch", Boolean.toString(isOptimizedMessageDispatch()));
         props.setProperty("password", getPassword());
         props.setProperty("useAsyncSend", Boolean.toString(isUseAsyncSend()));
@@ -426,14 +423,6 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
         
     }
 
-    public boolean isOnSendPrepareMessageBody() {
-        return onSendPrepareMessageBody;
-    }
-
-    public void setOnSendPrepareMessageBody(boolean onSendPrepareMessageBody) {
-        this.onSendPrepareMessageBody = onSendPrepareMessageBody;
-    }
-
     public boolean isUseCompression() {
         return useCompression;
     }