diff --git a/src/js/app-config.js b/src/js/app-config.js
index 7cf5889..be38b38 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -54,7 +54,7 @@ define(function(require) {
         fallbackSubject: '(no subject)',
         invitationSubject: 'Invitation to a private conversation',
         invitationMessage: 'I would like to invite you to a private conversation!\n\nIn order to read my encrypted message please 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',
-        message: 'this is a private conversation. To read my encrypted message below, simply install Whiteout Mail for Chrome. The app is really easy to use and automatically encrypts sent emails, so that only the two of us can read them.\n\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg',
+        message: 'this is a private conversation. To read my encrypted message below, simply open it in Whiteout Mail.\n\nOpen Whiteout Mail: https://chrome.google.com/webstore/detail/jjgghafhamholjigjoghcfcekhkonijg',
         cryptPrefix: '-----BEGIN PGP MESSAGE-----',
         cryptSuffix: '-----END PGP MESSAGE-----',
         signature: 'Sent securely from Whiteout Mail',
diff --git a/src/js/bo/outbox.js b/src/js/bo/outbox.js
index 9be27e1..6fdae00 100644
--- a/src/js/bo/outbox.js
+++ b/src/js/bo/outbox.js
@@ -227,13 +227,12 @@ define(function(require) {
 
             // send an invitation to the unregistered user, aka the recipient
             function sendInvitationMail(recipient, sender) {
-                var to = (recipient.name || recipient.address).split('@')[0].split('.')[0].split(' ')[0],
-                    invitationMail = {
-                        from: [sender],
-                        to: [recipient],
-                        subject: str.invitationSubject,
-                        body: 'Hi ' + to + ',\n\n' + str.invitationMessage + '\n\n'
-                    };
+                var invitationMail = {
+                    from: [sender],
+                    to: [recipient],
+                    subject: str.invitationSubject,
+                    body: 'Hi,\n\n' + str.invitationMessage + '\n\n'
+                };
 
                 // send invitation mail
                 self._emailDao.sendPlaintext({
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index e2b31f3..15fb640 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -954,8 +954,7 @@ define(function(require) {
                 message = str.message + '\n\n\n',
                 signature = '\n\n' + str.signature + '\n\n';
 
-            // get first name of recipient
-            greeting = 'Hi ' + (email.to[0].name || email.to[0].address).split('@')[0].split('.')[0].split(' ')[0] + ',\n\n';
+            greeting = 'Hi,\n\n';
 
             // build encrypted text body
             email.body = greeting + message + ct + signature;