diff --git a/qml/component/ImageBubble.qml b/qml/component/ImageBubble.qml
index 887b37e..979c670 100644
--- a/qml/component/ImageBubble.qml
+++ b/qml/component/ImageBubble.qml
@@ -12,7 +12,7 @@ AvatarContainer {
         width: messageImage.width + 24
         height: messageImage.height + 24
 
-        color: sentByMe ? background : Material.accent
+        color: sentByMe ? background : Material.primary
 
         DownloadableContent {
             id: downloadable
diff --git a/qml/form/RoomListForm.qml b/qml/form/RoomListForm.qml
index 1b0aad7..ef7a0a6 100644
--- a/qml/form/RoomListForm.qml
+++ b/qml/form/RoomListForm.qml
@@ -166,7 +166,7 @@ Item {
                             Layout.fillWidth: true
                             Layout.fillHeight: true
 
-                            text: (lastEvent || topic).replace(/(\r\n\t|\n|\r\t)/gm,"");
+                            text: (lastEvent == "" ? topic : lastEvent).replace(/(\r\n\t|\n|\r\t)/gm,"");
                             elide: Text.ElideRight
                             wrapMode: Text.NoWrap
                         }
diff --git a/src/matriqueroom.cpp b/src/matriqueroom.cpp
index dcd79ae..faa36c8 100644
--- a/src/matriqueroom.cpp
+++ b/src/matriqueroom.cpp
@@ -83,6 +83,7 @@ void MatriqueRoom::sendTypingNotification(bool isTyping) {
 QString MatriqueRoom::lastEvent() {
   if (timelineSize() == 0) return "";
   const RoomEvent* lastEvent = messageEvents().rbegin()->get();
+  if (lastEvent->contentJson().value("body").toString() == "") return "";
   return user(lastEvent->senderId())->displayname() + ": " +
          lastEvent->contentJson().value("body").toString();
 }