diff --git a/static-data/www/mail/loadsettings.js b/static-data/www/mail/loadsettings.js
index ac9db054..0fbd6c26 100644
--- a/static-data/www/mail/loadsettings.js
+++ b/static-data/www/mail/loadsettings.js
@@ -17,4 +17,7 @@ fetch('/config/get/mail', {
     if (mailSettings.notificationSetting === false){
       document.getElementById('notificationSetting').checked = false
     }
+    if (mailSettings.signature !== false){
+      document.getElementById('mailSignatureSetting').value = mailSettings.signature
+    }
   })
\ No newline at end of file
diff --git a/static-data/www/mail/sendmail.js b/static-data/www/mail/sendmail.js
index 1d9db870..7872ecd5 100755
--- a/static-data/www/mail/sendmail.js
+++ b/static-data/www/mail/sendmail.js
@@ -46,6 +46,10 @@ function sendMail(toData, message, subject){
         message = padString(message)
     }
 
+    if (document.getElementById('mailSignatureSetting').value !== false){
+        message += "\n"
+        message += document.getElementById('mailSignatureSetting').value
+    }
 
     postData = {'message': message, 'to': toData, 'type': 'pm', 'encrypt': true, 'meta': JSON.stringify(meta)}
     postData.forward = document.getElementById('forwardSecrecySetting').checked