diff --git a/qml/component/MessageDelegate.qml b/qml/component/MessageDelegate.qml
index 5800893..6de039a 100644
--- a/qml/component/MessageDelegate.qml
+++ b/qml/component/MessageDelegate.qml
@@ -98,6 +98,19 @@ RowLayout {
 
                 spacing: 8
 
+                Repeater {
+                    model: userMarker
+
+                    ImageItem {
+                        width: parent.height
+                        height: parent.height
+
+                        hint: modelData.displayName
+                        defaultColor: Util.stringToColor(modelData.displayName)
+                        image: modelData.avatar
+                    }
+                }
+
                 AutoLabel {
                     id: timeLabel
 
@@ -107,24 +120,6 @@ RowLayout {
                     Material.foreground: "grey"
                     font.pointSize: 8
                 }
-
-                MaterialIcon {
-                    height: timeLabel.height
-
-                    visible: userMarker.length > 0
-                    icon: "\ue5ca"
-                    color: highlighted ? "white": Material.foreground
-                    font.pointSize: 12
-
-                    MouseArea {
-                        anchors.fill: parent
-
-                        onClicked: {
-                            readMarkerDialog.listModel = userMarker
-                            readMarkerDialog.open()
-                        }
-                    }
-                }
             }
         }
 
diff --git a/qml/form/RoomForm.qml b/qml/form/RoomForm.qml
index 2af0a2c..99a4fa6 100644
--- a/qml/form/RoomForm.qml
+++ b/qml/form/RoomForm.qml
@@ -121,7 +121,7 @@ Item {
                     spacing: 8
 
                     boundsBehavior: Flickable.DragOverBounds
-                    flickDeceleration: 9001
+                    flickDeceleration: 2000
 
                     cacheBuffer: 200
 
@@ -277,6 +277,7 @@ Item {
                             id: readMarkerListView
 
                             clip: true
+                            boundsBehavior: Flickable.DragOverBounds
 
                             delegate: ItemDelegate {
                                 width: parent.width
@@ -303,6 +304,8 @@ Item {
                                     }
                                 }
                             }
+
+                            ScrollBar.vertical: ScrollBar {}
                         }
                     }
                 }
diff --git a/qml/menu/MessageContextMenu.qml b/qml/menu/MessageContextMenu.qml
index a5354e6..d41f9d0 100644
--- a/qml/menu/MessageContextMenu.qml
+++ b/qml/menu/MessageContextMenu.qml
@@ -22,6 +22,16 @@ Menu {
             sourceDialog.open()
         }
     }
+    MenuItem {
+        visible: model && model.userMarker.length > 0
+        height: visible ? undefined : 0
+        text: "View Receipts"
+
+        onTriggered: {
+            readMarkerDialog.listModel = model.userMarker
+            readMarkerDialog.open()
+        }
+    }
     MenuItem {
         visible: isFile
         height: visible ? undefined : 0
diff --git a/src/imageitem.cpp b/src/imageitem.cpp
index 69a8acc..95bc0f3 100644
--- a/src/imageitem.cpp
+++ b/src/imageitem.cpp
@@ -22,7 +22,7 @@ void ImageItem::paint(QPainter *painter) {
                         int(bounding_rect.height()));
     painter->setPen(QPen(Qt::white, 2));
     QFont font;
-    font.setPixelSize(22);
+    font.setPixelSize(bounding_rect.width() / 2);
     font.setBold(true);
     painter->setFont(font);
     painter->drawText(