Icon to identify messages sent by emails

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -1037,6 +1037,7 @@
   "Message_ShowDeletedStatus": "Show Deleted Status",
   "Message_ShowEditedStatus": "Show Edited Status",
   "Message_ShowFormattingTips": "Show Formatting Tips",
+  "Message_sent_by_email": "Message sent by Email",
   "Message_starring": "Message starring",
   "Message_TimeFormat": "Time Format",
   "Message_TimeAndDateFormat": "Time and Date Format",

packages/rocketchat-lib/server/lib/processDirectEmail.js

@@ -4,7 +4,9 @@ RocketChat.processDirectEmail = function(email) {
 	function sendMessage(email) {
 		const message = {
 			ts: new Date(email.headers.date),
-			msg: email.body
+			msg: email.body,
+			emailReply: true,
+			groupable: false
 		};
 
 		if (!message.ts) {
@@ -63,12 +65,9 @@ RocketChat.processDirectEmail = function(email) {
 		} else if (roomInfo.t === 'p') {
 			prevMessageLink += `/group/${ roomInfo.name }?msg=${ email.headers.mid }) `;
 		}
-
+		// add reply message link
 		message.msg = prevMessageLink + message.msg;
 
-		// info: message was sent by email
-		message.msg += '\n>Message sent by Email';
-
 		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(message.rid, user._id);
 		if (subscription && subscription.blocked || subscription.blocker) {
 			// room is blocked

packages/rocketchat-ui-message/client/message.html

@@ -35,6 +35,11 @@
 				<i class="icon-language {{#if autoTranslateFetching}}loading{{/if}}" aria-label="{{_ "Translated"}}"></i>
 			</span>
 		{{/if}}
+		{{#if emailReply}}
+			<span class="translated">
+				<i class="icon-mail" title='{{_ "Message_sent_by_email"}}' aria-label="{{_ "icon-mail"}}"></i>
+			</span>
+		{{/if}}
 		{{#if edited}}
 			<span class="edited" title='{{_ "edited"}} {{_ "at"}} {{editTime}} {{_ "by"}} {{editedBy}}'>
 				<i class="icon-edit" aria-label="{{_ "Edited"}}"></i>