diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index dab9d9de1..c63e56041 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -265,6 +265,7 @@
                 padding: 12px;
                 margin-bottom: 20px;
                 border-radius: @variables_radius;
+                overflow-wrap: break-word;
             }
             .cp-teams-invite-password {
                 margin-bottom: 20px;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index c498e4876..450ac6189 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1349,8 +1349,15 @@ define([
                     Messages._getKey('team_inviteFromMsg',
                     [Util.fixHTML(getDisplayName(json.author.displayName)),
                     Util.fixHTML(json.teamName)])));
-                if (json.message) {
-                    $div.append(h('div.cp-teams-invite-message', json.message));
+                if (typeof(json.message) === 'string') {
+                    var message = h('div.cp-teams-invite-message');
+                    json.message.split('\n').forEach(line => {
+                        if (line.trim()) {
+                            message.appendChild(h('span', line));
+                        }
+                        message.appendChild(h('br'));
+                    });
+                    $div.append(message);
                 }
             }));
         }).nThen(function (waitFor) {