diff --git a/index.html b/index.html
index e6343b4f66..06ae42ac33 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=32"></script>
+    <script src="libs/app.bundle.js?v=33"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/lang/main.json b/lang/main.json
index d86c659ac5..6facb338c1 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -191,8 +191,8 @@
     },
     "email":
     {
-        "sharedKey": "This conference is password protected. Please use the following pin when joining:%0D%0A%0D%0A __sharedKey__ %0D%0A%0D%0A",
+        "sharedKey": "This conference is password protected. Please use the following pin when joining:\n\n __sharedKey__ \n\n",
         "subject": "Invitation to a __appName__ (__conferenceName__)",
-        "body": "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.%0D%0A%0D%0APlease click on the following link in order to join the conference.%0D%0A%0D%0A __roomUrl__%0D%0A%0D%0A__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.%0D%0A%0D%0ATalk to you in a sec!"
+        "body": "Hey there, I%27d like to invite you to a __appName__ conference I%27ve just set up.\n\nPlease click on the following link in order to join the conference.\n\n __roomUrl__\n\n__sharedKeyText__ Note that __appName__ is currently only supported by Chromium, Google Chrome and Opera, so you need to be using one of these browsers.\n\nTalk to you in a sec!"
     }
 }
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index feb8d951f3..b8e1f36b95 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -4832,6 +4832,7 @@ function inviteParticipants() {
         sharedKeyText =
             APP.translation.translateString("email.sharedKey",
                 {sharedKey: sharedKey});
+        sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
     }
 
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
@@ -4840,6 +4841,7 @@ function inviteParticipants() {
     var body = APP.translation.translateString("email.body",
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
             roomUrl: roomUrl});
+    body = body.replace(/\n/g, "%0D%0A");
 
     if (window.localStorage.displayname) {
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 6e0f1c9351..c10e2a29c5 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -199,6 +199,7 @@ function inviteParticipants() {
         sharedKeyText =
             APP.translation.translateString("email.sharedKey",
                 {sharedKey: sharedKey});
+        sharedKeyText = sharedKeyText.replace(/\n/g, "%0D%0A");
     }
 
     var conferenceName = roomUrl.substring(roomUrl.lastIndexOf('/') + 1);
@@ -207,6 +208,7 @@ function inviteParticipants() {
     var body = APP.translation.translateString("email.body",
         {appName:interfaceConfig.APP_NAME, sharedKeyText: sharedKeyText,
             roomUrl: roomUrl});
+    body = body.replace(/\n/g, "%0D%0A");
 
     if (window.localStorage.displayname) {
         body += "%0D%0A%0D%0A" + window.localStorage.displayname;