diff --git a/src/CONST.js b/src/CONST.js
index 0ecb1aedf48a..9a2140b11130 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -379,6 +379,8 @@ const CONST = {
         DECIMAL_PAD: 'decimal-pad',
     },
 
+    ATTACHMENT_SOURCE_ATTRIBUTE: 'data-expensify-source',
+
     ATTACHMENT_PICKER_TYPE: {
         FILE: 'file',
         IMAGE: 'image',
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 2767abf30d72..80856fc8e4c3 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -183,7 +183,7 @@ function getSimplifiedReportObject(report) {
     const createTimestamp = lodashGet(report, 'lastActionCreated', 0);
     const lastMessageTimestamp = moment.utc(createTimestamp).unix();
     const lastActionMessage = lodashGet(report, ['lastActionMessage', 'html'], '');
-    const isLastMessageAttachment = /<img([^>]+)\/>/gi.test(lastActionMessage);
+    const isLastMessageAttachment = new RegExp(`<img|a\\s[^>]*${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}\\s*=\\s*"[^"]*"[^>]*>`, 'gi').test(lastActionMessage);
     const chatType = lodashGet(report, ['reportNameValuePairs', 'chatType'], '');
 
     let lastMessageText = null;