diff --git a/src/kmail_part.rc b/src/kmail_part.rc
--- a/src/kmail_part.rc
+++ b/src/kmail_part.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE gui>
-<gui version="522" name="kmmainwin" translationDomain="kmail">
+<gui version="523" name="kmmainwin" translationDomain="kmail">
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -199,8 +199,6 @@
    <Separator/>
    <Action name="kmail_export_data"/>
    <Separator/>
-   <Action name="accountWizard"/>
-   <Separator/>
    <ActionList name="kmail_plugins_tools"/>
   </Menu>
   <Menu noMerge="1" name="settings">
@@ -210,6 +208,7 @@
    <Action name="show_quick_search"/>
    <Action name="filter" append="save_merge"/>
    <Action name="sieveFilters" append="save_merge"/>
+   <Action name="accountWizard"/>
    <Separator/>
    <Action name="tools_automatic_archiving"/>
    <Separator/>
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -2926,11 +2926,6 @@
         connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotFilterLogViewer);
     }
     {
-        QAction *action = new QAction(i18n("&Account Wizard..."), this);
-        actionCollection()->addAction(QStringLiteral("accountWizard"), action);
-        connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotAccountWizard);
-    }
-    {
         QAction *action = new QAction(i18n("&Import from another Email Client..."), this);
         actionCollection()->addAction(QStringLiteral("importWizard"), action);
         connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotImportWizard);
@@ -3315,6 +3310,11 @@
         connect(action, &QAction::triggered, this, &KMMainWidget::slotManageSieveScripts);
     }
     {
+        QAction *action = new QAction(i18n("&Add Account..."), this);
+        actionCollection()->addAction(QStringLiteral("accountWizard"), action);
+        connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotAccountWizard);
+    }
+    {
         mShowIntroductionAction = new QAction(QIcon::fromTheme(QStringLiteral("kmail")), i18n("KMail &Introduction"), this);
         actionCollection()->addAction(QStringLiteral("help_kmail_welcomepage"), mShowIntroductionAction);
         KMail::Util::addQActionHelpText(mShowIntroductionAction, i18n("Display KMail's Welcome Page"));
diff --git a/src/kmmainwin.rc b/src/kmmainwin.rc
--- a/src/kmmainwin.rc
+++ b/src/kmmainwin.rc
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE gui>
-<gui version="522" name="kmmainwin" translationDomain="kmail">
+<gui version="523" name="kmmainwin" translationDomain="kmail">
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -199,8 +199,6 @@
    <Separator/>
    <Action name="kmail_export_data"/>
    <Separator/>
-   <Action name="accountWizard"/>
-   <Separator/>
    <ActionList name="kmail_plugins_tools"/>
   </Menu>
   <Menu noMerge="1" name="settings">
@@ -210,6 +208,7 @@
    <Action name="show_quick_search"/>
    <Action name="filter" append="save_merge"/>
    <Action name="sieveFilters" append="save_merge"/>
+   <Action name="accountWizard"/>
    <Separator/>
    <Action name="tools_automatic_archiving"/>
    <Separator/>