diff --git a/CHANGES b/CHANGES
index f318bcfb6..27b38170d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2799,4 +2799,6 @@
 * nfs: disable rpcbind service. we only support nfsv4 mounting
 * dashboard: only show postinstall if notes are not just empty
 * ami: disable route53
+* mailer: add html version of test mail
+* sshfs: server side copying
 
diff --git a/src/mail_templates/test-html.ejs b/src/mail_templates/test-html.ejs
new file mode 100644
index 000000000..c124a95e8
--- /dev/null
+++ b/src/mail_templates/test-html.ejs
@@ -0,0 +1,20 @@
+<center>
+
+<p>Test email from  <%= cloudronName %>.</p>
+
+<br/>
+
+<p>If you can read this, your Cloudron email settings are good.</p>
+
+<br/>
+
+<p>Sent at: <%= new Date().toUTCString() %></p>
+
+<br/>
+<br/>
+
+<div style="font-size: 10px; color: #333333; background: #ffffff;">
+  Powered by <a href="https://cloudron.io">Cloudron</a>
+</div>
+
+</center>
diff --git a/src/mail_templates/test.ejs b/src/mail_templates/test.ejs
index b482b6201..8d6ac848f 100644
--- a/src/mail_templates/test.ejs
+++ b/src/mail_templates/test.ejs
@@ -4,6 +4,8 @@ Test email from <%= cloudronName %>,
 
 If you can read this, your Cloudron email settings are good.
 
+Powered by https://cloudron.io
+
 Sent at: <%= new Date().toUTCString() %>
 
 <% } else { %>
diff --git a/src/mailer.js b/src/mailer.js
index a68443b62..40d92c3cf 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -229,7 +229,8 @@ async function sendTestMail(domain, email) {
         from: `"${mailConfig.cloudronName}" <no-reply@${domain}>`,
         to: email,
         subject: `[${mailConfig.cloudronName}] Test Email`,
-        text: render('test.ejs', { cloudronName: mailConfig.cloudronName, format: 'text'})
+        text: render('test.ejs', { cloudronName: mailConfig.cloudronName, format: 'text'}),
+        html: render('test-html.ejs', { cloudronName: mailConfig.cloudronName })
     };
 
     await sendMail(mailOptions);