diff --git a/src/configuredialog/configurecomposerpage.cpp b/src/configuredialog/configurecomposerpage.cpp
index 26167beb9..66c382119 100644
--- a/src/configuredialog/configurecomposerpage.cpp
+++ b/src/configuredialog/configurecomposerpage.cpp
@@ -133,7 +133,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
     : ConfigModuleTab(parent)
 {
     // Main layout
-    QHBoxLayout *hb1 = new QHBoxLayout();           // box with 2 columns
+    QHBoxLayout *hb1 = new QHBoxLayout(this);           // box with 2 columns
     QVBoxLayout *vb1 = new QVBoxLayout();           // first with 2 groupboxes
     QVBoxLayout *vb2 = new QVBoxLayout();           // second with 1 groupbox
 
@@ -472,7 +472,6 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
 
     hb1->addLayout(vb1);
     hb1->addLayout(vb2);
-    setLayout(hb1);
 }
 
 void ComposerPage::GeneralTab::doResetToDefaultsOther()
diff --git a/src/widgets/vacationscriptindicatorwidget.cpp b/src/widgets/vacationscriptindicatorwidget.cpp
index b01eb10fb..ca15cbc22 100644
--- a/src/widgets/vacationscriptindicatorwidget.cpp
+++ b/src/widgets/vacationscriptindicatorwidget.cpp
@@ -96,7 +96,7 @@ void VacationScriptIndicatorWidget::setVacationScriptActive(bool active, const Q
 void VacationScriptIndicatorWidget::createIndicator()
 {
     delete mBoxLayout;
-    mBoxLayout = new QHBoxLayout;
+    mBoxLayout = new QHBoxLayout(this);
     mBoxLayout->setMargin(0);
     mBoxLayout->setSpacing(0);
     mInfo = new VacationLabel(i18np("Out of office reply active on server", "Out of office reply active on servers", mServerActive.count()));
@@ -107,7 +107,6 @@ void VacationScriptIndicatorWidget::createIndicator()
         connect(lab, &ServerLabel::clicked, this, &VacationScriptIndicatorWidget::clicked);
         mBoxLayout->addWidget(lab);
     }
-    setLayout(mBoxLayout);
 }
 
 void VacationScriptIndicatorWidget::slotVacationLabelClicked()