diff --git a/indra/newview/skins/default/xui/de/menu_avs_list.xml b/indra/newview/skins/default/xui/de/menu_avs_list.xml
index ed8f51903..dcf9ddfb1 100644
--- a/indra/newview/skins/default/xui/de/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/de/menu_avs_list.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Avatar Menu">
   <menu_item_call label="Profil" name="Profile"/>
-  <menu_item_call label="Web Profil" name="Web Profile"/>
-  <menu_item_call label="Bezahlen" name="Pay"/>
-  <menu_item_call label="Instant Message" name="Instant Message"/>
-  <menu_item_call label="Konferenz-Chat" name="Conference Chat"/>
-  <menu_item_call label="Anrufen" name="Call"/>
-  <menu_item_call label="Konferenzgespräch" name="Conference Call"/>
-  <menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-  <menu_item_call label="Freund entfernen" name="Remove Friend"/>
-  <menu_item_call label="Gruppeneinladung schicken" name="Invite To Group"/>
-  <menu_item_call label="Teleport anbieten" name="Offer Teleport"/>
-  <!--menu_item_call label="Request Teleport" name="Request Teleport">
-    <on_click function="List.RequestTeleport"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call-->
-  
-  <menu_item_call label="Stummschaltung" name="Mute/Unmute"/>
-  <!--menu_item_call label="Report Abuse" name="Report Abuse">
-    <on_click function="List.ReportAbuse"/>
-    <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call-->
-  <menu_item_call label="Kopiere Schlüssel" name="Copy Key"/>
+  <menu label="Avatar" name="Avatar">
+    <menu_item_call label="Web Profil" name="Web Profile"/>
+    <menu_item_call label="Bezahlen" name="Pay"/>
+    <menu_item_call label="Instant Message" name="Instant Message"/>
+    <menu_item_call label="Konferenz-Chat" name="Conference Chat"/>
+    <menu_item_call label="Anrufen" name="Call"/>
+    <menu_item_call label="Konferenzgespräch" name="Conference Call"/>
+    <menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+    <menu_item_call label="Freund entfernen" name="Remove Friend"/>
+    <menu_item_call label="Gruppeneinladung schicken" name="Invite To Group"/>
+    <menu_item_call label="Teleport anbieten" name="Offer Teleport"/>
+    <menu_item_call label="Kopiere Schlüssel" name="Copy Key"/>
+  </menu>
+  <menu label="Moderation" name="Moderation">
+    <menu_item_call label="Stummschaltung" name="Mute/Unmute"/>
+  </menu>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_local_avs.xml b/indra/newview/skins/default/xui/de/menu_local_avs.xml
new file mode 100644
index 000000000..e1ccfd3c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_local_avs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Local Avs Menu">
+  <menu_item_call label="Profile" name="Profile"/>
+  <menu label="Avatar" name="Avatar">
+    <menu_item_call label="Web Profil" name="Web Profile"/>
+    <menu_item_call label="Bezahlen" name="Pay"/>
+    <menu_item_call label="Instant Message" name="Instant Message"/>
+    <menu_item_call label="Konferenz-Chat" name="Conference Chat"/>
+    <menu_item_call label="Anrufen" name="Call"/>
+    <menu_item_call label="Konferenzgespräch" name="Conference Call"/>
+    <menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+    <menu_item_call label="Freund entfernen" name="Remove Friend"/>
+    <menu_item_call label="Gruppeneinladung schicken" name="Invite To Group"/>
+    <menu_item_call label="Teleport anbieten" name="Offer Teleport"/>
+    <menu_item_call label="Kopiere Schlüssel" name="Copy Key"/>
+  </menu>
+  <menu label="Moderation" name="Moderation">
+    <menu_item_call label="Stummschaltung" name="Mute/Unmute"/>
+  </menu>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index ddb072ba8..b73656bdd 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profil anzeigen" name="show_agent"/>
 	<menu_item_call label="IM senden..." name="send_im"/>
+  <menu name="Actions" label="Actions">
+	<menu_item_call label="Profil anzeigen" name="show_agent"/>
 	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
 	<menu_item_call label="Freund entfernen..." name="remove_friend"/>
+  </menu>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
index a6eb22eca..a22aad8ea 100644
--- a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
@@ -56,18 +56,18 @@
       <on_click function="Text.Url.Ext" userdata="Share"/>
       <on_visible function="Text.Url.ExtVisible" userdata="Share"/>
     </menu_item_call>
-  <menu_item_call label="Chat History" name="Chat History">
-    <on_click function="Text.Url.Ext" userdata="ShowLog"/>
-      <on_visible function="Text.Url.ExtVisible" userdata="ShowLog"/>
-  </menu_item_call>
-  <menu_item_call label="Track/Untrack" name="Track/Untrack">
-    <on_click function="Text.Url.Ext" userdata="Track"/>
-    <on_visible function="Text.Url.ExtVisible" userdata="Track"/>
-  </menu_item_call>
-  <menu_item_call label="Focus" name="Focus">
-    <on_click function="Text.Url.Ext" userdata="Focus"/>
-    <on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
-  </menu_item_call>
+    <menu_item_call label="Chat History" name="Chat History">
+      <on_click function="Text.Url.Ext" userdata="ShowLog"/>
+        <on_visible function="Text.Url.ExtVisible" userdata="ShowLog"/>
+    </menu_item_call>
+    <menu_item_call label="Track/Untrack" name="Track/Untrack">
+      <on_click function="Text.Url.Ext" userdata="Track"/>
+      <on_visible function="Text.Url.ExtVisible" userdata="Track"/>
+    </menu_item_call>
+    <menu_item_call label="Focus" name="Focus">
+      <on_click function="Text.Url.Ext" userdata="Focus"/>
+      <on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
+    </menu_item_call>
   </menu>
   <menu_item_separator
     layout="topleft" />
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 2c7443c6c..2a1d2ad51 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil" name="show_agent"/>
 	<menu_item_call label="Envoyer IM..." name="send_im"/>
+  <menu name="Actions" label="Actions">
+	<menu_item_call label="Voir le profil" name="show_agent"/>
 	<menu_item_call label="Devenir amis..." name="add_friend"/>
 	<menu_item_call label="Supprimer cet ami..." name="remove_friend"/>
+  </menu>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index e5c20fb9e..15a28c0e0 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Vedi profilo" name="show_agent"/>
 	<menu_item_call label="Manda IM..." name="send_im"/>
+  <menu name="Actions" label="Actions">
+	<menu_item_call label="Vedi profilo" name="show_agent"/>
 	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
 	<menu_item_call label="Togli amicizia..." name="remove_friend"/>
+  </menu>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index 102df18b2..a24b287d6 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Exibir perfil" name="show_agent"/>
 	<menu_item_call label="Enviar MI..." name="send_im"/>
+  <menu name="Actions" label="Actions">
+	<menu_item_call label="Exibir perfil" name="show_agent"/>
 	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
 	<menu_item_call label="Remover amigo..." name="remove_friend"/>
+  </menu>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>