diff --git a/lib/web/templates/email/group_membership_approval.html.heex b/lib/web/templates/email/group_membership_approval.html.heex
index aafa72415..a681bbc55 100644
--- a/lib/web/templates/email/group_membership_approval.html.heex
+++ b/lib/web/templates/email/group_membership_approval.html.heex
@@ -48,7 +48,7 @@
"Your membership request for group %{link_start}%{group}%{link_end} has been approved.",
group: Mobilizon.Actors.Actor.display_name(@group),
link_start:
- "",
+ " URI.decode()}\">",
link_end: ""
)
|> raw %>
@@ -66,7 +66,7 @@
URI.decode()}"
}
target="_blank"
style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
diff --git a/lib/web/templates/email/group_membership_approval.text.eex b/lib/web/templates/email/group_membership_approval.text.eex
index 423ba9d89..adf657fdf 100644
--- a/lib/web/templates/email/group_membership_approval.text.eex
+++ b/lib/web/templates/email/group_membership_approval.text.eex
@@ -2,4 +2,4 @@
==
<%= gettext "Your membership request for group %{group} has been approved.", group: Mobilizon.Actors.Actor.display_name(@group) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) %>
+<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) |> URI.decode() %>
diff --git a/lib/web/templates/email/group_membership_rejection.html.heex b/lib/web/templates/email/group_membership_rejection.html.heex
index 565e3bea3..29343d5ed 100644
--- a/lib/web/templates/email/group_membership_rejection.html.heex
+++ b/lib/web/templates/email/group_membership_rejection.html.heex
@@ -48,7 +48,7 @@
"Your membership request for group %{link_start}%{group}%{link_end} has been rejected.",
group: Mobilizon.Actors.Actor.display_name(@group),
link_start:
- "",
+ " URI.decode()}\">",
link_end: ""
)
|> raw %>
diff --git a/lib/web/templates/email/group_membership_rejection.text.eex b/lib/web/templates/email/group_membership_rejection.text.eex
index 9c867eeb4..7ecf7c2b7 100644
--- a/lib/web/templates/email/group_membership_rejection.text.eex
+++ b/lib/web/templates/email/group_membership_rejection.text.eex
@@ -2,4 +2,4 @@
==
<%= gettext "Your membership request for group %{group} has been rejected.", group: Mobilizon.Actors.Actor.display_name(@group) %>
-<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) %>
+<%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@group)) |> URI.decode() %>
diff --git a/lib/web/templates/email/participation/card/_title.html.heex b/lib/web/templates/email/participation/card/_title.html.heex
index df8ab978f..3d9f6fe0a 100644
--- a/lib/web/templates/email/participation/card/_title.html.heex
+++ b/lib/web/templates/email/participation/card/_title.html.heex
@@ -40,7 +40,7 @@
:actor,
Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)
)
- |> raw
+ |> URI.decode()
}
style="color: rgb(254,56,89); font-family: Helvetica,Arial,sans-serif; font-weight: normal; text-align: left; line-height: 1.3; text-decoration: none; vertical-align: baseline; margin: 0; padding: 0; border: 0;"
target="_blank"
diff --git a/lib/web/templates/email/participation/card/_title.text.eex b/lib/web/templates/email/participation/card/_title.text.eex
index 9e9d81c38..0ffc0a4da 100644
--- a/lib/web/templates/email/participation/card/_title.text.eex
+++ b/lib/web/templates/email/participation/card/_title.text.eex
@@ -1,3 +1,3 @@
<%= gettext("Title: %{title}", title: @event.title) %>
-<%= if @event.attributed_to do %><%= gettext("Organizer: %{organizer}", organizer: @event.attributed_to.name || @event.attributed_to.preferred_username) %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)) %><% else %><%= gettext("Organizer: %{organizer}", organizer: @event.organizer_actor.name || @event.organizer_actor.preferred_username) %><% end %>
\ No newline at end of file
+<%= if @event.attributed_to do %><%= gettext("Organizer: %{organizer}", organizer: @event.attributed_to.name || @event.attributed_to.preferred_username) %> <%= Routes.page_url(Mobilizon.Web.Endpoint, :actor, Mobilizon.Actors.Actor.preferred_username_and_domain(@event.attributed_to)) |> URI.decode() %><% else %><%= gettext("Organizer: %{organizer}", organizer: @event.organizer_actor.name || @event.organizer_actor.preferred_username) %><% end %>
\ No newline at end of file
|