diff --git a/src/gui/GuiTools.cpp b/src/gui/GuiTools.cpp
index 30963b3741..12599d8a46 100644
--- a/src/gui/GuiTools.cpp
+++ b/src/gui/GuiTools.cpp
@@ -33,7 +33,7 @@ namespace GuiTools
             QString prompt;
             if (entries.size() == 1) {
                 prompt = QObject::tr("Do you really want to delete the entry \"%1\" for good?")
-                             .arg(entries.first()->title().toHtmlEscaped());
+                             .arg(entries.first()->title());
             } else {
                 prompt = QObject::tr("Do you really want to delete %n entry(s) for good?", "", entries.size());
             }
@@ -51,7 +51,7 @@ namespace GuiTools
             QString prompt;
             if (entries.size() == 1) {
                 prompt = QObject::tr("Do you really want to move entry \"%1\" to the recycle bin?")
-                             .arg(entries.first()->title().toHtmlEscaped());
+                             .arg(entries.first()->title());
             } else {
                 prompt = QObject::tr("Do you really want to move %n entry(s) to the recycle bin?", "", entries.size());
             }
diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
index 04e6ccb29a..275e72cb2d 100644
--- a/src/gui/MessageBox.cpp
+++ b/src/gui/MessageBox.cpp
@@ -26,6 +26,7 @@
 QWindow* MessageBox::m_overrideParent(nullptr);
 
 MessageBox::Button MessageBox::m_nextAnswer(MessageBox::NoButton);
+Qt::TextFormat MessageBox::textFormat = Qt::PlainText;
 
 QHash<QAbstractButton*, MessageBox::Button> MessageBox::m_addedButtonLookup =
     QHash<QAbstractButton*, MessageBox::Button>();
diff --git a/src/gui/MessageBox.h b/src/gui/MessageBox.h
index 46939a535a..9778b3cb28 100644
--- a/src/gui/MessageBox.h
+++ b/src/gui/MessageBox.h
@@ -130,6 +130,7 @@ class MessageBox
                              QCheckBox* checkbox = nullptr);
 
     static QString stdButtonText(QMessageBox::StandardButton button);
+    static Qt::TextFormat textFormat;
 };
 
 #endif // KEEPASSX_MESSAGEBOX_H