diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx
index dc4b7a23a..68c938e85 100644
--- a/internal_packages/message-list/lib/message-item.cjsx
+++ b/internal_packages/message-list/lib/message-item.cjsx
@@ -54,6 +54,10 @@ class MessageItem extends React.Component
       @_renderFull()
 
   _renderCollapsed: =>
+    attachmentIcon = []
+    if @props.message.files.length > 0
+      attachmentIcon = <div className="collapsed-attachment"></div>
+
     <div className={@props.className} onClick={@_toggleCollapsed}>
       <div className="message-item-area">
         <div className="collapsed-from">
@@ -65,6 +69,7 @@ class MessageItem extends React.Component
         <div className="collapsed-timestamp">
           <MessageTimestamp date={@props.message.date} />
         </div>
+        {attachmentIcon}
       </div>
     </div>
 
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 7cfa8065a..657408dbd 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -167,6 +167,17 @@
         color: @text-color-very-subtle;
       }
 
+      .collapsed-attachment {
+        width:15px;
+        height:15px;
+        background-size: 15px;
+        background-repeat: no-repeat;
+        background-position:center;
+        padding:12px;
+        margin-left: 0.5em;
+        background-image:url(../static/images/message-list/icon-attachment-@2x.png);
+      }
+
       .collapsed-from {
         font-weight: @font-weight-semi-bold;
         color: @text-color-very-subtle;
diff --git a/static/images/message-list/icon-attachment-@2x.png b/static/images/message-list/icon-attachment-@2x.png
new file mode 100644
index 000000000..8823351d1
Binary files /dev/null and b/static/images/message-list/icon-attachment-@2x.png differ