Work in progress on preserving raw email