diff --git a/app/views/event_mailer/accept.text.haml b/app/views/event_mailer/accept.text.haml
index 739561ab..87867ac4 100644
--- a/app/views/event_mailer/accept.text.haml
+++ b/app/views/event_mailer/accept.text.haml
@@ -1,18 +1,23 @@
 = t '.body', moderator: @current_user
-= event_url @event
+= surround '<'.html_safe, '>'.html_safe do
+  = event_url @event
 \
 = t '.edit_link'
-= edit_event_url @event, secret: @event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = edit_event_url @event, secret: @event.secret
 \
 = t '.delete_link'
-= cancel_event_url @event, secret: @event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = cancel_event_url @event, secret: @event.secret
 \
 - if @event.repeat > 0 && !@event.event_id
   = t '.repeat_helper', count: @event.repeat
   - @event.events.each do |e|
     = e
-    = edit_event_url e, secret: e.secret
-    = cancel_event_url e, secret: e.secret
+    = surround '<'.html_safe, '>'.html_safe do
+      = edit_event_url e, secret: e.secret
+    = surround '<'.html_safe, '>'.html_safe do
+      = cancel_event_url e, secret: e.secret
 \
 = render file: '/events/show'
 \
diff --git a/app/views/event_mailer/create.text.haml b/app/views/event_mailer/create.text.haml
index e2998631..c4e04f8f 100644
--- a/app/views/event_mailer/create.text.haml
+++ b/app/views/event_mailer/create.text.haml
@@ -1,8 +1,10 @@
 = t '.body', subject: @event.title,
   start_time: l(@event.start_time, format: :at)
-= edit_event_url @event, secret: @event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = edit_event_url @event, secret: @event.secret
 \
 = t '.delete_link'
-= cancel_event_url @event, secret: @event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = cancel_event_url @event, secret: @event.secret
 \
 = t '.signature'
diff --git a/app/views/moderation_mailer/accept.text.haml b/app/views/moderation_mailer/accept.text.haml
index 8a23fd8e..e18ae90d 100644
--- a/app/views/moderation_mailer/accept.text.haml
+++ b/app/views/moderation_mailer/accept.text.haml
@@ -3,6 +3,7 @@
 = render file: '/events/show'
 \
 = t '.access'
-= event_url @event
+= surround '<'.html_safe, '>'.html_safe do
+  = event_url @event
 \
 = t '.signature'
diff --git a/app/views/moderation_mailer/create.text.haml b/app/views/moderation_mailer/create.text.haml
index 35d5832d..33c41fa5 100644
--- a/app/views/moderation_mailer/create.text.haml
+++ b/app/views/moderation_mailer/create.text.haml
@@ -1,6 +1,7 @@
 = t '.body', subject: @event.title, start_time: l(@event.start_time,
   format: :at)
-= moderations_url
+= surround '<'.html_safe, '>'.html_safe do
+  = moderations_url
 \
 = render file: '/events/show'
 \
diff --git a/app/views/moderation_mailer/update.text.haml b/app/views/moderation_mailer/update.text.haml
index b3ac82f6..c195b996 100644
--- a/app/views/moderation_mailer/update.text.haml
+++ b/app/views/moderation_mailer/update.text.haml
@@ -13,9 +13,10 @@
   Differ.format = Differ::Format::Patch
 = Differ.diff new, prev
 \
-- if @current_user
-  = edit_moderation_url @event
-- else
-  = edit_event_url @event, secret: @event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  - if @current_user
+    = edit_moderation_url @event
+  - else
+    = edit_event_url @event, secret: @event.secret
 \
 = t '.signature'
diff --git a/app/views/note_mailer/create.text.haml b/app/views/note_mailer/create.text.haml
index be237e7e..e0cb3bd1 100644
--- a/app/views/note_mailer/create.text.haml
+++ b/app/views/note_mailer/create.text.haml
@@ -2,6 +2,7 @@
 \
 = strip_tags @note.contents
 \
-= moderations_url
+= surround '<'.html_safe, '>'.html_safe do
+  = moderations_url
 \
 = t '.signature'
diff --git a/app/views/note_mailer/notify.text.haml b/app/views/note_mailer/notify.text.haml
index 1a961d12..4022eb8c 100644
--- a/app/views/note_mailer/notify.text.haml
+++ b/app/views/note_mailer/notify.text.haml
@@ -6,6 +6,7 @@
 \
 = t '.edit_link'
 \
-= edit_event_url @note.event, secret: @note.event.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = edit_event_url @note.event, secret: @note.event.secret
 \
 = t '.signature'
diff --git a/app/views/orga_mailer/accept.text.haml b/app/views/orga_mailer/accept.text.haml
index 4e4640a5..2264290f 100644
--- a/app/views/orga_mailer/accept.text.haml
+++ b/app/views/orga_mailer/accept.text.haml
@@ -3,6 +3,7 @@
 = render file: '/orgas/show'
 \
 = t '.access'
-= orga_url @orga
+= surround '<'.html_safe, '>'.html_safe do
+  = orga_url @orga
 \
 = t '.signature'
diff --git a/app/views/orga_mailer/create.text.haml b/app/views/orga_mailer/create.text.haml
index e124a824..d096d55a 100644
--- a/app/views/orga_mailer/create.text.haml
+++ b/app/views/orga_mailer/create.text.haml
@@ -1,7 +1,9 @@
 = t '.body', subject: @orga.name
-= edit_orga_url @orga, secret: @orga.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = edit_orga_url @orga, secret: @orga.secret
 \
 = t '.delete_link'
-= cancel_orga_url @orga, secret: @orga.secret
+= surround '<'.html_safe, '>'.html_safe do
+  = cancel_orga_url @orga, secret: @orga.secret
 \
 = t '.signature'
diff --git a/app/views/orga_mailer/update.text.haml b/app/views/orga_mailer/update.text.haml
index 9a60dca9..b447f31b 100644
--- a/app/views/orga_mailer/update.text.haml
+++ b/app/views/orga_mailer/update.text.haml
@@ -14,6 +14,7 @@
 = Differ.diff new, prev
 
 = t '.access'
-= orga_url @orga
+= surround '<'.html_safe, '>'.html_safe do
+  = orga_url @orga
 \
 = t '.signature'