Fixes #282 with some better mail piratical needs to be tested.