diff --git a/src/mail_templates/app_down.ejs b/src/mail_templates/app_down.ejs
index 4124a0a1a..95da48202 100644
--- a/src/mail_templates/app_down.ejs
+++ b/src/mail_templates/app_down.ejs
@@ -1,17 +1,19 @@
 <%if (format === 'text') { %>
 
-Dear Admin,
+Dear Cloudron Admin,
 
 The application '<%= title %>' installed at <%= appFqdn %> is not responding.
 
 This is most likely a problem in the application.
 
-You are receiving this email because you are an Admin of the Cloudron at <%= fqdn %>.
+To resolve this, you can try the following:
+* restart the app in the app configuration dialog
+* restore the app to the latest backup
+* contact us via support@cloudron.io or https://chat.cloudron.io
 
-Thank you,
-Application WatchDog
+
+Powered by https://cloudron.io
 
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/app_update_available.ejs b/src/mail_templates/app_update_available.ejs
index c8044570c..38bfafbb0 100644
--- a/src/mail_templates/app_update_available.ejs
+++ b/src/mail_templates/app_update_available.ejs
@@ -1,18 +1,17 @@
 <%if (format === 'text') { %>
 
-Dear Admin,
+Dear Cloudron Admin,
 
-A new version <%= updateInfo.manifest.version %> of the app '<%= app.manifest.title %>' installed at <%= app.fqdn %> is available!
+a new version <%= updateInfo.manifest.version %> of the app '<%= app.manifest.title %>' installed at <%= app.fqdn %> is available!
 
 The app will update automatically tonight. Alternately, update immediately at <%= webadminUrl %>.
 
 Changes:
 <%= updateInfo.manifest.changelog %>
 
-Thank you,
-your Cloudron
+
+Powered by https://cloudron.io
 
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/backup_failed.ejs b/src/mail_templates/backup_failed.ejs
index 30768048d..3073a5772 100644
--- a/src/mail_templates/backup_failed.ejs
+++ b/src/mail_templates/backup_failed.ejs
@@ -1,17 +1,18 @@
 <%if (format === 'text') { %>
 
-Dear Cloudron Team,
+Dear Cloudron Admin,
 
-Backup of <%= fqdn %> failed.
-
-Thank you,
-Your Cloudron
+creating a backup of <%= fqdn %> has failed.
 
 -------------------------------------
 
 <%- message %>
 
+-------------------------------------
+
+
+Powered by https://cloudron.io
+
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/certificate_renewal_error.ejs b/src/mail_templates/certificate_renewal_error.ejs
index a7d9a8396..c7937fba6 100644
--- a/src/mail_templates/certificate_renewal_error.ejs
+++ b/src/mail_templates/certificate_renewal_error.ejs
@@ -1,13 +1,18 @@
 <%if (format === 'text') { %>
 
-Dear Cloudron Team,
-<%= domain %> was not renewed.
+Dear Cloudron Admin,
+
+the certificate for <%= domain %> could not be renewed.
+
+-------------------------------------
 
 <%- message %>
 
-Thank you,
-Your Cloudron
+-------------------------------------
+
+
+Powered by https://cloudron.io
+
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/feedback.ejs b/src/mail_templates/feedback.ejs
index c6a06515d..901b9dd50 100644
--- a/src/mail_templates/feedback.ejs
+++ b/src/mail_templates/feedback.ejs
@@ -12,4 +12,3 @@ Subject: <%= subject %>
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/oom_event.ejs b/src/mail_templates/oom_event.ejs
index e8364a613..7f3b57f48 100644
--- a/src/mail_templates/oom_event.ejs
+++ b/src/mail_templates/oom_event.ejs
@@ -1,6 +1,6 @@
 <%if (format === 'text') { %>
 
-Dear Cloudron Team,
+Dear Cloudron Admin,
 
 The <%= program %> on <%= fqdn %> exited unexpectedly!
 
@@ -9,14 +9,15 @@ you should give the program more memory.
 
 Please see some excerpt of the logs below.
 
-Thank you,
-Your Cloudron
-
 -------------------------------------
 
 <%- context %>
 
+-------------------------------------
+
+
+Powered by https://cloudron.io
+
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/out_of_disk_space.ejs b/src/mail_templates/out_of_disk_space.ejs
index 676a1d531..694b8715e 100644
--- a/src/mail_templates/out_of_disk_space.ejs
+++ b/src/mail_templates/out_of_disk_space.ejs
@@ -1,19 +1,20 @@
 <%if (format === 'text') { %>
 
-Dear Cloudron Team,
+Dear Cloudron Admin,
 
 <%= fqdn %> is running out of disk space.
 
 Disk space logs are attached.
 
-Thank you,
-Your Cloudron
-
 -------------------------------------
 
 <%- message %>
 
+-------------------------------------
+
+
+Powered by https://cloudron.io
+
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/password_reset.ejs b/src/mail_templates/password_reset.ejs
index 01a5e322c..1bd5faf4a 100644
--- a/src/mail_templates/password_reset.ejs
+++ b/src/mail_templates/password_reset.ejs
@@ -13,7 +13,7 @@ After you have submitted the form, you can login using the new password.
 
 
 
-Powered by Cloudron.io
+Powered by https://cloudron.io
 
 <% } else { %>
 
diff --git a/src/mail_templates/unexpected_exit.ejs b/src/mail_templates/unexpected_exit.ejs
index 130ca2bfd..67356d62e 100644
--- a/src/mail_templates/unexpected_exit.ejs
+++ b/src/mail_templates/unexpected_exit.ejs
@@ -1,19 +1,20 @@
 <%if (format === 'text') { %>
 
-Dear Cloudron Team,
+Dear Cloudron Admin,
 
 Unfortunately <%= program %> on <%= fqdn %> exited unexpectedly!
 
-Please see some excerpt of the logs below.
-
-Thank you,
-Your Cloudron
+Please see some excerpt of the logs below:
 
 -------------------------------------
 
 <%- context %>
 
+-------------------------------------
+
+
+Powered by https://cloudron.io
+
 <% } else { %>
 
 <% } %>
-
diff --git a/src/mail_templates/user_event.ejs b/src/mail_templates/user_event.ejs
index cbf4e6131..74e1a398e 100644
--- a/src/mail_templates/user_event.ejs
+++ b/src/mail_templates/user_event.ejs
@@ -1,15 +1,14 @@
 <%if (format === 'text') { %>
 
-Dear Admin,
+Dear Cloudron Admin,
 
 User <%= user.username || user.alternateEmail || user.email %> <%= event %> in the Cloudron at <%= fqdn %>.
 
 You are receiving this email because you are an Admin of the Cloudron at <%= fqdn %>.
 
-Thank you,
-User Manager
+
+Powered by https://cloudron.io
 
 <% } else { %>
 
 <% } %>
-