4 files changed, 21 insertions, 2 deletions
diff --git a/service/test/mailsets/common/cur/mbox00000002:2,S b/service/test/mailsets/common/cur/mbox00000002:2,S
new file mode 100644
index 00000000..2881e352
--- /dev/null
+++ b/service/test/mailsets/common/cur/mbox00000002:2,S
@@ -0,0 +1,19 @@
+Subject: A read mail
+From: bob@try.pixelated-project.org
+To: alice@try.pixelated-project.org
+X-Pixelated-encryption-status: true
+Date: Tue, 08 Apr 2015 18:32:05 +0000 (UTC)
+
+Q:	How many hardware engineers does it take to change a lightbulb?
+A:	None.  We'll fix it in software.
+
+Q:	How many system programmers does it take to change a light bulb?
+A:	None.  The application can work around it.
+
+Q:	How many software engineers does it take to change a lightbulb?
+A:	None.  We'll document it in the manual.
+
+Q:	How many tech writers does it take to change a lightbulb?
+A:	None.  The user can figure it out.
+
+
diff --git a/service/test/mailsets/common/mbox00000000 b/service/test/mailsets/common/new/mbox00000000:2,
index c3fab833..a35e63f0 100644
--- a/service/test/mailsets/common/mbox00000000
+++ b/service/test/mailsets/common/new/mbox00000000:2,
@@ -1,5 +1,5 @@
-From bob@try.pixelated-project.org
 Subject: Hey Alice
+From: bob@try.pixelated-project.org
 To: alice@try.pixelated-project.org
 X-TW-Pixelated-Tags: cia
 X-Pixelated-encryption-status: true
diff --git a/service/test/mailsets/common/mbox00000001 b/service/test/mailsets/common/new/mbox00000001
index f80a35cb..e1c6ba8b 100644
--- a/service/test/mailsets/common/mbox00000001
+++ b/service/test/mailsets/common/new/mbox00000001
@@ -1,5 +1,5 @@
-From bob@try.pixelated-project.org
 Subject: Garbage collection works
+From: bob@try.pixelated-project.org
 To: alice@try.pixelated-project.org
 X-TW-Pixelated-Tags: garbage
 X-Pixelated-encryption-status: true
diff --git a/service/test/mailsets/common/tmp/.keep b/service/test/mailsets/common/tmp/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/service/test/mailsets/common/tmp/.keep