 												_.extend msgObj, msgDataDefaults
 
 												if message.edited?
-													msgObj.ets = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000)
+													msgObj.editedAt = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000)
+													editedBy = @getRocketUser(message.edited.user)
+													if editedBy?
+														msgObj.editedBy =
+															_id: editedBy._id
+															username: editedBy.username
 
 												RocketChat.sendMessage @getRocketUser(message.user), msgObj, room, true
 

												_.extend msgObj, msgDataDefaults

												if message.edited?
													msgObj.ets = new Date(parseInt(message.edited.ts.split('.')[0]) * 1000)

												if message.icons?
													msgObj.emoji = message.icons.emoji

									if RocketChat.models.Messages.findOneById(msgDataDefaults._id)? and message.reactions?.length > 0
										for reaction in message.reactions
											for u in reaction.users
												rcUser = @getRocketUser(u)
												if rcUser?
													Meteor.runAsUser rcUser._id, () =>
														Meteor.call 'setReaction', ":#{reaction.name}:", msgDataDefaults._id

									@addCountCompleted 1
			console.log 'Missed import types:', missedTypes
			@updateProgress Importer.ProgressStep.FINISHING
			for channel in @channels.channels when channel.do_import and channel.is_archived
				do (channel) =>
