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
new file mode 100644
index 00000000000..3747718bfac
--- /dev/null
+++ b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html
@@ -0,0 +1,100 @@
+<!-- 
+
+    use a css inliner tool like https://putsmail.com/inliner to inline css
+
+ -->
+
+<html>
+<head>
+    <title>${title}</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <style type="text/css">
+        .content {
+            margin: 10px;
+        }
+
+        .buttonContainer {
+            display: inline-block;
+        }
+
+        .linkButton, .linkButton:active, .linkButton:visited {
+            padding: 15px;
+            margin: 10px 10px 0px 0px;
+            display: inline-block;
+            background-color: #337ab7;
+            border-radius: 4px;
+            color: #ffffff;
+            border: 1px solid #2e6da4;
+            text-decoration: none;
+        }
+
+        .linkButton:hover {
+            background-color: #2b618e;
+            border: 1px solid #204d74;
+        }
+
+        .body {
+            background-color: #e3e3e3;
+            color: black;
+            padding: 40px;
+            max-width: 800px;
+            margin: 0 auto;
+            margin-bottom: 100px;
+            font-family: 'Open Sans', sans-serif;
+        }
+
+        .main {
+            border: 1px solid black;
+            background-color: white;
+        }
+
+        .header {
+            background-color: black;
+            padding: 10px;
+            font-size: 16px;
+            border-bottom: .2em solid #efaa00;
+            color: white;
+        }
+
+        .content {
+            padding: 20px 30px;
+            min-height: 200px;
+        }
+
+        .footer {
+            margin: 30px 10% 200px 10%;
+            text-align: center;
+            font-size: 13px;
+        }
+
+        .sapLogo {
+            height: 30px;
+            width: auto;
+            vertical-align: middle;
+        }
+
+        .sailingAnalytics {
+            display: inline-block;
+            line-height: 30px;
+            vertical-align: middle;
+        }
+    </style>
+</head>
+<body marginheight="0" topmargin="0" marginwidth="0" bgcolor="#e3e3e3" offset="0" leftmargin="0" style="background-color: #e3e3e3;">
+<div class="body">
+    <div class="main">
+        <div class="header">
+            <img src="cid:saplogo" class="sapLogo" alt="SAP "/><span class="sailingAnalytics">Sailing Analytics</span>
+        </div>
+        <div class="content">
+            ${content}
+        </div>
+    </div>
+    <div class="footer">
+        <p>${subscription_information}</p>
+        <p>${site}</p>
+        <p>${footer_links}</p>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/sap_logo_header.png b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/sap_logo_header.png
index e5d2daf91f3..cac9fd66d07 100644
Binary files a/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/sap_logo_header.png and b/java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/sap_logo_header.png differ
diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
index 20daf51e466..15213d022d4 100644
--- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
+++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties
@@ -31,4 +31,4 @@ subscriptionInformation=You are receiving notifications from SAP Sailing Analyti
 userProfile=User Profile
 imprint=Imprint
 privacy=Privacy
-salutation=Hallo {0},
\ No newline at end of file
+salutation=Hallo {0},
diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
index 17c634fa2e8..f287ccc8493 100644
--- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
+++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties
@@ -31,4 +31,4 @@ subscriptionInformation=Bei dieser Mail handelt es sich um eine automatisierte B
 userProfile=Benutzerprofil
 imprint=Impressum
 privacy=Datenschutzerklärung
-salutation=Hallo {0},
\ No newline at end of file
+salutation=Hallo {0},