diff --git a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.html b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.html
index de98d057ad8..62a424c20c8 100644
--- a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.html
+++ b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.html
@@ -1,7 +1,4 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!-- 
-    use a css inliner tool like https://putsmail.com/inliner to inline css
- -->
 <html>
   <head>
     <title>${title}</title>
@@ -25,6 +22,10 @@
         <div class="contentWrapper" style="background-color:white">
           <div class="content" style="border:20px solid white;border-right:30px solid white;border-left:30px solid white;min-height:200px">
             ${content}
+                
+            <div class="buttons" style="border-top:15px solid white;border-bottom:15px solid white">
+              ${buttons}
+                </div>
           </div>
           <div class="clear" style="clear:both"></div>
         </div>
diff --git a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html
index e6bdce54d28..076c29ad5d2 100644
--- a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html
+++ b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html
@@ -9,6 +9,10 @@
     <title>${title}</title>
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <style type="text/css">
+        .buttons {
+            border-top: 15px solid white;
+            border-bottom: 15px solid white;
+        }
         .buttonContainer {
             float: left;
             border-top: 10px solid white;
@@ -113,6 +117,9 @@
         <div class="contentWrapper">
             <div class="content">
                 ${content}
+                <div class="buttons">
+                    ${buttons}
+                </div>
             </div>
             <div class="clear"></div>
         </div>
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java
index 425e512788e..0533ee1c192 100644
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java
@@ -118,8 +118,9 @@ public abstract class NotificationSetNotification<T> implements MailNotification
         bodyContent.append("<div class=\"paragraph\" style=\" border-top: 5px solid white; border-bottom: 5px solid white;\">")
                 .append(htmlify(notificationMailTemplate.getText()))
                 .append("</div>");
+        StringBuilder buttons = new StringBuilder();
         for (Pair<String, String> link : notificationMailTemplate.getLabelsAndLinkUrls()) {
-            bodyContent.append("<span class=\"buttonContainer\" style=\"float: left; border-top: 10px solid white; border-right: 10px solid white;\">")
+            buttons.append("<span class=\"buttonContainer\" style=\"float: left; border-top: 10px solid white; border-right: 10px solid white;\">")
                 .append("<a class=\"linkButton\" href=\"")
                 .append(link.getB())
                 .append("\" style=\"display:inline-block;background-color:#337ab7;border-radius:4px;color:#ffffff;border:1px solid #2e6da4;text-decoration:none;\">")
@@ -150,6 +151,7 @@ public abstract class NotificationSetNotification<T> implements MailNotification
         return TEMPLATE
                 .replace("${title}", notificationMailTemplate.getSubject())
                 .replace("${content}", bodyContent.toString())
+                .replace("${buttons}", buttons.toString())
                 .replace("${subscription_information}", subscriptionInformation)
                 .replace("${site}", siteLink) //
                 .replace("${footer_links}", footerLinks.toString())