diff --git a/coreapi/chat.c b/coreapi/chat.c
index a16a8132f..8e8de20c0 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -840,39 +840,19 @@ static void linphone_chat_room_send_is_composing_notification(LinphoneChatRoom *
 }
 
 uint32_t linphone_chat_room_get_char(const LinphoneChatRoom *cr) {
-	if (cr->pending_message && strlen(cr->pending_message->message) > 0 ) {
-		return cr->pending_message->message[strlen(cr->pending_message->message)-1];
-	} else return 0;
+	return 0;
 }
-int linphone_chat_message_put_char(LinphoneChatMessage *msg,uint32_t charater) {
-	/*stubbed implementation using im-iscomposing+xml*/
-	LinphoneChatRoom *cr=linphone_chat_message_get_chat_room(msg);
-	char *content;
-	SalOp *op = sal_op_new(cr->lc->sal);
-	char* value;
-	const char* from;
-	LinphoneCall *call = cr->call;
-	cr->is_composing = LinphoneIsComposingActive;
-	content = linphone_chat_room_create_is_composing_xml(cr);
-	linphone_configure_op(cr->lc, op, cr->peer_url, NULL, lp_config_get_int(cr->lc->config, "sip", "chat_msg_with_contact", 0));
-	if (charater==' ')
-		value=ms_strdup("S P");
-	else
-		value=ms_strdup_printf("%c%c%c%c",((char*)&charater)[0],((char*)&charater)[1],((char*)&charater)[2],((char*)&charater)[3]);
-	sal_op_set_sent_custom_header(op,sal_custom_header_append(NULL,"X-RTT",value));
-	ms_free(value);
-	if (call->dir==LinphoneCallOutgoing) {
-		from = sal_op_get_from(call->op);
-	} else {
-		from = sal_op_get_to(call->op);
-	}
-	sal_message_send(op
-					, from
-					, cr->peer
-					, "application/im-iscomposing+xml"
-					, content
-					, NULL);
 
+int linphone_chat_message_put_char(LinphoneChatMessage *msg, uint32_t charater) {
+	LinphoneChatRoom *cr = linphone_chat_message_get_chat_room(msg);
+	LinphoneCall *call = cr->call;
+	
+	if (!call || !call->textstream) {
+		return -1;
+	}
+	
+	text_stream_putchar32(call->textstream, charater);
+	
 	return 0;
 }
 static int linphone_chat_room_stop_composing(void *data, unsigned int revents) {
diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 1497944db..0ed8d1970 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -3151,7 +3151,41 @@ static void linphone_call_start_video_stream(LinphoneCall *call, LinphoneCallSta
 }
 
 static void linphone_call_start_text_stream(LinphoneCall *call) {
-	//TODO textstream
+	LinphoneCore *lc = call->core;
+	int used_pt = -1;
+	const SalStreamDescription *tstream;
+	
+	tstream = sal_media_description_find_best_stream(call->resultdesc, SalText);
+	if (tstream != NULL && tstream->dir != SalStreamInactive && tstream->rtp_port != 0) {
+		const char *rtp_addr=tstream->rtp_addr[0]!='\0' ? tstream->rtp_addr : call->resultdesc->addr;
+		const char *rtcp_addr=tstream->rtcp_addr[0]!='\0' ? tstream->rtcp_addr : call->resultdesc->addr;
+		const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, tstream->proto, SalText);
+		bool_t is_multicast = ms_is_multicast(rtp_addr);
+		call->text_profile = make_profile(call, call->resultdesc, tstream, &used_pt);
+
+		if (used_pt != -1) {
+			call->current_params->text_codec = rtp_profile_get_payload(call->text_profile, used_pt);
+			call->current_params->realtimetext_enabled=TRUE;
+
+			if (sal_stream_description_has_srtp(tstream) == TRUE) {
+				int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, tstream->crypto_local_tag);
+				if (crypto_idx >= 0) {
+					ms_media_stream_sessions_set_srtp_recv_key_b64(&call->textstream->ms.sessions, tstream->crypto[0].algo,tstream->crypto[0].master_key);
+					ms_media_stream_sessions_set_srtp_send_key_b64(&call->textstream->ms.sessions, tstream->crypto[0].algo,local_st_desc->crypto[crypto_idx].master_key);
+				}
+			}
+			configure_rtp_session_for_rtcp_fb(call, tstream);
+			configure_rtp_session_for_rtcp_xr(lc, call, SalText);
+			
+			if (is_multicast) rtp_session_set_multicast_ttl(call->textstream->ms.sessions.rtp_session,tstream->ttl);
+			
+			text_stream_start(call->textstream, call->text_profile, rtp_addr, tstream->rtp_port, rtcp_addr, (linphone_core_rtcp_enabled(lc) && !is_multicast)  ? (tstream->rtcp_port ? tstream->rtcp_port : tstream->rtp_port + 1) : 0, used_pt);
+
+			ms_media_stream_sessions_set_encryption_mandatory(&call->textstream->ms.sessions,linphone_core_is_media_encryption_mandatory(call->core));
+		} else ms_warning("No text stream accepted.");
+	} else {
+		ms_message("No valid text stream defined.");
+	}
 }
 
 static void setZrtpCryptoTypesParameters(MSZrtpParams *params, LinphoneCore *lc)