diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mbox_resource_1 b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mbox_resource_1
new file mode 100644
index 0000000..54de844
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mbox_resource_1
@@ -0,0 +1,3 @@
+[Agent]
+DesiredOnlineState=true
+Name=mbox1
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mixedmaildir_resource_1 b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mixedmaildir_resource_1
new file mode 100644
index 0000000..1716f65
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/config/akonadi/agent_config_akonadi_mixedmaildir_resource_1
@@ -0,0 +1,3 @@
+[Agent]
+DesiredOnlineState=true
+Name=Local Folders
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/list.txt b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/list.txt
index 3043cf9..14cb610 100644
--- a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/list.txt
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/list.txt
@@ -1,10 +1,16 @@
 information/VERSION_2
 information/exportdatatype.xml
 identities/emailidentities
 configs/akonadi_archivemail_agentrc
 configs/foldermailarchiverc
 configs/kabldaprc
 configs/kmail2rc
 configs/templatesconfigurationrc
 transports/mailtransports
 configs/filters
+mails/akonadi_mbox_resource_1/agent_config_akonadi_mbox_resource_1
+mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1.mbox
+mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1rc
+mails/akonadi_mixedmaildir_resource_1/agent_config_akonadi_mixedmaildir_resource_1
+mails/akonadi_mixedmaildir_resource_1/akonadi_mixedmaildir_resource_1rc
+mails/akonadi_mixedmaildir_resource_1/mail.zip
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/agent_config_akonadi_mbox_resource_1 b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/agent_config_akonadi_mbox_resource_1
new file mode 100644
index 0000000..54de844
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/agent_config_akonadi_mbox_resource_1
@@ -0,0 +1,3 @@
+[Agent]
+DesiredOnlineState=true
+Name=mbox1
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1.mbox b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1.mbox
new file mode 100644
index 0000000..e69de29
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1rc b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1rc
new file mode 100644
index 0000000..954a014
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mbox_resource_1/akonadi_mbox_resource_1rc
@@ -0,0 +1,2 @@
+[General]
+Path[$e]=$[TEST_PATH]/resources/akonadi_mbox_resource_1/akonadi_mbox_resource_1.mbox
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/agent_config_akonadi_mixedmaildir_resource_1 b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/agent_config_akonadi_mixedmaildir_resource_1
new file mode 100644
index 0000000..1716f65
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/agent_config_akonadi_mixedmaildir_resource_1
@@ -0,0 +1,3 @@
+[Agent]
+DesiredOnlineState=true
+Name=Local Folders
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/akonadi_mixedmaildir_resource_1rc b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/akonadi_mixedmaildir_resource_1rc
new file mode 100644
index 0000000..ddea63d
--- /dev/null
+++ b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/akonadi_mixedmaildir_resource_1rc
@@ -0,0 +1,3 @@
+[General]
+Path[$e]=$[TEST_PATH]/resources/akonadi_mixedmaildir_resource_1/
+TopLevelIsContainer=true
diff --git a/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/mail.zip b/core/autotests/mail/data/export/identitiesandconfigandmailtransportandresources/references/mails/akonadi_mixedmaildir_resource_1/mail.zip
new file mode 100644
index 0000000..e69de29