diff --git a/packages/rocketchat-livechat/app/client/views/message.coffee b/packages/rocketchat-livechat/app/client/views/message.coffee
index 1b49884bd82..87cc3d9164e 100644
--- a/packages/rocketchat-livechat/app/client/views/message.coffee
+++ b/packages/rocketchat-livechat/app/client/views/message.coffee
@@ -4,7 +4,7 @@ Template.message.helpers
 		return 'own' if this.u?._id is Meteor.userId()
 
 	time: ->
-		return moment(this.ts).format('HH:mm')
+		return moment(this.ts).format('LT')
 
 	date: ->
 		return moment(this.ts).format('LL')
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
index a8415b6be65..94e56f6f9ca 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
+++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js
@@ -18,7 +18,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'guest'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'Hello',
 					sequential: null
@@ -28,7 +28,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'rocketchat-agent'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'Hey, what can I help you with?',
 					sequential: null
@@ -38,7 +38,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'guest'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'I\'m looking for informations about your product.',
 					sequential: null
@@ -48,7 +48,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'rocketchat-agent'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'Our product is open source, you can do what you want with it! =D',
 					sequential: null
@@ -58,7 +58,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'guest'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'Yay, thanks. That\'s awesome.',
 					sequential: null
@@ -68,7 +68,7 @@ Template.livechatAppearance.helpers({
 					u: {
 						username: 'rocketchat-agent'
 					},
-					time: moment(this.ts).format('HH:mm'),
+					time: moment(this.ts).format('LT'),
 					date: moment(this.ts).format('LL'),
 					body: 'You\'re welcome.',
 					sequential: null
diff --git a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
index 0a8514faeb1..3c3dc4c6da3 100644
--- a/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
+++ b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
@@ -31,7 +31,7 @@ Template.userInfo.helpers
 
 	userTime: ->
 		if @utcOffset?
-			return Template.instance().now.get().utcOffset(@utcOffset).format('HH:mm')
+			return Template.instance().now.get().utcOffset(@utcOffset).format('LT')
 
 	canRemoveUser: ->
 		return RocketChat.authz.hasAllPermission('remove-user', Session.get('openedRoom'))
diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee
index f3cbfedf32c..6295dd6b957 100644
--- a/packages/rocketchat-ui-message/message/message.coffee
+++ b/packages/rocketchat-ui-message/message/message.coffee
@@ -14,7 +14,7 @@ Template.message.helpers
 	chatops: ->
 		return 'chatops-message' if this.u?.username is RocketChat.settings.get('Chatops_Username')
 	time: ->
-		return moment(this.ts).format('HH:mm')
+		return moment(this.ts).format('LT')
 	date: ->
 		return moment(this.ts).format('LL')
 	isTemp: ->
@@ -32,7 +32,7 @@ Template.message.helpers
 
 	editTime: ->
 		if Template.instance().wasEdited
-			return moment(@editedAt).format('LL hh:mma') #TODO profile pref for 12hr/24hr clock?
+			return moment(@editedAt).format('LL LT') #TODO profile pref for 12hr/24hr clock?
 	editedBy: ->
 		return "" unless Template.instance().wasEdited
 		# try to return the username of the editor,