diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index ed80ed2a..3e55750f 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -1014,5 +1014,32 @@
   "General settings": "General settings",
   "Unsubscribe to WebPush": "Unsubscribe to WebPush",
   "WebPush": "WebPush",
-  "You can't use webpush in this browser.": "You can't use webpush in this browser."
+  "You can't use webpush in this browser.": "You can't use webpush in this browser.",
+  "Notify participants": "Notify participants",
+  "Browser notifications": "Browser notifications",
+  "Unsubscribe to browser notifications": "Unsubscribe to browser notifications",
+  "Activate browser notification": "Activate browser notification",
+  "You can't use notifications in this browser.": "You can't use notifications in this browser.",
+  "Notification settings": "Notification settings",
+  "Select the activities for which you wish to receive an email or a push notification.": "Select the activities for which you wish to receive an email or a push notification.",
+  "Push": "Push",
+  "Mentions": "Mentions",
+  "I've been mentionned in a comment under an event": "I've been mentionned in a comment under an event",
+  "I've been mentionned in a group discussion": "I've been mentionned in a group discussion",
+  "An event I'm going to has been updated": "An event I'm going to has been updated",
+  "An event I'm going to has posted an announcement": "An event I'm going to has posted an announcement",
+  "An event I'm organizing has a new pending participation": "An event I'm organizing has a new pending participation",
+  "An event I'm organizing has a new participation": "An event I'm organizing has a new participation",
+  "An event I'm organizing has a new comment": "An event I'm organizing has a new comment",
+  "Group activity": "Group activity",
+  "An event from one of my groups has been published": "An event from one of my groups has been published",
+  "An event from one of my groups has been updated or deleted": "An event from one of my groups has been updated or deleted",
+  "A discussion has been created or updated": "A discussion has been created or updated",
+  "A post has been published": "A post has been published",
+  "A post has been updated": "A post has been updated",
+  "A resource has been created or updated": "A resource has been created or updated",
+  "A member requested to join one of my groups": "A member requested to join one of my groups",
+  "A member has been updated": "A member has been updated",
+  "User settings": "User settings",
+  "You changed your email or password": "You changed your email or password"
 }
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index 4b568397..95e3723a 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -1105,5 +1105,32 @@
   "General settings": "Paramètres généraux",
   "Unsubscribe to WebPush": "Se désinscrire de WebPush",
   "WebPush": "WebPush",
-  "You can't use webpush in this browser.": "Vous ne pouvez pas utiliser webpush dans ce navigateur."
+  "You can't use webpush in this browser.": "Vous ne pouvez pas utiliser webpush dans ce navigateur.",
+  "Notify participants": "Notifier les participant⋅es",
+  "Browser notifications": "Notifications du navigateur",
+  "Unsubscribe to browser notifications": "Se désabonner des notifications du navigateur",
+  "Activate browser notification": "Activer le notifications du navigateur",
+  "You can't use notifications in this browser.": "Vous ne pouvez pas utiliser les notifications dans ce navigateur.",
+  "Notification settings": "Paramètres des notifications",
+  "Select the activities for which you wish to receive an email or a push notification.": "Sélectionnez les activités pour lesquelles vous souhaitez recevoir un email ou une notification push.",
+  "Push": "Push",
+  "Mentions": "Mentions",
+  "I've been mentionned in a comment under an event": "J'ai été mentionné⋅e dans un commentaire sous un événement",
+  "I've been mentionned in a group discussion": "J'ai été mentionné⋅e dans une discussion d'un groupe",
+  "An event I'm going to has been updated": "Un événement auquel je participe a été mis à jour",
+  "An event I'm going to has posted an announcement": "Un événement auquel je participe a posté une mise à jour",
+  "An event I'm organizing has a new pending participation": "Un événement que j'organise a une nouvelle participation en attente",
+  "An event I'm organizing has a new participation": "Un événement que j'organise a une nouvelle participation",
+  "An event I'm organizing has a new comment": "Un événement que j'organise a un nouveau commentaire",
+  "Group activity": "Activité des groupes",
+  "An event from one of my groups has been published": "Un événement d'un de mes groupes a été publié",
+  "An event from one of my groups has been updated or deleted": "Un événement d'un de mes groupes a été mis à jour ou supprimé",
+  "A discussion has been created or updated": "Une discussion a été créée ou mise à jour",
+  "A post has been published": "Un billet a été publié",
+  "A post has been updated": "Un billet a été mis à jour",
+  "A resource has been created or updated": "Une resource a été créée ou mise à jour",
+  "A member requested to join one of my groups": "Un membre a demandé a rejoindre l'un de mes groupes",
+  "A member has been updated": "Un membre a été mis à jour",
+  "User settings": "Paramètres utilisateur⋅ices",
+  "You changed your email or password": "Vous avez modifié votre email ou votre mot de passe"
 }
diff --git a/priv/gettext/activity.pot b/priv/gettext/activity.pot
index 3dcd2c33..bd0a8f40 100644
--- a/priv/gettext/activity.pot
+++ b/priv/gettext/activity.pot
@@ -11,40 +11,40 @@ msgid ""
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -75,10 +75,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -95,7 +95,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -113,16 +113,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -153,7 +153,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -195,7 +195,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -213,14 +213,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -235,6 +235,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/ar/LC_MESSAGES/activity.po b/priv/gettext/ar/LC_MESSAGES/activity.po
index 496fa0dd..59de48dc 100644
--- a/priv/gettext/ar/LC_MESSAGES/activity.po
+++ b/priv/gettext/ar/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=6\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -244,6 +244,28 @@ msgstr[4] ""
 msgstr[5] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/ar/LC_MESSAGES/errors.po b/priv/gettext/ar/LC_MESSAGES/errors.po
index fb6d0cd8..02ea3704 100644
--- a/priv/gettext/ar/LC_MESSAGES/errors.po
+++ b/priv/gettext/ar/LC_MESSAGES/errors.po
@@ -135,7 +135,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -161,18 +161,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -180,49 +180,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -232,17 +232,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -267,12 +267,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -307,47 +307,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -397,8 +397,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -592,7 +592,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -652,7 +652,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -697,7 +697,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -722,17 +722,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -802,12 +802,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -837,7 +837,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -863,7 +863,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -873,6 +873,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/be/LC_MESSAGES/activity.po b/priv/gettext/be/LC_MESSAGES/activity.po
index acf443d6..c3c277e9 100644
--- a/priv/gettext/be/LC_MESSAGES/activity.po
+++ b/priv/gettext/be/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=3\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -238,6 +238,28 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/be/LC_MESSAGES/errors.po b/priv/gettext/be/LC_MESSAGES/errors.po
index 3776146f..7ae1e0af 100644
--- a/priv/gettext/be/LC_MESSAGES/errors.po
+++ b/priv/gettext/be/LC_MESSAGES/errors.po
@@ -109,7 +109,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -135,18 +135,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -154,49 +154,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -206,17 +206,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -281,47 +281,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -371,8 +371,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -626,7 +626,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -646,7 +646,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -696,17 +696,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -776,12 +776,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -811,7 +811,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -847,6 +847,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/ca/LC_MESSAGES/activity.po b/priv/gettext/ca/LC_MESSAGES/activity.po
index f02a0410..25c4bd24 100644
--- a/priv/gettext/ca/LC_MESSAGES/activity.po
+++ b/priv/gettext/ca/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/ca/LC_MESSAGES/errors.po b/priv/gettext/ca/LC_MESSAGES/errors.po
index fa2a6bbc..1bbc59ec 100644
--- a/priv/gettext/ca/LC_MESSAGES/errors.po
+++ b/priv/gettext/ca/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "El perfil actual no administra el grup seleccionat"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "No s'han pogut desar les preferències"
 
@@ -136,18 +136,18 @@ msgid "Member not found"
 msgstr "No s'ha trobat el/la membre"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -155,49 +155,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -207,17 +207,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -242,12 +242,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -257,7 +257,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -282,47 +282,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -372,8 +372,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -697,17 +697,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -777,12 +777,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -812,7 +812,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -838,7 +838,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -848,6 +848,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/cs/LC_MESSAGES/activity.po b/priv/gettext/cs/LC_MESSAGES/activity.po
index b1d9bc2f..25f5115e 100644
--- a/priv/gettext/cs/LC_MESSAGES/activity.po
+++ b/priv/gettext/cs/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=3\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -238,6 +238,28 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/cs/LC_MESSAGES/errors.po b/priv/gettext/cs/LC_MESSAGES/errors.po
index 0c2d0a70..aa7bf3d8 100644
--- a/priv/gettext/cs/LC_MESSAGES/errors.po
+++ b/priv/gettext/cs/LC_MESSAGES/errors.po
@@ -109,7 +109,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -135,18 +135,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -154,49 +154,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -206,17 +206,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -241,12 +241,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -281,47 +281,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -371,8 +371,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -500,7 +500,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -566,7 +566,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -626,7 +626,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -646,7 +646,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -696,17 +696,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -776,12 +776,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -811,7 +811,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -847,6 +847,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/activity.po b/priv/gettext/de/LC_MESSAGES/activity.po
index db677c96..ed1caefd 100644
--- a/priv/gettext/de/LC_MESSAGES/activity.po
+++ b/priv/gettext/de/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po
index 3aaf076c..42f54daa 100644
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Aktuelles Profil ist kein Administrator der ausgewählten Gruppe"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Fehler beim Speichern von Benutzereinstellungen"
 
@@ -138,19 +138,19 @@ msgid "Member not found"
 msgstr "Mitglied wurde nicht gefunden"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Kein Profil für den Moderator-Benutzer gefunden"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 "Es wurde kein Benutzer gefunden, der mit dieser E-Mail validiert werden kann"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Es wurde kein Benutzer mit dieser E-Mail gefunden"
 
@@ -158,51 +158,51 @@ msgstr "Es wurde kein Benutzer mit dieser E-Mail gefunden"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Profil ist nicht im Besitz des authentifizierten Benutzers"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Registrierungen sind nicht geöffnet"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Das aktuelle Passwort ist ungültig"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Die neue E-Mail scheint nicht gültig zu sein"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Die neue E-Mail muss anders lauten"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Das neue Passwort muss anders lauten"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Das angegebene Passwort ist ungültig"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Das von Ihnen gewählte Passwort ist zu kurz. Bitte stellen Sie sicher, dass "
 "Ihr Passwort mindestens 6 Zeichen enthält."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Dieser Benutzer kann sein Passwort nicht zurücksetzen"
 
@@ -212,17 +212,17 @@ msgid "This user has been disabled"
 msgstr "Dieser Benutzer wurde deaktiviert"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Benutzer kann nicht validiert werden"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Benutzer bereits deaktiviert"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "Angeforderter Benutzer ist nicht eingeloggt"
 
@@ -249,12 +249,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Sie dürfen keine Gruppen auflisten, es sei denn, Sie sind Moderator."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Sie müssen eingeloggt sein, um Ihre E-Mail zu ändern"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Sie müssen eingeloggt sein, um Ihr Passwort zu ändern"
 
@@ -264,7 +264,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Sie müssen eingeloggt sein, um eine Gruppe zu löschen"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Sie müssen eingeloggt sein, um Ihr Konto zu löschen"
 
@@ -290,47 +290,47 @@ msgstr ""
 "Sie müssen ein bestehendes Token haben, um ein Refresh-Token zu erhalten"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Sie haben erneut eine Bestätigungs-E-Mail zu früh angefordert"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Ihre E-Mail ist nicht in der Zulassungsliste enthalten"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Fehler beim Ausführen einer Hintergrundaufgabe"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Kein Profil mit dieser ID gefunden"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Kein entferntes Profil mit dieser ID gefunden"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Nur Moderatoren und Administratoren können ein Profil sperren"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Nur Moderatoren und Administratoren können ein Profil unsuspendieren"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Nur entfernte Profile können aufgefrischt werden"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Profil bereits gesperrt"
 
@@ -380,8 +380,8 @@ msgid "Event id not found"
 msgstr "Veranstaltungs-ID nicht gefunden"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Veranstaltung nicht gefunden"
 
@@ -511,7 +511,7 @@ msgid "Token is not a valid UUID"
 msgstr "Token ist keine gültige UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "User nicht gefunden"
 
@@ -582,7 +582,7 @@ msgid "You cannot delete this comment"
 msgstr "Sie können diesen Kommentar nicht löschen"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Sie können diese Veranstaltung nicht löschen"
 
@@ -652,7 +652,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Sie müssen eingeloggt sein, um auf Ressourcen zugreifen zu können"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Sie müssen eingeloggt sein, um Ereignisse zu erstellen"
 
@@ -672,7 +672,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Sie müssen eingeloggt sein, um Ressourcen zu erstellen"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Sie müssen eingeloggt sein, um ein Ereignis zu löschen"
 
@@ -697,7 +697,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Sie müssen eingeloggt sein, um eine Veranstaltung zu verlassen"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Sie müssen eingeloggt sein, um ein Ereignis zu aktualisieren"
 
@@ -722,19 +722,19 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "Die übergeordnete Ressource gehört nicht zu dieser Gruppe"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Das gewählte Passwort ist zu kurz."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "Das Registrierungs-Token ist bereits in Gebrauch, dies sieht nach einem "
 "Problem auf unserer Seite aus."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Diese E-Mail wird bereits verwendet."
 
@@ -804,12 +804,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Profil ist nicht Administrator für die Gruppe"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Sie können dieses Ereignis nicht bearbeiten."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Sie können dieses Ereignis nicht diesem Profil zuordnen."
 
@@ -841,7 +841,7 @@ msgstr ""
 "zuzugreifen"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Organizer-Profil ist nicht im Besitz des Benutzers"
 
@@ -867,7 +867,7 @@ msgid "Error while creating resource"
 msgstr "Fehler beim Speichern des Reports"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -877,6 +877,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Dieses Moderatorenprofil hat keine Berechtigung für diese Veranstaltung"
diff --git a/priv/gettext/en/LC_MESSAGES/activity.po b/priv/gettext/en/LC_MESSAGES/activity.po
index 5f762726..bbecb050 100644
--- a/priv/gettext/en/LC_MESSAGES/activity.po
+++ b/priv/gettext/en/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po
index c563dff5..42dd920f 100644
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -113,7 +113,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -139,18 +139,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -158,49 +158,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -210,17 +210,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -285,47 +285,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -375,8 +375,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -504,7 +504,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -570,7 +570,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -650,7 +650,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -675,7 +675,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -700,17 +700,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -780,12 +780,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -815,7 +815,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -841,7 +841,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -851,6 +851,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index 8cc4bf0f..3cde34de 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -136,18 +136,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -155,49 +155,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -207,17 +207,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -242,12 +242,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -257,7 +257,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -282,47 +282,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -372,8 +372,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -697,17 +697,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -777,12 +777,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -812,7 +812,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -838,7 +838,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -848,6 +848,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/es/LC_MESSAGES/activity.po b/priv/gettext/es/LC_MESSAGES/activity.po
index 7aac461c..1c76b867 100644
--- a/priv/gettext/es/LC_MESSAGES/activity.po
+++ b/priv/gettext/es/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/es/LC_MESSAGES/errors.po b/priv/gettext/es/LC_MESSAGES/errors.po
index f3d57ba7..2625a108 100644
--- a/priv/gettext/es/LC_MESSAGES/errors.po
+++ b/priv/gettext/es/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "El perfil actual no es un administrador del grupo seleccionado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Error al guardar los parámetros del usuario"
 
@@ -137,18 +137,18 @@ msgid "Member not found"
 msgstr "Miembro no encontrado"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "No se encontró el perfil del usuario moderador"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "No se encontró ningún usuario para validar con este correo electrónico"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "No se encontró ningún usuario con este correo electrónico"
 
@@ -156,51 +156,51 @@ msgstr "No se encontró ningún usuario con este correo electrónico"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "El perfil no es propiedad del usuario autenticado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Las inscripciones no están abiertas"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "La contraseña actual no es válida"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "El nuevo correo electrónico no parece ser válido"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "El nuevo correo electrónico debe ser diferente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "La nueva contraseña debe ser diferente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "La contraseña proporcionada no es válida"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "La contraseña que ha elegido es demasiado corta. Asegúrese de que su "
 "contraseña contenga al menos 6 caracteres."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Este usuario no puede restablecer su contraseña"
 
@@ -210,17 +210,17 @@ msgid "This user has been disabled"
 msgstr "Este usuario ha sido inhabilitado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "No se puede validar al usuario"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "El usuario ya está inhabilitado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "El usuario solicitado no ha iniciado sesión"
 
@@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator."
 msgstr "No puedes enumerar grupos a menos que seas moderador."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Debes iniciar sesión para cambiar tu correo electrónico"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Debes iniciar sesión para cambiar tu contraseña"
 
@@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Debes iniciar sesión para eliminar un grupo"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Debes iniciar sesión para eliminar su cuenta"
 
@@ -285,50 +285,50 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Debes tener un token existente para obtener un token de actualización"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 "Solicitó de nuevo un correo electrónico de confirmación demasiado pronto"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Tu correo electrónico no está en la lista de permitidos"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Error al realizar la tarea en segundo plano"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "No se encontró ningún perfil con este ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "No se encontró ningún perfil remoto con este ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Solo los moderadores y administradores pueden suspender un perfil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 "Solo los moderadores y administradores pueden anular la suspensión de un "
 "perfil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Solo se pueden actualizar los perfiles remotos"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Perfil ya suspendido"
 
@@ -378,8 +378,8 @@ msgid "Event id not found"
 msgstr "ID de evento no encontrado"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Evento no encontrado"
 
@@ -507,7 +507,7 @@ msgid "Token is not a valid UUID"
 msgstr "El token no es un UUID válido"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
@@ -577,7 +577,7 @@ msgid "You cannot delete this comment"
 msgstr "No puedes borrar este comentario"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "No puedes borrar este evento"
 
@@ -644,7 +644,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Debes iniciar sesión para acceder a los recursos"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Debes iniciar sesión para crear eventos"
 
