diff --git a/rssguard.pro b/rssguard.pro
index 3275d10c2..9a29f53d3 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -743,7 +743,6 @@ mac {
   IDENTIFIER = org.$${TARGET}.RSSGuard
   CONFIG -= app_bundle
   ICON = resources/macosx/$${TARGET}.icns
-  QMAKE_MAC_SDK = macosx10.12
   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
   LIBS += -framework AppKit
 
diff --git a/src/core/messagesmodelsqllayer.cpp b/src/core/messagesmodelsqllayer.cpp
index ae3b48b6d..3e1dbd454 100755
--- a/src/core/messagesmodelsqllayer.cpp
+++ b/src/core/messagesmodelsqllayer.cpp
@@ -10,7 +10,7 @@ MessagesModelSqlLayer::MessagesModelSqlLayer()
   m_sortColumns(QList<int>()), m_sortOrders(QList<Qt::SortOrder>()) {
   m_db = qApp->database()->connection(QSL("MessagesModel"), DatabaseFactory::FromSettings);
 
-  // Used is <x>: SELECT <x1>, <x2> FROM ....;
+  // Used in <x>: SELECT <x1>, <x2> FROM ....;
   m_fieldNames[MSG_DB_ID_INDEX] = "Messages.id";
   m_fieldNames[MSG_DB_READ_INDEX] = "Messages.is_read";
   m_fieldNames[MSG_DB_DELETED_INDEX] = "Messages.is_deleted";
@@ -29,7 +29,7 @@ MessagesModelSqlLayer::MessagesModelSqlLayer()
   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";
 
-  // Used is <x>: SELECT ... FROM ... ORDER BY <x1> DESC, <x2> ASC;
+  // Used in <x>: SELECT ... FROM ... ORDER BY <x1> DESC, <x2> ASC;
   m_orderByNames[MSG_DB_ID_INDEX] = "Messages.id";
   m_orderByNames[MSG_DB_READ_INDEX] = "Messages.is_read";
   m_orderByNames[MSG_DB_DELETED_INDEX] = "Messages.is_deleted";
diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp
index 794e50d31..040920927 100755
--- a/src/miscellaneous/databasequeries.cpp
+++ b/src/miscellaneous/databasequeries.cpp
@@ -336,7 +336,7 @@ QList<Message> DatabaseQueries::getUndeletedMessagesForFeed(QSqlDatabase db, con
   QSqlQuery q(db);
 
   q.setForwardOnly(true);
-  q.prepare("SELECT id, is_read, is_deleted, is_important, custom_id, title, url, author, date_created, contents, is_pdeleted, enclosures, account_id, custom_id, custom_hash, feed "
+  q.prepare("SELECT id, is_read, is_deleted, is_important, custom_id, title, url, author, date_created, contents, is_pdeleted, enclosures, account_id, custom_id, custom_hash, feed, CASE WHEN length(Messages.enclosures) > 10 THEN 'true' ELSE 'false' END AS has_enclosures "
             "FROM Messages "
             "WHERE is_deleted = 0 AND is_pdeleted = 0 AND feed = :feed AND account_id = :account_id;");
   q.bindValue(QSL(":feed"), feed_custom_id);
@@ -1799,7 +1799,7 @@ Assignment DatabaseQueries::getTtRssFeeds(QSqlDatabase db, int account_id, bool*
   return feeds;
 }
 
-QString DatabaseQueries::unnulifyString(const QString &str) {
+QString DatabaseQueries::unnulifyString(const QString& str) {
   return str.isNull() ? "" : str;
 }