diff --git a/api/team.go b/api/team.go
index 775bc29ae2..24b7ec9e1a 100644
--- a/api/team.go
+++ b/api/team.go
@@ -488,12 +488,21 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) {
 			} else {
 				sender = user.FullName
 			}
+
+			senderRole := ""
+			if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) {
+				senderRole = "administrator"
+			} else {
+				senderRole = "member"
+			}
+
 			subjectPage := NewServerTemplatePage("invite_subject", teamUrl)
 			subjectPage.Props["SenderName"] = sender
 			subjectPage.Props["TeamName"] = team.Name
 			bodyPage := NewServerTemplatePage("invite_body", teamUrl)
 			bodyPage.Props["TeamName"] = team.Name
 			bodyPage.Props["SenderName"] = sender
+			bodyPage.Props["SenderStatus"] = senderRole
 
 			bodyPage.Props["Email"] = invite
 
diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html
index 06f48759cf..8be2ac0df2 100644
--- a/api/templates/invite_body.html
+++ b/api/templates/invite_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">You've been invited</h2>
-                                                <p>{{.Props.TeamName}} started using {{.SiteName}}.<br> The team administrator <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamName}}</strong>.</p>
+                                                <p>{{.Props.TeamName}} started using {{.SiteName}}.<br> The team {{.Props.SenderStatus}} <strong>{{.Props.SenderName}}</strong>, has invited you to join <strong>{{.Props.TeamName}}</strong>.</p>
                                                 <p style="margin: 20px 0 15px">
                                                     <a href="{{.Props.Link}}" style="background: #2389D7; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 200px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">Join Team</a>
                                                 </p>
diff --git a/utils/mail.go b/utils/mail.go
index 2fb7f801d5..3cd37ffef8 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -11,6 +11,7 @@ import (
 	"net"
 	"net/mail"
 	"net/smtp"
+	"html"
 )
 
 func CheckMailSettings() *model.AppError {
@@ -84,7 +85,7 @@ func SendMail(to, subject, body string) *model.AppError {
 	headers := make(map[string]string)
 	headers["From"] = fromMail.String()
 	headers["To"] = toMail.String()
-	headers["Subject"] = subject
+	headers["Subject"] = html.UnescapeString(subject)
 	headers["MIME-version"] = "1.0"
 	headers["Content-Type"] = "text/html"