diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index c75f1f473..44d2be68d 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -20,12 +20,13 @@
 |spring.sleuth.integration.patterns | `[!hystrixStreamOutput*, *, !channel*]` | An array of patterns against which channel names will be matched. @see org.springframework.integration.config.GlobalChannelInterceptor#patterns() Defaults to any channel name not matching the Hystrix Stream and functional Stream channel names.
 |spring.sleuth.integration.websockets.enabled | `true` | Enable tracing for WebSockets.
 |spring.sleuth.messaging.enabled | `false` | Should messaging be turned on.
-|spring.sleuth.messaging.jms.enabled | `false` | Enable tracing of JMS.
+|spring.sleuth.messaging.jms.enabled | `true` | Enable tracing of JMS.
 |spring.sleuth.messaging.jms.remote-service-name | `jms` | JMS remote service name.
-|spring.sleuth.messaging.kafka.enabled | `false` | Enable tracing of Kafka.
+|spring.sleuth.messaging.kafka.enabled | `true` | Enable tracing of Kafka.
+|spring.sleuth.messaging.kafka.mapper.enabled | `true` | Enable DefaultKafkaHeaderMapper tracing for Kafka.
 |spring.sleuth.messaging.kafka.remote-service-name | `kafka` | Kafka remote service name.
-|spring.sleuth.messaging.kafka.streams.enabled | `false` | Enable tracing of Kafka Streams.
-|spring.sleuth.messaging.rabbit.enabled | `false` | Enable tracing of RabbitMQ.
+|spring.sleuth.messaging.kafka.streams.enabled | `false` | Should Kafka Streams be turned on.
+|spring.sleuth.messaging.rabbit.enabled | `true` | Enable tracing of RabbitMQ.
 |spring.sleuth.messaging.rabbit.remote-service-name | `rabbitmq` | Rabbit remote service name.
 |spring.sleuth.mongodb.enabled | `true` | Enable tracing for MongoDb.
 |spring.sleuth.opentracing.enabled | `true` | Enables OpenTracing support.
diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/instrument/messaging/BraveMessagingAutoConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/instrument/messaging/BraveMessagingAutoConfiguration.java
index f8fced815..0da77fc78 100644
--- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/instrument/messaging/BraveMessagingAutoConfiguration.java
+++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/instrument/messaging/BraveMessagingAutoConfiguration.java
@@ -148,8 +148,8 @@ public class BraveMessagingAutoConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		JmsTracing jmsTracing(MessagingTracing messagingTracing, SleuthMessagingProperties properties) {
-			return JmsTracing.newBuilder(messagingTracing)
-					.remoteServiceName(properties.getJms().getRemoteServiceName()).build();
+			return JmsTracing.newBuilder(messagingTracing).remoteServiceName(properties.getJms().getRemoteServiceName())
+					.build();
 		}
 
 		@Bean