diff --git a/mailmerge/mailmergewidget.cpp b/mailmerge/mailmergewidget.cpp
index 6a8da50c2..e0926d459 100644
--- a/mailmerge/mailmergewidget.cpp
+++ b/mailmerge/mailmergewidget.cpp
@@ -54,13 +54,16 @@ MailMergeWidget::MailMergeWidget(QWidget *parent)
     vbox->addWidget(mStackedWidget);
 
     QWidget *addressBookWidget = new QWidget;
+    addressBookWidget->setObjectName(QLatin1String("addressbookwidget"));
     QVBoxLayout *addressBookWidgetLayout = new QVBoxLayout;
     //TODO add addressbook select
     addressBookWidget->setLayout(addressBookWidgetLayout);
     mStackedWidget->addWidget(addressBookWidget);
 
     QWidget *csvWidget = new QWidget;
+    csvWidget->setObjectName(QLatin1String("csvwidget"));
     QVBoxLayout *csvWidgetLayout = new QVBoxLayout;
+    csvWidgetLayout->setMargin(0);
     csvWidget->setLayout(csvWidgetLayout);
 
     lab = new QLabel(i18n("Path:"));
diff --git a/mailmerge/tests/mailmergewidgettest.cpp b/mailmerge/tests/mailmergewidgettest.cpp
index 610ed0195..dfc4f3ea4 100644
--- a/mailmerge/tests/mailmergewidgettest.cpp
+++ b/mailmerge/tests/mailmergewidgettest.cpp
@@ -35,11 +35,18 @@ void MailMergeWidgetTest::shouldHaveDefaultValueOnCreation()
     QVERIFY(source);
     QCOMPARE(source->currentIndex(), 0);
 
+
     QStackedWidget *stackedwidget = qFindChild<QStackedWidget *>(&mailmerge, QLatin1String("stackedwidget"));
     QVERIFY(stackedwidget);
     QCOMPARE(stackedwidget->count(), 2);
     QCOMPARE(stackedwidget->currentIndex(), 0);
 
+    for(int i=0; i < stackedwidget->count(); ++i) {
+        const QString objectName = stackedwidget->widget(i)->objectName();
+        bool hasName = (objectName == QLatin1String("addressbookwidget") ||
+                        objectName == QLatin1String("csvwidget"));
+        QVERIFY(hasName);
+    }
     PimCommon::SimpleStringListEditor *listEditor = qFindChild<PimCommon::SimpleStringListEditor *>(&mailmerge, QLatin1String("attachment-list"));
     QVERIFY(listEditor);
     QCOMPARE(listEditor->stringList().count(), 0);