@@ -664,7 +664,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Debe iniciar sesión para crear recursos"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Debe iniciar sesión para eliminar un evento"
 
@@ -689,7 +689,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Debes iniciar sesión para salir de un evento"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Debe iniciar sesión para actualizar un evento"
 
@@ -714,19 +714,19 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "El recurso principal no pertenece a este grupo"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "La contraseña elegida es demasiado corta."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "El token de registro ya está en uso, esto parece un problema de nuestra "
 "parte."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Este correo electrónico ya está en uso."
 
@@ -796,12 +796,12 @@ msgid "Profile is not administrator for the group"
 msgstr "El perfil no es miembro del grupo"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "No puedes borrar este evento."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "No puedes rechazar esta invitación con este perfil."
 
@@ -832,7 +832,7 @@ msgstr ""
 "Debe proporcionar una identificación o un slug para acceder a una discusión"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "El perfil del organizador no es propiedad del usuario"
 
@@ -858,7 +858,7 @@ msgid "Error while creating resource"
 msgstr "Error al crear el recurso"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Token de activación no válido"
 
@@ -868,6 +868,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "No se pueden recuperar los detalles del recurso de esta URL."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "El perfil de moderador proporcionado no tiene permiso para este evento"
diff --git a/priv/gettext/fi/LC_MESSAGES/activity.po b/priv/gettext/fi/LC_MESSAGES/activity.po
index d1183024..ffe1634f 100644
--- a/priv/gettext/fi/LC_MESSAGES/activity.po
+++ b/priv/gettext/fi/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/fi/LC_MESSAGES/errors.po b/priv/gettext/fi/LC_MESSAGES/errors.po
index 28632770..eaea5669 100644
--- a/priv/gettext/fi/LC_MESSAGES/errors.po
+++ b/priv/gettext/fi/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Nykyinen profiili ei ole valitun ryhmän ylläpitäjä"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Käyttäjän asetusten tallennuksessa tapahtui virhe"
 
@@ -137,18 +137,18 @@ msgid "Member not found"
 msgstr "Jäsentä ei löydy"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Moderaattorikäyttäjän profiilia ei löydy"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Käyttäjää tämän sähköpostin vahvistamiseksi ei löydy"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Käyttäjää, jolla on tämä sähköpostiosoite ei löydy"
 
@@ -156,51 +156,51 @@ msgstr "Käyttäjää, jolla on tämä sähköpostiosoite ei löydy"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Profiili ei ole tunnistautuneen käyttäjän omistuksessa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Ei voi rekisteröityä"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Nykyinen salasana ei kelpaa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Uusi sähköpostiosoite ei vaikuta kelvolliselta"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Uuden sähköpostiosoitteen on poikettava vanhasta"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Uuden salasanan on poikettava vanhasta"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Annettu salasana on epäkelpo"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Valitsemasi salasana on liian lyhyt. Käytä vähintään kuuden merkin mittaista "
 "salasanaa."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Käyttäjä ei voi palauttaa salasanaansa"
 
@@ -210,17 +210,17 @@ msgid "This user has been disabled"
 msgstr "Käyttäjä on poistettu käytöstä"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Käyttäjää ei voi vahvistaa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Käyttäjä on jo poistettu käytöstä"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "Pyydetty käyttäjä ei ole kirjautuneena sisään"
 
@@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Voit nähdä ryhmäluettelon vain, jos olet moderaattori."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Sähköpostiosoitteen voi vaihtaa vain sisäänkirjautuneena"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Salasanan voi vaihtaa vain sisäänkirjautuneena"
 
@@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Ryhmän voi poistaa vain sisäänkirjautuneena"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Voit poistaa tilisi vain sisäänkirjautuneena"
 
@@ -285,47 +285,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Voit saada uuden merkin vain, jos sinulla on jo merkki"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Pyysit uutta vahvistussähköpostia liian aikaisin"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Sähköpostiosoitteesi ei ole sallittujen luettelossa"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Virhe taustatehtävää suoritettaessa"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Tällä tunnisteella ei löytynyt profiilia"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Tällä tunnisteella ei löytynyt etäprofiilia"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Vain moderaattorit ja ylläpitäjät voivat hyllyttää profiilin"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Vain moderaattorit ja ylläpitäjät voivat palauttaa hyllytetyn profiilin"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Vain etäprofiilit voi ladata uudelleen"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Profiili on jo hyllytetty"
 
@@ -375,8 +375,8 @@ msgid "Event id not found"
 msgstr "Tapahtumatunnistetta ei löydy"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Tapahtumaa ei löydy"
 
@@ -504,7 +504,7 @@ msgid "Token is not a valid UUID"
 msgstr "Merkki ei ole kelvollinen UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Käyttäjää ei löydy"
 
@@ -573,7 +573,7 @@ msgid "You cannot delete this comment"
 msgstr "Et voi poistaa kommenttia"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Et voi poistaa tapahtumaa"
 
@@ -633,7 +633,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Pääsy resursseihin vain sisäänkirjautuneena"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Tapahtumien luonti vain sisäänkirjautuneena"
 
@@ -653,7 +653,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Resurssien luonti vain sisäänkirjautuneena"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Tapahtuman poisto vain sisäänkirjautuneena"
 
@@ -678,7 +678,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Tapahtumasta poistuminen vain sisäänkirjautuneena"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Tapahtuman päivittäminen vain sisäänkirjautuneena"
 
@@ -703,17 +703,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "Ylätason resurssi ei kuulu tähän ryhmään"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Valittu salasana on liian lyhyt."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr "Rekisteröintimerkki on jo käytössä. Vaikuttaa palvelinpään virheeltä."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Sähköpostiosoite on jo käytössä."
 
@@ -783,12 +783,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Profiili ei ole ryhmän ylläpitäjä"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Et voi muokata tapahtumaa."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Et voi yhdistää tapahtumaa tähän profiiliin."
 
@@ -818,7 +818,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr "Keskusteluun pääsemiseen vaaditaan tunniste tai polkutunnus"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Järjestäjän profiili ei ole käyttäjän hallussa"
 
@@ -844,7 +844,7 @@ msgid "Error while creating resource"
 msgstr "Virhe raporttia tallennettaessa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -854,6 +854,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Annetulla moderaattoriprofiililla ei ole oikeuksia tähän tapahtumaan"
diff --git a/priv/gettext/fr/LC_MESSAGES/activity.po b/priv/gettext/fr/LC_MESSAGES/activity.po
index 16a9d04b..7885e035 100644
--- a/priv/gettext/fr/LC_MESSAGES/activity.po
+++ b/priv/gettext/fr/LC_MESSAGES/activity.po
@@ -20,223 +20,223 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.4.3\n"
 
-#: lib/service/activity/renderer/member.ex:43
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:19
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:12
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:38
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr "%{member} a accepté l'invitation à rejoindre le groupe."
 
-#: lib/service/activity/renderer/member.ex:53
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:26
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:17
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:42
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr "%{member} a refusé l'invitation à rejoindre le groupe."
 
-#: lib/service/activity/renderer/member.ex:23
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:4
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:1
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:30
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr "%{member} a demandé à rejoindre le groupe."
 
-#: lib/service/activity/renderer/member.ex:33
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:11
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:6
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:34
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr "%{member} a été invité⋅e par %{profile}."
 
-#: lib/service/activity/renderer/member.ex:72
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:40
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:27
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:50
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr "%{profile} a ajouté le ou la membre %{membre}."
 
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53
-#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
-#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr "%{profile} a archivé la discussion %{discussion}."
 
+#, elixir-format
 #: lib/service/activity/renderer/discussion.ex:23
-#: lib/service/activity/renderer/post.ex:23
-#: lib/web/templates/email/activity/_comment_activity_item.html.eex:4
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
-#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:4
+#: lib/service/activity/renderer/post.ex:23 lib/web/templates/email/activity/_comment_activity_item.html.eex:4
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:1 lib/web/templates/email/activity/_discussion_activity_item.html.eex:4
 #: lib/web/templates/email/activity/_discussion_activity_item.text.eex:1
 msgid "%{profile} created the discussion %{discussion}."
 msgstr "%{profile} a créé la discussion %{discussion}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:24
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:5
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:2
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:5 lib/web/templates/email/activity/_resource_activity_item.text.eex:2
 msgid "%{profile} created the folder %{resource}."
 msgstr "%{profile} a créé le dossier %{resource}."
 
+#, elixir-format
 #: lib/web/templates/email/activity/_group_activity_item.html.eex:4
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:1
 msgid "%{profile} created the group %{group}."
 msgstr "%{profile} a créé le groupe %{group}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:33
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:20
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:8
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:20 lib/web/templates/email/activity/_resource_activity_item.text.eex:8
 msgid "%{profile} created the resource %{resource}."
 msgstr "%{profile} a créé la resource %{resource}."
 
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63
-#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25
-#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr "%{profile} a créé la discussion %{discussion}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:97
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:103
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:40
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:103 lib/web/templates/email/activity/_resource_activity_item.text.eex:40
 msgid "%{profile} deleted the folder %{resource}."
 msgstr "%{profile} a supprimé le dossier %{resource}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:106
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:111
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:45
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:111 lib/web/templates/email/activity/_resource_activity_item.text.eex:45
 msgid "%{profile} deleted the resource %{resource}."
 msgstr "%{profile} a supprimé la resource %{resource}."
 
-#: lib/service/activity/renderer/member.ex:92
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:56
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:39
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:58
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr "%{profile} a exclu le ou la membre %{membre}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:76
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:71
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:28
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:71 lib/web/templates/email/activity/_resource_activity_item.text.eex:28
 msgid "%{profile} moved the folder %{resource}."
 msgstr "%{profile} a déplacé le dossier %{resource}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:85
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:86
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:34
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:86 lib/web/templates/email/activity/_resource_activity_item.text.eex:34
 msgid "%{profile} moved the resource %{resource}."
 msgstr "%{profile} a déplacé la ressource %{resource}."
 
-#: lib/service/activity/renderer/member.ex:102
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:45
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:62
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr "%{profile} a quitté le groupe."
 
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43
-#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13
-#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#, elixir-format
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr "%{profile} a renommé la discussion %{discussion}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:45
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:37
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:14
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:37 lib/web/templates/email/activity/_resource_activity_item.text.eex:14
 msgid "%{profile} renamed the folder from %{old_resource_title} to %{resource}."
 msgstr "%{profile} a renommé le dossier %{old_resource_title} en %{resource}."
 
+#, elixir-format
 #: lib/service/activity/renderer/resource.ex:59
-#: lib/web/templates/email/activity/_resource_activity_item.html.eex:53
-#: lib/web/templates/email/activity/_resource_activity_item.text.eex:21
+#: lib/web/templates/email/activity/_resource_activity_item.html.eex:53 lib/web/templates/email/activity/_resource_activity_item.text.eex:21
 msgid "%{profile} renamed the resource from %{old_resource_title} to %{resource}."
 msgstr "%{profile} a renommé la resource %{old_resource_title} en %{resource}."
 
+#, elixir-format
 #: lib/service/activity/renderer/discussion.ex:33
-#: lib/service/activity/renderer/post.ex:33
-#: lib/web/templates/email/activity/_comment_activity_item.html.eex:19
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:7
-#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:18
+#: lib/service/activity/renderer/post.ex:33 lib/web/templates/email/activity/_comment_activity_item.html.eex:19
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:7 lib/web/templates/email/activity/_discussion_activity_item.html.eex:18
 #: lib/web/templates/email/activity/_discussion_activity_item.text.eex:7
 msgid "%{profile} replied to the discussion %{discussion}."
 msgstr "%{profile} a répondu à la discussion %{discussion}."
 
+#, elixir-format
 #: lib/web/templates/email/activity/_group_activity_item.html.eex:19
 #: lib/web/templates/email/activity/_group_activity_item.text.eex:7
 msgid "%{profile} updated the group %{group}."
 msgstr "%{profile} a mis à jour le groupe %{group}."
 
-#: lib/service/activity/renderer/member.ex:82
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:48
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:33
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:54
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr "%{profile} a mis à jour le membre %{member}."
 
+#, elixir-format
 #: lib/service/activity/renderer/event.ex:23
-#: lib/web/templates/email/activity/_event_activity_item.html.eex:4
-#: lib/web/templates/email/activity/_event_activity_item.text.eex:1
+#: lib/web/templates/email/activity/_event_activity_item.html.eex:4 lib/web/templates/email/activity/_event_activity_item.text.eex:1
 msgid "The event %{event} was created by %{profile}."
 msgstr "L'événement %{event} a été créé par %{profile}."
 
+#, elixir-format
 #: lib/service/activity/renderer/event.ex:43
-#: lib/web/templates/email/activity/_event_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_event_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_event_activity_item.html.eex:34 lib/web/templates/email/activity/_event_activity_item.text.eex:13
 msgid "The event %{event} was deleted by %{profile}."
 msgstr "L'événement %{event} a été supprimé par %{profile}."
 
+#, elixir-format
 #: lib/service/activity/renderer/event.ex:33
-#: lib/web/templates/email/activity/_event_activity_item.html.eex:19
-#: lib/web/templates/email/activity/_event_activity_item.text.eex:7
+#: lib/web/templates/email/activity/_event_activity_item.html.eex:19 lib/web/templates/email/activity/_event_activity_item.text.eex:7
 msgid "The event %{event} was updated by %{profile}."
 msgstr "L'événement %{event} a été mis à jour par %{profile}."
 
+#, elixir-format
 #: lib/service/activity/renderer/group.ex:23
-#: lib/web/templates/email/activity/_post_activity_item.html.eex:4
-#: lib/web/templates/email/activity/_post_activity_item.text.eex:1
+#: lib/web/templates/email/activity/_post_activity_item.html.eex:4 lib/web/templates/email/activity/_post_activity_item.text.eex:1
 msgid "The post %{post} was created by %{profile}."
 msgstr "Le billet %{post} a été créé par %{profile}."
 
+#, elixir-format
 #: lib/service/activity/renderer/group.ex:43
-#: lib/web/templates/email/activity/_post_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_post_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_post_activity_item.html.eex:34 lib/web/templates/email/activity/_post_activity_item.text.eex:13
 msgid "The post %{post} was deleted by %{profile}."
 msgstr "Le billet %{post} a été supprimé par %{profile}."
 
+#, elixir-format
 #: lib/service/activity/renderer/group.ex:33
-#: lib/web/templates/email/activity/_post_activity_item.html.eex:19
-#: lib/web/templates/email/activity/_post_activity_item.text.eex:7
+#: lib/web/templates/email/activity/_post_activity_item.html.eex:19 lib/web/templates/email/activity/_post_activity_item.text.eex:7
 msgid "The post %{post} was updated by %{profile}."
 msgstr "Le billet %{post} a été mis à jour par %{profile}."
 
-#: lib/service/activity/renderer/member.ex:63
-#: lib/web/templates/email/activity/_member_activity_item.html.eex:33
-#: lib/web/templates/email/activity/_member_activity_item.text.eex:22
+#, elixir-format
+#: lib/service/activity/renderer/member.ex:46
+#: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr "%{member} a rejoint le groupe."
 
+#, elixir-format
 #: lib/service/activity/renderer/event.ex:63
-#: lib/web/templates/email/activity/_event_activity_item.html.eex:58
-#: lib/web/templates/email/activity/_event_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_event_activity_item.html.eex:58 lib/web/templates/email/activity/_event_activity_item.text.eex:25
 msgid "%{profile} posted a comment on the event %{event}."
 msgstr "%{profile} a posté un commentaire sur l'événement %{event}."
 
+#, elixir-format
 #: lib/service/activity/renderer/event.ex:54
-#: lib/web/templates/email/activity/_event_activity_item.html.eex:43
-#: lib/web/templates/email/activity/_event_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_event_activity_item.html.eex:43 lib/web/templates/email/activity/_event_activity_item.text.eex:19
 msgid "%{profile} replied to a comment on the event %{event}."
 msgstr "%{profile} a répondu à un commentaire sur l'événement %{event}."
 
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#, elixir-format
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr "Vous ne voulez pas recevoir de notifications d'activité ? Vous pouvez changer leur fréquence ou les désactiver dans vos préférences."
 
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#, elixir-format
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] "Voir une activité de plus"
 msgstr[1] "Voir %{count} activités de plus"
 
+#, elixir-format
 #: lib/web/templates/email/email_direct_activity.html.eex:38
 #: lib/web/templates/email/email_direct_activity.text.eex:4
 msgid "There has been an activity!"
@@ -244,6 +244,29 @@ msgid_plural "There has been some activity!"
 msgstr[0] "Il y a eu une activité !"
 msgstr[1] "Il y a eu de l'activité !"
 
-#: lib/service/activity/renderer/renderer.ex:28
+#, elixir-format
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr "Activité sur %{instance}"
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr "%{profile} a posté un commentaire sur l'événement %{event}."
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr "%{profile} a répondu à un commentaire sur l'événement %{event}."
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr "%{profile} a répondu à la discussion %{discussion}."
diff --git a/priv/gettext/fr/LC_MESSAGES/errors.po b/priv/gettext/fr/LC_MESSAGES/errors.po
index ff5dc003..6e2d2c8d 100644
--- a/priv/gettext/fr/LC_MESSAGES/errors.po
+++ b/priv/gettext/fr/LC_MESSAGES/errors.po
@@ -112,7 +112,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Le profil actuel n'est pas un·e administrateur·ice du groupe sélectionné"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Erreur lors de la sauvegarde des paramètres utilisateur"
 
@@ -138,18 +138,18 @@ msgid "Member not found"
 msgstr "Membre non trouvé"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Aucun profil trouvé pour l'utilisateur modérateur"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Aucun·e utilisateur·ice à valider avec cet email n'a été trouvé·e"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Aucun·e utilisateur·ice avec cette adresse e-mail n'a été trouvé·e"
 
