diff --git a/needles/kde/apps/enable_unified_mailboxes.json b/needles/kde/apps/enable_unified_mailboxes.json
new file mode 100644
index 00000000..208c54f7
--- /dev/null
+++ b/needles/kde/apps/enable_unified_mailboxes.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 231,
+      "ypos": 303,
+      "width": 115,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "enable_unified_mailboxes"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/enable_unified_mailboxes.png b/needles/kde/apps/enable_unified_mailboxes.png
new file mode 100644
index 00000000..a49bba49
Binary files /dev/null and b/needles/kde/apps/enable_unified_mailboxes.png differ
diff --git a/needles/kde/apps/konversation_confirm_close-20190327.json b/needles/kde/apps/konversation_confirm_close-20190327.json
new file mode 100644
index 00000000..8fa5b242
--- /dev/null
+++ b/needles/kde/apps/konversation_confirm_close-20190327.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 288,
+      "type": "match",
+      "width": 54,
+      "height": 19,
+      "xpos": 357
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "konversation_confirm_close"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kde/apps/konversation_confirm_close-20190327.png b/needles/kde/apps/konversation_confirm_close-20190327.png
new file mode 100644
index 00000000..8d4bad40
Binary files /dev/null and b/needles/kde/apps/konversation_confirm_close-20190327.png differ
diff --git a/tests/apps_startstop/kde/kmail.pm b/tests/apps_startstop/kde/kmail.pm
index 9f70bc0c..1c05162c 100644
--- a/tests/apps_startstop/kde/kmail.pm
+++ b/tests/apps_startstop/kde/kmail.pm
@@ -10,8 +10,15 @@ sub run {
     
     # Start the application
     start_with_launcher('kmail_launch','menu_applications','menu_internet');
+    # Enable unified mailboxes, if they appear
+    if (check_screen("enable_unified_mailboxes", 1)) {
+        assert_and_click "enable_unified_mailboxes";
+    }
     # Cancel Kmail data wizard
     assert_and_click 'kmail_cancel_data';
+    if (check_screen("kmail_cancel_data", 1)) {
+        assert_and_click "kmail_cancel_data";
+    }
     # Check that it is started
     assert_screen 'kmail_runs';
     # Close the application
diff --git a/tests/apps_startstop/kde/kontakt.pm b/tests/apps_startstop/kde/kontakt.pm
index 5f12955b..e46e4141 100644
--- a/tests/apps_startstop/kde/kontakt.pm
+++ b/tests/apps_startstop/kde/kontakt.pm
@@ -10,8 +10,15 @@ sub run {
     
     # Start the application
     start_with_launcher('kontact_launch','menu_applications','menu_office');
+    # Enable unified mailboxes, if they appear
+    if (check_screen("enable_unified_mailboxes", 1)) {
+        assert_and_click "enable_unified_mailboxes";
+    }
     # Get rid of personal data
     assert_and_click 'kontact_provide_data';
+    if (check_screen("enable_unified_mailboxes", 1)) {
+        assert_and_click "enable_unified_mailboxes";
+    }
     # Check that it is started
     assert_screen 'kontact_runs';
     # Close the application