diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index ae7925166..8b7180bb7 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -75,7 +75,11 @@ bool ActionsHandler::handleQuickEdit(NeoChatRoom *room, const QString &handledTe
                     if (event->senderId() == room->localMember().id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
+#if Quotient_VERSION_MINOR > 8
+                            originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content().get())->body;
+#else
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;
+#endif
                         } else {
                             originalString = event->plainBody();
                         }
diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index fac9882a1..32813dcb6 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -236,7 +236,11 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
     }
 
     if (event.hasTextContent() && event.content()) {
+#if Quotient_VERSION_MINOR > 8
+        body = static_cast<const EventContent::TextContent *>(event.content().get())->body;
+#else
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
     } else {
         body = event.plainBody();
     }
@@ -476,7 +480,11 @@ QString EventHandler::getMessageBody(const NeoChatRoom *room, const RoomMessageE
 
     QString body;
     if (event.hasTextContent() && event.content()) {
+#if Quotient_VERSION_MINOR > 8
+        body = static_cast<const EventContent::TextContent *>(event.content().get())->body;
+#else
         body = static_cast<const EventContent::TextContent *>(event.content())->body;
+#endif
     } else {
         body = event.plainBody();
     }
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index d330b84b4..be1babedd 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -363,7 +363,11 @@ bool NeoChatRoom::lastEventIsSpoiler() const
     if (auto event = lastEvent()) {
         if (auto e = eventCast<const RoomMessageEvent>(event)) {
             if (e->hasTextContent() && e->content() && e->mimeType().name() == "text/html"_ls) {
+#if Quotient_VERSION_MINOR > 8
+                auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content().get())->body;
+#else
                 auto htmlBody = static_cast<const Quotient::EventContent::TextContent *>(e->content())->body;
+#endif
                 return htmlBody.contains("data-mx-spoiler"_ls);
             }
         }