Fixed email export problems I introduced while adding new features.