--- empathy_orig/empathy-2.34.0/src/empathy-preferences.ui	2011-02-10 07:10:25.000000000 -0500
+++ empathy-2.34.0/src/empathy-preferences.ui	2012-01-29 20:50:34.000000000 -0500
@@ -147,6 +147,19 @@
                                 <property name="position">3</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_telltyping">
+                                <property name="label" translatable="yes">Tell others when I am typing to them</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
--- empathy_orig/empathy-2.34.0/src/empathy-preferences.c	2011-03-24 11:15:16.000000000 -0400
+++ empathy-2.34.0/src/empathy-preferences.c	2012-01-29 20:59:59.000000000 -0500
@@ -66,6 +66,7 @@
 	GtkWidget *checkbutton_sounds_disabled_away;
 	GtkWidget *treeview_sounds;
 
+	GtkWidget *checkbutton_telltyping;
 	GtkWidget *checkbutton_notifications_enabled;
 	GtkWidget *checkbutton_notifications_disabled_away;
 	GtkWidget *checkbutton_notifications_focus;
@@ -231,10 +232,16 @@
 			 G_SETTINGS_BIND_DEFAULT);
 
 	g_settings_bind (priv->gsettings_chat,
+			 EMPATHY_PREFS_CHAT_TELLTYPING,
+			 priv->checkbutton_telltyping,
+			 "active",
+			 G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (priv->gsettings_chat,
 			 EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
 			 priv->checkbutton_show_smileys,
 			 "active",
 			 G_SETTINGS_BIND_DEFAULT);
+
 	g_settings_bind (priv->gsettings_chat,
 			 EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS,
 			 priv->checkbutton_show_contacts_in_rooms,
@@ -895,6 +902,7 @@
 		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
 		"checkbutton_autoconnect", &priv->checkbutton_autoconnect,
 		"checkbutton_logging", &priv->checkbutton_logging,
+		"checkbutton_telltyping", &priv->checkbutton_telltyping,
 		"checkbutton_notifications_enabled", &priv->checkbutton_notifications_enabled,
 		"checkbutton_notifications_disabled_away", &priv->checkbutton_notifications_disabled_away,
 		"checkbutton_notifications_focus", &priv->checkbutton_notifications_focus,
--- empathy_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-01-29 20:31:56.000000000 -0500
@@ -307,12 +307,20 @@
 chat_composing_stop_timeout_cb (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv;
+	gboolean telltyping;
 
 	priv = GET_PRIV (chat);
 
 	priv->composing_stop_timeout_id = 0;
-	empathy_tp_chat_set_state (priv->tp_chat,
-				   TP_CHANNEL_CHAT_STATE_PAUSED);
+
+	telltyping = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_TELLTYPING);
+	if (! telltyping) {
+		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 telltyping;
 
 	priv = GET_PRIV (chat);
 
+	telltyping = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_TELLTYPING);
+	if (! telltyping) {
+		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 telltyping;
 
 	priv = GET_PRIV (chat);
 
+	telltyping = g_settings_get_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_TELLTYPING);
+	if (! telltyping) {
+		return;
+	}
+
 	chat_composing_remove_timeout (chat);
 	empathy_tp_chat_set_state (priv->tp_chat,
 				   TP_CHANNEL_CHAT_STATE_ACTIVE);
--- empathy_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-01-29 20:39:43.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_TELLTYPING              "telltyping"
 
 #define EMPATHY_PREFS_UI_SCHEMA EMPATHY_PREFS_SCHEMA ".ui"
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     "separate-chat-windows"
--- empathy_orig/empathy-2.34.0/data/empathy.convert	2011-03-24 11:15:16.000000000 -0400
+++ empathy-2.34.0/data/empathy.convert	2012-01-29 20:48:33.000000000 -0500
@@ -50,6 +50,7 @@
 theme = /apps/empathy/conversation/theme
 adium-path = /apps/empathy/conversation/adium_path
 enable-webkit-developer-tools = /apps/empathy/conversation/enable_webkit_developer_tools
+telltyping = /apps/empathy/conversation/telltyping
 theme-chat-room = /apps/empathy/conversation/theme_chat_room
 spell-checker-languages = /apps/empathy/conversation/spell_checker_languages
 spell-checker-enabled = /apps/empathy/conversation/spell_checker_enabled
--- empathy_orig/empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in	2011-03-24 11:15:16.000000000 -0400
+++ empathy-2.34.0/data/org.gnome.Empathy.gschema.xml.in	2012-01-29 20:49:04.000000000 -0500
@@ -194,6 +194,11 @@
       <_summary>Enable WebKit Developer Tools</_summary>
       <_description>Whether WebKit developer tools, such as the Web Inspector, should be enabled.</_description>
     </key>
+    <key type="b" name="telltyping">
+      <default>true</default>
+      <summary>Tell typing</summary>
+      <description>Whether the person you are typing to should be informed when you start and stop typing.</description>
+    </key>
     <key name="theme-chat-room" type="b">
       <default>true</default>
       <_summary>Use theme for chat rooms</_summary>
