diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java b/spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java
index 7d482a3766b..bc4d4f40bd5 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java
@@ -76,7 +76,7 @@ public byte[] asBytes() {
 
 	@Override
 	protected String toStringPayload() {
-		return (getPayloadLength() > 10) ? getPayload().substring(0, 10) + ".." : getPayload();
+		return (getPayload().length() > 10) ? getPayload().substring(0, 10) + ".." : getPayload();
 	}
 
 }
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/TextMessageTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/TextMessageTests.java
new file mode 100644
index 00000000000..2b73641d54e
--- /dev/null
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/TextMessageTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.socket;
+
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test fixture for {@link TextMessage}
+ * @author Shinobu Aoki
+ */
+public class TextMessageTests {
+
+	@Test
+	public void toStringAscii() {
+		String expected = "foo,bar";
+		TextMessage actual = new TextMessage(expected);
+		assertThat(actual.getPayload(), Matchers.is(expected));
+	}
+
+	@Test
+	public void toStringMultibyteString() {
+		String expected = "\u3042\u3044\u3046\u3048\u304a";
+		TextMessage actual = new TextMessage(expected);
+		assertThat(actual.getPayload(), Matchers.is(expected));
+	}
+
+}