diff --git a/client/res/templates/stream/notes/email-received.tpl b/client/res/templates/stream/notes/email-received.tpl
index 2a94f14a5e..b2caa8919a 100644
--- a/client/res/templates/stream/notes/email-received.tpl
+++ b/client/res/templates/stream/notes/email-received.tpl
@@ -46,5 +46,8 @@
 
 <div class="stream-date-container">
     <a class="text-muted small" href="#Note/view/{{model.id}}">{{{createdAt}}}</a>
+    {{#if isPinned}}
+        <span class="fas fa-map-pin fa-sm pin-icon" title="{{translate 'Pinned' scope='Note'}}"></span>
+    {{/if}}
 </div>
 
diff --git a/client/res/templates/stream/notes/email-sent.tpl b/client/res/templates/stream/notes/email-sent.tpl
index df8462e628..6aeba0135c 100644
--- a/client/res/templates/stream/notes/email-sent.tpl
+++ b/client/res/templates/stream/notes/email-sent.tpl
@@ -46,5 +46,8 @@
 
 <div class="stream-date-container">
     <a class="text-muted small" href="#Note/view/{{model.id}}">{{{createdAt}}}</a>
+    {{#if isPinned}}
+        <span class="fas fa-map-pin fa-sm pin-icon" title="{{translate 'Pinned' scope='Note'}}"></span>
+    {{/if}}
 </div>
 
diff --git a/client/res/templates/stream/notes/post.tpl b/client/res/templates/stream/notes/post.tpl
index 4a88ee5e3a..e7d84f352a 100644
--- a/client/res/templates/stream/notes/post.tpl
+++ b/client/res/templates/stream/notes/post.tpl
@@ -33,4 +33,7 @@
 
 <div class="stream-date-container">
     <a class="text-muted small" href="#Note/view/{{model.id}}">{{{createdAt}}}</a>
+    {{#if isPinned}}
+        <span class="fas fa-map-pin fa-sm pin-icon" title="{{translate 'Pinned' scope='Note'}}"></span>
+    {{/if}}
 </div>
diff --git a/client/src/views/stream/notes/email-received.js b/client/src/views/stream/notes/email-received.js
index d61b0ef98e..ffbde30ca6 100644
--- a/client/src/views/stream/notes/email-received.js
+++ b/client/src/views/stream/notes/email-received.js
@@ -42,6 +42,8 @@ class EmailReceivedNoteStreamView extends NoteStreamView {
             hasPost: this.hasPost,
             hasAttachments: this.hasAttachments,
             emailIconClassName: this.getMetadata().get(['clientDefs', 'Email', 'iconClass']) || '',
+            isPinned: this.isThis && this.model.get('isPinned') && this.model.collection &&
+                !this.model.collection.pinnedList,
         };
     }
 
diff --git a/client/src/views/stream/notes/email-sent.js b/client/src/views/stream/notes/email-sent.js
index 2c58628d60..f33ec07ee6 100644
--- a/client/src/views/stream/notes/email-sent.js
+++ b/client/src/views/stream/notes/email-sent.js
@@ -41,6 +41,8 @@ class EmailSentNoteStreamView extends NoteStreamView {
             hasPost: this.hasPost,
             hasAttachments: this.hasAttachments,
             emailIconClassName: this.getMetadata().get(['clientDefs', 'Email', 'iconClass']) || '',
+            isPinned: this.isThis && this.model.get('isPinned') && this.model.collection &&
+                !this.model.collection.pinnedList,
         };
     }
 
diff --git a/client/src/views/stream/notes/post.js b/client/src/views/stream/notes/post.js
index 03a209004d..2080cf1fa5 100644
--- a/client/src/views/stream/notes/post.js
+++ b/client/src/views/stream/notes/post.js
@@ -42,6 +42,9 @@ class PostNoteStreamView extends NoteStreamView {
         data.showPost = !!this.model.get('post');
         data.isInternal = this.isInternal;
 
+        data.isPinned = this.isThis && this.model.get('isPinned') && this.model.collection &&
+            !this.model.collection.pinnedList;
+
         return data;
     }
 
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 4d2c17fa34..c2e945bd30 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -1992,6 +1992,16 @@ td > span.color-icon {
     margin-bottom: 2px;
 }
 
+.stream-date-container {
+    .pin-icon {
+        display: inline-block;
+        float: right;
+        position: relative;
+        top: 5px;
+        color: var(--text-muted-color);
+    }
+}
+
 .stream-head-container {
     margin-bottom: 4px;
 }