diff --git a/spring-amqp/src/main/java/org/springframework/amqp/core/AddressUtils.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AddressUtils.java
index 09b5b5a7..eebe92fd 100644
--- a/spring-amqp/src/main/java/org/springframework/amqp/core/AddressUtils.java
+++ b/spring-amqp/src/main/java/org/springframework/amqp/core/AddressUtils.java
@@ -20,8 +20,15 @@ package org.springframework.amqp.core;
  * @since 1.4.1
  *
  */
+@Deprecated
 public class AddressUtils {
 
+	/**
+	 * @deprecated Use the constant in {@link Address#AMQ_RABBITMQ_REPLY_TO}.
+	 */
+	@Deprecated
+	public static final String AMQ_RABBITMQ_REPLY_TO = Address.AMQ_RABBITMQ_REPLY_TO;
+
 	/**
 	 * Decodes the reply-to {@link Address} into exchange/key.
 	 *
diff --git a/spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java b/spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java
index 3d247365..b1ed5b5b 100644
--- a/spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java
+++ b/spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java
@@ -15,7 +15,6 @@ package org.springframework.amqp.remoting.service;
 
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.core.Address;
-import org.springframework.amqp.core.AddressUtils;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
@@ -61,7 +60,7 @@ public class AmqpInvokerServiceExporter extends RemoteInvocationBasedExporter im
 
 	@Override
 	public void onMessage(Message message) {
-		Address replyToAddress = AddressUtils.decodeReplyToAddress(message);
+		Address replyToAddress = message.getMessageProperties().getReplyToAddress();
 		if (replyToAddress == null) {
 			throw new AmqpRejectAndDontRequeueException("No replyToAddress in inbound AMQP Message");
 		}
diff --git a/spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
index e4dbc771..e5a0ffae 100644
--- a/spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
+++ b/spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
@@ -90,7 +90,7 @@ public class AddressTests {
 		MessageProperties props = new MessageProperties();
 		props.setReplyTo(replyTo);
 		Message message = new Message("foo".getBytes(), props);
-		Address address = AddressUtils.decodeReplyToAddress(message);
+		Address address = message.getMessageProperties().getReplyToAddress();
 		assertEquals("", address.getExchangeName());
 		assertEquals(replyTo, address.getRoutingKey());
 		address = props.getReplyToAddress();
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index e88195df..2a78a62e 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -33,7 +33,6 @@ import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.AmqpIllegalStateException;
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.core.Address;
-import org.springframework.amqp.core.AddressUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.core.MessagePostProcessor;
@@ -1164,7 +1163,7 @@ public class RabbitTemplate extends RabbitAccessor
 	 * @see org.springframework.amqp.core.MessageProperties#getReplyTo()
 	 */
 	private Address getReplyToAddress(Message request) throws AmqpException {
-		Address replyTo = AddressUtils.decodeReplyToAddress(request);
+		Address replyTo = request.getMessageProperties().getReplyToAddress();
 		if (replyTo == null) {
 			if (this.exchange == null) {
 				throw new AmqpException(
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java
index d61e898e..ea13a615 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java
@@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.amqp.AmqpException;
 import org.springframework.amqp.core.Address;
-import org.springframework.amqp.core.AddressUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.amqp.core.MessagePostProcessor;
@@ -284,7 +283,7 @@ public abstract class AbstractAdaptableMessageListener implements MessageListene
 	 * @see org.springframework.amqp.core.MessageProperties#getReplyTo()
 	 */
 	protected Address getReplyToAddress(Message request) throws Exception {
-		Address replyTo = AddressUtils.decodeReplyToAddress(request);
+		Address replyTo = request.getMessageProperties().getReplyToAddress();
 		if (replyTo == null) {
 			if (this.responseExchange == null) {
 				throw new AmqpException(