diff --git a/internal_packages/thread-list/lib/thread-list.cjsx b/internal_packages/thread-list/lib/thread-list.cjsx
index 2d676cc4a..40d96567d 100644
--- a/internal_packages/thread-list/lib/thread-list.cjsx
+++ b/internal_packages/thread-list/lib/thread-list.cjsx
@@ -104,8 +104,7 @@ class ThreadList extends React.Component
       resolver: (thread) =>
         attachment = []
         labels = []
-        hasAttachments = _.find (thread.metadata ? []), (m) -> m.files.length > 0
-        if hasAttachments
+        if thread.hasAttachments
           attachment = <div className="thread-icon thread-icon-attachment"></div>
 
         currentCategoryId = FocusedMailViewStore.mailView()?.categoryId()
@@ -146,13 +145,11 @@ class ThreadList extends React.Component
         pencil = []
         attachment = []
         hasDraft = _.find (thread.metadata ? []), (m) -> m.draft
-        hasAttachments = _.find (thread.metadata ? []), (m) -> m.files.length > 0
+        if thread.hasAttachments
+          attachment = <div className="thread-icon thread-icon-attachment"></div>
         if hasDraft
           pencil = <RetinaImg name="icon-draft-pencil.png" className="draft-icon" mode={RetinaImg.Mode.ContentPreserve} />
 
-        if hasAttachments
-          attachment = <div className="thread-icon thread-icon-attachment"></div>
-
         <div>
           <div style={display: 'flex'}>
             <ThreadListIcon thread={thread} />
diff --git a/src/components/menu.cjsx b/src/components/menu.cjsx
index ea4d3b65f..c30c34c3d 100644
--- a/src/components/menu.cjsx
+++ b/src/components/menu.cjsx
@@ -22,7 +22,7 @@ class MenuItem extends React.Component
    - `checked` (optional) Pass a {Boolean} to specify whether the item is checked.
   ###
   @propTypes:
-    divider: React.PropTypes.bool
+    divider: React.PropTypes.string
     key: React.PropTypes.string
     selected: React.PropTypes.bool
     checked: React.PropTypes.bool
diff --git a/src/flux/models/thread.coffee b/src/flux/models/thread.coffee
index baa379204..1791655b3 100644
--- a/src/flux/models/thread.coffee
+++ b/src/flux/models/thread.coffee
@@ -75,6 +75,9 @@ class Thread extends Model
       modelKey: 'participants'
       itemClass: Contact
 
+    'hasAttachments': Attributes.Boolean
+      modelKey: 'has_attachments'
+
     'lastMessageReceivedTimestamp': Attributes.DateTime
       queryable: true
       modelKey: 'lastMessageReceivedTimestamp'