diff --git a/static-data/www/mail/sendmail.js b/static-data/www/mail/sendmail.js
index d24fc21d..3c2b5ca4 100755
--- a/static-data/www/mail/sendmail.js
+++ b/static-data/www/mail/sendmail.js
@@ -24,7 +24,9 @@ subject = document.getElementById('draftSubject')
friendPicker = document.getElementById('friendSelect')
function sendMail(toData, message, subject){
+
postData = {'message': message, 'to': toData, 'type': 'pm', 'encrypt': true, 'meta': JSON.stringify({'subject': subject})}
+ postData.forward = document.getElementById('forwardSecrecySetting').checked
postData = JSON.stringify(postData)
sendForm.style.display = 'none'
fetch('/insertblock', {
diff --git a/static-data/www/mail/settings.js b/static-data/www/mail/settings.js
index aeaf641b..605d6b71 100644
--- a/static-data/www/mail/settings.js
+++ b/static-data/www/mail/settings.js
@@ -28,6 +28,7 @@ document.getElementById('forwardSecrecySetting').onchange = function(e){
}})
.then((resp) => resp.text())
.then(function(data) {
+ mailSettings['forwardSecrecy'] = document.getElementById('forwardSecrecySetting').checked
PNotify.success({
text: 'Successfully toggled default forward secrecy'
})