diff --git a/lib/event_ds.dart b/lib/event_ds.dart
index bbd20c5..5eef2c7 100644
--- a/lib/event_ds.dart
+++ b/lib/event_ds.dart
@@ -371,8 +371,28 @@ class EventData {
                 return quote;
               }
             }
+
+            String tag = "";
+            switch(tags[n][0]) {
+            case "p":
+              tag = "@";
+              break;
+            case "e":
+              tag = "#";
+              break;
+            case "%": // something else for future
+              tag = "%";
+              break;
+            default: 
+              tag = "@";
+            }
+
+
+            return tag+mentionedId;
+
           }
         }
+
         return mentionTag;
       }
       if( gDebug > 0) printWarning("In replaceMentions returning nothing");