diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
index f3d55274b5..9b59e4ce54 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
@@ -222,7 +222,7 @@ public class ChannelPublishingJmsMessageListener extends AbstractMessagingGatewa
 		Message<?> requestMessage = (object instanceof Message<?>) ?
 				MessageBuilder.fromMessage((Message<?>) object).copyHeaders(headers).build() : 
 				MessageBuilder.withPayload(object).copyHeaders(headers).build();
-		this.writeMessageHistory(requestMessage, this);		
+		this.writeMessageHistory(requestMessage);		
 		if (!this.expectReply) {
 			this.send(requestMessage);
 		}
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
index f7de52ce46..eb149f41b8 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
@@ -86,11 +86,13 @@ public class JmsDestinationPollingSource extends AbstractJmsTemplateBasedAdapter
 			Object convertedObject = converter.fromMessage(jmsMessage);
 			if (convertedObject instanceof Message) {
 				convertedMessage = MessageBuilder.fromMessage((Message<Object>) convertedObject).copyHeaders(mappedHeaders).build();
-			} else {
+			}
+			else {
 				convertedMessage = MessageBuilder.withPayload(convertedObject).build();
 			}
-			this.writeMessageHistory(convertedMessage, this);
-		} catch (Exception e) {
+			this.writeMessageHistory(convertedMessage);
+		}
+		catch (Exception e) {
 			throw new MessagingException(e.getMessage(), e);
 		}
 		return convertedMessage;
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
index 20d5cc4aed..19cb3c48ff 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
@@ -62,7 +62,7 @@ public class JmsSendingMessageHandler extends AbstractJmsTemplateBasedAdapter im
 		if (message == null) {
 			throw new IllegalArgumentException("message must not be null");
 		}
-		this.writeMessageHistory(message, this);
+		this.writeMessageHistory(message);
 		this.getJmsTemplate().convertAndSend(message, new MessagePostProcessor() {
 			public javax.jms.Message postProcessMessage(javax.jms.Message jmsMessage)
 					throws JMSException {