@@ -157,51 +157,51 @@ msgstr "Aucun·e utilisateur·ice avec cette adresse e-mail n'a été trouvé·e
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Le profil n'est pas possédé par l'utilisateur connecté"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Les inscriptions ne sont pas ouvertes"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Le mot de passe actuel est invalid"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "La nouvelle adresse e-mail ne semble pas être valide"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "La nouvelle adresse e-mail doit être différente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Le nouveau mot de passe doit être différent"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Le mot de passe fourni est invalide"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Le mot de passe que vous avez choisi est trop court. Merci de vous assurer que votre mot de passe contienne au moins "
 "6 caractères."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Cet·te utilisateur·ice ne peut pas réinitialiser son mot de passe"
 
@@ -211,17 +211,17 @@ msgid "This user has been disabled"
 msgstr "Cet·te utilisateur·ice a été désactivé·e"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Impossible de valider l'utilisateur·ice"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "L'utilisateur·ice est déjà désactivé·e"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "L'utilisateur·ice demandé·e n'est pas connecté·e"
 
@@ -246,12 +246,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Vous ne pouvez pas lister les groupes sauf à être modérateur·ice."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Vous devez être connecté·e pour changer votre adresse e-mail"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Vous devez être connecté·e pour changer votre mot de passe"
 
@@ -261,7 +261,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Vous devez être connecté·e pour supprimer un groupe"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Vous devez être connecté·e pour supprimer votre compte"
 
@@ -286,47 +286,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Vous devez avoir un jeton existant pour obtenir un jeton de rafraîchissement"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Vous avez à nouveau demandé un email de confirmation trop vite"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Votre adresse e-mail n'est pas sur la liste d'autorisations"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Erreur lors de l'exécution d'une tâche d'arrière-plan"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Aucun profil trouvé avec cet ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Aucun profil distant trouvé avec cet ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Seul·es les modérateur·ice et les administrateur·ices peuvent suspendre un profil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Seul·es les modérateur·ice et les administrateur·ices peuvent annuler la suspension d'un profil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Seuls les profils distants peuvent être rafraîchis"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Le profil est déjà suspendu"
 
@@ -376,8 +376,8 @@ msgid "Event id not found"
 msgstr "ID de l'événement non trouvé"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Événement non trouvé"
 
@@ -505,7 +505,7 @@ msgid "Token is not a valid UUID"
 msgstr "Ce jeton n'est pas un UUID valide"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Utilisateur·ice non trouvé·e"
 
@@ -573,7 +573,7 @@ msgid "You cannot delete this comment"
 msgstr "Vous ne pouvez pas supprimer ce commentaire"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Vous ne pouvez pas supprimer cet événement"
 
@@ -633,7 +633,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Vous devez être connecté·e pour supprimer un groupe"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Vous devez être connecté·e pour créer des événements"
 
@@ -653,7 +653,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Vous devez être connecté·e pour quitter un groupe"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Vous devez être connecté·e pour supprimer un groupe"
 
@@ -678,7 +678,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Vous devez être connecté·e pour quitter un groupe"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Vous devez être connecté·e pour mettre à jour un groupe"
 
@@ -703,17 +703,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "La ressource parente n'appartient pas à ce groupe"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Le mot de passe choisi est trop court."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr "Le jeton d'inscription est déjà utilisé, cela ressemble à un problème de notre côté."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Cette adresse e-mail est déjà utilisée."
 
@@ -783,12 +783,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Le profil n'est pas administrateur·ice pour le groupe"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Vous ne pouvez pas éditer cet événement."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Vous ne pouvez pas attribuer cet événement à ce profil."
 
@@ -818,7 +818,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr "Vous devez fournir un ID ou bien un slug pour accéder à une discussion"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Le profil de l'organisateur·ice n'appartient pas à l'utilisateur·ice"
 
@@ -844,7 +844,7 @@ msgid "Error while creating resource"
 msgstr "Erreur lors de la création de la resource"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Jeton d'activation invalide"
 
@@ -854,6 +854,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Impossible de récupérer les détails de la ressource depuis cette URL."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Le profil modérateur fourni n'a pas de permissions sur cet événement"
diff --git a/priv/gettext/gl/LC_MESSAGES/activity.po b/priv/gettext/gl/LC_MESSAGES/activity.po
index 9dd50f7a..64ff03b5 100644
--- a/priv/gettext/gl/LC_MESSAGES/activity.po
+++ b/priv/gettext/gl/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/gl/LC_MESSAGES/errors.po b/priv/gettext/gl/LC_MESSAGES/errors.po
index cb9eed82..ffbe563a 100644
--- a/priv/gettext/gl/LC_MESSAGES/errors.po
+++ b/priv/gettext/gl/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "O perfil actual non é administrador do grupo seleccionado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Erro ó gardar os axustes de usuaria"
 
@@ -137,18 +137,18 @@ msgid "Member not found"
 msgstr "Membro non atopado"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Non se atopou o perfil para a usuaria moderadora"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Non se atopou unha usuaria con este email para validar"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Non se atopa ningunha usuaria con este email"
 
@@ -156,51 +156,51 @@ msgstr "Non se atopa ningunha usuaria con este email"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "O perfil non pertence a unha usuaria autenticada"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "O rexistro está pechado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "O contrasinal actual non é válido"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "O novo email non semella ser válido"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "O novo email ten que ser diferente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "O novo contrasinal ten que ser diferente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "O contrasinal escrito non é válido"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "O contrasinal escollido é demasiado curto, ten que ter 6 caracteres polo "
 "menos."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Esta usuaria non pode restablecer o seu contrasinal"
 
@@ -210,17 +210,17 @@ msgid "This user has been disabled"
 msgstr "Estab usuaria foi desactivada"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Non se puido validar a usuaria"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "A usuaria xa está desactivada"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "A usuaria solicitada non está conectada"
 
@@ -245,12 +245,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Non podes facer listas de grupos porque non es moderadora."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Tes que estar conectada para poder cambiar o email"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Tes que estar conectada para poder cambiar o contrasinal"
 
@@ -260,7 +260,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Tes que estar conectada para poder eleminar un grupo"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Tes que estar conectada para poder eliminar a conta"
 
@@ -285,47 +285,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Tes que ter un token existente para obter un token actualizado"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Solicitaches demasiado pronto un email de confirmación"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "O teu email non está na lista dos permitidos"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Erro ó executar a tarefa en segundo plano"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Non se atopa o perfil con este ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Non se atopa o perfil remoto con este ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Só moderadoras e administradoras poden suspender un perfil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Só moderadoras e administradoras pode restablecer un perfil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Só os perfís remotos poderían ser actualizdos"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "O perfil xa está suspendido"
 
@@ -375,8 +375,8 @@ msgid "Event id not found"
 msgstr "Non se atopou o ID do evento"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Evento non atopado"
 
@@ -504,7 +504,7 @@ msgid "Token is not a valid UUID"
 msgstr "O token non é un UUID válido"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Usuaria non atopada"
 
@@ -573,7 +573,7 @@ msgid "You cannot delete this comment"
 msgstr "Non podes eliminar este comentario"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Non podes eliminar este evento"
 
@@ -641,7 +641,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Tes que estar conectada para acceder ós recursos"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Tes que estar conectada para crear eventos"
 
@@ -661,7 +661,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Tes que estar conectada para crear recursos"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Tes que estar conectada para eliminar un evento"
 
@@ -686,7 +686,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Tes que estar conectada para saír dun evento"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Tes que estar conectada para actualizar un evento"
 
@@ -711,18 +711,18 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "O recurso relacionado non pertence a este grupo"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "O contrasinal elexido é demasiado curto."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "O token de rexistro xa está a ser usado, semella un problema pola nosa parte."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Este email xa se está a usar."
 
@@ -792,12 +792,12 @@ msgid "Profile is not administrator for the group"
 msgstr "O perfil non é administrador do grupo"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Non podes editar este evento."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Non podes atribuír este evento a este perfil."
 
@@ -827,7 +827,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr "Debes proporcionar ou ben un ID ou nome para acceder á conversa"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "O perfil da organización non pertence á usuaria"
 
@@ -853,7 +853,7 @@ msgid "Error while creating resource"
 msgstr "Erro ao crear o recurso"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "O token de activación non é válido"
 
@@ -863,6 +863,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Non se puideron obter os detalles do recurso desde o URL."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "O perfil da moderadora proporcionado non ten permisos neste evento"
diff --git a/priv/gettext/hu/LC_MESSAGES/activity.po b/priv/gettext/hu/LC_MESSAGES/activity.po
index 0762eb83..fe7154fe 100644
--- a/priv/gettext/hu/LC_MESSAGES/activity.po
+++ b/priv/gettext/hu/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/hu/LC_MESSAGES/errors.po b/priv/gettext/hu/LC_MESSAGES/errors.po
index 4bed746a..0e6de57d 100644
--- a/priv/gettext/hu/LC_MESSAGES/errors.po
+++ b/priv/gettext/hu/LC_MESSAGES/errors.po
@@ -126,7 +126,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "A jelenlegi profil nem adminisztrátora a kijelölt csoportnak"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Hiba a felhasználói beállítások mentésekor"
 
@@ -152,18 +152,18 @@ msgid "Member not found"
 msgstr "Nem található a tag"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Nem található profil a moderátor felhasználóhoz"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Nem található ezzel az e-mail-címmel ellenőrzendő felhasználó"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Nem található ezzel az e-mail-címmel rendelkező felhasználó"
 
@@ -171,51 +171,51 @@ msgstr "Nem található ezzel az e-mail-címmel rendelkező felhasználó"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "A profilt nem hitelesített felhasználó birtokolja"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "A regisztrációk nincsenek nyitva"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "A jelenlegi jelszó érvénytelen"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Az új e-mail-cím nem tűnik érvényesnek"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Az új e-mail-címnek eltérőnek kell lennie"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Az új jelszónak eltérőnek kell lennie"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "A megadott jelszó érvénytelen"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "A választott jelszó túl rövid. Győződjön meg arról, hogy a jelszava "
 "tartalmazzon legalább 6 karaktert."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Ez a felhasználó nem tudja visszaállítani a jelszavát"
 
@@ -225,17 +225,17 @@ msgid "This user has been disabled"
 msgstr "Ez a felhasználó le lett tiltva"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Nem lehet ellenőrizni a felhasználót"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "A felhasználó már le van tiltva"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "A kért felhasználó nincs bejelentkezve"
 
@@ -260,12 +260,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Lehet, hogy nem sorolhatja fel a csoportokat, hacsak nem moderátor."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Bejelentkezve kell lennie az e-mail-címe megváltoztatásához"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Bejelentkezve kell lennie a jelszava megváltoztatásához"
 
@@ -275,7 +275,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Bejelentkezve kell lennie egy csoport törléséhez"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Bejelentkezve kell lennie a fiókja törléséhez"
 
@@ -300,49 +300,49 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Szüksége van egy meglévő tokenre egy frissítési token beszerzéséhez"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Túl hamar kért újra egy megerősítő e-mailt"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Az e-mail-címe nincs rajta az engedélyezési listán"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Hiba a háttérfeladat végrehajtásakor"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Nem található profil ezzel az azonosítóval"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Nem található távoli profil ezzel az azonosítóval"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Csak moderátorok és adminisztrátorok függeszthetnek fel egy profilt"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 "Csak moderátorok és adminisztrátorok szüntethetik meg egy profil "
 "felfüggesztését"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Csak távoli profilokat lehet frissíteni"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "A profil már fel van függesztve"
 
@@ -392,8 +392,8 @@ msgid "Event id not found"
 msgstr "Nem található az eseményazonosító"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Nem található az esemény"
 
@@ -521,7 +521,7 @@ msgid "Token is not a valid UUID"
 msgstr "A token nem érvényes UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Nem található a felhasználó"
 
@@ -590,7 +590,7 @@ msgid "You cannot delete this comment"
 msgstr "Nem tudja törölni ezt a hozzászólást"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Nem tudja törölni ezt az eseményt"
 
@@ -664,7 +664,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Bejelentkezve kell lennie az erőforrásokhoz való hozzáféréshez"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Bejelentkezve kell lennie az események létrehozásához"
 
@@ -684,7 +684,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Bejelentkezve kell lennie az erőforrások létrehozásához"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Bejelentkezve kell lennie egy esemény törléséhez"
 
@@ -709,7 +709,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Bejelentkezve kell lennie egy esemény elhagyásához"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Bejelentkezve kell lennie egy esemény frissítéséhez"
 
@@ -734,18 +734,18 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "A szülőerőforrás nem tartozik ehhez a csoporthoz"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "A választott jelszó túl rövid."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "A regisztrációs token már használatban van. Ez hibának tűnik a mi oldalunkon."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Ez az e-mail-cím már használatban van."
 
@@ -815,12 +815,12 @@ msgid "Profile is not administrator for the group"
 msgstr "A profil nem adminisztrátor ennél a csoportnál"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Nem tudja szerkeszteni ezt az eseményt."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Nem tudja ezt az eseményt ennek a profilnak tulajdonítani."
 
@@ -852,7 +852,7 @@ msgstr ""
 "megbeszéléshez való hozzáféréshez"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "A szervező profilját nem a felhasználó birtokolja"
 
@@ -878,7 +878,7 @@ msgid "Error while creating resource"
 msgstr "Hiba az erőforrás létrehozáskor"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Érvénytelen aktiválási token"
 
@@ -888,6 +888,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Nem lehet lekérni az erőforrás részleteit erről az URL-ről."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "A megadott moderátorprofilnak nincs jogosultsága ezen az eseményen"
diff --git a/priv/gettext/it/LC_MESSAGES/activity.po b/priv/gettext/it/LC_MESSAGES/activity.po
index 4f768988..d378b4c3 100644
--- a/priv/gettext/it/LC_MESSAGES/activity.po
+++ b/priv/gettext/it/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po
index 7155537f..a55eeba0 100644
--- a/priv/gettext/it/LC_MESSAGES/default.po
+++ b/priv/gettext/it/LC_MESSAGES/default.po
@@ -1039,9 +1039,9 @@ msgstr ""
 "Ciao! Solo una breve nota per confermare che l'indirizzo email collegato al "
 "tuo account su% {host} è stato cambiato da questo a:"
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_old.html.eex:62
 #: lib/web/templates/email/email_changed_old.text.eex:5
-#, elixir-format
 msgid "If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}."
 msgstr ""
 "Se non hai attivato tu stesso questa modifica, è probabile che qualcuno "
@@ -1702,18 +1702,18 @@ msgstr "Questo è un sito di prova per testare Mobilizon."
 msgid "%{name}'s feed"
 msgstr "Flusso di %{name}"
 
-#: lib/service/export/feed.ex:120
 #, elixir-format
+#: lib/service/export/feed.ex:120
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr "Flusso privato degli eventi di %{actor} su %{instance}"
 
-#: lib/service/export/feed.ex:115
 #, elixir-format
+#: lib/service/export/feed.ex:115
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr "Flusso pubblico degli eventi di %{actor} su %{instance}"
 
-#: lib/service/export/feed.ex:220
 #, elixir-format
+#: lib/service/export/feed.ex:220
 msgid "Feed for %{email} on %{instance}"
 msgstr "Flusso per %{email} su %{instance}"
 
@@ -1740,8 +1740,8 @@ msgstr "Dettagli tecnici"
 msgid "The Mobilizon server %{instance} seems to be temporarily down."
 msgstr "Il server Mobilizon sembra essere temporaneamente inattivo."
 
-#: lib/service/export/feed.ex:73
 #, elixir-format
+#: lib/service/export/feed.ex:73
 msgid "Public feed for %{instance}"
 msgstr "Feed pubblico per %{instance}"
 
diff --git a/priv/gettext/it/LC_MESSAGES/errors.po b/priv/gettext/it/LC_MESSAGES/errors.po
index dae83d66..7dd4c8a4 100644
--- a/priv/gettext/it/LC_MESSAGES/errors.po
+++ b/priv/gettext/it/LC_MESSAGES/errors.po
@@ -99,29 +99,29 @@ msgstr "dev'essere uguale a %{number}"
 msgid "Cannot refresh the token"
 msgstr "Il token non può essere aggiornato"
 
-#: lib/graphql/resolvers/group.ex:206
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:206
 msgid "Current profile is not a member of this group"
 msgstr "Il profilo corrente non è membro di questo gruppo"
 
-#: lib/graphql/resolvers/group.ex:210
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:210
 msgid "Current profile is not an administrator of the selected group"
 msgstr "Il profilo corrente non è amministratore del gruppo selezionato"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Errore nel salvare le preferenze utente"
 
+#, elixir-format
 #: lib/graphql/error.ex:90 lib/graphql/resolvers/group.ex:203
 #: lib/graphql/resolvers/group.ex:234 lib/graphql/resolvers/group.ex:269 lib/graphql/resolvers/member.ex:80
-#, elixir-format
 msgid "Group not found"
 msgstr "Gruppo non trovato"
 
-#: lib/graphql/resolvers/group.ex:68
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:68
 msgid "Group with ID %{id} not found"
 msgstr "Gruppo con ID %{id} non trovato"
 
@@ -130,24 +130,24 @@ msgstr "Gruppo con ID %{id} non trovato"
 msgid "Impossible to authenticate, either your email or password are invalid."
 msgstr "Impossibile autenticarsi: email e/o password non validi."
 
-#: lib/graphql/resolvers/group.ex:266
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:266
 msgid "Member not found"
 msgstr "Membro non trovato"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Nessun profilo trovato per l'utente moderatore"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Nessun utente da convalidare trovato con questa email"
 
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Nessun utente con questa email"
 
@@ -155,49 +155,49 @@ msgstr "Nessun utente con questa email"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "L'utente autenticato non è propietario di questo profilo"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Le registrazioni non sono aperte"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "la password corrente non è valida"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "La nuova email sembra non valida"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "La nuova email dev'essere diversa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "La nuova password deve essere diversa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "La password assegnata non è valida"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr "la password scelta è troppo corta, deve avere almeno 6 caratteri."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Questo utente non può resettare la password"
 
