From 09999f991a05d8c71bbffb40734218931982744a Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Wed, 5 Mar 2014 16:00:00 +0100
Subject: [PATCH] fix strings and dont add signature to invitation email

---
 src/js/app-config.js       | 4 ++--
 src/js/controller/write.js | 2 +-
 src/js/dao/email-dao.js    | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/js/app-config.js b/src/js/app-config.js
index 3c06298..169d00c 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -53,11 +53,11 @@ define(function(require) {
         subjectPrefix: '[whiteout] ',
         fallbackSubject: '(no subject)',
         invitationSubject: 'Invitation to a private conversation',
-        invitationMessage: 'Hi,\n\nI would like to invite you to a private conversation!\n\nPlease install the Whiteout Mail application. This application is used to read and write messages securely with strong encryption applied.\n\nGo to the Whiteout Networks homepage to learn more and to download the application: https://whiteout.io',
+        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',
         cryptPrefix: '-----BEGIN PGP MESSAGE-----',
         cryptSuffix: '-----END PGP MESSAGE-----',
-        signature: '\n\n\n--\nSent from Whiteout Mail - PGP encryption for the rest of us.\nhttps://whiteout.io\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: 'New public key uploaded',
         sendBtnClear: 'Send',
diff --git a/src/js/controller/write.js b/src/js/controller/write.js
index fd21876..499f8fc 100644
--- a/src/js/controller/write.js
+++ b/src/js/controller/write.js
@@ -225,7 +225,7 @@ define(function(require) {
                 cc: $scope.cc.filter(filterEmptyAddresses),
                 bcc: $scope.bcc.filter(filterEmptyAddresses),
                 subject: $scope.subject.trim() ? $scope.subject.trim() : str.fallbackSubject, // Subject line, or the fallback subject, if nothing valid was entered
-                body: $scope.body.trim(), // use parsed plaintext body
+                body: $scope.body.trim() + (!$scope.sendBtnSecure ? str.signature : ''), // use parsed plaintext body
                 attachments: $scope.attachments
             };
 
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 0fdebcd..acb8705 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -1052,9 +1052,6 @@ define(function(require) {
             return;
         }
 
-        // append the signature to plaintext mails
-        options.email.body += str.signature;
-
         // mime encode, sign and send email via smtp
         this._pgpMailer.send({
             mail: options.email