diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
index b9c167d02f..50557ae6f8 100644
--- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
+++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapter.java
@@ -21,7 +21,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
-import org.springframework.integration.endpoint.AbstractMessageProducingEndpoint;
+import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -32,7 +32,7 @@ import org.springframework.util.CollectionUtils;
  * 
  * @author Mark Fisher
  */
-public class ApplicationEventInboundChannelAdapter extends AbstractMessageProducingEndpoint implements ApplicationListener {
+public class ApplicationEventInboundChannelAdapter extends MessageProducerSupport implements ApplicationListener {
 
 	private final List<Class<? extends ApplicationEvent>> eventTypes = new CopyOnWriteArrayList<Class<? extends ApplicationEvent>>();
 
diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
index 3db85b4864..2859336e9c 100755
--- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
+++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
@@ -23,7 +23,7 @@ import javax.mail.internet.MimeMessage;
 import org.springframework.context.Lifecycle;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.endpoint.AbstractMessageProducingEndpoint;
+import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.util.Assert;
 
@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
  * @author Arjen Poutsma
  * @author Mark Fisher
  */
-public class ImapIdleChannelAdapter extends AbstractMessageProducingEndpoint implements Lifecycle {
+public class ImapIdleChannelAdapter extends MessageProducerSupport implements Lifecycle {
 
 	private final IdleTask idleTask = new IdleTask();
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
similarity index 88%
rename from org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
index e490bbcaa4..0d70a98a04 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * 
  * @author Mark Fisher
  */
-public abstract class AbstractMessageProducingEndpoint extends AbstractEndpoint implements InitializingBean {
+public abstract class MessageProducerSupport extends AbstractEndpoint implements InitializingBean {
 
 	private volatile MessageChannel outputChannel;
 
@@ -39,6 +39,10 @@ public abstract class AbstractMessageProducingEndpoint extends AbstractEndpoint
 		this.outputChannel = outputChannel;
 	}
 
+	public void setSendTimeout(long sendTimeout) {
+		this.channelTemplate.setSendTimeout(sendTimeout);
+	}
+
 	public void afterPropertiesSet() {
 		Assert.notNull(this.outputChannel, "outputChannel is required");
 	}