@@ -207,72 +207,72 @@ msgid "This user has been disabled"
 msgstr "L'utente è stato disabilitato"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Impossibile convalidare l'utente"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Utente già disabilitato"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "L'utente richiesto non è loggato"
 
-#: lib/graphql/resolvers/group.ex:240
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:240
 msgid "You are already a member of this group"
 msgstr "Sei già un membro di questo gruppo"
 
-#: lib/graphql/resolvers/group.ex:273
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:273
 msgid "You can't leave this group because you are the only administrator"
 msgstr "Non puoi lasciare questo gruppo perchè sei l'unico amministratore"
 
-#: lib/graphql/resolvers/group.ex:237
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:237
 msgid "You cannot join this group"
 msgstr "Non puoi unirti a questo gruppo"
 
-#: lib/graphql/resolvers/group.ex:96
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:96
 msgid "You may not list groups unless moderator."
 msgstr "Non è possibile elencare i gruppi a meno che non sia un moderatore."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "È necessario effettuare il login per modificare la tua email"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "È necessario effettuare il login per modificare la tua password"
 
-#: lib/graphql/resolvers/group.ex:215
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:215
 msgid "You need to be logged-in to delete a group"
 msgstr "È necessario effettuare il login per eliminare un gruppo"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "È necessario effettuare il login per eliminare il tuo account"
 
-#: lib/graphql/resolvers/group.ex:245
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:245
 msgid "You need to be logged-in to join a group"
 msgstr "È necessario effettuare il login per entrare a far parte di un gruppo"
 
-#: lib/graphql/resolvers/group.ex:278
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:278
 msgid "You need to be logged-in to leave a group"
 msgstr "È necessario effettuare il login per lasciare un gruppo"
 
-#: lib/graphql/resolvers/group.ex:180
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:180
 msgid "You need to be logged-in to update a group"
 msgstr "È necessario effettuare il login per aggiornare un gruppo"
 
@@ -284,47 +284,47 @@ msgstr ""
 "aggiornamento"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Hai richiesto di nuovo un'e-mail di conferma troppo presto"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "La tua mail non è nella lista delle autorizzazioni"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Errore nell'eseguire un processo in background"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Nessun profilo trovato con questo ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Nessun profilo remoto trovato con questo ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Solo i moderatori e gli amministratori possono sospendere un profilo"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Solo i moderatori e gli amministratori possono riattivare un profilo"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "È possibile aggiornare solo i profili remoti"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Profilo già sospeso"
 
@@ -338,13 +338,13 @@ msgstr "Un'email valida è richiesta dalla vostra istanza"
 msgid "Anonymous participation is not enabled"
 msgstr "La partecipazione anonima non è abilitata"
 
-#: lib/graphql/resolvers/person.ex:196
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:196
 msgid "Cannot remove the last administrator of a group"
 msgstr "Impossibile rimuovere l'ultimo amministratore di un gruppo"
 
-#: lib/graphql/resolvers/person.ex:193
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:193
 msgid "Cannot remove the last identity of a user"
 msgstr "Impossibile rimuovere l'ultima identità di un utente"
 
@@ -374,8 +374,8 @@ msgid "Event id not found"
 msgstr "ID evento non trovato"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Evento non trovato"
 
@@ -390,8 +390,8 @@ msgstr "L'evento con questo ID %{id} non esiste"
 msgid "Internal Error"
 msgstr "Errore Interno"
 
-#: lib/graphql/resolvers/discussion.ex:202
 #, elixir-format
+#: lib/graphql/resolvers/discussion.ex:202
 msgid "No discussion with ID %{id}"
 msgstr "Nessuna discussione con l'ID %{id}"
 
@@ -400,8 +400,8 @@ msgstr "Nessuna discussione con l'ID %{id}"
 msgid "No profile found for user"
 msgstr "Nessuno profilo trovato per l'utente"
 
-#: lib/graphql/resolvers/feed_token.ex:64
 #, elixir-format
+#: lib/graphql/resolvers/feed_token.ex:64
 msgid "No such feed token"
 msgstr "Nessun token di rifornimento corrispondente"
 
@@ -417,13 +417,13 @@ msgstr "Il partecipante ha già il ruolo %{role}"
 msgid "Participant not found"
 msgstr "Partecipante non trovato"
 
-#: lib/graphql/resolvers/person.ex:30
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:30
 msgid "Person with ID %{id} not found"
 msgstr "La persona con l'ID %{id} non è stata trovata"
 
-#: lib/graphql/resolvers/person.ex:52
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:52
 msgid "Person with username %{username} not found"
 msgstr "La persona con il nome utente %{username} non è stata trovata"
 
@@ -456,13 +456,13 @@ msgstr "Il profilo è già un membro diquesto gruppo"
 msgid "Profile is not member of group"
 msgstr "Il profilo non è membro del gruppo"
 
-#: lib/graphql/resolvers/person.ex:162 lib/graphql/resolvers/person.ex:190
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:162 lib/graphql/resolvers/person.ex:190
 msgid "Profile not found"
 msgstr "Profilo non trovato"
 
-#: lib/graphql/resolvers/report.ex:36
 #, elixir-format
+#: lib/graphql/resolvers/report.ex:36
 msgid "Report not found"
 msgstr "Segnalazione non trovata"
 
@@ -492,23 +492,23 @@ msgstr "L'elemento to-do non esiste"
 msgid "Todo list doesn't exist"
 msgstr "la lista non esiste"
 
-#: lib/graphql/resolvers/feed_token.ex:73
 #, elixir-format
+#: lib/graphql/resolvers/feed_token.ex:73
 msgid "Token does not exist"
 msgstr "Il token non esiste"
 
-#: lib/graphql/resolvers/feed_token.ex:67 lib/graphql/resolvers/feed_token.ex:70
 #, elixir-format
+#: lib/graphql/resolvers/feed_token.ex:67 lib/graphql/resolvers/feed_token.ex:70
 msgid "Token is not a valid UUID"
 msgstr "Il token non è un UUID valido"
 
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
 #, elixir-format
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: lib/graphql/resolvers/person.ex:257
 #, elixir-format
+#: lib/graphql/resolvers/person.ex:257
 msgid "You already have a profile for this user"
 msgstr "Hai già un profilo per questo utente"
 
@@ -522,8 +522,8 @@ msgstr "Se già un partecipante di questo evento"
 msgid "You are not a member of this group"
 msgstr "Non sei un membro di questo gruppo"
 
-#: lib/graphql/resolvers/member.ex:149
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:149
 msgid "You are not a moderator or admin for this group"
 msgstr "Non sei un moderatore o amministratore di questo gruppo"
 
@@ -542,8 +542,8 @@ msgstr "Non puoi creare un token di rifornimento senza connessione"
 msgid "You are not allowed to delete a comment if not connected"
 msgstr "Non è consentito eliminare un commento se non si è collegati"
 
-#: lib/graphql/resolvers/feed_token.ex:82
 #, elixir-format
+#: lib/graphql/resolvers/feed_token.ex:82
 msgid "You are not allowed to delete a feed token if not connected"
 msgstr "Non puoi eliminare un token di rifornimento senza connettersi"
 
@@ -559,8 +559,8 @@ msgid "You can't leave event because you're the only event creator participant"
 msgstr ""
 "Non puoi lasciare l'evento perchè sei l'unico partecipante creatore di eventi"
 
-#: lib/graphql/resolvers/member.ex:153
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:153
 msgid "You can't set yourself to a lower member role for this group because you are the only administrator"
 msgstr ""
 "Non puoi impostare te stesso per un ruolo di membro inferiore per questo "
@@ -572,7 +572,7 @@ msgid "You cannot delete this comment"
 msgstr "Non puoi eliminare questo commento"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Non puoi eliminare questo evento"
 
@@ -581,13 +581,13 @@ msgstr "Non puoi eliminare questo evento"
 msgid "You cannot invite to this group"
 msgstr "Non puoi invitare in questo gruppo"
 
-#: lib/graphql/resolvers/feed_token.ex:76
 #, elixir-format
+#: lib/graphql/resolvers/feed_token.ex:76
 msgid "You don't have permission to delete this token"
 msgstr "Non hai il permesso di cancellare questo token"
 
-#: lib/graphql/resolvers/admin.ex:53
 #, elixir-format
+#: lib/graphql/resolvers/admin.ex:53
 msgid "You need to be logged-in and a moderator to list action logs"
 msgstr "Devi essere connesso e un moderatore per elencare i log delle azioni"
 
@@ -606,29 +606,29 @@ msgstr "Devi essere connesso e un moderatore per aggiornare un rapporto"
 msgid "You need to be logged-in and a moderator to view a report"
 msgstr "Devi essere connesso e un moderatore per visualizzare un rapporto"
 
-#: lib/graphql/resolvers/admin.ex:237
 #, elixir-format
+#: lib/graphql/resolvers/admin.ex:237
 msgid "You need to be logged-in and an administrator to access admin settings"
 msgstr ""
 "Devi essere connesso e un moderatore per accedere alle opzioni "
 "dell'amministratore"
 
-#: lib/graphql/resolvers/admin.ex:222
 #, elixir-format
+#: lib/graphql/resolvers/admin.ex:222
 msgid "You need to be logged-in and an administrator to access dashboard statistics"
 msgstr ""
 "Devi essere connesso e un moderatore per accedere alle statistiche del "
 "dashboard"
 
-#: lib/graphql/resolvers/admin.ex:261
 #, elixir-format
+#: lib/graphql/resolvers/admin.ex:261
 msgid "You need to be logged-in and an administrator to save admin settings"
 msgstr ""
 "Devi essere connesso e un moderatore per salvare le impostazioni "
 "dell'amministratore"
 
-#: lib/graphql/resolvers/discussion.ex:77
 #, elixir-format
+#: lib/graphql/resolvers/discussion.ex:77
 msgid "You need to be logged-in to access discussions"
 msgstr "Devi essere connesso per accedere alle discussioni"
 
@@ -638,7 +638,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Devi essere connesso per accedere alle risorse"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Devi essere connesso per creare eventi"
 
@@ -658,7 +658,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Devi essere connesso per creare risorse"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Devi essere connesso per eliminare un evento"
 
@@ -683,7 +683,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Devi essere connesso per lasciare un evento"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Devi essere connesso per aggiornare un evento"
 
@@ -708,19 +708,19 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "La risorsa principale non appartiene a questo gruppo"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "La password scelta è troppo corta."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "Il token di registrazione è già in uso, questo sembra un problema dalla "
 "nostra parte."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Questa email è già in uso."
 
@@ -769,13 +769,13 @@ msgstr "Non hai il permesso di farlo"
 msgid "You need to be logged in"
 msgstr "Devi essere connesso"
 
-#: lib/graphql/resolvers/member.ex:114
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:114
 msgid "You can't accept this invitation with this profile."
 msgstr "Non puoi accettare l'invito con questo profilo."
 
-#: lib/graphql/resolvers/member.ex:132
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:132
 msgid "You can't reject this invitation with this profile."
 msgstr "Non puoi rifiutare l'invito con questo profilo."
 
@@ -784,33 +784,33 @@ msgstr "Non puoi rifiutare l'invito con questo profilo."
 msgid "File doesn't have an allowed MIME type."
 msgstr "Il file non ha un tipo MIME consentito."
 
-#: lib/graphql/resolvers/group.ex:175
 #, elixir-format
+#: lib/graphql/resolvers/group.ex:175
 msgid "Profile is not administrator for the group"
 msgstr "Il profilo non è amministratore del gruppo"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Non puoi modificare questo evento."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Non puo iattribuire questo evento a questo profilo."
 
-#: lib/graphql/resolvers/member.ex:135
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:135
 msgid "This invitation doesn't exist."
 msgstr "Questo invito non esiste."
 
-#: lib/graphql/resolvers/member.ex:177
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:177
 msgid "This member already has been rejected."
 msgstr "Questo memebro è già stato rifiutato."
 
-#: lib/graphql/resolvers/member.ex:184
 #, elixir-format
+#: lib/graphql/resolvers/member.ex:184
 msgid "You don't have the right to remove this member."
 msgstr "Non hai il diritto di rimuovere questo membro."
 
@@ -819,15 +819,15 @@ msgstr "Non hai il diritto di rimuovere questo membro."
 msgid "This username is already taken."
 msgstr "Questo nome utente è già in uso."
 
-#: lib/graphql/resolvers/discussion.ex:74
 #, elixir-format
+#: lib/graphql/resolvers/discussion.ex:74
 msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 "Devi fornire un ID o la stringa utente (ad es. <em>utente@mobilizon.sm</em>) "
 "per accedere ad una discussione"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Il profilo dell'organizzatore non è di proprietà dell'utente"
 
@@ -836,9 +836,9 @@ msgstr "Il profilo dell'organizzatore non è di proprietà dell'utente"
 msgid "Profile ID provided is not the anonymous profile one"
 msgstr "L'ID profilo fornito non è quello del profilo anonimo"
 
+#, elixir-format
 #: lib/graphql/resolvers/group.ex:136 lib/graphql/resolvers/group.ex:169
 #: lib/graphql/resolvers/person.ex:132 lib/graphql/resolvers/person.ex:159 lib/graphql/resolvers/person.ex:251
-#, elixir-format
 msgid "The provided picture is too heavy"
 msgstr "L'immagine inserita è troppo pesante"
 
@@ -847,13 +847,13 @@ msgstr "L'immagine inserita è troppo pesante"
 msgid "Index file not found. You need to recompile the front-end."
 msgstr "Il file di indice non è stato trovato. Devi ricompilare il front-end."
 
-#: lib/graphql/resolvers/resource.ex:122
 #, elixir-format
+#: lib/graphql/resolvers/resource.ex:122
 msgid "Error while creating resource"
 msgstr "Errore durante la creazione della risorsa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Token di attivazione non valido"
 
@@ -862,8 +862,8 @@ msgstr "Token di attivazione non valido"
 msgid "Unable to fetch resource details from this URL."
 msgstr "Impossibile recuperare i dettagli della risorsa da questa URL."
 
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
 #, elixir-format
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
 "Il profilo del moderatore fornito non dispone dell'autorizzazione per questo "
diff --git a/priv/gettext/ja/LC_MESSAGES/activity.po b/priv/gettext/ja/LC_MESSAGES/activity.po
index f912b116..8d5b55b7 100644
--- a/priv/gettext/ja/LC_MESSAGES/activity.po
+++ b/priv/gettext/ja/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=1\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -234,6 +234,28 @@ msgid_plural "There has been some activity!"
 msgstr[0] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/ja/LC_MESSAGES/errors.po b/priv/gettext/ja/LC_MESSAGES/errors.po
index a9fd66f7..170182f2 100644
--- a/priv/gettext/ja/LC_MESSAGES/errors.po
+++ b/priv/gettext/ja/LC_MESSAGES/errors.po
@@ -97,7 +97,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -123,18 +123,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -142,49 +142,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -194,17 +194,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -229,12 +229,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -269,47 +269,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -359,8 +359,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -488,7 +488,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -554,7 +554,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -614,7 +614,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -634,7 +634,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -659,7 +659,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -684,17 +684,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -764,12 +764,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -799,7 +799,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -825,7 +825,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -835,6 +835,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/nl/LC_MESSAGES/activity.po b/priv/gettext/nl/LC_MESSAGES/activity.po
index 4145c0eb..4319392c 100644
--- a/priv/gettext/nl/LC_MESSAGES/activity.po
+++ b/priv/gettext/nl/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/nl/LC_MESSAGES/errors.po b/priv/gettext/nl/LC_MESSAGES/errors.po
index bdb41f56..a13bc6d9 100644
--- a/priv/gettext/nl/LC_MESSAGES/errors.po
+++ b/priv/gettext/nl/LC_MESSAGES/errors.po
@@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -129,18 +129,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -148,49 +148,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -200,17 +200,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -275,47 +275,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -365,8 +365,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -494,7 +494,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -620,7 +620,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -690,17 +690,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -770,12 +770,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -805,7 +805,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -841,6 +841,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/nn/LC_MESSAGES/activity.po b/priv/gettext/nn/LC_MESSAGES/activity.po
index d2e1ac97..753b5690 100644
--- a/priv/gettext/nn/LC_MESSAGES/activity.po
+++ b/priv/gettext/nn/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/nn/LC_MESSAGES/errors.po b/priv/gettext/nn/LC_MESSAGES/errors.po
index 4cb5e014..359c2132 100644
--- a/priv/gettext/nn/LC_MESSAGES/errors.po
+++ b/priv/gettext/nn/LC_MESSAGES/errors.po
@@ -126,7 +126,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Denne brukaren er ikkje styrar av gruppa"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Greidde ikkje lagra brukarinnstillingane"
 
@@ -152,18 +152,18 @@ msgid "Member not found"
 msgstr "Fann ikkje medlemen"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Fann ingen profil for moderator-brukaren"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Fann ingen brukar med denne eposten å godkjenna"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Fann ingen brukar med denne eposten"
 
@@ -171,49 +171,49 @@ msgstr "Fann ingen brukar med denne eposten"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Ingen godkjent brukar eig denne profilen"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Det er ikkje opna for å registrera seg"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Dette passordet er ugyldig"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Den nye epostadressa ser ut til å vera feil"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Den nye epostadressa må vera annleis"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Det nye passordet må vera annleis"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Dette passordet er ugyldig"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr "Dette passordet er for kort. Passord må ha minst 6 teikn."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Denne brukaren kan ikkje nullstilla passordet sitt"
 
@@ -223,17 +223,17 @@ msgid "This user has been disabled"
 msgstr "Denne brukaren er avskrudd"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Greier ikkje godkjenna brukaren"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Brukaren er allereie inaktiv"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "Den førespurte brukaren er ikkje innlogga"
 
@@ -258,12 +258,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Du kan ikkje lista opp grupper med mindre du er moderator."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Du må vera innlogga for å endra epostadressa di"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Du må vera innlogga for å endra passordet ditt"
 
