diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java
new file mode 100644
index 0000000000..77be2ada9f
--- /dev/null
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandlerTests.java
@@ -0,0 +1,77 @@
+/**
+ * 
+ */
+package org.springframework.integration.xmpp.messages;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.jivesoftware.smack.Chat;
+import org.jivesoftware.smack.ChatManager;
+import org.jivesoftware.smack.MessageListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageHandlingException;
+import org.springframework.integration.message.GenericMessage;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.xmpp.XmppHeaders;
+
+/**
+ * @author Oleg Zhurakousky
+ *
+ */
+public class XmppMessageSendingMessageHandlerTests {
+	
+
+	@Test
+	public void validateMessagePost() throws Exception{
+		XMPPConnection connection = mock(XMPPConnection.class);
+		ChatManager chantManager = mock(ChatManager.class);
+		when(connection.getChatManager()).thenReturn(chantManager);
+		Chat chat = mock(Chat.class);
+		when(chantManager.createChat(Mockito.any(String.class), Mockito.any(MessageListener.class))).thenReturn(chat);
+		
+		XmppMessageSendingMessageHandler handler = new XmppMessageSendingMessageHandler();
+		handler.setXmppConnection(connection);
+
+		Message<?> message = MessageBuilder.withPayload("Test Message").
+					setHeader(XmppHeaders.CHAT_TO_USER, "kermit@frog.com").
+					build();
+		// first Message
+		handler.handleMessage(message);
+		
+		verify(chantManager, times(1)).createChat(Mockito.any(String.class), Mockito.any(MessageListener.class));
+		verify(chat, times(1)).sendMessage("Test Message");
+		
+		// assuming we know thread ID although currently we do not provide this capability
+		message = MessageBuilder.withPayload("Hello Kitty").
+			setHeader(XmppHeaders.CHAT_TO_USER, "kermit@frog.com").
+			setHeader(XmppHeaders.CHAT_THREAD_ID, "123").
+			build();
+		reset(chat, chantManager);
+		when(chantManager.getThreadChat("123")).thenReturn(chat);
+		
+		handler.handleMessage(message);
+		// in threaded conversation we need to look for existing chat
+		verify(chantManager, times(0)).createChat(Mockito.any(String.class), Mockito.any(MessageListener.class));
+		verify(chantManager, times(1)).getThreadChat("123");
+		verify(chat, times(1)).sendMessage("Hello Kitty");
+	}
+	
+	@Test(expected=MessageHandlingException.class)
+	public void validateFailureNoChatToUser() throws Exception{	
+		XmppMessageSendingMessageHandler handler = new XmppMessageSendingMessageHandler();
+		handler.handleMessage(new GenericMessage("hello"));
+	}
+	
+	@Test(expected=MessageHandlingException.class)
+	public void validateMessageWithUnsupportedPayload() throws Exception{	
+		XmppMessageSendingMessageHandler handler = new XmppMessageSendingMessageHandler();
+		handler.handleMessage(new GenericMessage(123));
+	}
+}