diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee
index 648837328a2..98a54e28902 100644
--- a/packages/rocketchat-ui-message/message/message.coffee
+++ b/packages/rocketchat-ui-message/message/message.coffee
@@ -30,17 +30,15 @@ Template.message.helpers
 			return 'temp'
 	body: ->
 		return Template.instance().body
-
 	system: ->
 		if RocketChat.MessageTypes.isSystemMessage(this)
 			return 'system'
-
 	edited: ->
 		return Template.instance().wasEdited
 
 	editTime: ->
 		if Template.instance().wasEdited
-			return moment(@editedAt).format('LL LT') #TODO profile pref for 12hr/24hr clock?
+			return moment(@editedAt).format(RocketChat.settings.get('Message_DateFormat') + ' ' + RocketChat.settings.get('Message_TimeFormat'))
 	editedBy: ->
 		return "" unless Template.instance().wasEdited
 		# try to return the username of the editor,
diff --git a/packages/rocketchat-ui-message/message/message.html b/packages/rocketchat-ui-message/message/message.html
index 2903fc20fd6..a268cbc1527 100644
--- a/packages/rocketchat-ui-message/message/message.html
+++ b/packages/rocketchat-ui-message/message/message.html
@@ -30,32 +30,22 @@
 			<button type="button" class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{u.username}}</button>
 		{{/if}}
 		<span class="info">
-			{{#each roleTags}}
-				<span class="role-tag" data-role="{{description}}">{{description}}</span>
-			{{/each}}
-			{{#if isBot}}
-				<span class="is-bot">BOT</span>
-			{{/if}}
-			{{#if edited}}
-				<span
-					title='{{_ "edited"}} {{_ "at"}} {{editTime}} {{_ "by"}} {{editedBy}}'
-					class="time">
-					{{time}}
-				</span>
-				<span class="edited" title='{{_ "edited"}} {{_ "at"}} {{editTime}} {{_ "by"}} {{editedBy}}' >
-					<i class="icon-edit" aria-label="{{_ "Edited"}}"></i>
-					{{_ "by"}}
-					<button class="thumb thumb-small user-card-message" data-username="{{editedBy}}" tabindex="1">
-						{{> avatar username=editedBy}}
-					</button>
-				</span>
-			{{else}}
-				<span class="time">{{time}}</span>
-			{{/if}}
-			{{#if private}}
-				<span class="private">{{_ "Only_you_can_see_this_message"}}</span>
-			{{/if}}
-
+		{{#each roleTags}}
+			<span class="role-tag" data-role="{{description}}">{{description}}</span>
+		{{/each}}
+		{{#if isBot}}
+			<span class="is-bot">BOT</span>
+		{{/if}}
+		<span class="time" title='{{date}} {{time}}'>{{time}}</span>
+		{{#if edited}}
+			<span class="edited" title='{{_ "edited"}} {{_ "at"}} {{editTime}} {{_ "by"}} {{editedBy}}'>
+				<i class="icon-edit" aria-label="{{_ "Edited"}}"></i>
+				<button class="thumb thumb-small user-card-message" data-username="{{editedBy}}" tabindex="1">{{> avatar username=editedBy}}</button>
+			</span>
+		{{/if}}
+		{{#if private}}
+			<span class="private">{{_ "Only_you_can_see_this_message"}}</span>
+		{{/if}}
 			<div class="message-cog-container {{hideCog}}">
 				<i class="icon-cog message-cog" aria-label="{{_ "Actions"}}"></i>
 			</div>
@@ -64,13 +54,11 @@
 			{{{body}}}
 			{{#if hasOembed}}
 				{{#each urls}}
-					{{injectIndex . @index}}
-					{{> oembedBaseWidget}}
+					{{injectIndex . @index}} {{> oembedBaseWidget}}
 				{{/each}}
 			{{/if}}
 			{{#each attachments}}
-				{{injectIndex . @index}}
-				{{> messageAttachment}}
+				{{injectIndex . @index}} {{> messageAttachment}}
 			{{/each}}
 		</div>
 		<ul class="actionLinks {{hideActionLinks}}">