diff --git a/src/qml/Bubble.qml b/src/qml/Bubble.qml
index 584f0acc4..2281ee37c 100644
--- a/src/qml/Bubble.qml
+++ b/src/qml/Bubble.qml
@@ -40,6 +40,11 @@ QQC2.Control {
      */
     property var author
 
+    /**
+     * @brief Whether the author should be shown.
+     */
+    required property bool showAuthor
+
     /**
      * @brief The timestamp of the message.
      */
@@ -133,6 +138,7 @@ QQC2.Control {
     contentItem: ColumnLayout {
         RowLayout {
             Layout.maximumWidth: root.maxContentWidth
+            visible: root.showAuthor
             QQC2.Label {
                 Layout.fillWidth: true
                 text: root.author.displayName
diff --git a/src/qml/MessageDelegate.qml b/src/qml/MessageDelegate.qml
index 49260f48f..610d0a8c0 100644
--- a/src/qml/MessageDelegate.qml
+++ b/src/qml/MessageDelegate.qml
@@ -394,6 +394,7 @@ TimelineDelegate {
                 ]
 
                 author: root.author
+                showAuthor: root.showAuthor || root.alwaysShowAuthor
                 time: root.time
                 timeString: root.timeString