diff --git a/packages/rocketchat-lib/client/MessageAction.coffee b/packages/rocketchat-lib/client/MessageAction.coffee
index e02d3d763ff09..5a24b5c34add5 100644
--- a/packages/rocketchat-lib/client/MessageAction.coffee
+++ b/packages/rocketchat-lib/client/MessageAction.coffee
@@ -182,3 +182,40 @@ Meteor.startup ->
 			$(event.currentTarget).attr('data-clipboard-text', message)
 			toastr.success(TAPi18n.__('Copied'))
 		order: 4
+
+	RocketChat.MessageAction.addButton
+		id: 'quote-message'
+		icon: 'icon-quote-left'
+		i18nLabel: 'Quote'
+		context: [
+			'message'
+			'message-mobile'
+		]
+		action: (event, instance) ->
+			m = @_arguments[1]
+			message = m.msg
+			msg = $(event.currentTarget).closest('.message')[0]
+			$("\##{msg.id} .message-dropdown").hide()
+			zpad = (n) ->
+				result = n.toString()
+				if result.length > 1
+					return result
+				else
+					return '0' + result
+			ts = zpad(m.ts.getUTCHours()) + ':' + zpad(m.ts.getUTCMinutes()) + ' UTC'
+			now = new Date
+			if (now.getUTCFullYear() isnt m.ts.getUTCFullYear() or
+			    now.getUTCMonth() isnt m.ts.getUTCMonth() or
+			    now.getUTCDate() isnt m.ts.getUTCDate())
+				ts = m.ts.getUTCFullYear() + '-' + zpad(m.ts.getUTCMonth()) + '-' + zpad(m.ts.getUTCDate()) + ' ' + ts
+			input = instance.find('.input-message')
+			text = input.value
+			if text
+				text += '\n'
+			text += '@' + m.u.username + ' said (' + ts + '):\n'
+			for line in message.split(/\r\n|\r|\n/)
+				text += '> ' + line + '\n'
+			input.value = text
+			input.focus()
+			$(input).keyup()
+		order: 5