diff --git a/src/dialogs/exportdialog.cpp b/src/dialogs/exportdialog.cpp
index 910460b55..148e6b6df 100644
--- a/src/dialogs/exportdialog.cpp
+++ b/src/dialogs/exportdialog.cpp
@@ -1,201 +1,202 @@
 /*  Copyright (c) 2017 Intevation GmbH
 
     Kleopatra is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     Kleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "exportdialog.h"
 
 #include "kleopatra_debug.h"
 
 #include "view/waitwidget.h"
 
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFontDatabase>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
 
 #include <gpgme++/key.h>
 
 #include <QGpgME/Protocol>
 #include <QGpgME/ExportJob>
 
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <Libkleo/Formatting>
 
 using namespace Kleo;
 
 class ExportWidget::Private
 {
 public:
     Private(ExportWidget *qq)
         : q(qq)
     {}
 
     void setupUi();
 
     GpgME::Key key;
     QTextEdit *textEdit;
     WaitWidget *waitWidget;
 private:
     ExportWidget *q;
 };
 
 void ExportWidget::Private::setupUi()
 {
     auto vlay = new QVBoxLayout(q);
+    vlay->setMargin(0);
 
     textEdit = new QTextEdit;
     textEdit->setVisible(false);
     textEdit->setReadOnly(true);
 
     auto fixedFont = QFont(QStringLiteral("Monospace"));
     fixedFont.setStyleHint(QFont::TypeWriter);
 
     textEdit->setFont(fixedFont);
     textEdit->setReadOnly(true);
     vlay->addWidget(textEdit);
 
     waitWidget = new WaitWidget;
     waitWidget->setText(i18n("Exporting ..."));
     vlay->addWidget(waitWidget);
 }
 
 ExportWidget::ExportWidget(QWidget *parent)
     : QWidget(parent)
     , d(new Private(this))
 {
     d->setupUi();
 }
 
 ExportWidget::~ExportWidget()
 {
 }
 
 static QString injectComments(const GpgME::Key &key, const QByteArray &data)
 {
     QString ret = QString::fromUtf8(data);
 
     if (key.protocol() != GpgME::OpenPGP) {
         return ret;
     }
 
     auto overView = Formatting::toolTip(key, Formatting::Fingerprint |
                                              Formatting::UserIDs |
                                              Formatting::Issuer |
                                              Formatting::Subject |
                                              Formatting::ExpiryDates |
                                              Formatting::CertificateType |
                                              Formatting::CertificateUsage);
 
     // Fixup the HTML coming from the toolTip for our own format.
     overView.remove(QLatin1String("<tr><th>"));
     overView.replace(QLatin1String("</th><td>"), QLatin1String("\t"));
     overView.replace(QLatin1String("</td></tr>"), QLatin1String("\n"));
     overView.remove(QLatin1String("<table border=\"0\">"));
     overView.remove(QLatin1String("\n</table>"));
     overView.replace(QLatin1String("&lt;"), QLatin1String("<"));
     overView.replace(QLatin1String("&gt;"), QLatin1String(">"));
 
     auto overViewLines = overView.split(QLatin1Char('\n'));
 
     // Format comments so that they fit for RFC 4880
     auto comments = QString::fromLatin1("Comment: ");
     comments += overViewLines.join(QStringLiteral("\nComment: ")) + QLatin1Char('\n');
 
     ret.insert(37 /* -----BEGIN PGP PUBLIC KEY BLOCK-----\n */, comments);
 
     return ret;
 }
 
 void ExportWidget::exportResult(const GpgME::Error &err, const QByteArray &data)
 {
     d->waitWidget->setVisible(false);
     d->textEdit->setVisible(true);
 
     if (err) {
         /* Should not happen. But well,.. */
         d->textEdit->setText(i18nc("%1 is error message", "Failed to export: '%1'", QString::fromLatin1(err.asString())));
     }
 
     d->textEdit->setText(injectComments(d->key, data));
 }
 
 void ExportWidget::setKey(const GpgME::Key &key)
 {
     d->waitWidget->setVisible(true);
     d->textEdit->setVisible(false);
     d->key = key;
 
     auto protocol = key.protocol() == GpgME::CMS ?
                                       QGpgME::smime() : QGpgME::openpgp();
 
     auto job = protocol->publicKeyExportJob(true);
 
     /* New style connect does not work on Windows. */
     connect(job, SIGNAL(result(GpgME::Error,QByteArray)),
             this, SLOT(exportResult(GpgME::Error,QByteArray)));
 
     job->start(QStringList() << QLatin1String(key.primaryFingerprint()));
 }
 
 GpgME::Key ExportWidget::key() const
 {
     return d->key;
 }
 
 ExportDialog::ExportDialog(QWidget *parent)
     : QDialog(parent),
       mWidget(new ExportWidget(this))
 {
     KConfigGroup dialog(KSharedConfig::openConfig(), "ExportDialog");
     const auto size = dialog.readEntry("Size", QSize(600, 800));
     if (size.isValid()) {
         resize(size);
     }
     setWindowTitle(i18n("Export..."));
 
     auto l = new QVBoxLayout(this);
     l->addWidget(mWidget);
 
     auto bbox = new QDialogButtonBox(this);
     auto btn = bbox->addButton(QDialogButtonBox::Close);
     connect(btn, &QPushButton::pressed, this, &QDialog::accept);
     l->addWidget(bbox);
 }
 
 ExportDialog::~ExportDialog()
 {
     KConfigGroup dialog(KSharedConfig::openConfig(), "ExportDialog");
     dialog.writeEntry("Size", size());
     dialog.sync();
 }
 
 void ExportDialog::setKey(const GpgME::Key &key)
 {
     mWidget->setKey(key);
 }
 
 GpgME::Key ExportDialog::key() const
 {
     return mWidget->key();
 }