Mailstream prerequisites

I think I've got my mailstream plugin working well enough to submit it to main.  First I need these two changes though.