MO: fix email handling