diff --git a/src/js/app-config.js b/src/js/app-config.js
index 5de1335..3716460 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -67,7 +67,7 @@ define(function(require) {
         fallbackSubject: '(no subject)',
         invitationSubject: 'Invitation to a private conversation',
         invitationMessage: 'Hi,\n\nI use Whiteout Mail to send and receive encrypted email. I would like to exchange encrypted messages with you as well.\n\nPlease install the Whiteout Mail application. This application makes it easy to read and write messages securely with PGP encryption applied.\n\nGo to the Whiteout Networks homepage to learn more and to download the application: https://whiteout.io\n\n',
-        message: 'Hi,\n\nthis is a private conversation. To read my encrypted message below, simply open it in Whiteout Mail.\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg',
+        message: 'Hi,\n\nthis is a private conversation. To read my encrypted message below, simply open it in Whiteout Mail.\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg\n\n\n',
         signature: '\n\n\n--\nSent from Whiteout Mail - Email encryption for the rest of us\nhttps://whiteout.io\n\n',
         webSite: 'http://whiteout.io',
         verificationSubject: '[whiteout] New public key uploaded',
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 82f2f17..f711196 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -978,7 +978,7 @@ define(function(require) {
         // mime encode, sign, encrypt and send email via smtp
         self._pgpMailer.send({
             encrypt: true,
-            cleartextMessage: str.message + str.signature,
+            cleartextMessage: str.message,
             smtpclient: options.smtpclient, // filled solely in the integration test, undefined in normal usage
             mail: options.email,
             publicKeysArmored: options.email.publicKeysArmored
diff --git a/src/lib/openpgp/openpgp.js b/src/lib/openpgp/openpgp.js
index da094d6..47f49e9 100644
--- a/src/lib/openpgp/openpgp.js
+++ b/src/lib/openpgp/openpgp.js
@@ -1511,7 +1511,7 @@ module.exports = {
   show_version: true,
   show_comment: true,
   versionstring: "OpenPGP.js v0.7.1",
-  commentstring: "http://openpgpjs.org",
+  commentstring: "Whiteout Mail - https://whiteout.io",
 
   keyserver: "keyserver.linux.it", // "pgp.mit.edu:11371"
   node_store: './openpgp.store',
diff --git a/test/unit/pgp-test.js b/test/unit/pgp-test.js
index 4226fc5..f391ec7 100644
--- a/test/unit/pgp-test.js
+++ b/test/unit/pgp-test.js
@@ -15,7 +15,7 @@ define(function(require) {
             keyId = 'F6F60E9B42CDFF4C',
             pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK-----\r\n' +
             'Version: OpenPGP.js v0.7.1\r\n' +
-            'Comment: http://openpgpjs.org\r\n' +
+            'Comment: Whiteout Mail - https://whiteout.io\r\n' +
             '\r\n' +
             'xk0EUlhMvAEB/2MZtCUOAYvyLFjDp3OBMGn3Ev8FwjzyPbIF0JUw+L7y2XR5\r\n' +
             'RVGvbK88unV3cU/1tOYdNsXI6pSp/Ztjyv7vbBUAEQEAAc0pV2hpdGVvdXQg\r\n' +
@@ -26,7 +26,7 @@ define(function(require) {
             '-----END PGP PUBLIC KEY BLOCK-----\r\n\r\n',
             privkey = '-----BEGIN PGP PRIVATE KEY BLOCK-----\r\n' +
             'Version: OpenPGP.js v0.7.1\r\n' +
-            'Comment: http://openpgpjs.org\r\n' +
+            'Comment: Whiteout Mail - https://whiteout.io\r\n' +
             '\r\n' +
             'xcBeBFJYTLwBAf9jGbQlDgGL8ixYw6dzgTBp9xL/BcI88j2yBdCVMPi+8tl0\r\n' +
             'eUVRr2yvPLp1d3FP9bTmHTbFyOqUqf2bY8r+72wVABEBAAH+AwMIhNB4ivtv\r\n' +