@@ -273,7 +273,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Du må vera innlogga for å sletta ei gruppe"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Du må vera innlogga for å sletta kontoen din"
 
@@ -298,47 +298,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Du treng eit eksisterande teikn for å få eit fornyingsteikn"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Du ba om ny stadfestingsepost for snøgt"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Epostadressa di er ikkje på lista over godkjende adresser"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Greidde ikkje utføra ei bakgrunnsoppgåve"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Fann ingen profil med denne ID-en"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Fann ingen fjern profil med denne ID-en"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Berre moderatorar og styrarar kan sperra ein profil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Berre moderatorar og styrarar kan oppheva sperring av profilar"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Du kan berre lasta fjerne profilar på nytt"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Profilen er allereie sperra"
 
@@ -388,8 +388,8 @@ msgid "Event id not found"
 msgstr "Fann ikkje ID-en til hendinga"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Fann ikkje hendinga"
 
@@ -517,7 +517,7 @@ msgid "Token is not a valid UUID"
 msgstr "Teiknet er ikkje ein gyldig UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Fann ikkje brukaren"
 
@@ -588,7 +588,7 @@ msgid "You cannot delete this comment"
 msgstr "Du kan ikkje sletta denne kommentaren"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Du kan ikkje sletta denne hendinga"
 
@@ -655,7 +655,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Du må vera innlogga for å sjå ressursane"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Du må vera innlogga for å laga hendingar"
 
@@ -675,7 +675,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Du må vera innlogga for å laga ressursar"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Du må vera innlogga for å sletta ei hending"
 
@@ -700,7 +700,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Du må vera innlogga for å melda deg av ei hending"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Du må vera innlogga for å oppdatera hendingar"
 
@@ -725,19 +725,19 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "Opphavsressursen høyrer ikkje til denne gruppa"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Dette passordet er for kort."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "Registreringsteiknet er allereie i bruk, dette ser ut som ein feil frå vår "
 "side."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Denne eposten er allereie i bruk."
 
@@ -807,12 +807,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Profilen er ikkje administrator for gruppa"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Du kan ikkje endra denne hendinga."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Du kan ikkje kopla denne hendinga til denne profilen."
 
@@ -843,7 +843,7 @@ msgstr ""
 "Du må gje anten ein ID eller ei stuttadresse for å få tilgang til ordskiftet"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Brukaren eig ikkje arrangørprofilen"
 
@@ -869,7 +869,7 @@ msgid "Error while creating resource"
 msgstr "Greidde ikkje laga ressursen"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Ugyldig aktiveringslykjel"
 
@@ -879,6 +879,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Greidde ikkje henta ressursdetaljane frå denne adressa."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Moderatorprofilen har ikkje tilgang til denne hendinga"
diff --git a/priv/gettext/oc/LC_MESSAGES/activity.po b/priv/gettext/oc/LC_MESSAGES/activity.po
index 3531e9da..d22ecd21 100644
--- a/priv/gettext/oc/LC_MESSAGES/activity.po
+++ b/priv/gettext/oc/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/oc/LC_MESSAGES/errors.po b/priv/gettext/oc/LC_MESSAGES/errors.po
index b9176f18..a1d37534 100644
--- a/priv/gettext/oc/LC_MESSAGES/errors.po
+++ b/priv/gettext/oc/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Lo perfil actual es pas administrator del grop seleccionat"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Error en salvagardant los paramètres utilizaire"
 
@@ -138,18 +138,18 @@ msgid "Member not found"
 msgstr "Membre pas trobat"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Cap de perfil pas trobat per l’utilizaire moderator"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr "Cap d’utilizaire de validar amb aqueste email pas trobat"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Degun trobat d'amb aquesta email"
 
@@ -157,51 +157,51 @@ msgstr "Degun trobat d'amb aquesta email"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Lo perhiu es pas proprietat del utilizator autenticat"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Las inscripciones sèn pas obèrtas"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Lo mòt de santa clara actuau es invalid"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Lo email nau sèm invalid"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Lo email nau deb esser different"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Lo mòt de santa clara nau deb esser different"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Lo mòt de santa clara aprovedit es invalid"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Lo mòt de santa clara que avetz causit es tròp cort. Merci de vos assegurar "
 "que vostre mòt de santa clara contienga au mèns 6 caracteres."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Aquest utilizator pod pas reinicializar lo sèn mòt de santa clara"
 
@@ -211,17 +211,17 @@ msgid "This user has been disabled"
 msgstr "Aquest utilizator a essat dasactivat"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Es impossible de validar l'utilizator"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Utilizator déjà desactivat"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "L'utilizator demandat es pas conectat"
 
@@ -246,12 +246,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Podetz listar los grops sonque se essetz moderator."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Debetz esser conectat per cambiar lo voste email"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Debetz d'esser conectat per cambiar lo voste mòt de santa clara"
 
@@ -261,7 +261,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Debetz d'esser conectat per suprimir un grop"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Devetz d'esser conectat per suprimir lo voste compte"
 
@@ -286,48 +286,48 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Devetz aver un senhau existant per obtiéner un senhau nau"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Demandatz de nau un email de confirmacion tròp lèu"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Vòstre email es pas en la lista d'autorizacions"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Error mentre que efectuant ua tasca de plan darrèr"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Cap de profiu trobat d'amb aquesta ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Cap de profiu distant trobat d'amb aquesta ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Sonque moderators e administrators pòden suspendre un profiu"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 "Sonque moderators e administrators pòden annular la suspension d'un profiu"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Sonque profius distants pòden esser refrescats"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Profiu déjà suspendut"
 
@@ -377,8 +377,8 @@ msgid "Event id not found"
 msgstr "ID d'eveniment non trobat"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Eveniment non trobat"
 
@@ -506,7 +506,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -572,7 +572,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -632,7 +632,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -652,7 +652,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -677,7 +677,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -702,17 +702,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -782,12 +782,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -817,7 +817,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -843,7 +843,7 @@ msgid "Error while creating resource"
 msgstr "Error mentre que sauvant lo rapòrt"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -853,6 +853,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/pl/LC_MESSAGES/activity.po b/priv/gettext/pl/LC_MESSAGES/activity.po
index 7fca2979..058f96f2 100644
--- a/priv/gettext/pl/LC_MESSAGES/activity.po
+++ b/priv/gettext/pl/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=3\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -238,6 +238,28 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/pl/LC_MESSAGES/errors.po b/priv/gettext/pl/LC_MESSAGES/errors.po
index 1faef75e..54d6830e 100644
--- a/priv/gettext/pl/LC_MESSAGES/errors.po
+++ b/priv/gettext/pl/LC_MESSAGES/errors.po
@@ -117,7 +117,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Obecny profil nie jest administratorem zaznaczonej grupy"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Błąd zapisywania ustawień użytkownika"
 
@@ -144,19 +144,19 @@ msgid "Member not found"
 msgstr "Nie odnaleziono użytkownika"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Nie znaleziono profilu dla konta moderatora"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 "Nie znaleziono użytkownika do zatwierdzenia z użyciem tego adresu e-mail"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Nie znaleziono użytkownika o tym adresie e-mail"
 
@@ -164,51 +164,51 @@ msgstr "Nie znaleziono użytkownika o tym adresie e-mail"
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Profil nie należy do uwierzytelnionego użytkownika"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Rejestracje nie są otwarte"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Obecne hasło jest nieprawidłowe"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Nowy adres e-mail nie wydaje się być prawidłowy"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Nowy adres e-mail musi się różnić od obecnego"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Nowe hasło musi różnić się od obecnego"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Wprowadzone hasło jest nieprawidłowe"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Wprowadzone hasło jest zbyt krótkie. Upewnij się, że Twoje hasło składa się "
 "z przynajmniej 6 znaków."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Ten użytkownik nie może resetować swojego hasła"
 
@@ -218,17 +218,17 @@ msgid "This user has been disabled"
 msgstr "Ten użytkownik jest wyłączony"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Nie udało się zwalidować użytkownika"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Użytkownik jest już wyłączony"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "Żądany użytkownik nie jest zalogowany"
 
@@ -254,12 +254,12 @@ msgid "You may not list groups unless moderator."
 msgstr "Nie masz dostępu do listy grup, jeżeli nie jesteś moderatorem."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr "Musisz być zalogowany(-a), aby zmienić adres e-mail"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Musisz być zalogowany(-a), aby zmienić hasło"
 
@@ -269,7 +269,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Musisz być zalogowany(-a), aby usunąć grupę"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Musisz być zalogowany(-a), aby usunąć konto"
 
@@ -294,47 +294,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "Musisz mieć istniejący token, aby uzyskać token odświeżający"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Zbyt wcześnie poprosiłeś(-aś) o nową wiadomość potwierdzającą"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Twój adres e-mail nie jest na białej liście"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Błąd podczas przetwarzania zadań w tle"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Nie ma profilu o tym ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Nie ma zdalnego profilu o tym ID"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Tylko moderatorzy i administratorzy mogą zawiesić profil"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Tylko moderatorzy i administratorzy mogą cofnąć zawieszenie profilu"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Tylko zdalne profile mogą być odświeżane"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Już zawieszono profil"
 
@@ -384,8 +384,8 @@ msgid "Event id not found"
 msgstr "Nie znaleziono id wydarzenia"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Nie znaleziono wydarzenia"
 
@@ -513,7 +513,7 @@ msgid "Token is not a valid UUID"
 msgstr "Token nie jest prawidłowym UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
@@ -581,7 +581,7 @@ msgid "You cannot delete this comment"
 msgstr "Nie możesz usunąć tego komentarza"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Nie możesz usunąć tego wydarzenia"
 
@@ -647,7 +647,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Musisz być zalogowany(-a), aby uzyskać dostęp do zasobów"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr "Musisz być zalogowany(-a), aby móc utworzyć wydarzenia"
 
@@ -667,7 +667,7 @@ msgid "You need to be logged-in to create resources"
 msgstr "Musisz być zalogowany(-a), aby utworzyć zasób"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr "Musisz być zalogowany(-a), aby usunąć wydarzenie"
 
@@ -692,7 +692,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Musisz być zalogowany(-a), aby opuścić wydarzenie"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Musisz być zalogowany(-a), aby zaktualizować wydarzenie"
 
@@ -717,19 +717,19 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "Nadrzędny zasób nie należy do tej grupy"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Wybrane hasło jest zbyt krótkie"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "Token rejestracyjny jest już w użyciu, to wygląda na problem po naszej "
 "stronie."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Ten adres e-mail jest już w użyciu."
 
@@ -799,12 +799,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Profil nie jest administratorem grupy"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Nie możesz edytować tego wydarzenia."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Nie możesz przypisać tego wydarzenia do tego profilu."
 
@@ -834,7 +834,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgid "Error while creating resource"
 msgstr "Wystąpił błąd podczas zapisywania zgłoszenia"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -870,6 +870,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Wskazany profil moderatora nie ma uprawnień dla tego wydarzenia"
diff --git a/priv/gettext/pt/LC_MESSAGES/activity.po b/priv/gettext/pt/LC_MESSAGES/activity.po
index 2bf2bb1c..5bac3502 100644
--- a/priv/gettext/pt/LC_MESSAGES/activity.po
+++ b/priv/gettext/pt/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/pt/LC_MESSAGES/errors.po b/priv/gettext/pt/LC_MESSAGES/errors.po
index 4cc4c6f7..0ad4164a 100644
--- a/priv/gettext/pt/LC_MESSAGES/errors.po
+++ b/priv/gettext/pt/LC_MESSAGES/errors.po
@@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -129,18 +129,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -148,49 +148,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -200,17 +200,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -275,47 +275,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -365,8 +365,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -494,7 +494,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -620,7 +620,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -690,17 +690,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -770,12 +770,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -805,7 +805,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -841,6 +841,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/pt_BR/LC_MESSAGES/activity.po b/priv/gettext/pt_BR/LC_MESSAGES/activity.po
index 6412a93a..6590e373 100644
--- a/priv/gettext/pt_BR/LC_MESSAGES/activity.po
+++ b/priv/gettext/pt_BR/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/pt_BR/LC_MESSAGES/errors.po b/priv/gettext/pt_BR/LC_MESSAGES/errors.po
index 538063b0..8cb11f0a 100644
--- a/priv/gettext/pt_BR/LC_MESSAGES/errors.po
+++ b/priv/gettext/pt_BR/LC_MESSAGES/errors.po
@@ -103,7 +103,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr ""
 
@@ -129,18 +129,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -148,49 +148,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -200,17 +200,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -235,12 +235,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -250,7 +250,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -275,47 +275,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -365,8 +365,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -494,7 +494,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -560,7 +560,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -620,7 +620,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -690,17 +690,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -770,12 +770,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -805,7 +805,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -841,6 +841,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""
diff --git a/priv/gettext/ru/LC_MESSAGES/activity.po b/priv/gettext/ru/LC_MESSAGES/activity.po
index acb893cd..e792e233 100644
--- a/priv/gettext/ru/LC_MESSAGES/activity.po
+++ b/priv/gettext/ru/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=3\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -238,6 +238,28 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/ru/LC_MESSAGES/errors.po b/priv/gettext/ru/LC_MESSAGES/errors.po
index f33f46ed..13ddaea6 100644
--- a/priv/gettext/ru/LC_MESSAGES/errors.po
+++ b/priv/gettext/ru/LC_MESSAGES/errors.po
@@ -117,7 +117,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr "Текущий профиль не является администратором выбранной группы"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Ошибка при сохранении пользовательских настроек"
 
@@ -145,20 +145,20 @@ msgid "Member not found"
 msgstr "Участник не найден"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr "Профиль модератора не найден"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 "Не найдено ни одного пользователя для подтверждения с этим адресом "
 "электронной почты"
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr "Пользователя с этим адресом электронной почты не найдено"
 
@@ -166,51 +166,51 @@ msgstr "Пользователя с этим адресом электронно
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr "Профиль не принадлежит аутентифицированному пользователю"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr "Регистрация не открыта"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr "Текущий пароль неверен"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr "Новый адрес электронной почты недействителен"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr "Новый адрес электронной почты должен отличаться от текущего"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr "Новый пароль должен отличаться от текущего"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr "Введён неверный пароль"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 "Введенный пароль слишком короткий. Убедитесь, что ваш пароль состоит не "
 "менее чем из 6 символов."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr "Этот пользователь не может сбросить свой пароль"
 
@@ -220,17 +220,17 @@ msgid "This user has been disabled"
 msgstr "Этот пользователь отключен"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr "Невозможно проверить пользователя"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr "Пользователь уже отключен"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr "Запрошенный пользователь не авторизован"
 
@@ -256,13 +256,13 @@ msgid "You may not list groups unless moderator."
 msgstr "Только модератор может просматривать список групп."
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 "Вам необходимо войти в систему, чтобы изменить свой адрес электронной почты"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr "Вам необходимо войти в систему, чтобы изменить свой пароль"
 
@@ -272,7 +272,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr "Вам необходимо войти в систему, чтобы удалить группу"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr "Вам необходимо войти в систему, чтобы удалить свою учетную запись"
 
@@ -297,47 +297,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr "У вас должен быть существующий токен, чтобы получить токен обновления"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr "Вы слишком рано запросили новое письмо с подтверждением"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr "Ваш адрес электронной почты отсутствует в белом списке"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr "Ошибка при выполнении фоновой задачи"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr "Профиль с этим ID не найден"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr "Удалённый профиль с этим ID не найден"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr "Только модераторы и администраторы могут заблокировать профиль"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr "Только модераторы и администраторы могут разблокировать профиль"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr "Обновлять можно только удаленные профили"
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr "Профиль уже заблокирован"
 
@@ -387,8 +387,8 @@ msgid "Event id not found"
 msgstr "Не найден id мероприятия"
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr "Мероприятие не найдено"
 
@@ -518,7 +518,7 @@ msgid "Token is not a valid UUID"
 msgstr "Токен не является допустимым UUID"
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr "Пользователь не найден"
 
@@ -588,7 +588,7 @@ msgid "You cannot delete this comment"
 msgstr "Вы не можете удалить этот комментарий"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr "Вы не можете удалить это мероприятие"
 
@@ -658,7 +658,7 @@ msgid "You need to be logged-in to access resources"
 msgstr "Вам необходимо войти в систему, чтобы получить доступ к ресурсам"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 "Вам необходимо войти в систему, чтобы иметь возможность создавать мероприятия"
@@ -682,7 +682,7 @@ msgstr ""
 "Вам необходимо войти в систему, чтобы иметь возможность создавать ресурсы"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 "Вам необходимо войти в систему, чтобы иметь возможность удалить мероприятие"
@@ -709,7 +709,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr "Вам необходимо войти в систему, чтобы покинуть мероприятие"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr "Вам необходимо войти в систему, чтобы обновить мероприятие"
 
@@ -738,18 +738,18 @@ msgid "Parent resource doesn't belong to this group"
 msgstr "Родительский ресурс не принадлежит к этой группе"
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr "Выбран слишком короткий пароль."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 "Регистрационный токен уже используется. Похоже, что проблема с нашей стороны."
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr "Этот электронный адрес уже используется."
 
@@ -819,12 +819,12 @@ msgid "Profile is not administrator for the group"
 msgstr "Профиль не является администратором группы"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr "Вы не можете редактировать это мероприятие."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr "Вы не можете назначить это мероприятие этому профилю."
 
@@ -855,7 +855,7 @@ msgstr ""
 "Вы должны предоставить либо ID, либо короткое имя для доступа к обсуждению"
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr "Профиль организатора не принадлежит пользователю"
 
@@ -881,7 +881,7 @@ msgid "Error while creating resource"
 msgstr "При создании ресурса произошла ошибка"
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr "Неверный токен активации"
 
