Email::Store ... again

[deflatermouse]

Some test failures. I haven't even looked into them but I think that it might just be a corruption in the test file.