2 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/widgets/mcontentitem.cpp b/src/corelib/widgets/mcontentitem.cpp
index 9ea2ab39..dc771ff0 100644
--- a/src/corelib/widgets/mcontentitem.cpp
+++ b/src/corelib/widgets/mcontentitem.cpp
@@ -123,6 +123,11 @@ void MContentItem::setTitle(const QString &text)
 
 void MContentItem::setSubtitle(const QString &text)
 {
+    if (additionalItem()) {
+        additionalItem()->setVisible(false);
+        setAdditionalItem(0);
+    }
+
     model()->setSubtitle(text);
 }
 
diff --git a/src/views/mcontentitemview.cpp b/src/views/mcontentitemview.cpp
index 75bb63d9..7664977a 100644
--- a/src/views/mcontentitemview.cpp
+++ b/src/views/mcontentitemview.cpp
@@ -266,8 +266,9 @@ void MContentItemViewPrivate::initTwoIconsTwoWidgetsLayout()
 
 void MContentItemViewPrivate::clearLayout()
 {
-    for (int i = layout->count(); i>0; i--)
-        layout->removeAt(0);
+    for (int i = layout->count()-1; i>=0; i--) {
+        layout->removeAt(i);
+    }
 }
 
 void MContentItemViewPrivate::setTitle(const QString &string)