Convert to email models immediately. Fixed related bugs.