@@ -891,6 +891,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr "Невозможно получить сведения о ресурсе по этому URL-адресу."
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr "Указанный профиль модератора не имеет доступа к этому событию"
diff --git a/priv/gettext/sv/LC_MESSAGES/activity.po b/priv/gettext/sv/LC_MESSAGES/activity.po
index 627afa7b..a2db59b8 100644
--- a/priv/gettext/sv/LC_MESSAGES/activity.po
+++ b/priv/gettext/sv/LC_MESSAGES/activity.po
@@ -12,40 +12,40 @@ msgstr ""
 "Plural-Forms: nplurals=2\n"
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:43
+#: lib/service/activity/renderer/member.ex:38
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:19 lib/web/templates/email/activity/_member_activity_item.text.eex:12
 msgid "%{member} accepted the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:53
+#: lib/service/activity/renderer/member.ex:42
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:26 lib/web/templates/email/activity/_member_activity_item.text.eex:17
 msgid "%{member} rejected the invitation to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:23
+#: lib/service/activity/renderer/member.ex:30
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:4 lib/web/templates/email/activity/_member_activity_item.text.eex:1
 msgid "%{member} requested to join the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:33
+#: lib/service/activity/renderer/member.ex:34
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:11 lib/web/templates/email/activity/_member_activity_item.text.eex:6
 msgid "%{member} was invited by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:72
+#: lib/service/activity/renderer/member.ex:50
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:40 lib/web/templates/email/activity/_member_activity_item.text.eex:27
 msgid "%{profile} added the member %{member}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:53
-#: lib/service/activity/renderer/post.ex:53 lib/web/templates/email/activity/_comment_activity_item.html.eex:49
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 lib/web/templates/email/activity/_discussion_activity_item.html.eex:46
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
+#: lib/service/activity/renderer/comment.ex:72
+#: lib/service/activity/renderer/discussion.ex:53 lib/service/activity/renderer/post.ex:53
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:49 lib/web/templates/email/activity/_comment_activity_item.text.eex:19
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:46 lib/web/templates/email/activity/_discussion_activity_item.text.eex:19
 msgid "%{profile} archived the discussion %{discussion}."
 msgstr ""
 
@@ -76,10 +76,10 @@ msgid "%{profile} created the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:63
-#: lib/service/activity/renderer/post.ex:63 lib/web/templates/email/activity/_comment_activity_item.html.eex:64
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:25 lib/web/templates/email/activity/_discussion_activity_item.html.eex:60
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
+#: lib/service/activity/renderer/comment.ex:82
+#: lib/service/activity/renderer/discussion.ex:63 lib/service/activity/renderer/post.ex:63
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:64 lib/web/templates/email/activity/_comment_activity_item.text.eex:25
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:60 lib/web/templates/email/activity/_discussion_activity_item.text.eex:25
 msgid "%{profile} deleted the discussion %{discussion}."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "%{profile} deleted the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:92
+#: lib/service/activity/renderer/member.ex:58
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:56 lib/web/templates/email/activity/_member_activity_item.text.eex:39
 msgid "%{profile} excluded member %{member}."
 msgstr ""
@@ -114,16 +114,16 @@ msgid "%{profile} moved the resource %{resource}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:102
+#: lib/service/activity/renderer/member.ex:62
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:64 lib/web/templates/email/activity/_member_activity_item.text.eex:45
 msgid "%{profile} quit the group."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/discussion.ex:43
-#: lib/service/activity/renderer/post.ex:43 lib/web/templates/email/activity/_comment_activity_item.html.eex:34
-#: lib/web/templates/email/activity/_comment_activity_item.text.eex:13 lib/web/templates/email/activity/_discussion_activity_item.html.eex:32
-#: lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
+#: lib/service/activity/renderer/comment.ex:62
+#: lib/service/activity/renderer/discussion.ex:43 lib/service/activity/renderer/post.ex:43
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:34 lib/web/templates/email/activity/_comment_activity_item.text.eex:13
+#: lib/web/templates/email/activity/_discussion_activity_item.html.eex:32 lib/web/templates/email/activity/_discussion_activity_item.text.eex:13
 msgid "%{profile} renamed the discussion %{discussion}."
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "%{profile} updated the group %{group}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:82
+#: lib/service/activity/renderer/member.ex:54
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:48 lib/web/templates/email/activity/_member_activity_item.text.eex:33
 msgid "%{profile} updated the member %{member}."
 msgstr ""
@@ -196,7 +196,7 @@ msgid "The post %{post} was updated by %{profile}."
 msgstr ""
 
 #, elixir-format
-#: lib/service/activity/renderer/member.ex:63
+#: lib/service/activity/renderer/member.ex:46
 #: lib/web/templates/email/activity/_member_activity_item.html.eex:33 lib/web/templates/email/activity/_member_activity_item.text.eex:22
 msgid "%{member} joined the group."
 msgstr ""
@@ -214,14 +214,14 @@ msgid "%{profile} replied to a comment on the event %{event}."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:142
-#: lib/web/templates/email/email_direct_activity.text.eex:21
+#: lib/web/templates/email/email_direct_activity.html.eex:144
+#: lib/web/templates/email/email_direct_activity.text.eex:23
 msgid "Don't want to receive activity notifications? You may change frequency or disable them in your settings."
 msgstr ""
 
 #, elixir-format
-#: lib/web/templates/email/email_direct_activity.html.eex:122
-#: lib/web/templates/email/email_direct_activity.text.eex:17
+#: lib/web/templates/email/email_direct_activity.html.eex:124
+#: lib/web/templates/email/email_direct_activity.text.eex:19
 msgid "View one more activity"
 msgid_plural "View %{count} more activities"
 msgstr[0] ""
@@ -236,6 +236,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-format
-#: lib/service/activity/renderer/renderer.ex:28
+#: lib/service/activity/renderer/renderer.ex:38
 msgid "Activity on %{instance}"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:38
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:88 lib/web/templates/email/activity/_comment_activity_item.text.eex:37
+msgid "%{profile} has posted an announcement under event %{event}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/email/activity/_comment_activity_item.text.eex:31
+msgid "%{profile} mentionned you in a comment under %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:24
+#: lib/web/templates/email/activity/_comment_activity_item.html.eex:73
+msgid "%{profile} mentionned you in a comment under event %{event}."
+msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/service/activity/renderer/comment.ex:52
+msgid "%{profile} mentionned you in the discussion %{discussion}."
+msgstr ""
diff --git a/priv/gettext/sv/LC_MESSAGES/default.po b/priv/gettext/sv/LC_MESSAGES/default.po
index b7ae50d6..e2f642ea 100644
--- a/priv/gettext/sv/LC_MESSAGES/default.po
+++ b/priv/gettext/sv/LC_MESSAGES/default.po
@@ -14,132 +14,132 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.6.2\n"
 
-#: lib/web/templates/email/password_reset.html.eex:48
 #, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:48
 msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
 msgstr ""
 "Du kan ignorera det här meddelandet om du inte frågade efter det. Ditt "
 "lösenord kommer inte ändras förrän du har öppnat länken nedan och skapat ett "
 "nytt."
 
-#: lib/web/templates/email/report.html.eex:74
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:74
 msgid "%{title} by %{creator}"
 msgstr "%{title} av %{creator}"
 
-#: lib/web/templates/email/registration_confirmation.html.eex:58
 #, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:58
 msgid "Activate my account"
 msgstr "Aktivera mitt konto"
 
+#, elixir-format
 #: lib/web/templates/email/email.html.eex:118
 #: lib/web/templates/email/email.text.eex:9
-#, elixir-format
 msgid "Ask the community on Framacolibri"
 msgstr "Fråga människorna på Framacolibri"
 
-#: lib/web/templates/email/report.text.eex:15
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:15
 msgid "Comments"
 msgstr "Kommentarer"
 
+#, elixir-format
 #: lib/web/templates/email/report.html.eex:72
 #: lib/web/templates/email/report.text.eex:11
-#, elixir-format
 msgid "Event"
 msgstr "Evenemang"
 
-#: lib/web/email/user.ex:48
 #, elixir-format
+#: lib/web/email/user.ex:48
 msgid "Instructions to reset your password on %{instance}"
 msgstr "Instruktioner för att återställa ditt lösenord på %{instance}"
 
-#: lib/web/templates/email/report.text.eex:21
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:21
 msgid "Reason"
 msgstr "Motivering"
 
-#: lib/web/templates/email/password_reset.html.eex:61
 #, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:61
 msgid "Reset Password"
 msgstr "Återställ lösenordet"
 
-#: lib/web/templates/email/password_reset.html.eex:41
 #, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:41
 msgid "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time."
 msgstr ""
 "Det är enkelt att återställa ditt lösenord, klicka bara på knappen nedan och "
 "följ instruktionerna. Du kommer vara igång igen på nolltid."
 
-#: lib/web/email/user.ex:28
 #, elixir-format
+#: lib/web/email/user.ex:28
 msgid "Instructions to confirm your Mobilizon account on %{instance}"
 msgstr "Instruktioner för att bekräfta ditt Mobilizon-konto på %{instance}"
 
-#: lib/web/email/admin.ex:24
 #, elixir-format
+#: lib/web/email/admin.ex:24
 msgid "New report on Mobilizon instance %{instance}"
 msgstr "Ny anmälan på Mobilizon-instansen %{instance}"
 
+#, elixir-format
 #: lib/web/templates/email/before_event_notification.html.eex:51
 #: lib/web/templates/email/before_event_notification.text.eex:4
-#, elixir-format
 msgid "Go to event page"
 msgstr "Gå till evenemangets sida"
 
-#: lib/web/templates/email/report.text.eex:1
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:1
 msgid "New report from %{reporter} on %{instance}"
 msgstr "Ny anmälan från %{reporter} på %{instance}"
 
-#: lib/web/templates/email/event_participation_approved.text.eex:1
 #, elixir-format
+#: lib/web/templates/email/event_participation_approved.text.eex:1
 msgid "Participation approved"
 msgstr "Ditt deltagande har godkänts"
 
+#, elixir-format
 #: lib/web/templates/email/password_reset.html.eex:13
 #: lib/web/templates/email/password_reset.text.eex:1
-#, elixir-format
 msgid "Password reset"
 msgstr "Återställ lösenord"
 
-#: lib/web/templates/email/password_reset.text.eex:7
 #, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:7
 msgid "Resetting your password is easy. Just click the link below and follow the instructions. We'll have you up and running in no time."
 msgstr ""
 "Det är enkelt att återställa ditt lösenord, klicka bara på knappen nedan och "
 "följ instruktionerna. Du kommer vara igång igen på nolltid."
 
-#: lib/web/templates/email/registration_confirmation.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/registration_confirmation.text.eex:5
 msgid "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email."
 msgstr ""
 "Du har skapat ett konto på %{host} med den här e-postadressen. Det återstår "
 "bara ett klick för att aktivera den. Om det inte var du som gjorde det kan "
 "du strunta i det här meddelandet."
 
-#: lib/web/email/participation.ex:112
 #, elixir-format
+#: lib/web/email/participation.ex:112
 msgid "Your participation to event %{title} has been approved"
 msgstr "Din förfrågan om att få delta i evenemanget %{title} har godkännts"
 
-#: lib/web/email/participation.ex:70
 #, elixir-format
+#: lib/web/email/participation.ex:70
 msgid "Your participation to event %{title} has been rejected"
 msgstr "Din förfrågan om att få delta i evenemanget %{title} har fått avslag"
 
-#: lib/web/email/event.ex:37
 #, elixir-format
+#: lib/web/email/event.ex:37
 msgid "Event %{title} has been updated"
 msgstr "Evenemanget %{title} har uppdaterats"
 
-#: lib/web/templates/email/event_updated.text.eex:15
 #, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:15
 msgid "New title: %{title}"
 msgstr "Ny titel: %{title}"
 
-#: lib/web/templates/email/password_reset.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:5
 msgid "You requested a new password for your account on %{instance}."
 msgstr "Du har bett om ett nytt lösenord för ditt konto på %{instance}."
 
@@ -148,634 +148,633 @@ msgstr "Du har bett om ett nytt lösenord för ditt konto på %{instance}."
 msgid "Warning"
 msgstr "Varning"
 
-#: lib/web/email/participation.ex:135
 #, elixir-format
+#: lib/web/email/participation.ex:135
 msgid "Confirm your participation to event %{title}"
 msgstr "Bekräfta ditt deltagande i eventet %{title}"
 
-#: lib/web/templates/api/privacy.html.eex:75
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:75
 msgctxt "terms"
 msgid "An internal ID for your current selected identity"
 msgstr "Ett internt ID för din nuvarande vald identitet"
 
-#: lib/web/templates/api/privacy.html.eex:74
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:74
 msgctxt "terms"
 msgid "An internal user ID"
 msgstr "Ett internt användar-ID"
 
-#: lib/web/templates/api/privacy.html.eex:37
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:37
 msgctxt "terms"
 msgid "Any of the information we collect from you may be used in the following ways:"
 msgstr "All information som vi samlar från dig kan användas på följande sätt:"
 
-#: lib/web/templates/api/privacy.html.eex:9
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:9
 msgctxt "terms"
 msgid "Basic account information"
 msgstr "Grundläggande kontoinformation"
 
-#: lib/web/templates/api/privacy.html.eex:25
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:25
 msgctxt "terms"
 msgid "Do not share any dangerous information over Mobilizon."
 msgstr "Dela inte farlig information över Mobilizon."
 
-#: lib/web/templates/api/privacy.html.eex:90
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:90
 msgctxt "terms"
 msgid "Do we disclose any information to outside parties?"
 msgstr "Utlämnar vi någon information till utanståender parter?"
 
-#: lib/web/templates/api/privacy.html.eex:68
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:68
 msgctxt "terms"
 msgid "Do we use cookies?"
 msgstr "Använder vi kakor?"
 
-#: lib/web/templates/api/privacy.html.eex:51
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:51
 msgctxt "terms"
 msgid "How do we protect your information?"
 msgstr "Hur skyddar vi din information?"
 
-#: lib/web/templates/api/privacy.html.eex:29
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:29
 msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr "IP-adresser och andra metadata"
 
-#: lib/web/templates/api/privacy.html.eex:17
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
 msgid "Published events and comments"
 msgstr "Publicerade evenemang och kommentarer"
 
-#: lib/web/templates/api/privacy.html.eex:64
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:64
 msgctxt "terms"
 msgid "Retain the IP addresses associated with registered users no more than 12 months."
 msgstr ""
 "Behåll inte IP-adresser kopplade till registrerade användare mer än 12 "
 "månader."
 
-#: lib/web/templates/api/privacy.html.eex:76
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:76
 msgctxt "terms"
 msgid "Tokens to authenticate you"
 msgstr "Nycklar för att identifiera dig"
 
-#: lib/web/templates/api/privacy.html.eex:31
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:31
 msgctxt "terms"
 msgid "We also may retain server logs which include the IP address of every request to our server."
 msgstr ""
 "Vi kan även behålla serverloggar med IP-adress för varje förfrågan till vår "
 "server."
 
-#: lib/web/templates/api/privacy.html.eex:70
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:70
 msgctxt "terms"
 msgid "We store the following information on your device when you connect:"
 msgstr "Vi sparar följande information på din enhet när du ansluter:"
 
-#: lib/web/templates/api/privacy.html.eex:58
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:58
 msgctxt "terms"
 msgid "We will make a good faith effort to:"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:35
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:35
 msgctxt "terms"
 msgid "What do we use your information for?"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:57
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:57
 msgctxt "terms"
 msgid "What is our data retention policy?"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:67
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:67
 msgctxt "terms"
 msgid "You may irreversibly delete your account at any time."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:115
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:115
 msgctxt "terms"
 msgid "Changes to our Privacy Policy"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:106
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:106
 msgctxt "terms"
 msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:109
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:109
 msgctxt "terms"
 msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:117
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:117
 msgctxt "terms"
 msgid "If we decide to change our privacy policy, we will post those changes on this page."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:112
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:112
 msgctxt "terms"
 msgid "Law requirements can be different if this server is in another jurisdiction."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:103
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:103
 msgctxt "terms"
 msgid "Site usage by children"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:47
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:47
 msgctxt "terms"
 msgid "The email address you provide may be used to send you information, updates and notifications about other people\n    interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n    questions."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:45
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:45
 msgctxt "terms"
 msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n    evasion or other violations."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:43
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:43
 msgctxt "terms"
 msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n    interact with other people's content and post your own content if you are logged in."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:6
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:6
 msgctxt "terms"
 msgid "What information do we collect?"
 msgstr ""
 
-#: lib/web/email/user.ex:176
 #, elixir-format
+#: lib/web/email/user.ex:176
 msgid "Mobilizon on %{instance}: confirm your email address"
 msgstr "Mobilizon på %{instance}: bekräfta din e-postadress"
 
-#: lib/web/email/user.ex:152
 #, elixir-format
+#: lib/web/email/user.ex:152
 msgid "Mobilizon on %{instance}: email changed"
 msgstr "Mobilizon på %{instance}: e-postadressen har ändrats"
 
-#: lib/web/email/notification.ex:47
 #, elixir-format
+#: lib/web/email/notification.ex:47
 msgid "One event planned today"
 msgid_plural "%{nb_events} events planned today"
 msgstr[0] "Ett evenemang har planerats idag"
 msgstr[1] "%{nb_events} evenemang har planerats idag"
 
+#, elixir-format
 #: lib/web/templates/email/on_day_notification.html.eex:38
 #: lib/web/templates/email/on_day_notification.text.eex:4
-#, elixir-format
 msgid "You have one event today:"
 msgid_plural "You have %{total} events today:"
 msgstr[0] "Du har ett evenemang idag:"
 msgstr[1] "Du har %{total} evenemang idag:"
 
-#: lib/web/templates/email/group_invite.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/group_invite.text.eex:3
 msgid "%{inviter} just invited you to join their group %{group}"
 msgstr "%{inviter} bjöd nyss in dig till sin grupp %{group}"
 
+#, elixir-format
 #: lib/web/templates/email/group_invite.html.eex:13
 #: lib/web/templates/email/group_invite.text.eex:1
-#, elixir-format
 msgid "Come along!"
 msgstr "Häng på!"
 
