--- emp_orig/empathy-2.34.0/libempathy-gtk/empathy-chat.c	2011-03-24 11:15:16.000000000 -0400
+++ empathy-2.34.0/libempathy-gtk/empathy-chat.c	2012-02-03 20:33:29.000000000 -0500
@@ -307,12 +307,20 @@
 chat_composing_stop_timeout_cb (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean send_chat_states;
 
 	priv = GET_PRIV (chat);
 
 	priv->composing_stop_timeout_id = 0;
-	empathy_tp_chat_set_state (priv->tp_chat,
-				   TP_CHANNEL_CHAT_STATE_PAUSED);
+
+	send_chat_states = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_SEND_CHAT_STATES);
+	if (!send_chat_states) {
+		empathy_tp_chat_set_state (priv->tp_chat,
+		                           TP_CHANNEL_CHAT_STATE_ACTIVE);
+	} else {
+		empathy_tp_chat_set_state (priv->tp_chat,
+		                           TP_CHANNEL_CHAT_STATE_PAUSED);
+	}
 
 	return FALSE;
 }
@@ -321,9 +329,15 @@
 chat_composing_start (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean send_chat_states;
 
 	priv = GET_PRIV (chat);
 
+	send_chat_states = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_SEND_CHAT_STATES);
+	if (!send_chat_states) {
+		return;
+	}
+
 	if (priv->composing_stop_timeout_id) {
 		/* Just restart the timeout */
 		chat_composing_remove_timeout (chat);
@@ -342,9 +356,15 @@
 chat_composing_stop (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean send_chat_states;
 
 	priv = GET_PRIV (chat);
 
+	send_chat_states = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_SEND_CHAT_STATES);
+	if (!send_chat_states) {
+		return;
+	}
+
 	chat_composing_remove_timeout (chat);
 	empathy_tp_chat_set_state (priv->tp_chat,
 				   TP_CHANNEL_CHAT_STATE_ACTIVE);
--- emp_orig/empathy-2.34.0/libempathy/empathy-gsettings.h	2011-03-24 11:15:16.000000000 -0400
+++ empathy-2.34.0/libempathy/empathy-gsettings.h	2012-02-03 20:34:36.000000000 -0500
@@ -62,6 +62,7 @@
 #define EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR    "nick-completion-char"
 #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON          "avatar-in-icon"
 #define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS  "enable-webkit-developer-tools"
+#define EMPATHY_PREFS_CHAT_SEND_CHAT_STATES        "send-chat-states"
 
 #define EMPATHY_PREFS_UI_SCHEMA EMPATHY_PREFS_SCHEMA ".ui"
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     "separate-chat-windows"
