fixed interleaved bug introduced by 70c6d
Merge bug fix from brazil into email3