diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
index 0f2872d76..495468651 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Highlight.kt
@@ -75,6 +75,7 @@ fun RenderHighlight(
 
     DisplayHighlight(
         highlight = noteEvent.quote(),
+        context = noteEvent.context(),
         authorHex = noteEvent.author(),
         url = noteEvent.inUrl(),
         postAddress = noteEvent.inPost(),
@@ -92,6 +93,7 @@ fun RenderHighlight(
 @Composable
 fun DisplayHighlight(
     highlight: String,
+    context: String?,
     authorHex: String?,
     url: String?,
     postAddress: ATag?,
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/HighlightEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/HighlightEvent.kt
index 398e46fbc..81d92b510 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/HighlightEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/HighlightEvent.kt
@@ -40,6 +40,8 @@ class HighlightEvent(
 
     fun quote() = content
 
+    fun context() = firstTagFor("context")
+
     fun inPost() = firstTaggedAddress()
 
     fun inPostVersion() = firstTaggedEvent()