diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java
index 65e427f480..993420a227 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java
@@ -27,21 +27,33 @@ import org.springframework.integration.MessageHeaders;
  * @since 2.0
  */
 public class XmppHeaders {
+
 	private static final String PREFIX = MessageHeaders.PREFIX + "xmpp_";
-	public static final String CHAT = PREFIX + "chat_key";
-	public static final String CHAT_TO_USER = PREFIX + "chat_to_user";
-	public static final String CHAT_THREAD_ID = PREFIX + "thread_id";
+
+	public static final String CHAT = PREFIX + "chatKey";
+
+	public static final String CHAT_TO_USER = PREFIX + "chatToUser";
+
+	public static final String CHAT_THREAD_ID = PREFIX + "threadId";
+
 	public static final String TYPE = PREFIX + "type";
-//    public static final String ROSTER_CHANGE_TYPE = PREFIX + "roster_change_type";
+
+//	public static final String ROSTER_CHANGE_TYPE = PREFIX + "roster_change_type";
+	
+//	public static final String ROSTER = PREFIX + "roster";
+
 	public static final String PRESENCE = PREFIX + "presence";
-//    public static final String ROSTER = PREFIX + "roster";
 
 	public static final String PRESENCE_LANGUAGE = PRESENCE + "language";
+
 	public static final String PRESENCE_PRIORITY = PRESENCE + "priority";
+
 	public static final String PRESENCE_MODE = PRESENCE + "mode";
+
 	public static final String PRESENCE_TYPE = PRESENCE + "type";
+
 	public static final String PRESENCE_STATUS = PRESENCE + "status";
+
 	public static final String PRESENCE_FROM = PRESENCE + "from";
 
-
 }
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
index 038b47fb23..79d61e89bc 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java
@@ -18,14 +18,13 @@ package org.springframework.integration.xmpp.messages;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManager;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
-import org.springframework.context.Lifecycle;
-import org.springframework.context.SmartLifecycle;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.endpoint.AbstractEndpoint;