BB: Email improvements