Fixes for razor email