-#: lib/web/email/notification.ex:24
 #, elixir-format
+#: lib/web/email/notification.ex:24
 msgid "Don't forget to go to %{title}"
 msgstr "Glöm inte att gå till %{title}"
 
+#, elixir-format
 #: lib/web/templates/email/before_event_notification.html.eex:38
 #: lib/web/templates/email/before_event_notification.text.eex:3
-#, elixir-format
 msgid "Get ready for %{title}"
 msgstr "Gör dig redo för %{title}"
 
-#: lib/web/templates/email/group_invite.html.eex:59
 #, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:59
 msgid "See my groups"
 msgstr "Visa mina grupper"
 
+#, elixir-format
 #: lib/web/templates/email/group_invite.html.eex:45
 #: lib/web/templates/email/group_invite.text.eex:5
-#, elixir-format
 msgid "To accept this invitation, head over to your groups."
 msgstr "Gå till dina grupper för att acceptera den här inbjudan."
 
-#: lib/web/templates/email/before_event_notification.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/before_event_notification.text.eex:5
 msgid "View the event on: %{link}"
 msgstr "Visa det uppdaterade evenemanget på %{link}"
 
-#: lib/web/email/group.ex:33
 #, elixir-format
+#: lib/web/email/group.ex:33
 msgid "You have been invited by %{inviter} to join group %{group}"
 msgstr "%{inviter} har bjudit in dig till gruppen %{group}"
 
-#: lib/web/email/notification.ex:71
 #, elixir-format
+#: lib/web/email/notification.ex:71
 msgid "One event planned this week"
 msgid_plural "%{nb_events} events planned this week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/web/email/notification.ex:93
 #, elixir-format
+#: lib/web/email/notification.ex:93
 msgid "One participation request for event %{title} to process"
 msgid_plural "%{number_participation_requests} participation requests for event %{title} to process"
 msgstr[0] ""
 msgstr[1] ""
 
+#, elixir-format
 #: lib/web/templates/email/notification_each_week.html.eex:38
 #: lib/web/templates/email/notification_each_week.text.eex:3
-#, elixir-format
 msgid "You have one event this week:"
 msgid_plural "You have %{total} events this week:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/service/metadata/utils.ex:52
 #, elixir-format
+#: lib/service/metadata/utils.ex:52
 msgid "The event organizer didn't add any description."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:54
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
 msgctxt "terms"
 msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:94
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
 msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:23
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
 msgid "Accepting these Terms"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:27
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
 msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:85
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
 msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:60
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
 msgctxt "terms"
 msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:65
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
 msgctxt "terms"
 msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:64
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
 msgctxt "terms"
 msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:55
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
 msgctxt "terms"
 msgid "Content that is illegal or unlawful, that would otherwise create liability;"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:56
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
 msgctxt "terms"
 msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:42
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
 msgctxt "terms"
 msgid "Creating Accounts"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:89
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
 msgctxt "terms"
 msgid "Entire Agreement"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:92
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
 msgctxt "terms"
 msgid "Feedback"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:83
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
 msgctxt "terms"
 msgid "Hyperlinks and Third Party Content"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:88
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
 msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:63
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
 msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:48
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
 msgctxt "terms"
 msgid "Our Service allows you and other users to post, link and otherwise make available content. You are responsible for the content that you make available to the Service, including its legality, reliability, and appropriateness."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:39
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
 msgctxt "terms"
 msgid "Privacy Policy"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:95
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
 msgctxt "terms"
 msgid "Questions & Contact Information"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:87
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
 msgctxt "terms"
 msgid "Termination"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:62
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
 msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:47
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
 msgid "Your Content & Conduct"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:84
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
 msgctxt "terms"
 msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:68
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
 msgctxt "terms"
 msgid "Finally, your use of the Service is also subject to acceptance of <a href=\"/rules\">the instance's own specific rules</a> regarding the code of conduct and moderation rules. Breaking those rules may also result in your account being disabled or suspended."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:81
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
 msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:18
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
 msgid "Here are the important things you need to know about accessing and using the <b>%{instance_name}</b> (<a href=\"https://%{instance_url}\">%{instance_url}</a>) website and service (collectively, \"Service\"). These are our terms of service (\"Terms\"). Please read them carefully."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:33
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
 msgctxt "terms"
 msgid "If we make major changes, we will notify our users in a clear and prominent manner. Minor changes may only be highlighted in the footer of our website. It is your responsibility to check the website regularly for changes to these Terms."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:53
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
 msgctxt "terms"
 msgid "In order to make <b>%{instance_name}</b> a great place for all of us, please do not post, link and otherwise make available on or through the Service any of the following:"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:57
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
 msgctxt "terms"
 msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:52
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
 msgctxt "terms"
 msgid "Since Mobilizon is a distributed network, it is possible, depending on the visibility rules set to your content, that your content has been distributed to other Mobilizon instances. When you delete your content, we will request those other instances to also delete the content. Our responsibility on the content being deleted from those other instances ends here. If for some reason, some other instance does not delete the content, we cannot be held responsible."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:90
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
 msgctxt "terms"
 msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:80
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
 msgctxt "terms"
 msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:58
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
 msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:51
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:96
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
 msgid "Questions or comments about the Service may be directed to us at %{contact}"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:79
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
 msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:93
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
 msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:74
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
 msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:6
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
 msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:44
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
 msgctxt "terms"
 msgid "If you discover or suspect any Service security breaches, please let us know as soon as possible. For security holes in the Mobilizon software itself, please contact <a href=\"https://framagit.org/framasoft/mobilizon/\">its contributors</a> directly."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:77
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
 msgctxt "terms"
 msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:98
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
 msgctxt "terms"
 msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:119
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
 msgctxt "terms"
 msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:3
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
 msgctxt "terms"
 msgid "Short version"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:9
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
 msgctxt "terms"
 msgid "The service is provided without warranties and these terms may change in the future"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:118
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
 msgctxt "terms"
 msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:97
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
 msgctxt "terms"
 msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:8
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
 msgctxt "terms"
 msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:7
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
 msgctxt "terms"
 msgid "You must respect the law when using <b>%{instance_name}</b>"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:5
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
 msgctxt "terms"
 msgid "Your content is yours"
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:51
 #, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:51
 msgid "Confirm my e-mail address"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/anonymous_participation_confirmation.html.eex:13
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:1
-#, elixir-format
 msgid "Confirm your e-mail"
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:3
 msgid "Hi there! You just registered to join this event: « %{title} ». Please confirm the e-mail address you provided:"
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/email.html.eex:115
 #: lib/web/templates/email/email.text.eex:8
-#, elixir-format
 msgid "Need help? Is something not working as expected?"
 msgstr "Behöver du hjälp? Är det något som krånglar?"
 
-#: lib/web/templates/email/registration_confirmation.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:38
 msgid "You created an account on <b>%{host}</b> with this email address. You are one click away from activating it."
 msgstr ""
 "Du har skapat ett konto på <b>%{host}</b> med den här e-postadressen. Nu "
 "återstår bara ett klick för att aktivera det."
 
-#: lib/web/templates/email/report.html.eex:13
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:13
 msgid "New report on <b>%{instance}</b>"
 msgstr "Ny anmälan på <b>%{instance}</b>"
 
-#: lib/web/templates/email/email_changed_old.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:38
 msgid "The email address for your account on <b>%{host}</b> is being changed to:"
 msgstr ""
 
-#: lib/web/templates/email/password_reset.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:38
 msgid "You requested a new password for your account on <b>%{instance}</b>."
 msgstr "Du har bett om ett nytt lösenord för ditt konto på <b>%{instance}</b>."
 
-#: lib/web/templates/email/email.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/email.text.eex:5
 msgid "Please do not use it for real purposes."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/anonymous_participation_confirmation.html.eex:63
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:6 lib/web/templates/email/event_updated.html.eex:133
 #: lib/web/templates/email/event_updated.text.eex:24 lib/web/templates/email/notification_each_week.html.eex:70
 #: lib/web/templates/email/notification_each_week.text.eex:11 lib/web/templates/email/on_day_notification.html.eex:70
 #: lib/web/templates/email/on_day_notification.text.eex:14
-#, elixir-format
 msgid "Would you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
 msgid_plural "Would you wish to cancel your attendance to one or several events, visit the event pages through the links above and click the « Attending » button."
 msgstr[0] ""
@@ -785,16 +784,16 @@ msgstr[1] ""
 "Om du behöver lämna återbud är det bara att gå till evenemangens sidor, via "
 "länkarna ovan, och klicka på deltagande-knappen."
 
+#, elixir-format
 #: lib/web/templates/email/pending_participation_notification.html.eex:38
 #: lib/web/templates/email/pending_participation_notification.text.eex:4
-#, elixir-format
 msgid "You have one pending attendance request to process:"
 msgid_plural "You have %{number_participation_requests} attendance requests to process:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/web/templates/email/email.text.eex:11
 #, elixir-format
+#: lib/web/templates/email/email.text.eex:11
 msgid "%{instance} is powered by Mobilizon."
 msgstr "%{instance} är en Mobilizon-server."
 
@@ -803,83 +802,83 @@ msgstr "%{instance} är en Mobilizon-server."
 msgid "<b>%{instance}</b> is powered by Mobilizon."
 msgstr "<b>%{instance}</b> är en Mobilizon-server."
 
+#, elixir-format
 #: lib/web/templates/email/pending_participation_notification.html.eex:13
 #: lib/web/templates/email/pending_participation_notification.text.eex:1
-#, elixir-format
 msgid "A request is pending!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/before_event_notification.html.eex:13
 #: lib/web/templates/email/before_event_notification.text.eex:1
-#, elixir-format
 msgid "An event is upcoming!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_new.html.eex:13
 #: lib/web/templates/email/email_changed_new.text.eex:1
-#, elixir-format
 msgid "Confirm new email"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.html.eex:84
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:84
 msgid "End"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.text.eex:21
 #, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:21
 msgid "End %{ends_on}"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_updated.html.eex:13
 #: lib/web/templates/email/event_updated.text.eex:1
-#, elixir-format
 msgid "Event update!"
 msgstr "Evenemang uppdaterat!"
 
-#: lib/web/templates/email/report.html.eex:88
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:88
 msgid "Flagged comments"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:45
 #: lib/web/templates/email/event_participation_approved.text.eex:7
-#, elixir-format
 msgid "Good news: one of the event organizers just approved your request. Update your calendar, because you're on the guest list now!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_new.html.eex:38
 #: lib/web/templates/email/email_changed_new.text.eex:3
-#, elixir-format
 msgid "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address."
 msgstr ""
 
-#: lib/web/templates/email/email_changed_old.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/email_changed_old.text.eex:3
 msgid "Hi there! Just a quick note to confirm that the email address linked to your account on %{host} has been changed from this one to:"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_old.html.eex:62
 #: lib/web/templates/email/email_changed_old.text.eex:5
-#, elixir-format
 msgid "If you did not trigger this change yourself, it is likely that someone has gained access to your %{host} account. Please log in and change your password immediately. If you cannot login, contact the admin on %{host}."
 msgstr ""
 
-#: lib/web/templates/email/password_reset.text.eex:12
 #, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:12
 msgid "If you didn't trigger the change yourself, please ignore this message. Your password won't be changed until you click the link above."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/anonymous_participation_confirmation.html.eex:70
 #: lib/web/templates/email/anonymous_participation_confirmation.text.eex:4 lib/web/templates/email/registration_confirmation.html.eex:45
-#, elixir-format
 msgid "If you didn't trigger this email, you may safely ignore it."
 msgstr ""
 "Du kan strunta i det här meddelandet om det inte var du frågade efter det."
 
+#, elixir-format
 #: lib/web/templates/email/before_event_notification.html.eex:63
 #: lib/web/templates/email/before_event_notification.text.eex:6
-#, elixir-format
 msgid "If you wish to cancel your attendance, visit the event page through the link above and click the « Attending » button."
 msgstr ""
 "Om du behöver lämna återbud är det bara att gå till evenemangets sida, på "
@@ -888,169 +887,168 @@ msgstr ""
 #, elixir-format
 #: lib/web/templates/email/email.html.eex:144
 #: lib/web/templates/email/email.text.eex:11
-#, elixir-format
 msgid "Learn more about Mobilizon here!"
 msgstr "Läs mer om Mobilizon här!"
 
-#: lib/web/templates/email/event_updated.html.eex:94
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:94
 msgid "Location"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.html.eex:104
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:104
 msgid "Location address was removed"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/pending_participation_notification.html.eex:51
 #: lib/web/templates/email/pending_participation_notification.text.eex:6
-#, elixir-format
 msgid "Manage pending requests"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/registration_confirmation.html.eex:13
 #: lib/web/templates/email/registration_confirmation.text.eex:1
-#, elixir-format
 msgid "Nearly there!"
 msgstr "Snart framme!"
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_old.html.eex:13
 #: lib/web/templates/email/email_changed_old.text.eex:1
-#, elixir-format
 msgid "New email confirmation"
 msgstr ""
 
-#: lib/web/templates/email/report.html.eex:106
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:106
 msgid "Reasons for report"
 msgstr ""
 
-#: lib/web/templates/email/report.html.eex:39
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:39
 msgid "Someone on <b>%{instance}</b> reported the following content for you to analyze:"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_rejected.html.eex:13
 #: lib/web/templates/email/event_participation_rejected.text.eex:1
-#, elixir-format
 msgid "Sorry! You're not going."
 msgstr ""
 
-#: lib/web/templates/email/event_updated.html.eex:74
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:74
 msgid "Start"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.text.eex:18
 #, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:18
 msgid "Start %{begins_on}"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:3
 msgid "There have been changes for %{title} so we'd thought we'd let you know."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_updated.html.eex:55
 #: lib/web/templates/email/event_updated.text.eex:11
-#, elixir-format
 msgid "This event has been cancelled by its organizers. Sorry!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_updated.html.eex:51
 #: lib/web/templates/email/event_updated.text.eex:7
-#, elixir-format
 msgid "This event has been confirmed"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_updated.html.eex:53
 #: lib/web/templates/email/event_updated.text.eex:9
-#, elixir-format
 msgid "This event has yet to be confirmed: organizers will let you know if they do confirm it."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_rejected.html.eex:45
 #: lib/web/templates/email/event_participation_rejected.text.eex:7
-#, elixir-format
 msgid "Unfortunately, the organizers rejected your request."
 msgstr "Organisatörerna har tyvärr gjort avslag på ditt deltagande."
 
-#: lib/web/templates/email/email_changed_new.html.eex:51
 #, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:51
 msgid "Verify your email address"
 msgstr ""
 
-#: lib/web/templates/email/report.html.eex:126
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:126
 msgid "View report"
 msgstr "Visa anmälan"
 
-#: lib/web/templates/email/report.text.eex:24
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:24
 msgid "View report:"
 msgstr "Visa anmälan:"
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:58
 #: lib/web/templates/email/event_participation_confirmed.html.eex:58
-#, elixir-format
 msgid "Visit event page"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.html.eex:121
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:121
 msgid "Visit the updated event page"
 msgstr ""
 
-#: lib/web/templates/email/event_updated.text.eex:23
 #, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:23
 msgid "Visit the updated event page: %{link}"
 msgstr "Visa det uppdaterade evenemanget på %{link}"
 
+#, elixir-format
 #: lib/web/templates/email/notification_each_week.html.eex:13
 #: lib/web/templates/email/notification_each_week.text.eex:1
-#, elixir-format
 msgid "What's up this week?"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/on_day_notification.html.eex:13
 #: lib/web/templates/email/on_day_notification.text.eex:1
-#, elixir-format
 msgid "What's up today?"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:70
 #: lib/web/templates/email/event_participation_approved.text.eex:11 lib/web/templates/email/event_participation_confirmed.html.eex:70
 #: lib/web/templates/email/event_participation_confirmed.text.eex:6
-#, elixir-format
 msgid "Would you wish to update or cancel your attendance, simply access the event page through the link above and click on the Attending button."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/pending_participation_notification.html.eex:64
 #: lib/web/templates/email/pending_participation_notification.text.eex:8
-#, elixir-format
 msgid "You are receiving this email because you chose to get notifications for pending attendance requests to your events. You can disable or change your notification settings in your user account settings under « Notifications »."
 msgstr ""
 
-#: lib/web/templates/email/event_participation_rejected.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/event_participation_rejected.text.eex:5
 msgid "You issued a request to attend %{title}."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.text.eex:5
 #: lib/web/templates/email/event_participation_confirmed.text.eex:3
-#, elixir-format
 msgid "You recently requested to attend %{title}."
 msgstr "Du har bett om att få delta i evenemanget %{title}."
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:13
 #: lib/web/templates/email/event_participation_confirmed.html.eex:13 lib/web/templates/email/event_participation_confirmed.text.eex:1
-#, elixir-format
 msgid "You're going!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/email_changed_new.html.eex:64
 #: lib/web/templates/email/email_changed_new.text.eex:5
-#, elixir-format
 msgid "If you didn't trigger the change yourself, please ignore this message."
 msgstr ""
 
@@ -1059,380 +1057,379 @@ msgstr ""
 msgid "<b>Please do not use it for real purposes.</b>"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_member_removal.html.eex:45
 #: lib/web/templates/email/group_member_removal.text.eex:5
-#, elixir-format
 msgid "If you feel this is an error, you may contact the group's administrators so that they can add you back."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_member_removal.html.eex:13
 #: lib/web/templates/email/group_member_removal.text.eex:1
-#, elixir-format
 msgid "So long, and thanks for the fish!"
 msgstr ""
 
-#: lib/web/email/group.ex:63
 #, elixir-format
+#: lib/web/email/group.ex:63
 msgid "You have been removed from group %{group}"
 msgstr ""
 
-#: lib/web/templates/email/group_member_removal.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/group_member_removal.text.eex:3
 msgid "You have been removed from group %{group}. You will not be able to access this group's private content anymore."
 msgstr ""
 
