diff --git a/Userland/Applications/MailSettings/CMakeLists.txt b/Userland/Applications/MailSettings/CMakeLists.txt
index 86a8ca52339..c528094ff33 100644
--- a/Userland/Applications/MailSettings/CMakeLists.txt
+++ b/Userland/Applications/MailSettings/CMakeLists.txt
@@ -4,15 +4,12 @@ serenity_component(
     TARGETS MailSettings
 )
 
-stringify_gml(MailSettingsWidget.gml MailSettingsWidgetGML.h mail_settings_widget_gml)
+compile_gml(MailSettingsWidget.gml MailSettingsWidgetGML.cpp)
 
 set(SOURCES
     main.cpp
     MailSettingsWidget.cpp
-)
-
-set(GENERATED_SOURCES
-    MailSettingsWidgetGML.h
+    MailSettingsWidgetGML.cpp
 )
 
 serenity_app(MailSettings ICON app-mail)
diff --git a/Userland/Applications/MailSettings/MailSettingsWidget.cpp b/Userland/Applications/MailSettings/MailSettingsWidget.cpp
index db088591891..f508d379e9f 100644
--- a/Userland/Applications/MailSettings/MailSettingsWidget.cpp
+++ b/Userland/Applications/MailSettings/MailSettingsWidget.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "MailSettingsWidget.h"
-#include <Applications/MailSettings/MailSettingsWidgetGML.h>
 #include <LibConfig/Client.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/CheckBox.h>
@@ -15,6 +14,7 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/TextBox.h>
 
+namespace MailSettings {
 void MailSettingsWidget::reset_default_values()
 {
     m_server_inputbox->set_text(""sv);
@@ -36,21 +36,12 @@ void MailSettingsWidget::apply_settings()
     Config::write_string("Mail"sv, "User"sv, "Username"sv, m_email);
 }
 
-ErrorOr<NonnullRefPtr<MailSettingsWidget>> MailSettingsWidget::try_create()
-{
-    auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) MailSettingsWidget()));
-    TRY(widget->setup());
-    return widget;
-}
-
-ErrorOr<void> MailSettingsWidget::setup()
+ErrorOr<void> MailSettingsWidget::initialize()
 {
     // Common port values for email fetching
     m_common_ports.append("143");
     m_common_ports.append("993");
 
-    TRY(load_from_gml(mail_settings_widget_gml));
-
     m_server_inputbox = *find_descendant_of_type_named<GUI::TextBox>("server_input");
     m_server_inputbox->set_text(Config::read_string("Mail"sv, "Connection"sv, "Server"sv, ""sv));
     m_server_inputbox->on_change = [&]() {
@@ -79,3 +70,4 @@ ErrorOr<void> MailSettingsWidget::setup()
 
     return {};
 }
+}
diff --git a/Userland/Applications/MailSettings/MailSettingsWidget.gml b/Userland/Applications/MailSettings/MailSettingsWidget.gml
index c39565484f7..65b5fb92d62 100644
--- a/Userland/Applications/MailSettings/MailSettingsWidget.gml
+++ b/Userland/Applications/MailSettings/MailSettingsWidget.gml
@@ -1,4 +1,4 @@
-@GUI::Frame {
+@MailSettings::MailSettingsWidget {
     fill_with_background_color: true
     layout: @GUI::VerticalBoxLayout {
         margins: [8]
diff --git a/Userland/Applications/MailSettings/MailSettingsWidget.h b/Userland/Applications/MailSettings/MailSettingsWidget.h
index d87768cb9ee..236538364de 100644
--- a/Userland/Applications/MailSettings/MailSettingsWidget.h
+++ b/Userland/Applications/MailSettings/MailSettingsWidget.h
@@ -11,18 +11,19 @@
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/Window.h>
 
+namespace MailSettings {
 class MailSettingsWidget final : public GUI::SettingsWindow::Tab {
     C_OBJECT_ABSTRACT(MailSettingsWidget)
 
 public:
     static ErrorOr<NonnullRefPtr<MailSettingsWidget>> try_create();
+    ErrorOr<void> initialize();
 
     virtual void apply_settings() override;
     virtual void reset_default_values() override;
 
 private:
     MailSettingsWidget() = default;
-    ErrorOr<void> setup();
 
     ByteString m_server;
     ByteString m_port;
@@ -35,3 +36,4 @@ private:
     RefPtr<GUI::CheckBox> m_tls_checkbox;
     RefPtr<GUI::TextBox> m_email_inputbox;
 };
+}
diff --git a/Userland/Applications/MailSettings/main.cpp b/Userland/Applications/MailSettings/main.cpp
index 44e1345883a..3b2a4cb8a7a 100644
--- a/Userland/Applications/MailSettings/main.cpp
+++ b/Userland/Applications/MailSettings/main.cpp
@@ -34,7 +34,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     auto app_icon = GUI::Icon::default_icon("app-mail"sv);
 
     auto window = TRY(GUI::SettingsWindow::create("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
-    (void)TRY(window->add_tab<MailSettingsWidget>("Mail"_string, "mail"sv));
+    (void)TRY(window->add_tab<MailSettings::MailSettingsWidget>("Mail"_string, "mail"sv));
     window->set_icon(app_icon.bitmap_for_size(16));
     window->set_active_tab(selected_tab);