diff --git a/pages/zone.php b/pages/zone.php
index 6af9e3af..7b5e2063 100644
--- a/pages/zone.php
+++ b/pages/zone.php
@@ -143,11 +143,11 @@ class ZonePage extends GenericPage
         {
             // entry always contains: type, id, name, level, coords[]
             if (!isset($som[$what][$entry['name']]))        // not found yet
-                $som[$what][$entry['name']][] = $entry;
+                $som[$what][$entry['id']][] = $entry;
             else                                            // found .. something..
             {
                 // check for identical floors
-                foreach ($som[$what][$entry['name']] as &$byFloor)
+                foreach ($som[$what][$entry['id']] as &$byFloor)
                 {
                     if ($byFloor['level'] != $entry['level'])
                         continue;
@@ -158,7 +158,7 @@ class ZonePage extends GenericPage
                 }
 
                 // floor not used yet, create it
-                $som[$what][$entry['name']][] = $entry;
+                $som[$what][$entry['id']][] = $entry;
             }
         };
 
@@ -215,6 +215,10 @@ class ZonePage extends GenericPage
                     case  9:
                         $what = 'book';
                         break;
+                    case 0:
+                        if ($tpl['type'] == 19)
+                            $what = 'mail';
+                        break;
                     case -6:
                         if ($tpl['spellFocusId'] == 1)
                             $what = 'anvil';
@@ -225,13 +229,20 @@ class ZonePage extends GenericPage
                 }
 
                 if ($what)
-                    $addToSOM($what, array(
+                {
+                    $blob = array(
                         'coords' => [[$spawn['posX'], $spawn['posY']]],
                         'level'  => $spawn['floor'],
                         'name'   => $n,
                         'type'   => TYPE_OBJECT,
                         'id'     => $tpl['id']
-                    ));
+                    );
+
+                    if ($what == 'mail')
+                       $blob['side'] = (($tpl['A'] < 0 ? 0 : 0x1) | ($tpl['H'] < 0 ? 0 : 0x2));
+
+                    $addToSOM($what, $blob);
+                }
 
                 if ($tpl['startsQuests'])
                 {
diff --git a/static/js/ShowOnMap.js b/static/js/ShowOnMap.js
index 88603286..9d80f993 100644
--- a/static/js/ShowOnMap.js
+++ b/static/js/ShowOnMap.js
@@ -107,8 +107,10 @@ ShowOnMap.prototype.construct = function() {
                 }
                 if (nCoords > 0) {
                     var url = (g_types[group[p][0].type] && group[p][0].id ? '?' + g_types[group[p][0].type] + '=' + group[p][0].id : '');
-                    legend[submenu.length+1] = [p, url];
-                    entry.push(p + $WH.sprintf(LANG.qty, nPins));
+                    // legend[submenu.length+1] = [p, url]; aowow - switch to numeric groupIdx to support mail
+                    // entry.push(p + $WH.sprintf(LANG.qty, nPins));
+                    legend[submenu.length+1] = [group[p][0].name, url];
+                    entry.push(group[p][0].name + $WH.sprintf(LANG.qty, nPins));
                     entry.push(this.showStuff.bind(this, coords, [i, i2], legend));
                     submenu.push(entry);
                     for (var l in coords) {
diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js
index 73b51826..78e2f19b 100644
--- a/static/js/locale_dede.js
+++ b/static/js/locale_dede.js
@@ -3242,7 +3242,8 @@ var LANG = {
         vein:           "Erzadern",
         spirithealer:   "Geistheiler",
         boss:           "Bosse",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                      // aowow - custom
+        mail:           "Briefkästen"
     },
 
     markup_b:       "Fett",
diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js
index e7beae61..df62ee84 100644
--- a/static/js/locale_enus.js
+++ b/static/js/locale_enus.js
@@ -3290,7 +3290,8 @@ var LANG = {
         vein:           "Mineral Veins",
         spirithealer:   "Spirit Healers",
         boss:           "Bosses",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                      // aowow - custom
+        mail:           "Mailbox"
     },
 
     markup_b:       "Bold",
diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js
index 44255f68..b4fd023d 100644
--- a/static/js/locale_eses.js
+++ b/static/js/locale_eses.js
@@ -3243,7 +3243,8 @@ var LANG = {
         vein:           "Venas de minerales",
         spirithealer:   "Espíritus sanadores",
         boss:           "Jefes",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                      // aowow - custom
+        mail:           "Buzón"
     },
 
     markup_b:       "Negrita",
diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js
index d9c34ada..287f2e32 100644
--- a/static/js/locale_frfr.js
+++ b/static/js/locale_frfr.js
@@ -3243,7 +3243,8 @@ var LANG = {
         vein:           "Filons de minerai",
         spirithealer:   "Esprits soigneurs",
         boss:           "Boss",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                       // aowow - custom
+        mail:           "Boîte aux lettres"
     },
 
     markup_b:       "Gras",
diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js
index d56628e5..d43d6c48 100644
--- a/static/js/locale_ruru.js
+++ b/static/js/locale_ruru.js
@@ -3243,7 +3243,8 @@ var LANG = {
         vein:           "Полезные ископаемые",
         spirithealer:   "Целители душ",
         boss:           "Боссы",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                      // aowow - custom
+        mail:           "Почтовый ящик"
     },
 
     markup_b:       "Жирный",
diff --git a/static/js/locale_zhcn.js b/static/js/locale_zhcn.js
index d2efc3fc..06b92a03 100644
--- a/static/js/locale_zhcn.js
+++ b/static/js/locale_zhcn.js
@@ -3290,7 +3290,8 @@ var LANG = {
         vein:           "矿点",
         spirithealer:   "灵魂医者",
         boss:           "首领",
-        areatrigger:    "Areatrigger"                       // aowow - custom
+        areatrigger:    "Areatrigger",                      // aowow - custom
+        mail:           "邮箱"
     },
 
     markup_b:       "勇敢",