diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
index 3337e18f6e..c6024c643a 100644
--- a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
+++ b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpThreadOverviewUpdater.java
@@ -1,5 +1,6 @@
 package org.togetherjava.tjbot.commands.help;
 
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
@@ -39,7 +40,7 @@
 public final class HelpThreadOverviewUpdater extends MessageReceiverAdapter implements Routine {
     private static final Logger logger = LoggerFactory.getLogger(HelpThreadOverviewUpdater.class);
 
-    private static final String STATUS_TITLE = "## __**Active questions**__ ##";
+    private static final String STATUS_TITLE = "## Active questions ##";
     private static final int OVERVIEW_QUESTION_LIMIT = 150;
     private static final AtomicInteger FIND_STATUS_MESSAGE_CONSECUTIVE_FAILURES =
             new AtomicInteger(0);
@@ -120,7 +121,9 @@ private void updateOverview(TextChannel overviewChannel) {
         logger.debug("Found {} active questions", activeThreads.size());
 
         MessageEditData message = new MessageEditBuilder()
-            .setContent(STATUS_TITLE + "\n\n" + createDescription(activeThreads))
+            .setEmbeds(new EmbedBuilder().setTitle(STATUS_TITLE)
+                .setDescription(createDescription(activeThreads))
+                .build())
             .build();
 
         getStatusMessage(overviewChannel)
@@ -163,12 +166,13 @@ private static RestAction<Optional<Message>> getStatusMessage(MessageChannel cha
     }
 
     private static boolean isStatusMessage(Message message) {
-        if (!message.getAuthor().equals(message.getJDA().getSelfUser())) {
+        if (message.getEmbeds().isEmpty()
+                || !message.getAuthor().equals(message.getJDA().getSelfUser())) {
             return false;
         }
 
-        String content = message.getContentRaw();
-        return content.startsWith(STATUS_TITLE);
+        String messageEmbedTitle = message.getEmbeds().get(0).getTitle();
+        return STATUS_TITLE.equals(messageEmbedTitle);
     }
 
     private RestAction<Message> sendUpdatedOverview(@Nullable Message statusMessage,