diff --git a/src/conversationlistmodelbase.cpp b/src/conversationlistmodelbase.cpp
index d9cd6f1e..6eb844bc 100644
--- a/src/conversationlistmodelbase.cpp
+++ b/src/conversationlistmodelbase.cpp
@@ -90,15 +90,8 @@ ConversationListModelBase::dataForItem(item_t item, int role) const
         return {};
     }
     case Role::Draft: {
-        if (!item.uid.isEmpty()) {
-            const auto draft = lrcInstance_->getContentDraft(item.uid, item.accountId);
-            if (!draft.isEmpty()) {
-                // Pencil Emoji
-                uint cp = 0x270F;
-                auto emojiString = QString::fromUcs4(reinterpret_cast<char32_t*>(&cp), 1);
-                return emojiString + draft;
-            }
-        }
+        if (!item.uid.isEmpty())
+            return lrcInstance_->getContentDraft(item.uid, item.accountId);
         return {};
     }
     case Role::IsRequest:
diff --git a/src/mainview/components/SmartListItemDelegate.qml b/src/mainview/components/SmartListItemDelegate.qml
index 7891d48c..dcf6a775 100644
--- a/src/mainview/components/SmartListItemDelegate.qml
+++ b/src/mainview/components/SmartListItemDelegate.qml
@@ -36,6 +36,8 @@ ItemDelegate {
     property string accountId: ""
     property string convId: ""
 
+    highlighted: ListView.isCurrentItem
+
     onVisibleChanged: {
         if (visible)
             return
@@ -129,6 +131,13 @@ ItemDelegate {
             color: JamiTheme.primaryForegroundColor
         }
 
+        // Draft indicator
+        ResponsiveImage {
+            visible: Draft && !root.highlighted
+            source: JamiResources.round_edit_24dp_svg
+            color: JamiTheme.primaryForegroundColor
+        }
+
         ColumnLayout {
             Layout.fillHeight: true
             spacing: 2