diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index daf19a72a8f9..618394b17e04 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/renameautotextdialog \
 	sw/uiconfig/swriter/ui/renameobjectdialog \
 	sw/uiconfig/swriter/ui/rowheight \
+	sw/uiconfig/swriter/ui/saveashtmldialog \
 	sw/uiconfig/swriter/ui/sortdialog \
 	sw/uiconfig/swriter/ui/splittable \
 	sw/uiconfig/swriter/ui/statisticsinfopage \
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 134da77c9ee5..fdde472a3fe2 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -451,12 +451,6 @@ QueryBox MSG_SAVE_HTML_QUERY
     DEFBUTTON = WB_DEF_YES ;
     Message [ en-US ] = "Conversion into HTML format \nmay cause information loss. \nDo you want to save the document?" ;
 };
-QueryBox MSG_SAVEAS_HTML_QUERY
-{
-    BUTTONS = WB_YES_NO;
-    DEFBUTTON = WB_DEF_NO ;
-    Message [ en-US ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?";
-};
 
 String STR_ABSTRACT_TITLE
 {
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 6ccf91da693f..07b85bd31979 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -872,7 +872,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         const SfxFilter* pFlt = GetMedium()->GetFilter();
                         if(!pFlt || pFlt->GetUserData() != pHtmlFlt->GetUserData())
                         {
-                            QueryBox aQuery(&pViewFrm->GetWindow(), SW_RES(MSG_SAVEAS_HTML_QUERY));
+                            MessageDialog aQuery(&pViewFrm->GetWindow(),
+                                "SaveAsHTMLDialog", "modules/swriter/ui/saveashtmldialog.ui");
+
                             if(RET_YES == aQuery.Execute())
                                 bLocalHasName = sal_False;
                             else
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index d9295e579556..a12e3b5bac0e 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -34,7 +34,6 @@
 
 // For the interface because the RID_APP_BEGIN is now Desktop.
 #define RID_SW_NAME                     ( RC_APP_BEGIN + 8)
-#define MSG_SAVEAS_HTML_QUERY           ( RC_APP_BEGIN + 9)
 
 
 #define STR_UNBENANNT                   (RC_APP_BEGIN + 13)
diff --git a/sw/uiconfig/swriter/ui/saveashtmldialog.ui b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
new file mode 100644
index 000000000000..cd8f0d0f8536
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="SaveAsHTMLDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Save as HTML</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">question</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Would you like to save the document as HTML?</property>
+    <property name="secondary_text" translatable="yes">The source code can only be displayed if the document is saved in HTML format.</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="messagedialog-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>