diff --git a/app/views/layouts/email.html.haml b/app/views/layouts/email.html.haml
new file mode 100644
index 00000000..6bcf3b4a
--- /dev/null
+++ b/app/views/layouts/email.html.haml
@@ -0,0 +1,12 @@
+= yield
+\
+%hr
+%ul
+  %li
+    %a{href: root_url} Foodsoft
+  - if FoodsoftConfig[:homepage]
+    %li
+      %a{href: FoodsoftConfig[:homepage]} Foodcoop
+  - if FoodsoftConfig[:help_url]
+    %li
+      %a{href: FoodsoftConfig[:help_url]}= t '.help'
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5a1a5b35..777244c1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1221,6 +1221,7 @@ de:
       footer_2_foodsoft: 'Foodsoft: %{url}'
       footer_3_homepage: 'Foodcoop: %{url}'
       footer_4_help: 'Hilfe: %{url}'
+      help: 'Hilfe'
     foodsoft: Foodsoft
     footer:
       revision: Revision %{revision}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 59e94385..bf75a895 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1224,6 +1224,7 @@ en:
       footer_2_foodsoft: 'Foodsoft: %{url}'
       footer_3_homepage: 'Foodcoop: %{url}'
       footer_4_help: 'Help: %{url}'
+      help: 'Help'
     foodsoft: Foodsoft
     footer:
       revision: revision %{revision}
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 620ec3bb..c713dd24 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1082,6 +1082,7 @@ es:
   layouts:
     email:
       footer_4_help: 'Ayuda: %{url}'
+      help: 'Ayuda'
     footer:
       revision: revisión %{revision}
     header:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4dbdb864..b1199dc7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -834,6 +834,7 @@ fr:
     email:
       footer_3_homepage: 'Boufcoop: %{url}'
       footer_4_help: 'Aide: %{url}'
+      help: 'Aide'
     footer:
       revision: révision %{revision}
     header:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4c97dda4..e66bae80 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1194,6 +1194,7 @@ nl:
       footer_2_foodsoft: 'Foodsoft: %{url}'
       footer_3_homepage: 'Foodcoop: %{url}'
       footer_4_help: 'Help: %{url}'
+      help: 'Help'
     foodsoft: Foodsoft
     footer:
       revision: revisie %{revision}
diff --git a/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml b/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml
index 8c81d380..7ca572f3 100644
--- a/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml
+++ b/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml
@@ -1,6 +1,11 @@
-= @message.body
-%hr/
-%pre
+= raw @message.body
+%hr
+%ul
   - if @message.group
-    = raw t '.footer_group', group: @message.group.name
-  = raw t '.footer', reply_url: new_message_url('message[reply_to]' => @message.id), msg_url: message_url(@message), profile_url: my_profile_url
\ No newline at end of file
+    %li= t '.footer_group', group: @message.group.name
+  %li
+    %a{href: new_message_url('message[reply_to]' => @message.id)}= t '.reply'
+  %li
+    %a{href: message_url(@message)}= t '.see_message_online'
+  %li
+    %a{href: my_profile_url}= t '.messaging_options'
diff --git a/plugins/messages/config/locales/de.yml b/plugins/messages/config/locales/de.yml
index f1615163..eb8cff21 100644
--- a/plugins/messages/config/locales/de.yml
+++ b/plugins/messages/config/locales/de.yml
@@ -138,6 +138,9 @@ de:
         Antworten: %{reply_url}
         Nachricht online einsehen: %{msg_url}
         Nachrichten-Einstellungen: %{profile_url}
+      reply: Antworten
+      see_message_online: Nachricht online einsehen
+      messaging_options: Nachrichten-Einstellungen
       footer_group: |
         Gesendet an Gruppe: %{group}
   navigation:
diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml
index ede3f88c..ccd8bb6c 100644
--- a/plugins/messages/config/locales/en.yml
+++ b/plugins/messages/config/locales/en.yml
@@ -140,6 +140,9 @@ en:
         Reply: %{reply_url}
         See message online: %{msg_url}
         Messaging options: %{profile_url}
+      reply: Reply
+      see_message_online: See message online
+      messaging_options: Messaging options
       footer_group: |
         Sent to group: %{group}
   navigation:
diff --git a/plugins/messages/config/locales/fr.yml b/plugins/messages/config/locales/fr.yml
index 54584b48..67d452c5 100644
--- a/plugins/messages/config/locales/fr.yml
+++ b/plugins/messages/config/locales/fr.yml
@@ -67,6 +67,9 @@ fr:
         Répondre: %{reply_url}
         Afficher ce message dans ton navigateur: %{msg_url}
         Préférences des messages: %{profile_url}
+      reply: Répondre
+      see_message_online: Afficher ce message dans ton navigateur
+      messaging_options: Préférences des messages
   simple_form:
     labels:
       settings:
diff --git a/plugins/messages/config/locales/nl.yml b/plugins/messages/config/locales/nl.yml
index d3960a23..56738c0b 100644
--- a/plugins/messages/config/locales/nl.yml
+++ b/plugins/messages/config/locales/nl.yml
@@ -140,6 +140,9 @@ nl:
         Antwoorden: %{reply_url}
         Bericht online lezen: %{msg_url}
         Berichtinstellingen: %{profile_url}
+      reply: Antwoorden
+      see_message_online: Bericht online lezen
+      messaging_options: Berichtinstellingen
       footer_group: |
         Verzenden aan groep: %{group}
   navigation: