diff --git a/packages/rocketchat-livechat/app/client/lib/stateChanges.js b/packages/rocketchat-livechat/app/client/lib/stateChanges.js
index f1f2e3ad1f2..96bea57344d 100644
--- a/packages/rocketchat-livechat/app/client/lib/stateChanges.js
+++ b/packages/rocketchat-livechat/app/client/lib/stateChanges.js
@@ -61,14 +61,12 @@ this.state = {
 							console.error(err);
 						}
 						swal({
-							title: t('transcript sent successfully'),
+							title: t('transcript_sent'),
 							type: 'success',
 							timer: 1000,
-							showConfirmButton: true,
-							confirmButtonText: t('ok')
-						}, () => {
-							self.cleanup();
+							showConfirmButton: false
 						});
+						self.cleanup();
 					});
 				}
 			}
diff --git a/packages/rocketchat-livechat/app/i18n/en.i18n.json b/packages/rocketchat-livechat/app/i18n/en.i18n.json
index f19e740b03e..d8e93390926 100644
--- a/packages/rocketchat-livechat/app/i18n/en.i18n.json
+++ b/packages/rocketchat-livechat/app/i18n/en.i18n.json
@@ -30,6 +30,7 @@
   "Type_your_email" : "Type your email",
   "Type_your_message" : "Type your message",
   "Type_your_name" : "Type your name",
+  "transcript_sent": "Transcript sent",
   "User_joined" : "User joined",
   "User_left" : "User left",
   "We_are_offline_Sorry_for_the_inconvenience" : "We are offline. Sorry for the inconvenience.",
diff --git a/packages/rocketchat-livechat/server/methods/sendTranscript.js b/packages/rocketchat-livechat/server/methods/sendTranscript.js
index 7c183fd75c0..8359a80d887 100644
--- a/packages/rocketchat-livechat/server/methods/sendTranscript.js
+++ b/packages/rocketchat-livechat/server/methods/sendTranscript.js
@@ -6,8 +6,8 @@ Meteor.methods({
 		check(email, String);
 
 		var messages = RocketChat.models.Messages.find({'rid': rid}, { sort: { 'ts' : 1 }}).fetch();
-		var header = '';
-		var footer = '';
+		const header = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Header') || '');
+		const footer = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Footer') || '');
 
 		if (messages[0].ts.getTime() > messages[1].ts.getTime()) {
 			messages.reverse();
@@ -16,16 +16,15 @@ Meteor.methods({
 		var html = '<div> <hr>';
 		for (var i = 0; i < messages.length; i++) {
 			var message = messages[i];
+			console.log(message);
 
-			// Agents should use their username, but livechat guests should user their name.
-			var key;
-			if (message.u.type === 'user') {
-				key = 'username';
+			var author;
+			if (message.u._id === Meteor.userId()) {
+				author = TAPi18n.__('You');
 			} else {
-				key = 'name';
+				author = message.u.username;
 			}
 
-			var author = (message.u)[key];
 			var datetime = moment(message.ts).format('dddd, MMMM Do YYYY, h:mm:ss a');
 			var singleMessage = `
 				<p><strong>${author}</strong>  <em>${datetime}</em></p>