From 32ae383e2d5650e96dd550bfdb5db565b8e85ec9 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 13 Jul 2016 06:47:34 +0200
Subject: [PATCH] Remove duplicate margin

---
 agents/archivemailagent/archivemaildialog.cpp   |  9 ++++-----
 agents/archivemailagent/ui/archivemailwidget.ui | 12 ++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/agents/archivemailagent/archivemaildialog.cpp b/agents/archivemailagent/archivemaildialog.cpp
index f50f283d3..1fdfcf558 100644
--- a/agents/archivemailagent/archivemaildialog.cpp
+++ b/agents/archivemailagent/archivemaildialog.cpp
@@ -50,12 +50,11 @@ ArchiveMailDialog::ArchiveMailDialog(QWidget *parent)
     setWindowTitle(i18n("Configure Archive Mail Agent"));
     setWindowIcon(QIcon::fromTheme(QStringLiteral("kmail")));
     setModal(true);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *vlay = new QVBoxLayout;
-    vlay->addWidget(mainWidget);
-    setLayout(vlay);
+    QVBoxLayout *vlay = new QVBoxLayout(this);
 
-    QHBoxLayout *mainLayout = new QHBoxLayout(mainWidget);
+    QHBoxLayout *mainLayout = new QHBoxLayout;
+    mainLayout->setMargin(0);
+    vlay->addLayout(mainLayout);
     mWidget = new ArchiveMailWidget(this);
     connect(mWidget, &ArchiveMailWidget::archiveNow, this, &ArchiveMailDialog::archiveNow);
     mWidget->setObjectName(QStringLiteral("archivemailwidget"));
diff --git a/agents/archivemailagent/ui/archivemailwidget.ui b/agents/archivemailagent/ui/archivemailwidget.ui
index 3567da8ae..33dfbf8a1 100644
--- a/agents/archivemailagent/ui/archivemailwidget.ui
+++ b/agents/archivemailagent/ui/archivemailwidget.ui
@@ -11,6 +11,18 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="1">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>