diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5a877e72a..49399a111 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5073,6 +5073,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableGestureSoundsSelf</key>
+    <map>
+      <key>Comment</key>
+      <string>Play sounds from your gestures when EnableGestureSounds is false. (Useless otherewise)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnableMouselook</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 63a71f5fb..110876bad 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4853,7 +4853,9 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	// Don't play sounds from gestures if they are not enabled.
 	if (object_id == owner_id && !gSavedSettings.getBOOL("EnableGestureSounds"))
 	{
-		return;
+		// Don't mute own gestures, if they're not muted.
+		if(owner_id != gAgent.getID() || !gSavedSettings.getBOOL("EnableGestureSoundsSelf"))
+			return;
 	}
 		
 	// <edit>