-#: lib/web/templates/email/group_invite.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:38
 msgid "<b>%{inviter}</b> just invited you to join their group %{link_start}<b>%{group}</b>%{link_end}"
 msgstr ""
 
-#: lib/web/templates/email/group_member_removal.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/group_member_removal.html.eex:38
 msgid "You have been removed from group %{link_start}<b>%{group}</b>%{link_end}. You will not be able to access this group's private content anymore."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_suspension.html.eex:54
 #: lib/web/templates/email/group_suspension.text.eex:7
-#, elixir-format
 msgid "As this group was located on another instance, it will continue to work for other instances than this one."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_suspension.html.eex:46
 #: lib/web/templates/email/group_suspension.text.eex:5
-#, elixir-format
 msgid "As this group was located on this instance, all of it's data has been irretrievably deleted."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_deletion.html.eex:38
 #: lib/web/templates/email/group_deletion.text.eex:3
-#, elixir-format
 msgid "The administrator %{author} deleted group %{group}. All of the group's events, discussions, posts and todos have been deleted."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_suspension.html.eex:13
 #: lib/web/templates/email/group_suspension.text.eex:1
-#, elixir-format
 msgid "The group %{group} has been suspended on %{instance}!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_deletion.html.eex:13
 #: lib/web/templates/email/group_deletion.text.eex:1
-#, elixir-format
 msgid "The group %{group} was deleted on %{instance}!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/group_suspension.html.eex:38
 #: lib/web/templates/email/group_suspension.text.eex:3
-#, elixir-format
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#: lib/web/email/group.ex:136
 #, elixir-format
+#: lib/web/email/group.ex:136
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#: lib/web/email/group.ex:97
 #, elixir-format
+#: lib/web/email/group.ex:97
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:24
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
 msgctxt "terms"
 msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:40
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
 msgctxt "terms"
 msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:36
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
 msgctxt "terms"
 msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:78
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
 msgctxt "terms"
 msgid "If you delete this information, you need to login again."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:80
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
 msgctxt "terms"
 msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:87
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
 msgctxt "terms"
 msgid "Note: This information is stored in your localStorage and not your cookies."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:71
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
 msgctxt "terms"
 msgid "Our responsibility"
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:61
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
 msgctxt "terms"
 msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/api/privacy.html.eex:3
 #: lib/web/templates/api/terms.html.eex:15
-#, elixir-format
 msgctxt "terms"
 msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:45
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
 msgctxt "terms"
 msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:50
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
 msgctxt "terms"
 msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:10
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
 msgctxt "terms"
 msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:30
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
 msgctxt "terms"
 msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:20
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
 msgctxt "terms"
 msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:43
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
 msgctxt "terms"
 msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
 msgstr ""
 
-#: lib/web/templates/api/terms.html.eex:49
 #, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
 msgctxt "terms"
 msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:19
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
 msgctxt "terms"
 msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
 msgstr ""
 
-#: lib/web/templates/api/privacy.html.eex:99
 #, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
 msgctxt "terms"
 msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
 msgstr ""
 
-#: lib/web/templates/email/event_participation_confirmed.text.eex:4
 #, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.text.eex:4
 msgid "You have confirmed your participation. Update your calendar, because you're on the guest list now!"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/event_participation_approved.html.eex:38
 #: lib/web/templates/email/event_participation_confirmed.html.eex:38
-#, elixir-format
 msgid "You recently requested to attend <b>%{title}</b>."
 msgstr "Du har bett om att få delta i evenemanget <b>%{title}</b>."
 
-#: lib/web/email/participation.ex:91
 #, elixir-format
+#: lib/web/email/participation.ex:91
 msgid "Your participation to event %{title} has been confirmed"
 msgstr "Din förfrågan om att få delta i evenemanget %{title} har godkännts"
 
-#: lib/web/templates/email/report.html.eex:41
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:41
 msgid "<b>%{reporter}</b> reported the following content."
 msgstr ""
 "<b>%{reporter_name}</b> (%{reporter_username}) har anmält följande innehåll."
 
-#: lib/web/templates/email/report.text.eex:5
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:5
 msgid "Group %{group} was reported"
 msgstr ""
 
-#: lib/web/templates/email/report.html.eex:51
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:51
 msgid "Group reported"
 msgstr ""
 
-#: lib/web/templates/email/report.text.eex:7
 #, elixir-format
+#: lib/web/templates/email/report.text.eex:7
 msgid "Profile %{profile} was reported"
 msgstr ""
 
-#: lib/web/templates/email/report.html.eex:56
 #, elixir-format
+#: lib/web/templates/email/report.html.eex:56
 msgid "Profile reported"
 msgstr ""
 
-#: lib/web/templates/email/event_participation_confirmed.html.eex:45
 #, elixir-format
+#: lib/web/templates/email/event_participation_confirmed.html.eex:45
 msgid "You have now confirmed your participation. Update your calendar, because you're on the guest list now!"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:94
 #, elixir-format
+#: lib/mobilizon/posts/post.ex:94
 msgid "A text is required for the post"
 msgstr ""
 
-#: lib/mobilizon/posts/post.ex:93
 #, elixir-format
+#: lib/mobilizon/posts/post.ex:93
 msgid "A title is required for the post"
 msgstr ""
 
-#: lib/web/templates/email/instance_follow.text.eex:3
 #, elixir-format
+#: lib/web/templates/email/instance_follow.text.eex:3
 msgid "%{name} (%{domain}) just requested to follow your instance."
 msgstr ""
 
-#: lib/web/email/follow.ex:54
 #, elixir-format
+#: lib/web/email/follow.ex:54
 msgid "%{name} requests to follow your instance"
 msgstr ""
 
-#: lib/web/templates/email/instance_follow.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/instance_follow.html.eex:38
 msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events."
 msgstr ""
 
-#: lib/web/templates/email/instance_follow.text.eex:4
 #, elixir-format
+#: lib/web/templates/email/instance_follow.text.eex:4
 msgid "If you accept, this instance will receive all of your public events."
 msgstr ""
 
-#: lib/web/email/follow.ex:48
 #, elixir-format
+#: lib/web/email/follow.ex:48
 msgid "Instance %{name} (%{domain}) requests to follow your instance"
 msgstr ""
 
-#: lib/web/templates/email/instance_follow.html.eex:66
 #, elixir-format
+#: lib/web/templates/email/instance_follow.html.eex:66
 msgid "See the federation settings"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/instance_follow.html.eex:52
 #: lib/web/templates/email/instance_follow.text.eex:6
-#, elixir-format
 msgid "To accept this invitation, head over to the instance's admin settings."
 msgstr "Gå till dina grupper för att acceptera den här inbjudan."
 
+#, elixir-format
 #: lib/web/templates/email/instance_follow.html.eex:13
 #: lib/web/templates/email/instance_follow.text.eex:1
-#, elixir-format
 msgid "Want to connect?"
 msgstr ""
 
+#, elixir-format
 #: lib/web/templates/email/instance_follow.html.eex:45
 #: lib/web/templates/email/instance_follow.text.eex:5
-#, elixir-format
 msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
 msgstr ""
 
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38
 msgid "Hi there! You just registered to join this event: « <b>%{title}</b> ». Please confirm the e-mail address you provided:"
 msgstr ""
 
-#: lib/web/templates/email/event_participation_rejected.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/event_participation_rejected.html.eex:38
 msgid "You issued a request to attend <b>%{title}</b>."
 msgstr ""
 
-#: lib/web/templates/email/event_updated.html.eex:64
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:64
 msgid "Event title"
 msgstr "Evenemangets titel"
 
-#: lib/web/templates/email/event_updated.html.eex:38
 #, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:38
 msgid "There have been changes for <b>%{title}</b> so we'd thought we'd let you know."
 msgstr "Det har skett ändringar kring <b>%{title}</b> som vi misstänker att du vill "
 "känna till."
 
-#: lib/web/templates/error/500_page.html.eex:7
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:7
 msgid "This page is not correct"
 msgstr ""
 
-#: lib/web/templates/error/500_page.html.eex:50
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:50
 msgid "We're sorry, but something went wrong on our end."
 msgstr ""
 
 #, elixir-format
 #: lib/web/templates/email/email.html.eex:89
 #: lib/web/templates/email/email.text.eex:4
-#, elixir-format
 msgid "This is a demonstration site to test Mobilizon."
 msgstr ""
 "Detta är en webbplats för att visa upp och testa beta-versionen av Mobilizon."
 
+#, elixir-format
 #: lib/service/metadata/actor.ex:53 lib/service/metadata/actor.ex:60
 #: lib/service/metadata/instance.ex:54 lib/service/metadata/instance.ex:60
-#, elixir-format
 msgid "%{name}'s feed"
 msgstr ""
 
-#: lib/service/export/feed.ex:120
 #, elixir-format
+#: lib/service/export/feed.ex:120
 msgid "%{actor}'s private events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:115
 #, elixir-format
+#: lib/service/export/feed.ex:115
 msgid "%{actor}'s public events feed on %{instance}"
 msgstr ""
 
-#: lib/service/export/feed.ex:220
 #, elixir-format
+#: lib/service/export/feed.ex:220
 msgid "Feed for %{email} on %{instance}"
 msgstr ""
 
-#: lib/web/templates/error/500_page.html.eex:57
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:57
 msgid "If the issue persists, you may contact the server administrator at %{contact}."
 msgstr ""
 
-#: lib/web/templates/error/500_page.html.eex:55
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:55
 msgid "If the issue persists, you may try to contact the server administrator."
 msgstr ""
 
-#: lib/web/templates/error/500_page.html.eex:68
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:68
 msgid "Technical details"
 msgstr ""
 
-#: lib/web/templates/error/500_page.html.eex:52
 #, elixir-format
+#: lib/web/templates/error/500_page.html.eex:52
 msgid "The Mobilizon server %{instance} seems to be temporarily down."
 msgstr ""
 
-#: lib/service/export/feed.ex:73
 #, elixir-format
+#: lib/service/export/feed.ex:73
 msgid "Public feed for %{instance}"
 msgstr ""
 
diff --git a/priv/gettext/sv/LC_MESSAGES/errors.po b/priv/gettext/sv/LC_MESSAGES/errors.po
index 9b9c6db7..e2a2b088 100644
--- a/priv/gettext/sv/LC_MESSAGES/errors.po
+++ b/priv/gettext/sv/LC_MESSAGES/errors.po
@@ -110,7 +110,7 @@ msgid "Current profile is not an administrator of the selected group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:501
+#: lib/graphql/resolvers/user.ex:523
 msgid "Error while saving user settings"
 msgstr "Ett fel uppstod när användarinställningarna skulle sparas"
 
@@ -136,18 +136,18 @@ msgid "Member not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:58 lib/graphql/resolvers/actor.ex:88
-#: lib/graphql/resolvers/user.ex:406
+#: lib/graphql/resolvers/actor.ex:61 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/user.ex:428
 msgid "No profile found for the moderator user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:193
+#: lib/graphql/resolvers/user.ex:215
 msgid "No user to validate with this email was found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:218
+#: lib/graphql/resolvers/person.ex:254 lib/graphql/resolvers/user.ex:240
 msgid "No user with this email was found"
 msgstr ""
 
@@ -155,49 +155,49 @@ msgstr ""
 #: lib/graphql/resolvers/feed_token.ex:28
 #: lib/graphql/resolvers/participant.ex:28 lib/graphql/resolvers/participant.ex:159
 #: lib/graphql/resolvers/participant.ex:188 lib/graphql/resolvers/person.ex:165 lib/graphql/resolvers/person.ex:199
-#: lib/graphql/resolvers/person.ex:278 lib/graphql/resolvers/person.ex:307 lib/graphql/resolvers/person.ex:334
-#: lib/graphql/resolvers/person.ex:346
+#: lib/graphql/resolvers/person.ex:279 lib/graphql/resolvers/person.ex:295 lib/graphql/resolvers/person.ex:323
+#: lib/graphql/resolvers/person.ex:340
 msgid "Profile is not owned by authenticated user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:123
+#: lib/graphql/resolvers/user.ex:145
 msgid "Registrations are not open"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:331
+#: lib/graphql/resolvers/user.ex:353
 msgid "The current password is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:376
+#: lib/graphql/resolvers/user.ex:398
 msgid "The new email doesn't seem to be valid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:373
+#: lib/graphql/resolvers/user.ex:395
 msgid "The new email must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:334
+#: lib/graphql/resolvers/user.ex:356
 msgid "The new password must be different"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:370 lib/graphql/resolvers/user.ex:428
-#: lib/graphql/resolvers/user.ex:431
+#: lib/graphql/resolvers/user.ex:392 lib/graphql/resolvers/user.ex:450
+#: lib/graphql/resolvers/user.ex:453
 msgid "The password provided is invalid"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:338
+#: lib/graphql/resolvers/user.ex:360
 msgid "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:214
+#: lib/graphql/resolvers/user.ex:236
 msgid "This user can't reset their password"
 msgstr ""
 
@@ -207,17 +207,17 @@ msgid "This user has been disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:177
+#: lib/graphql/resolvers/user.ex:199
 msgid "Unable to validate user"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:409
+#: lib/graphql/resolvers/user.ex:431
 msgid "User already disabled"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:476
+#: lib/graphql/resolvers/user.ex:498
 msgid "User requested is not logged-in"
 msgstr ""
 
@@ -242,12 +242,12 @@ msgid "You may not list groups unless moderator."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:381
+#: lib/graphql/resolvers/user.ex:403
 msgid "You need to be logged-in to change your email"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:346
+#: lib/graphql/resolvers/user.ex:368
 msgid "You need to be logged-in to change your password"
 msgstr ""
 
@@ -257,7 +257,7 @@ msgid "You need to be logged-in to delete a group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:436
+#: lib/graphql/resolvers/user.ex:458
 msgid "You need to be logged-in to delete your account"
 msgstr ""
 
@@ -282,47 +282,47 @@ msgid "You need to have an existing token to get a refresh token"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:196 lib/graphql/resolvers/user.ex:221
+#: lib/graphql/resolvers/user.ex:218 lib/graphql/resolvers/user.ex:243
 msgid "You requested again a confirmation email too soon"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:126
+#: lib/graphql/resolvers/user.ex:148
 msgid "Your email is not on the allowlist"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:64 lib/graphql/resolvers/actor.ex:94
+#: lib/graphql/resolvers/actor.ex:67 lib/graphql/resolvers/actor.ex:97
 msgid "Error while performing background task"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:27
+#: lib/graphql/resolvers/actor.ex:30
 msgid "No profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:54 lib/graphql/resolvers/actor.ex:91
+#: lib/graphql/resolvers/actor.ex:57 lib/graphql/resolvers/actor.ex:94
 msgid "No remote profile found with this ID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:69
+#: lib/graphql/resolvers/actor.ex:72
 msgid "Only moderators and administrators can suspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:99
+#: lib/graphql/resolvers/actor.ex:102
 msgid "Only moderators and administrators can unsuspend a profile"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:24
+#: lib/graphql/resolvers/actor.ex:27
 msgid "Only remote profiles may be refreshed"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/actor.ex:61
+#: lib/graphql/resolvers/actor.ex:64
 msgid "Profile already suspended"
 msgstr ""
 
@@ -372,8 +372,8 @@ msgid "Event id not found"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:281
-#: lib/graphql/resolvers/event.ex:325
+#: lib/graphql/error.ex:89 lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:328
 msgid "Event not found"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgid "Token is not a valid UUID"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:362
+#: lib/graphql/error.ex:87 lib/graphql/resolvers/person.ex:356
 msgid "User not found"
 msgstr ""
 
@@ -567,7 +567,7 @@ msgid "You cannot delete this comment"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:321
+#: lib/graphql/resolvers/event.ex:324
 msgid "You cannot delete this event"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgid "You need to be logged-in to access resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:256
+#: lib/graphql/resolvers/event.ex:259
 msgid "You need to be logged-in to create events"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgid "You need to be logged-in to create resources"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:330
+#: lib/graphql/resolvers/event.ex:333
 msgid "You need to be logged-in to delete an event"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgid "You need to be logged-in to leave an event"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:295
+#: lib/graphql/resolvers/event.ex:298
 msgid "You need to be logged-in to update an event"
 msgstr ""
 
@@ -697,17 +697,17 @@ msgid "Parent resource doesn't belong to this group"
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:109
+#: lib/mobilizon/users/user.ex:110
 msgid "The chosen password is too short."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:138
+#: lib/mobilizon/users/user.ex:139
 msgid "The registration token is already in use, this looks like an issue on our side."
 msgstr ""
 
 #, elixir-format
-#: lib/mobilizon/users/user.ex:104
+#: lib/mobilizon/users/user.ex:105
 msgid "This email is already used."
 msgstr ""
 
@@ -777,12 +777,12 @@ msgid "Profile is not administrator for the group"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:284
+#: lib/graphql/resolvers/event.ex:287
 msgid "You can't edit this event."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:287
+#: lib/graphql/resolvers/event.ex:290
 msgid "You can't attribute this event to this profile."
 msgstr ""
 
@@ -812,7 +812,7 @@ msgid "You must provide either an ID or a slug to access a discussion"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:245
+#: lib/graphql/resolvers/event.ex:248
 msgid "Organizer profile is not owned by the user"
 msgstr ""
 
@@ -838,7 +838,7 @@ msgid "Error while creating resource"
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/user.ex:390
+#: lib/graphql/resolvers/user.ex:412
 msgid "Invalid activation token"
 msgstr ""
 
@@ -848,6 +848,6 @@ msgid "Unable to fetch resource details from this URL."
 msgstr ""
 
 #, elixir-format
-#: lib/graphql/resolvers/event.ex:145 lib/graphql/resolvers/participant.ex:234
+#: lib/graphql/resolvers/event.ex:148 lib/graphql/resolvers/participant.ex:234
 msgid "Provided profile doesn't have moderator permissions on this event"
 msgstr ""