Email fix

Fixes DoSomething/dosomething#1057.