diff --git a/resources/binaries b/resources/binaries
index 4a01edaec..ae7084718 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8
+Subproject commit ae7084718c41afc01919779e58cd449e0eebd401
diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index eb55f942b..647b6c8c0 100755
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -33,6 +33,7 @@ void MessagesModel::setupIcons() {
   m_favoriteIcon = qApp->icons()->fromTheme(QSL("mail-mark-important"));
   m_readIcon = qApp->icons()->fromTheme(QSL("mail-mark-read"));
   m_unreadIcon = qApp->icons()->fromTheme(QSL("mail-mark-unread"));
+  m_enclosuresIcon = qApp->icons()->fromTheme(QSL("mail-attachment"));
 }
 
 void MessagesModel::updateItemHeight() {
@@ -179,7 +180,9 @@ void MessagesModel::setupHeaderData() {
 
     /*: Tooltip for custom hash string of message.*/ tr("Custom hash") <<
 
-    /*: Tooltip for custom ID of feed of message.*/ tr("Feed ID");
+    /*: Tooltip for custom ID of feed of message.*/ tr("Feed ID") <<
+
+    /*: Tooltip for indication of presence of enclosures.*/ tr("Has enclosures");
 
   m_tooltipData <<
     tr("Id of the message.") << tr("Is message read?") <<
@@ -189,7 +192,8 @@ void MessagesModel::setupHeaderData() {
     tr("Author of the message.") << tr("Creation date of the message.") <<
     tr("Contents of the message.") << tr("Is message permanently deleted from recycle bin?") <<
     tr("List of attachments.") << tr("Account ID of the message.") << tr("Custom ID of the message") <<
-    tr("Custom hash of the message.") << tr("Custom ID of feed of the message.");
+    tr("Custom hash of the message.") << tr("Custom ID of feed of the message.") <<
+    tr("Indication of enclosures presence within the message.");
 }
 
 Qt::ItemFlags MessagesModel::flags(const QModelIndex& index) const {
@@ -223,7 +227,7 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
 
         return author_name.isEmpty() ? QSL("-") : author_name;
       }
-      else if (index_column != MSG_DB_IMPORTANT_INDEX && index_column != MSG_DB_READ_INDEX) {
+      else if (index_column != MSG_DB_IMPORTANT_INDEX && index_column != MSG_DB_READ_INDEX && index_column != MSG_DB_HAS_ENCLOSURES) {
         return QSqlQueryModel::data(idx, role);
       }
       else {
@@ -297,6 +301,12 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
 
         return dta.toInt() == 1 ? m_favoriteIcon : QVariant();
       }
+      else if (index_column == MSG_DB_HAS_ENCLOSURES) {
+        QModelIndex idx_important = index(idx.row(), MSG_DB_HAS_ENCLOSURES);
+        QVariant dta = QSqlQueryModel::data(idx_important);
+
+        return dta.toBool() ? m_enclosuresIcon : QVariant();
+      }
       else {
         return QVariant();
       }
@@ -532,8 +542,8 @@ QVariant MessagesModel::headerData(int section, Qt::Orientation orientation, int
     case Qt::DisplayRole:
 
       // Display textual headers for all columns except "read" and
-      // "important" columns.
-      if (section != MSG_DB_READ_INDEX && section != MSG_DB_IMPORTANT_INDEX) {
+      // "important" and "has enclosures" columns.
+      if (section != MSG_DB_READ_INDEX && section != MSG_DB_IMPORTANT_INDEX && section != MSG_DB_HAS_ENCLOSURES) {
         return m_headerData.at(section);
       }
       else {
@@ -549,6 +559,9 @@ QVariant MessagesModel::headerData(int section, Qt::Orientation orientation, int
     // Display icons for "read" and "important" columns.
     case Qt::DecorationRole: {
       switch (section) {
+        case MSG_DB_HAS_ENCLOSURES:
+          return m_enclosuresIcon;
+
         case MSG_DB_READ_INDEX:
           return m_readIcon;
 
diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h
index 48d9f13cb..70bc84c5e 100755
--- a/src/core/messagesmodel.h
+++ b/src/core/messagesmodel.h
@@ -97,6 +97,7 @@ class MessagesModel : public QSqlQueryModel, public MessagesModelSqlLayer {
     QIcon m_favoriteIcon;
     QIcon m_readIcon;
     QIcon m_unreadIcon;
+    QIcon m_enclosuresIcon;
     int m_itemHeight;
 };
 
diff --git a/src/core/messagesmodelsqllayer.cpp b/src/core/messagesmodelsqllayer.cpp
index 420002e90..a41af31ba 100755
--- a/src/core/messagesmodelsqllayer.cpp
+++ b/src/core/messagesmodelsqllayer.cpp
@@ -25,6 +25,7 @@ MessagesModelSqlLayer::MessagesModelSqlLayer()
   m_fieldNames[MSG_DB_CUSTOM_ID_INDEX] = "Messages.custom_id";
   m_fieldNames[MSG_DB_CUSTOM_HASH_INDEX] = "Messages.custom_hash";
   m_fieldNames[MSG_DB_FEED_CUSTOM_ID_INDEX] = "Messages.feed";
+  m_fieldNames[MSG_DB_HAS_ENCLOSURES] = "CASE WHEN length(Messages.enclosures) > 10 THEN 'true' ELSE 'false' END AS has_enclosures";
 }
 
 void MessagesModelSqlLayer::addSortState(int column, Qt::SortOrder order) {
diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
index d71f1dc08..3a373dfb3 100755
--- a/src/definitions/definitions.h
+++ b/src/definitions/definitions.h
@@ -172,6 +172,7 @@
 #define MSG_DB_CUSTOM_ID_INDEX          13
 #define MSG_DB_CUSTOM_HASH_INDEX        14
 #define MSG_DB_FEED_CUSTOM_ID_INDEX     15
+#define MSG_DB_HAS_ENCLOSURES           16
 
 // Indexes of columns as they are DEFINED IN THE TABLE for CATEGORIES.
 #define CAT_DB_ID_INDEX           0
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 7746e243e..cddd6af1a 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -560,6 +560,7 @@ void MessagesView::adjustColumns() {
     header()->setSectionResizeMode(MSG_DB_ID_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_READ_INDEX, QHeaderView::ResizeToContents);
     header()->setSectionResizeMode(MSG_DB_DELETED_INDEX, QHeaderView::Interactive);
+    header()->setSectionResizeMode(MSG_DB_HAS_ENCLOSURES, QHeaderView::ResizeToContents);
     header()->setSectionResizeMode(MSG_DB_IMPORTANT_INDEX, QHeaderView::ResizeToContents);
     header()->setSectionResizeMode(MSG_DB_FEED_TITLE_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_TITLE_INDEX, QHeaderView::Interactive);
@@ -569,8 +570,6 @@ void MessagesView::adjustColumns() {
     header()->setSectionResizeMode(MSG_DB_CONTENTS_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_PDELETED_INDEX, QHeaderView::Interactive);
 
-    //header()->resizeSection(MSG_DB_READ_INDEX, MESSAGES_VIEW_MINIMUM_COL);
-    //header()->resizeSection(MSG_DB_IMPORTANT_INDEX, MESSAGES_VIEW_MINIMUM_COL);
     // Hide columns.
     hideColumn(MSG_DB_ID_INDEX);
     hideColumn(MSG_DB_DELETED_INDEX);